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

perf(crystal): Lazily evaluate version command (#2129) 

* perf(crystal): Lazily evaluate version command

This updates the module to lazily execute the `crystal --version`
command only when the `version` variable is used in the format string.

* perf(crystal): Update format string

Update format string to handle the `$version` variable not being set.
This commit is contained in:
Thomas O'Donnell 2021-01-13 18:35:44 +01:00 committed by GitHub
parent d49ff412f6
commit f640db87a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/config/README.md
View File

@ -567,12 +567,12 @@ The module will be shown if any of the following conditions are met:
### Options
| Option | Default | Description |
| ---------- | ---------------------------------- | --------------------------------------------------------- |
| `symbol` | `"🔮 "` | The symbol used before displaying the version of crystal. |
| `style` | `"bold red"` | The style for the module. |
| `format` | `"via [$symbol$version]($style) "` | The format for the module. |
| `disabled` | `false` | Disables the `crystal` module. |
| Option | Default | Description |
| ---------- | ------------------------------------ | --------------------------------------------------------- |
| `symbol` | `"🔮 "` | The symbol used before displaying the version of crystal. |
| `style` | `"bold red"` | The style for the module. |
| `format` | `"via [$symbol($version )]($style)"` | The format for the module. |
| `disabled` | `false` | Disables the `crystal` module. |
### Variables

2
src/configs/crystal.rs
View File

@ -13,7 +13,7 @@ pub struct CrystalConfig<'a> {
impl<'a> RootModuleConfig<'a> for CrystalConfig<'a> {
fn new() -> Self {
CrystalConfig {
format: "via [$symbol$version]($style) ",
format: "via [$symbol($version )]($style)",
symbol: "🔮 ",
style: "bold red",
disabled: false,

11
src/modules/crystal.rs
View File

@ -20,8 +20,6 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
return None;
}
let crystal_version = utils::exec_cmd("crystal", &["--version"])?.stdout;
let mut module = context.new_module("crystal");
let config: CrystalConfig = CrystalConfig::try_load(module.config);
@ -36,7 +34,10 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
_ => None,
})
.map(|variable| match variable {
"version" => format_crystal_version(&crystal_version).map(Ok),
"version" => format_crystal_version(
utils::exec_cmd("crystal", &["--version"])?.stdout.as_str(),
)
.map(Ok),
_ => None,
})
.parse(None)
@ -89,7 +90,7 @@ mod tests {
File::create(dir.path().join("shard.yml"))?.sync_all()?;
let actual = ModuleRenderer::new("crystal").path(dir.path()).collect();
let expected = Some(format!("via {} ", Color::Red.bold().paint("🔮 v0.35.1")));
let expected = Some(format!("via {}", Color::Red.bold().paint("🔮 v0.35.1 ")));
assert_eq!(expected, actual);
dir.close()
@ -101,7 +102,7 @@ mod tests {
File::create(dir.path().join("main.cr"))?.sync_all()?;
let actual = ModuleRenderer::new("crystal").path(dir.path()).collect();
let expected = Some(format!("via {} ", Color::Red.bold().paint("🔮 v0.35.1")));
let expected = Some(format!("via {}", Color::Red.bold().paint("🔮 v0.35.1 ")));
assert_eq!(expected, actual);
dir.close()