Use opts under org.babashka.cli ns

babashka · Mar 21, 2024 · 00e4a2a · 00e4a2a
1 parent 38f5c16
commit 00e4a2a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/src/babashka/cli.cljc b/src/babashka/cli.cljc
@@ -327,14 +327,14 @@
                         error-fn*))
          [opt shell cmdline] args
          _ (case opt
-             "--babashka.cli/completion-snippet"
+             "--org.babashka.cli/completion-snippet"
              (if-let [command-name (get-in opts [:completion :command])]
                (do (print-completion-shell-snippet (keyword shell) command-name)
                    (System/exit 0))
                (binding [*out* *err*]
-                 (println "Need `:completion {:command \"<name>\"}` in opts to support shell completions")
+                 (println "Need `:completion {:command \"<name>\"}` in `opts` to support shell completions")
                  (System/exit 1)))
-             "--babashka.cli/complete"
+             "--org.babashka.cli/complete"
              (do (print-opts-completions (keyword shell) opts cmdline)
                  (System/exit 0))
              :noop)
@@ -715,16 +715,16 @@
   (case type
     :bash (format "_babashka_cli_dynamic_completion()
 {
-    source <( \"$1\" --babashka.cli/complete \"bash\" \"${COMP_WORDS[*]// / }\" )
+    source <( \"$1\" --org.babashka.cli/complete \"bash\" \"${COMP_WORDS[*]// / }\" )
 }
 complete -o nosort -F _babashka_cli_dynamic_completion %s
 " program-name)
     :zsh (format "#compdef %s
-source <( \"${words[1]}\" --babashka.cli/complete \"zsh\" \"${words[*]// / }\" )
+source <( \"${words[1]}\" --org.babashka.cli/complete \"zsh\" \"${words[*]// / }\" )
 " program-name)
     :fish (format "function _babashka_cli_dynamic_completion
     set --local COMP_LINE (commandline --cut-at-cursor)
-    %s --babashka.cli/complete fish $COMP_LINE
+    %s --org.babashka.cli/complete fish $COMP_LINE
 end
 complete --command %s --no-files --arguments \"(_babashka_cli_dynamic_completion)\"
 " program-name program-name)))
@@ -818,9 +818,9 @@ complete --command %s --no-files --arguments \"(_babashka_cli_dynamic_completion
    (let [command-name (get-in opts [:completion :command])
          [opt shell cmdline] args]
      (case opt
-       "--babashka.cli/completion-snippet"
+       "--org.babashka.cli/completion-snippet"
        (print-completion-shell-snippet (keyword shell) command-name)
-       "--babashka.cli/complete"
+       "--org.babashka.cli/complete"
        (print-dispatch-completions (keyword shell) tree cmdline)
        (let [{:as res :keys [cmd-info error available-commands]}
              (dispatch-tree' tree args opts)

diff --git a/test/babashka/cli/completion_test.clj b/test/babashka/cli/completion_test.clj
@@ -115,10 +115,10 @@
 
 (deftest dispatch-completion-test
   (when-not (fs/windows?)
-    (is (= (slurp (io/resource "resources/completion/completion.zsh")) (with-out-str (cli/dispatch cmd-table ["--babashka.cli/completion-snippet" "zsh"] {:completion {:command "myprogram"}})))) ;
-    (is (= (slurp (io/resource "resources/completion/completion.bash")) (with-out-str (cli/dispatch cmd-table ["--babashka.cli/completion-snippet" "bash"] {:completion {:command "myprogram"}}))))
-    (is (= (slurp (io/resource "resources/completion/completion.fish")) (with-out-str (cli/dispatch cmd-table ["--babashka.cli/completion-snippet" "fish"] {:completion {:command "myprogram"}}))))
+    (is (= (slurp (io/resource "resources/completion/completion.zsh")) (with-out-str (cli/dispatch cmd-table ["--org.babashka.cli/completion-snippet" "zsh"] {:completion {:command "myprogram"}})))) ;
+    (is (= (slurp (io/resource "resources/completion/completion.bash")) (with-out-str (cli/dispatch cmd-table ["--org.babashka.cli/completion-snippet" "bash"] {:completion {:command "myprogram"}}))))
+    (is (= (slurp (io/resource "resources/completion/completion.fish")) (with-out-str (cli/dispatch cmd-table ["--org.babashka.cli/completion-snippet" "fish"] {:completion {:command "myprogram"}}))))
 
-    (is (= "compadd -- foo\n" (with-out-str (cli/dispatch cmd-table ["--babashka.cli/complete" "zsh" "myprogram f"] {:completion {:command "myprogram"}}))))
-    (is (= "COMPREPLY+=( \"foo\" )\n" (with-out-str (cli/dispatch cmd-table ["--babashka.cli/complete" "bash" "myprogram f "] {:completion {:command "myprogram"}}))))
-    (is (= "foo\n" (with-out-str (cli/dispatch cmd-table ["--babashka.cli/complete" "fish" "myprogram f "] {:completion {:command "myprogram"}}))))))
+    (is (= "compadd -- foo\n" (with-out-str (cli/dispatch cmd-table ["--org.babashka.cli/complete" "zsh" "myprogram f"] {:completion {:command "myprogram"}}))))
+    (is (= "COMPREPLY+=( \"foo\" )\n" (with-out-str (cli/dispatch cmd-table ["--org.babashka.cli/complete" "bash" "myprogram f "] {:completion {:command "myprogram"}}))))
+    (is (= "foo\n" (with-out-str (cli/dispatch cmd-table ["--org.babashka.cli/complete" "fish" "myprogram f "] {:completion {:command "myprogram"}}))))))
diff --git a/test/resources/completion/completion.bash b/test/resources/completion/completion.bash
@@ -1,5 +1,5 @@
 _babashka_cli_dynamic_completion()
 {
-    source <( "$1" --babashka.cli/complete "bash" "${COMP_WORDS[*]// / }" )
+    source <( "$1" --org.babashka.cli/complete "bash" "${COMP_WORDS[*]// / }" )
 }
 complete -o nosort -F _babashka_cli_dynamic_completion myprogram
diff --git a/test/resources/completion/completion.fish b/test/resources/completion/completion.fish
@@ -1,5 +1,5 @@
 function _babashka_cli_dynamic_completion
     set --local COMP_LINE (commandline --cut-at-cursor)
-    myprogram --babashka.cli/complete fish $COMP_LINE
+    myprogram --org.babashka.cli/complete fish $COMP_LINE
 end
 complete --command myprogram --no-files --arguments "(_babashka_cli_dynamic_completion)"
diff --git a/test/resources/completion/completion.zsh b/test/resources/completion/completion.zsh
@@ -1,2 +1,2 @@
 #compdef myprogram
-source <( "${words[1]}" --babashka.cli/complete "zsh" "${words[*]// / }" )
+source <( "${words[1]}" --org.babashka.cli/complete "zsh" "${words[*]// / }" )