haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(package): added showing gradle version based on the gradle.properties file (#4432) 

* feat: added showing gradle version based on the gradle.properties file

* fix: wouldn't return version

* fix: forgot to remove "version=" from returned version"

* fix: ran rustfmt

* fix: test now actually tests for something

Co-authored-by: David Knaack <davidkna@users.noreply.github.com>

* fix: the regex actually makes sense now

* fix: complete refactor of control flow

* Delete flake.nix

* changed order in which files are processed

Co-authored-by: BattleCh1cken <BattleCh1cken@Larkov.de>
Co-authored-by: David Knaack <davidkna@users.noreply.github.com>
This commit is contained in:
Felix H 2022-10-30 11:43:32 -04:00 committed by GitHub
parent d1bc982a37
commit 14ee81b9c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/package.rs
View File

@ -102,11 +102,19 @@ fn get_setup_cfg_version(context: &Context, config: &PackageConfig) -> Option<St
} }
fn get_gradle_version(context: &Context, config: &PackageConfig) -> Option<String> { fn get_gradle_version(context: &Context, config: &PackageConfig) -> Option<String> {
let file_contents = context.read_file_from_pwd("build.gradle")?; context
let re = Regex::new(r#"(?m)^version ['"](?P<version>[^'"]+)['"]$"#).unwrap(); .read_file_from_pwd("gradle.properties")
let caps = re.captures(&file_contents)?; .and_then(|contents| {
let re = Regex::new(r"version=(?P<version>.*)").unwrap();
let caps = re.captures(&contents)?;
format_version(&caps["version"], config.version_format)
}).or_else(|| {
let build_file_contents = context.read_file_from_pwd("build.gradle")?;
let re = Regex::new(r#"(?m)^version ['"](?P<version>[^'"]+)['"]$"#).unwrap(); /*dark magic*/
let caps = re.captures(&build_file_contents)?;
format_version(&caps["version"], config.version_format)
format_version(&caps["version"], config.version_format) })
} }
fn get_composer_version(context: &Context, config: &PackageConfig) -> Option<String> { fn get_composer_version(context: &Context, config: &PackageConfig) -> Option<String> {
@ -960,6 +968,17 @@ java {
expect_output(&project_dir, None, None); expect_output(&project_dir, None, None);
project_dir.close() project_dir.close()
} }
#[test]
fn test_extract_grade_version_from_properties() -> io::Result<()> {
let config_name = "gradle.properties";
let config_content = "
version=1.2.3
";
let project_dir = create_project_dir()?;
fill_config(&project_dir, config_name, Some(config_content))?;
expect_output(&project_dir, Some("v1.2.3"), None);
project_dir.close()
}
#[test] #[test]
fn test_extract_mix_version() -> io::Result<()> { fn test_extract_mix_version() -> io::Result<()> {