Merge pull request #527 from Tirka/add-nushell-completions

Feature: add shell completions for `nushell`

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+
+- Nushell autocompletion script [#527](https://github.com/Nukesor/pueue/pull/527)
+
 ## [3.4.0] - 2024-03-22
 
 ### Added

pueue/Cargo.toml

@@ -18,8 +18,9 @@ maintenance = { status = "actively-developed" }
 anyhow = "1.0"
 chrono = { workspace = true }
 chrono-english = "0.1"
-clap = { version = "4.3", features = ["derive", "cargo", "help"] }
-clap_complete = "4.3"
+clap = { version = "4.5.1", features = ["derive", "cargo", "help"] }
+clap_complete = "4.5.1"
+clap_complete_nushell = "4.5.1"
 comfy-table = "7"
 command-group = { workspace = true }
 ctrlc = { version = "3", features = ["termination"] }

pueue/src/bin/pueue.rs

@@ -110,21 +110,12 @@ fn create_shell_completion_file(shell: &Shell, output_directory: &Option<PathBuf
                 generate_to(shells::PowerShell, &mut app, "pueue", output_directory)
             }
             Shell::Zsh => generate_to(shells::Zsh, &mut app, "pueue", output_directory),
-        };
-        completion_result.context(format!("Failed to generate completions for {shell:?}"))?;
-
-        return Ok(());
-    }
-
-    if let Some(output_directory) = output_directory {
-        let completion_result = match shell {
-            Shell::Bash => generate_to(shells::Bash, &mut app, "pueue", output_directory),
-            Shell::Elvish => generate_to(shells::Elvish, &mut app, "pueue", output_directory),
-            Shell::Fish => generate_to(shells::Fish, &mut app, "pueue", output_directory),
-            Shell::PowerShell => {
-                generate_to(shells::PowerShell, &mut app, "pueue", output_directory)
-            }
-            Shell::Zsh => generate_to(shells::Zsh, &mut app, "pueue", output_directory),
+            Shell::Nushell => generate_to(
+                clap_complete_nushell::Nushell,
+                &mut app,
+                "pueue",
+                output_directory,
+            ),
         };
         completion_result.context(format!("Failed to generate completions for {shell:?}"))?;
 
@@ -139,6 +130,12 @@ fn create_shell_completion_file(shell: &Shell, output_directory: &Option<PathBuf
         Shell::Fish => generate(shells::Fish, &mut app, "pueue", &mut stdout),
         Shell::PowerShell => generate(shells::PowerShell, &mut app, "pueue", &mut stdout),
         Shell::Zsh => generate(shells::Zsh, &mut app, "pueue", &mut stdout),
+        Shell::Nushell => generate(
+            clap_complete_nushell::Nushell,
+            &mut app,
+            "pueue",
+            &mut stdout,
+        ),
     };
 
     Ok(())

pueue/src/client/cli.rs

@@ -528,6 +528,7 @@ pub enum Shell {
     Fish,
     PowerShell,
     Zsh,
+    Nushell,
 }
 
 #[derive(Parser, Debug)]

pueue/tests/client/integration/completions.rs

@@ -11,11 +11,12 @@ use rstest::rstest;
 #[case("bash")]
 #[case("fish")]
 #[case("power-shell")]
+#[case("nushell")]
 #[test]
 fn autocompletion_generation(#[case] shell: &'static str) -> Result<()> {
     let output = Command::cargo_bin("pueue")?
         .arg("completions")
-        .arg("zsh")
+        .arg(shell)
         .arg("./")
         .stdout(Stdio::piped())
         .stderr(Stdio::piped())