Add remaining completion files

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fab"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["Shaishav Gandhi <[email protected]>"]
 edition = "2018"
 

src/cli.rs

@@ -1,7 +1,7 @@
 use crate::preferences::Preferences;
 use clap::{App, Arg};
 
-pub const VERSION: &str = "0.4.1";
+pub const VERSION: &str = "0.4.2";
 
 /// Builds the App with commands and defaults.
 pub fn build_cli(preferences: &Preferences) -> App {
@@ -94,15 +94,17 @@ pub fn build_cli(preferences: &Preferences) -> App {
                 .author("Shaishav <[email protected]>"),
         )
         .subcommand(
-            App::new("autocomplete")
-                .about("Add autocomplete suggestions for vim")
-                .version(VERSION)
-                .author("Shaishav <[email protected]>"),
-        )
-        .subcommand(
-            App::new("generate-bash-completions")
+            App::new("generate-shell-completions")
                 .about("Generate the bash completion files for fab")
                 .version(VERSION)
+                .arg(
+                    Arg::with_name("shell")
+                        .short('s')
+                        .long("shell")
+                        .required(true)
+                        .help("Pass the shell for which you want completions")
+                        .possible_values(&["bash", "zsh", "fish", "elvish", "powershell"]),
+                )
                 .author("Shaishav <[email protected]>"),
         )
 }

src/main.rs

@@ -37,16 +37,31 @@ fn main() -> Result<(), Error> {
         summary::process_summary(matches, &config, &preferences)?;
     } else if let Some(matches) = matches.subcommand_matches("configure") {
         preferences::process_configuration(matches)?;
-    } else if let Some(_matches) = matches.subcommand_matches("generate-bash-completions") {
-        generate::<Bash, _>(&mut cli::build_cli(&preferences), "fab", &mut io::stdout());
-    } else if let Some(_matches) = matches.subcommand_matches("generate-zsh-completions") {
-        generate::<Zsh, _>(&mut cli::build_cli(&preferences), "fab", &mut io::stdout());
-    } else if let Some(_matches) = matches.subcommand_matches("generate-fish-completions") {
-        generate::<Fish, _>(&mut cli::build_cli(&preferences), "fab", &mut io::stdout());
-    } else if let Some(_matches) = matches.subcommand_matches("generate-elvish-completions") {
-        generate::<Elvish, _>(&mut cli::build_cli(&preferences), "fab", &mut io::stdout());
-    } else if let Some(_matches) = matches.subcommand_matches("generate-powershell-completions") {
-        generate::<PowerShell, _>(&mut cli::build_cli(&preferences), "fab", &mut io::stdout());
+    } else if let Some(matches) = matches.subcommand_matches("generate-shell-completions") {
+        let shell = matches
+            .value_of("shell")
+            .expect("No shell specified for generating completions");
+
+        match shell {
+            "bash" => {
+                generate::<Bash, _>(&mut cli::build_cli(&preferences), "fab", &mut io::stdout())
+            }
+            "zsh" => {
+                generate::<Zsh, _>(&mut cli::build_cli(&preferences), "fab", &mut io::stdout())
+            }
+            "fish" => {
+                generate::<Fish, _>(&mut cli::build_cli(&preferences), "fab", &mut io::stdout())
+            }
+            "elvish" => {
+                generate::<Elvish, _>(&mut cli::build_cli(&preferences), "fab", &mut io::stdout())
+            }
+            "powershell" => generate::<PowerShell, _>(
+                &mut cli::build_cli(&preferences),
+                "fab",
+                &mut io::stdout(),
+            ),
+            _ => return Err(failure::err_msg("No matching shell specified")),
+        }
     }
     Ok(())
 }