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

Fix ruby version to not assume length (#1082)

This commit is contained in:
Jonathan Knapp 2020-04-10 12:41:14 -04:00 committed by GitHub
parent b11fe2ad30
commit 19e8301ff1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/ruby.rs
View File

@ -38,7 +38,10 @@ fn format_ruby_version(ruby_version: &str) -> Option<String> {
.split_whitespace() .split_whitespace()
// return "2.6.0p0" // return "2.6.0p0"
.nth(1)? .nth(1)?
.get(0..5)?; // split into ["2.6.0", "0"]
.split('p')
// return "2.6.0"
.next()?;
let mut formatted_version = String::with_capacity(version.len() + 1); let mut formatted_version = String::with_capacity(version.len() + 1);
formatted_version.push('v'); formatted_version.push('v');
@ -104,6 +107,10 @@ mod tests {
#[test] #[test]
fn test_format_ruby_version() -> io::Result<()> { fn test_format_ruby_version() -> io::Result<()> {
assert_eq!(
format_ruby_version("ruby 2.1.10p492 (2016-04-01 revision 54464) [x86_64-darwin19.0]"),
Some("v2.1.10".to_string())
);
assert_eq!( assert_eq!(
format_ruby_version("ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-linux-gnu]"), format_ruby_version("ruby 2.5.1p57 (2018-03-29 revision 63029) [x86_64-linux-gnu]"),
Some("v2.5.1".to_string()) Some("v2.5.1".to_string())