Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-11-28 15:56:28 +00:00
Code Issues Releases Activity

fix(dart): detect version output in stdout with dart 2.15+ (#3349)

Browse Source
This commit is contained in:
Zhong Liu 2021-12-24 22:43:07 +08:00 committed by GitHub
parent 10e8912159
commit 8d0cebdcbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/dart.rs
View File

@ -3,6 +3,7 @@ use super::{Context, Module, RootModuleConfig};
use crate::configs::dart::DartConfig; use crate::configs::dart::DartConfig;
use crate::formatter::StringFormatter; use crate::formatter::StringFormatter;
use crate::formatter::VersionFormatter; use crate::formatter::VersionFormatter;
use crate::utils::get_command_string_output;
/// Creates a module with the current Dart version /// Creates a module with the current Dart version
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> { pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
@ -32,8 +33,8 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
}) })
.map(|variable| match variable { .map(|variable| match variable {
"version" => { "version" => {
let dart_version = let command = context.exec_cmd("dart", &["--version"])?;
parse_dart_version(&context.exec_cmd("dart", &["--version"])?.stderr)?; let dart_version = parse_dart_version(&get_command_string_output(command))?;
VersionFormatter::format_module_version( VersionFormatter::format_module_version(
module.get_name(), module.get_name(),
&dart_version, &dart_version,
@ -71,6 +72,7 @@ fn parse_dart_version(dart_version: &str) -> Option<String> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::test::ModuleRenderer; use crate::test::ModuleRenderer;
use crate::utils::CommandOutput;
use ansi_term::Color; use ansi_term::Color;
use std::fs::{self, File}; use std::fs::{self, File};
use std::io; use std::io;
@ -138,4 +140,25 @@ mod tests {
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
} }
#[test]
fn detect_version_output_in_stdout() -> io::Result<()> {
// after dart 2.15.0, version info output in stdout.
let dir = tempfile::tempdir()?;
File::create(dir.path().join("any.dart"))?.sync_all()?;
let actual = ModuleRenderer::new("dart")
.cmd(
"dart --version",
Some(CommandOutput {
stdout: String::from("Dart SDK version: 2.15.1 (stable) (Tue Dec 14 13:32:21 2021 +0100) on \"linux_x64\""),
stderr: String::default(),
}),
)
.path(dir.path())
.collect();
let expected = Some(format!("via {}", Color::Blue.bold().paint("🎯 v2.15.1 ")));
assert_eq!(expected, actual);
dir.close()
}
} }