Since other people are actually on zsh!

Author: itowlson

src/bin/spin.rs

@@ -7,6 +7,7 @@ use spin_cli::commands::{
     build::BuildCommand,
     deploy::DeployCommand,
     external::execute_external_subcommand,
+    generate_completions::GenerateCompletionsCommand,
     login::LoginCommand,
     new::{AddCommand, NewCommand},
     plugins::PluginCommands,
@@ -57,8 +58,8 @@ enum SpinApp {
     Plugin(PluginCommands),
     #[clap(subcommand, hide = true)]
     Trigger(TriggerCommands),
-    #[clap(hide = true, name = "generate-bash-completions")]
-    GenerateBashCompletions,
+    #[clap(hide = true, name = "generate-completions")]
+    GenerateCompletions(GenerateCompletionsCommand),
     #[clap(external_subcommand)]
     External(Vec<String>),
 }
@@ -84,11 +85,7 @@ impl SpinApp {
             Self::Trigger(TriggerCommands::Redis(cmd)) => cmd.run().await,
             Self::Login(cmd) => cmd.run().await,
             Self::Plugin(cmd) => cmd.run().await,
-            Self::GenerateBashCompletions => {
-                let mut cmd: clap::Command = SpinApp::into_app();
-                print_completions(clap_complete::Shell::Bash, &mut cmd);
-                Ok(())
-            }
+            Self::GenerateCompletions(cmd) => cmd.run(SpinApp::into_app()).await,
             Self::External(cmd) => execute_external_subcommand(cmd, SpinApp::command()).await,
         }
     }
@@ -103,7 +100,3 @@ fn build_info() -> String {
         env!("VERGEN_GIT_COMMIT_DATE")
     )
 }
-
-fn print_completions<G: clap_complete::Generator>(gen: G, cmd: &mut clap::Command) {
-    clap_complete::generate(gen, cmd, cmd.get_name().to_string(), &mut std::io::stdout())
-}

src/commands.rs

@@ -8,6 +8,8 @@ pub mod build;
 pub mod deploy;
 /// Commands for external subcommands (i.e. plugins)
 pub mod external;
+/// Command to generate shell completions
+pub mod generate_completions;
 // Command for logging into the server
 pub mod login;
 /// Command for creating a new application.

src/commands/generate_completions.rs

@@ -0,0 +1,22 @@
+use anyhow::Result;
+use clap::Parser;
+
+/// Generate shell completions.
+#[derive(Parser, Debug)]
+#[clap(about = "Generate completions")]
+pub struct GenerateCompletionsCommand {
+    #[clap(value_parser = clap::value_parser!(clap_complete::Shell))]
+    pub shell: clap_complete::Shell,
+}
+
+impl GenerateCompletionsCommand {
+    pub async fn run(&self, mut cmd: clap::Command<'_>) -> Result<()> {
+        // let mut cmd: clap::Command = SpinApp::into_app();
+        print_completions(self.shell, &mut cmd);
+        Ok(())
+    }
+}
+
+fn print_completions<G: clap_complete::Generator>(gen: G, cmd: &mut clap::Command) {
+    clap_complete::generate(gen, cmd, cmd.get_name().to_string(), &mut std::io::stdout())
+}