Merge branch 'add_nushell_autocompletion' into add_nushell

Author: doubleailes

Cargo.lock

@@ -46,7 +46,7 @@ bytes = "1.5"
 cached = "0.48.1"
 chrono = { version = "0.4.34", features = ["serde"] }
 clap = { version = "4.5", features = ["derive", "env"] }
-clap_complete = "4.3"
+clap_complete = "4.5"
 colored = "2.0.0"
 config = "0.14.0"
 console = "0.15.8"

Cargo.toml

@@ -20,17 +20,11 @@ mod tree;
 use std::cell::RefCell;
 
 pub use annotation::{
-    Annotation,
-    AnnotationValue,
-    DEFAULT_SPFS_ANNOTATION_LAYER_MAX_STRING_VALUE_SIZE,
+    Annotation, AnnotationValue, DEFAULT_SPFS_ANNOTATION_LAYER_MAX_STRING_VALUE_SIZE,
 };
 pub use blob::Blob;
 pub use database::{
-    Database,
-    DatabaseIterator,
-    DatabaseView,
-    DatabaseWalker,
-    DigestSearchCriteria,
+    Database, DatabaseIterator, DatabaseView, DatabaseWalker, DigestSearchCriteria,
 };
 pub use entry::Entry;
 pub use kind::{HasKind, Kind, ObjectKind};

crates/spfs/src/graph/mod.rs

@@ -21,21 +21,8 @@ pub mod winfsp;
 #[cfg(unix)]
 pub use overlayfs::is_removed_entry;
 pub use storage::{
-    makedirs_with_perms,
-    Author,
-    BindMount,
-    Config,
-    Data,
-    KeyValuePair,
-    KeyValuePairBuf,
-    LiveLayer,
-    LiveLayerFile,
-    MountBackend,
-    OwnedRuntime,
-    Runtime,
-    Status,
-    Storage,
-    STARTUP_FILES_LOCATION,
+    makedirs_with_perms, Author, BindMount, Config, Data, KeyValuePair, KeyValuePairBuf, LiveLayer,
+    LiveLayerFile, MountBackend, OwnedRuntime, Runtime, Status, Storage, STARTUP_FILES_LOCATION,
 };
 #[cfg(windows)]
 pub use winfsp::is_removed_entry;

crates/spfs/src/runtime/mod.rs

@@ -26,9 +26,9 @@ use tokio::io::AsyncReadExt;
 
 #[cfg(windows)]
 use super::startup_ps;
-use super::{config_nu, env_nu};
 #[cfg(unix)]
 use super::{startup_csh, startup_sh};
+use super::{config_nu, env_nu};
 use crate::encoding::Digest;
 use crate::env::SPFS_DIR_PREFIX;
 use crate::graph::object::Enum;

crates/spfs/src/runtime/storage.rs

@@ -34,6 +34,7 @@ spk-storage = { workspace = true }
 strip-ansi-escapes = { version = "0.1.1" }
 tokio = { workspace = true, features = ["rt"] }
 tracing = { workspace = true }
+clap_complete_nushell ={ version = "4.5"}
 
 [dev-dependencies]
 rstest = { workspace = true }

crates/spk-cli/group1/Cargo.toml

@@ -8,36 +8,81 @@ use std::io::Write;
 
 use clap::{value_parser, Command, Parser};
 use clap_complete;
-use clap_complete::Shell;
+use clap_complete::{Generator, Shell};
+use clap_complete_nushell::Nushell;
+use clap::ValueEnum;
 use miette::Result;
 use spk_cli_common::CommandArgs;
 
+#[derive(Clone, Debug, ValueEnum)]
+enum ShellCompletion {
+    /// Bourne Again SHell (bash)
+    Bash,
+    /// Friendly Interactive SHell (fish)
+    Fish,
+    /// PowerShell
+    Zsh,
+    /// Nushell
+    Nushell,
+}
+impl ToString for ShellCompletion {
+    fn to_string(&self) -> String {
+        match self {
+            ShellCompletion::Bash => "bash".to_string(),
+            ShellCompletion::Fish => "fish".to_string(),
+            ShellCompletion::Zsh => "zsh".to_string(),
+            ShellCompletion::Nushell => "nu".to_string(),
+        }
+    }
+}
+
+impl Generator for ShellCompletion {
+    /// Generate the file name for the completion script.
+    fn file_name(&self, name: &str) -> String {
+        match self {
+            ShellCompletion::Bash => Shell::Bash.file_name(name),
+            ShellCompletion::Fish => Shell::Fish.file_name(name),
+            ShellCompletion::Zsh => Shell::Zsh.file_name(name),
+            ShellCompletion::Nushell => Nushell.file_name(name),
+        }
+    }
+
+    /// Generate the completion script for the shell.
+    fn generate(&self, cmd: &clap::Command, buf: &mut dyn std::io::Write) {
+        match self {
+            ShellCompletion::Bash => Shell::Bash.generate(cmd, buf),
+            ShellCompletion::Fish => Shell::Fish.generate(cmd, buf),
+            ShellCompletion::Zsh => Shell::Zsh.generate(cmd, buf),
+            ShellCompletion::Nushell => Nushell.generate(cmd, buf),
+        }
+    }
+}
+
 /// Generate shell completions for "spk"
 #[derive(Parser, Clone, Debug)]
 #[command(author, about, long_about)]
 pub struct Completion {
     /// Shell syntax to emit
-    #[arg(default_value_t = Shell::Bash, value_parser = value_parser!(Shell))]
-    pub shell: Shell,
+    #[arg(default_value_t = ShellCompletion::Bash, value_parser = value_parser!(ShellCompletion))]
+    shell: ShellCompletion,
 }
 
 impl Completion {
     pub fn run(&self, mut cmd: Command) -> Result<i32> {
         let mut buf = vec![];
-        clap_complete::generate(self.shell, &mut cmd, "spk", &mut buf);
+        clap_complete::generate(self.shell.clone(), &mut cmd, "spk", &mut buf);
         std::io::stdout().write_all(&buf).unwrap_or(());
-
         Ok(0)
     }
 }
 
 impl CommandArgs for Completion {
     fn get_positional_args(&self) -> Vec<String> {
         let args: Vec<String> = vec![match self.shell {
-            Shell::Bash => "bash".to_string(),
-            Shell::Fish => "fish".to_string(),
-            Shell::Zsh => "zsh".to_string(),
-            _ => todo!(), // Shell is non-exhaustive.
+            ShellCompletion::Bash => "bash".to_string(),
+            ShellCompletion::Fish => "fish".to_string(),
+            ShellCompletion::Zsh => "zsh".to_string(),
+            ShellCompletion::Nushell => "nu".to_string(),
         }];
 
         args