From 9e21e3cf5fb0938902c526ed3917e27d289baca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20T=C3=BCrkal?= Date: Sat, 30 Jan 2021 14:05:16 +0300 Subject: [PATCH] feat(vagrant): Add support for Vagrant (#1812) Signed-off-by: Dentrax Co-authored-by: Thomas O'Donnell Co-authored-by: Thomas O'Donnell --- docs/config/README.md | 36 ++++++++++++ src/configs/mod.rs | 1 + src/configs/starship_root.rs | 1 + src/configs/vagrant.rs | 22 ++++++++ src/module.rs | 1 + src/modules/mod.rs | 3 + src/modules/vagrant.rs | 105 +++++++++++++++++++++++++++++++++++ src/utils.rs | 4 ++ 8 files changed, 173 insertions(+) create mode 100644 src/configs/vagrant.rs create mode 100644 src/modules/vagrant.rs diff --git a/docs/config/README.md b/docs/config/README.md index 533de1e3..7a1b8a68 100644 --- a/docs/config/README.md +++ b/docs/config/README.md @@ -218,6 +218,7 @@ $ruby\ $rust\ $swift\ $terraform\ +$vagrant\ $zig\ $nix_shell\ $conda\ @@ -2496,6 +2497,41 @@ disabled = false 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 The `zig` module shows the currently installed version of Zig. diff --git a/src/configs/mod.rs b/src/configs/mod.rs index 156474c0..91d3b106 100644 --- a/src/configs/mod.rs +++ b/src/configs/mod.rs @@ -50,6 +50,7 @@ pub mod swift; pub mod terraform; pub mod time; pub mod username; +pub mod vagrant; pub mod zig; pub use starship_root::*; diff --git a/src/configs/starship_root.rs b/src/configs/starship_root.rs index 554e2418..5450747e 100644 --- a/src/configs/starship_root.rs +++ b/src/configs/starship_root.rs @@ -51,6 +51,7 @@ pub const PROMPT_ORDER: &[&str] = &[ "rust", "swift", "terraform", + "vagrant", "zig", // ↑ Toolchain version modules ↑ "nix_shell", diff --git a/src/configs/vagrant.rs b/src/configs/vagrant.rs new file mode 100644 index 00000000..cab83c01 --- /dev/null +++ b/src/configs/vagrant.rs @@ -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, + } + } +} diff --git a/src/module.rs b/src/module.rs index 2f436ea0..431a3790 100644 --- a/src/module.rs +++ b/src/module.rs @@ -61,6 +61,7 @@ pub const ALL_MODULES: &[&str] = &[ "status", "time", "username", + "vagrant", "zig", ]; diff --git a/src/modules/mod.rs b/src/modules/mod.rs index 4884fcfd..91872b36 100644 --- a/src/modules/mod.rs +++ b/src/modules/mod.rs @@ -51,6 +51,7 @@ mod terraform; mod time; mod username; mod utils; +mod vagrant; mod zig; #[cfg(feature = "battery")] @@ -120,6 +121,7 @@ pub fn handle<'a>(module: &str, context: &'a Context) -> Option> { "time" => time::module(context), "crystal" => crystal::module(context), "username" => username::module(context), + "vagrant" => vagrant::module(context), "zig" => zig::module(context), _ => { 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", "time" => "The current local time", "username" => "The active user's username", + "vagrant" => "The currently installed version of Vagrant", "zig" => "The currently installed version of Zig", _ => "", } diff --git a/src/modules/vagrant.rs b/src/modules/vagrant.rs new file mode 100644 index 00000000..45563c2b --- /dev/null +++ b/src/modules/vagrant.rs @@ -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> { + 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 { + // `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())); + } +} diff --git a/src/utils.rs b/src/utils.rs index 68435288..2ab34a88 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -168,6 +168,10 @@ Target: x86_64-apple-darwin19.4.0\n", ), stderr: String::default(), }), + "vagrant --version" => Some(CommandOutput { + stdout: String::from("Vagrant 2.2.10\n"), + stderr: String::default(), + }), "zig version" => Some(CommandOutput { stdout: String::from("0.6.0\n"), stderr: String::default(),