mirror of
https://github.com/Llewellynvdm/starship.git
synced 2024-11-15 01:34:10 +00:00
feat(vagrant): Add support for Vagrant (#1812)
Signed-off-by: Dentrax <furkan.turkal@hotmail.com> Co-authored-by: Thomas O'Donnell <andytom@users.noreply.github.com> Co-authored-by: Thomas O'Donnell <andytom@users.noreply.github.com>
This commit is contained in:
parent
9b02a9742a
commit
9e21e3cf5f
@ -218,6 +218,7 @@ $ruby\
|
|||||||
$rust\
|
$rust\
|
||||||
$swift\
|
$swift\
|
||||||
$terraform\
|
$terraform\
|
||||||
|
$vagrant\
|
||||||
$zig\
|
$zig\
|
||||||
$nix_shell\
|
$nix_shell\
|
||||||
$conda\
|
$conda\
|
||||||
@ -2496,6 +2497,41 @@ disabled = false
|
|||||||
show_always = true
|
show_always = true
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Vagrant
|
||||||
|
|
||||||
|
The `vagrant` module shows the currently installed version of Vagrant.
|
||||||
|
The module will be shown if any of the following conditions are met:
|
||||||
|
|
||||||
|
- The current directory contains a `Vagrantfile` file
|
||||||
|
|
||||||
|
### Options
|
||||||
|
|
||||||
|
| Option | Default | Description |
|
||||||
|
| ---------- | ---------------------------------- | --------------------------------------------------- |
|
||||||
|
| `format` | `"via [$symbol($version )]($style)"` | The format for the module. |
|
||||||
|
| `symbol` | `"⍱ "` | A format string representing the symbol of Vagrant. |
|
||||||
|
| `style` | `"cyan bold"` | The style for the module. |
|
||||||
|
| `disabled` | `false` | Disables the `Vagrant` module. |
|
||||||
|
|
||||||
|
### Variables
|
||||||
|
|
||||||
|
| Variable | Example | Description |
|
||||||
|
| -------- | ---------------- | ------------------------------------ |
|
||||||
|
| version | `Vagrant 2.2.10` | The version of `Vagrant` |
|
||||||
|
| symbol | | Mirrors the value of option `symbol` |
|
||||||
|
| style\* | | Mirrors the value of option `style` |
|
||||||
|
|
||||||
|
\*: This variable can only be used as a part of a style string
|
||||||
|
|
||||||
|
### Example
|
||||||
|
|
||||||
|
```toml
|
||||||
|
# ~/.config/starship.toml
|
||||||
|
|
||||||
|
[vagrant]
|
||||||
|
format = "via [⍱ $version](bold white) "
|
||||||
|
```
|
||||||
|
|
||||||
## Zig
|
## Zig
|
||||||
|
|
||||||
The `zig` module shows the currently installed version of Zig.
|
The `zig` module shows the currently installed version of Zig.
|
||||||
|
@ -50,6 +50,7 @@ pub mod swift;
|
|||||||
pub mod terraform;
|
pub mod terraform;
|
||||||
pub mod time;
|
pub mod time;
|
||||||
pub mod username;
|
pub mod username;
|
||||||
|
pub mod vagrant;
|
||||||
pub mod zig;
|
pub mod zig;
|
||||||
|
|
||||||
pub use starship_root::*;
|
pub use starship_root::*;
|
||||||
|
@ -51,6 +51,7 @@ pub const PROMPT_ORDER: &[&str] = &[
|
|||||||
"rust",
|
"rust",
|
||||||
"swift",
|
"swift",
|
||||||
"terraform",
|
"terraform",
|
||||||
|
"vagrant",
|
||||||
"zig",
|
"zig",
|
||||||
// ↑ Toolchain version modules ↑
|
// ↑ Toolchain version modules ↑
|
||||||
"nix_shell",
|
"nix_shell",
|
||||||
|
22
src/configs/vagrant.rs
Normal file
22
src/configs/vagrant.rs
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
use crate::config::{ModuleConfig, RootModuleConfig};
|
||||||
|
|
||||||
|
use starship_module_config_derive::ModuleConfig;
|
||||||
|
|
||||||
|
#[derive(Clone, ModuleConfig)]
|
||||||
|
pub struct VagrantConfig<'a> {
|
||||||
|
pub format: &'a str,
|
||||||
|
pub symbol: &'a str,
|
||||||
|
pub style: &'a str,
|
||||||
|
pub disabled: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> RootModuleConfig<'a> for VagrantConfig<'a> {
|
||||||
|
fn new() -> Self {
|
||||||
|
VagrantConfig {
|
||||||
|
format: "via [$symbol($version )]($style)",
|
||||||
|
symbol: "⍱ ",
|
||||||
|
style: "cyan bold",
|
||||||
|
disabled: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -61,6 +61,7 @@ pub const ALL_MODULES: &[&str] = &[
|
|||||||
"status",
|
"status",
|
||||||
"time",
|
"time",
|
||||||
"username",
|
"username",
|
||||||
|
"vagrant",
|
||||||
"zig",
|
"zig",
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@ mod terraform;
|
|||||||
mod time;
|
mod time;
|
||||||
mod username;
|
mod username;
|
||||||
mod utils;
|
mod utils;
|
||||||
|
mod vagrant;
|
||||||
mod zig;
|
mod zig;
|
||||||
|
|
||||||
#[cfg(feature = "battery")]
|
#[cfg(feature = "battery")]
|
||||||
@ -120,6 +121,7 @@ pub fn handle<'a>(module: &str, context: &'a Context) -> Option<Module<'a>> {
|
|||||||
"time" => time::module(context),
|
"time" => time::module(context),
|
||||||
"crystal" => crystal::module(context),
|
"crystal" => crystal::module(context),
|
||||||
"username" => username::module(context),
|
"username" => username::module(context),
|
||||||
|
"vagrant" => vagrant::module(context),
|
||||||
"zig" => zig::module(context),
|
"zig" => zig::module(context),
|
||||||
_ => {
|
_ => {
|
||||||
eprintln!("Error: Unknown module {}. Use starship module --list to list out all supported modules.", module);
|
eprintln!("Error: Unknown module {}. Use starship module --list to list out all supported modules.", module);
|
||||||
@ -194,6 +196,7 @@ pub fn description(module: &str) -> &'static str {
|
|||||||
"terraform" => "The currently selected terraform workspace and version",
|
"terraform" => "The currently selected terraform workspace and version",
|
||||||
"time" => "The current local time",
|
"time" => "The current local time",
|
||||||
"username" => "The active user's username",
|
"username" => "The active user's username",
|
||||||
|
"vagrant" => "The currently installed version of Vagrant",
|
||||||
"zig" => "The currently installed version of Zig",
|
"zig" => "The currently installed version of Zig",
|
||||||
_ => "<no description>",
|
_ => "<no description>",
|
||||||
}
|
}
|
||||||
|
105
src/modules/vagrant.rs
Normal file
105
src/modules/vagrant.rs
Normal file
@ -0,0 +1,105 @@
|
|||||||
|
use super::{Context, Module, RootModuleConfig};
|
||||||
|
|
||||||
|
use crate::configs::vagrant::VagrantConfig;
|
||||||
|
use crate::formatter::StringFormatter;
|
||||||
|
use crate::utils;
|
||||||
|
|
||||||
|
/// Creates a module with the current Vagrant version
|
||||||
|
///
|
||||||
|
/// Will display the Vagrant version if any of the following criteria are met:
|
||||||
|
/// - Current directory contains a `Vagrantfile` file
|
||||||
|
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
|
||||||
|
let is_vagrant_project = context
|
||||||
|
.try_begin_scan()?
|
||||||
|
.set_files(&["Vagrantfile"])
|
||||||
|
.is_match();
|
||||||
|
|
||||||
|
if !is_vagrant_project {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut module = context.new_module("vagrant");
|
||||||
|
let config = VagrantConfig::try_load(module.config);
|
||||||
|
let parsed = StringFormatter::new(config.format).and_then(|formatter| {
|
||||||
|
formatter
|
||||||
|
.map_meta(|var, _| match var {
|
||||||
|
"symbol" => Some(config.symbol),
|
||||||
|
_ => None,
|
||||||
|
})
|
||||||
|
.map_style(|variable| match variable {
|
||||||
|
"style" => Some(Ok(config.style)),
|
||||||
|
_ => None,
|
||||||
|
})
|
||||||
|
.map(|variable| match variable {
|
||||||
|
"version" => format_vagrant_version(
|
||||||
|
&utils::exec_cmd("vagrant", &["--version"])?.stdout.as_str(),
|
||||||
|
)
|
||||||
|
.map(Ok),
|
||||||
|
_ => None,
|
||||||
|
})
|
||||||
|
.parse(None)
|
||||||
|
});
|
||||||
|
|
||||||
|
module.set_segments(match parsed {
|
||||||
|
Ok(segments) => segments,
|
||||||
|
Err(error) => {
|
||||||
|
log::warn!("Error in module `vagrant`:\n{}", error);
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Some(module)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn format_vagrant_version(vagrant_stdout: &str) -> Option<String> {
|
||||||
|
// `vagrant --version` output looks like this:
|
||||||
|
// Vagrant 2.2.10
|
||||||
|
let version = vagrant_stdout
|
||||||
|
// split into ["Vagrant","2.2.10"]
|
||||||
|
.split_whitespace()
|
||||||
|
// return "2.2.10"
|
||||||
|
.nth(1)?;
|
||||||
|
|
||||||
|
let mut formatted_version = String::with_capacity(version.len() + 1);
|
||||||
|
formatted_version.push('v');
|
||||||
|
formatted_version.push_str(version);
|
||||||
|
Some(formatted_version)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use crate::test::ModuleRenderer;
|
||||||
|
use ansi_term::Color;
|
||||||
|
use std::fs::File;
|
||||||
|
use std::io;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn folder_without_vagrant_files() -> io::Result<()> {
|
||||||
|
let dir = tempfile::tempdir()?;
|
||||||
|
|
||||||
|
let actual = ModuleRenderer::new("vagrant").path(dir.path()).collect();
|
||||||
|
|
||||||
|
let expected = None;
|
||||||
|
assert_eq!(expected, actual);
|
||||||
|
dir.close()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn folder_with_vagrant_file() -> io::Result<()> {
|
||||||
|
let dir = tempfile::tempdir()?;
|
||||||
|
File::create(dir.path().join("Vagrantfile"))?.sync_all()?;
|
||||||
|
|
||||||
|
let actual = ModuleRenderer::new("vagrant").path(dir.path()).collect();
|
||||||
|
|
||||||
|
let expected = Some(format!("via {}", Color::Cyan.bold().paint("⍱ v2.2.10 ")));
|
||||||
|
assert_eq!(expected, actual);
|
||||||
|
dir.close()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_format_vagrant_version() {
|
||||||
|
let vagrant = "Vagrant 2.2.10\n";
|
||||||
|
assert_eq!(format_vagrant_version(vagrant), Some("v2.2.10".to_string()));
|
||||||
|
}
|
||||||
|
}
|
@ -168,6 +168,10 @@ Target: x86_64-apple-darwin19.4.0\n",
|
|||||||
),
|
),
|
||||||
stderr: String::default(),
|
stderr: String::default(),
|
||||||
}),
|
}),
|
||||||
|
"vagrant --version" => Some(CommandOutput {
|
||||||
|
stdout: String::from("Vagrant 2.2.10\n"),
|
||||||
|
stderr: String::default(),
|
||||||
|
}),
|
||||||
"zig version" => Some(CommandOutput {
|
"zig version" => Some(CommandOutput {
|
||||||
stdout: String::from("0.6.0\n"),
|
stdout: String::from("0.6.0\n"),
|
||||||
stderr: String::default(),
|
stderr: String::default(),
|
||||||
|
Loading…
Reference in New Issue
Block a user