final update

Author: ofek

vdev/Cargo.lock

@@ -13,11 +13,11 @@ atty = "0.2.14"
 cached = "0.40.0"
 clap = { version = "4.0.18", features = ["derive"] }
 clap-verbosity-flag = "2.0.0"
+clap_complete = "4.0.5"
 confy = "0.5.1"
 directories = "4.0.1"
 # remove this when stabilized https://doc.rust-lang.org/stable/std/path/fn.absolute.html
 dunce = "1.0.3"
-env_logger = "0.9.1"
 hashlink = { version = "0.8.1", features = ["serde_impl"] }
 home = "0.5.4"
 indicatif = { version = "0.17.1", features = ["improved_unicode"] }

vdev/Cargo.toml

@@ -5,21 +5,16 @@ use once_cell::sync::OnceCell;
 use std::time::Duration;
 use std::{borrow::Cow, process::Command};
 
-use crate::config::{Config, ConfigFile};
+use crate::config::Config;
 
 static VERBOSITY: OnceCell<LevelFilter> = OnceCell::new();
-static CONFIG_FILE: OnceCell<ConfigFile> = OnceCell::new();
 static CONFIG: OnceCell<Config> = OnceCell::new();
 static PATH: OnceCell<String> = OnceCell::new();
 
 pub fn verbosity() -> &'static LevelFilter {
     VERBOSITY.get().expect("verbosity is not initialized")
 }
 
-pub fn config_file() -> &'static ConfigFile {
-    CONFIG_FILE.get().expect("config file is not initialized")
-}
-
 pub fn config() -> &'static Config {
     CONFIG.get().expect("config is not initialized")
 }
@@ -98,17 +93,13 @@ fn render_command(command: &mut Command) -> String {
 }
 
 pub fn set_global_verbosity(verbosity: LevelFilter) {
-    VERBOSITY.set(verbosity).unwrap()
-}
-
-pub fn set_global_config_file(config_file: ConfigFile) {
-    CONFIG_FILE.set(config_file).unwrap()
+    VERBOSITY.set(verbosity).expect("could not set verbosity")
 }
 
 pub fn set_global_config(config: Config) {
-    CONFIG.set(config).unwrap()
+    CONFIG.set(config).expect("could not set config")
 }
 
 pub fn set_global_path(path: String) {
-    PATH.set(path).unwrap()
+    PATH.set(path).expect("could not set path")
 }

vdev/src/app.rs

@@ -2,50 +2,34 @@ use anyhow::Result;
 use clap::{Parser, Subcommand};
 use clap_verbosity_flag::{InfoLevel, Verbosity};
 
-use crate::commands;
-
 /// Vector's unified dev tool
 #[derive(Parser, Debug)]
-#[
-    command(
-        bin_name = "vdev",
-        author,
-        version,
-        about,
-        disable_help_subcommand = true,
-        long_about = None,
-    )
-]
+#[command(version, bin_name = "vdev", disable_help_subcommand = true)]
 pub struct Cli {
     #[clap(flatten)]
-    pub(crate) verbose: Verbosity<InfoLevel>,
+    pub verbose: Verbosity<InfoLevel>,
 
     #[command(subcommand)]
     command: Commands,
 }
 
 #[derive(Subcommand, Debug)]
 enum Commands {
-    /// Build Vector
-    Build(commands::build::Cli),
-    /// Manage the vdev config file
-    Config(commands::config::cli::Cli),
-    /// Execute a command within the repository
-    Exec(commands::exec::Cli),
-    /// Manage integrations
-    Int(commands::int::cli::Cli),
-    /// Collection of useful utilities
-    Meta(commands::meta::cli::Cli),
-    /// Show information about the current environment
-    Status(commands::status::Cli),
-    /// Execute tests
-    Test(commands::test::Cli),
+    Build(super::build::Cli),
+    Complete(super::complete::Cli),
+    Config(super::config::cli::Cli),
+    Exec(super::exec::Cli),
+    Int(super::int::cli::Cli),
+    Meta(super::meta::cli::Cli),
+    Status(super::status::Cli),
+    Test(super::test::Cli),
 }
 
 impl Cli {
     pub fn exec(&self) -> Result<()> {
         match &self.command {
             Commands::Build(cli) => cli.exec(),
+            Commands::Complete(cli) => cli.exec(),
             Commands::Config(cli) => cli.exec(),
             Commands::Exec(cli) => cli.exec(),
             Commands::Int(cli) => cli.exec(),

vdev/src/commands/cli.rs

@@ -0,0 +1,24 @@
+use anyhow::Result;
+use clap::{Args, CommandFactory};
+use clap_complete::{generate, Shell};
+use std::io;
+
+use crate::commands::cli::Cli as RootCli;
+
+/// Display the completion file for a given shell
+#[derive(Args, Debug)]
+#[command()]
+pub struct Cli {
+    #[arg(value_enum)]
+    shell: Shell,
+}
+
+impl Cli {
+    pub fn exec(&self) -> Result<()> {
+        let mut cmd = RootCli::command();
+        let bin_name = cmd.get_name().to_string();
+        generate(self.shell, &mut cmd, bin_name, &mut io::stdout());
+
+        Ok(())
+    }
+}

vdev/src/commands/complete.rs

@@ -1,8 +1,6 @@
 use anyhow::Result;
 use clap::{Args, Subcommand};
 
-use crate::commands;
-
 /// Manage the vdev config file
 #[derive(Args, Debug)]
 #[command()]
@@ -13,10 +11,8 @@ pub struct Cli {
 
 #[derive(Subcommand, Debug)]
 enum Commands {
-    /// Locate the config file
-    Find(commands::config::find::Cli),
-    /// Modify the config file
-    Set(commands::config::set::cli::Cli),
+    Find(super::find::Cli),
+    Set(super::set::cli::Cli),
 }
 
 impl Cli {