wip

Cargo.toml

@@ -42,6 +42,7 @@ heck = "0.4.1"
 default = ["clap"]
 
 [dev-dependencies]
+ctor = "0.2"
 insta = "1"
 
 [package.metadata.release]

cli/Cargo.toml

@@ -43,4 +43,5 @@ xx = "0.2"
 
 [dev-dependencies]
 assert_cmd = { version = "2", features = ["color-auto"] }
+ctor = "0.2"
 predicates = "3"

cli/src/lib.rs

@@ -17,6 +17,9 @@ mod errors;
 mod hash;
 mod shebang;
 
+#[cfg(test)]
+mod test;
+
 pub fn run(args: &[String]) -> Result<()> {
     trace!("args: {:?}", args);
     // if let Some("__USAGE__") = args.get(2).map(|s| s.as_str()) {

cli/src/test.rs

@@ -0,0 +1,6 @@
+use crate::env;
+
+#[ctor::ctor]
+fn init() {
+    env::set_var("USAGE_BIN", "usage");
+}

src/complete/bash.rs

@@ -39,7 +39,7 @@ mod tests {
                 _USAGE_SPEC_MYCLI="$(mycli complete --usage)"
             fi
 
-            COMPREPLY=( $(/Users/jdx/src/usage/target/debug/deps/usage-6b6342071eb3064a complete-word -s "${_USAGE_SPEC_MYCLI}" --cword="$COMP_CWORD" -- "${COMP_WORDS[@]}") )
+            COMPREPLY=( $(usage complete-word -s "${_USAGE_SPEC_MYCLI}" --cword="$COMP_CWORD" -- "${COMP_WORDS[@]}") )
             if [[ $? -ne 0 ]]; then
                 unset COMPREPLY
             fi

src/complete/fish.rs

@@ -23,7 +23,7 @@ mod tests {
         // let spec = Spec::parse(&Default::default(), spec).unwrap();
         assert_snapshot!(complete_fish("mycli", "mycli complete --usage").trim(), @r###"
         set _usage_spec_mycli (mycli complete --usage)
-        complete -xc mycli -a '(/Users/jdx/src/usage/target/debug/deps/usage-6b6342071eb3064a complete-word -s "$_usage_spec_mycli" --ctoken=(commandline -t) -- (commandline -op))'
+        complete -xc mycli -a '(usage complete-word -s "$_usage_spec_mycli" --ctoken=(commandline -t) -- (commandline -op))'
         "###);
     }
 }

src/env.rs

@@ -10,3 +10,11 @@ pub static USAGE_BIN: Lazy<PathBuf> = Lazy::new(|| {
         .or_else(|| current_exe().ok())
         .unwrap_or_else(|| "usage".into())
 });
+
+/// On linux, env::current_exe() follows symlinks which causes problems when updating the CLI.
+#[cfg(not(target_os = "macos"))]
+pub static USAGE_BIN: Lazy<PathBuf> = Lazy::new(|| {
+    var_os("USAGE_BIN")
+        .map(PathBuf::from)
+        .unwrap_or_else(|| "usage".into())
+});

src/lib.rs

@@ -12,6 +12,9 @@ pub mod context;
 pub(crate) mod env;
 pub mod parse;
 
+#[cfg(test)]
+mod test;
+
 pub use crate::parse::arg::SpecArg;
 pub use crate::parse::cmd::SpecCommand;
 pub use crate::parse::complete::Complete;

src/test.rs

@@ -0,0 +1,6 @@
+use crate::env;
+
+#[ctor::ctor]
+fn init() {
+    env::set_var("USAGE_BIN", "usage");
+}