For messy commands, show command usage after group help

Author: hlship

src/net/lewisship/cli_tools/impl.clj

@@ -906,11 +906,14 @@
                invoke-last-command-fn nil]
           (cond-let
            (#{"-h" "--help"} term)
-           (if invoke-last-command-fn
-             (invoke-last-command-fn)
-             (do
-               (print-commands nil container-map commands-map false)
-               (exit 0)))
+           (do
+             (print-commands nil container-map commands-map false)
+             ;; This is the ugly mixed case where its a group and a command; we present
+             ;; the group first then the command.
+             (when invoke-last-command-fn
+               (println)
+               (invoke-last-command-fn))
+             (exit 0))
 
            :let [possible-commands commands-map
                  matchable-terms (keys possible-commands)]

test/net/lewisship/cli_tools/messy_test.clj

@@ -39,11 +39,21 @@
               (dispatch "mess" "kiwi"))))
 
 (deftest help-for-messy-command-shows-command-help
-  (let [{:keys [status out]} (dispatch "mess" "-h")]
-    (is (= 0 status))
-    (is (string/includes? out "Usage:"))
-    (is (string/includes? out "NAME"))
-    (is (not (string/includes? out "nested")))))
+  (is (match? {:status    0
+               :out-lines ["bigmess messy - Messy command and group at same time"
+                           ""
+                           "Commands:"
+                           "  nested: Command nested under messy group/command"
+                           ""
+                           "Usage: bigmess messy [OPTIONS] NAME"
+                           "Messy command."
+                           ""
+                           "Options:"
+                           "  -h, --help This command summary"
+                           ""
+                           "Arguments:"
+                           "  NAME: Name to print"]}
+              (dispatch "mess" "-h"))))
 
 (comment