Fix tests

Author: plexus

bb.edn

@@ -1,5 +1,5 @@
 {:paths ["src"]
- :deps {com.lambdaisland/launchpad {:mvn/version "0.26.123-alpha"}
+ :deps {com.lambdaisland/launchpad {:mvn/version "0.28.129-alpha"}
         lambdaisland/open-source {:git/url "https://github.com/lambdaisland/open-source"
-                                  :git/sha "7ce125cbd14888590742da7ab3b6be9bba46fc7a"
+                                  :git/sha "50d58d4dd7d83007e6be40b6ffbb9064a0654dd0"
                                   #_#_:local/root "../open-source"}}}

deps.edn

@@ -1,7 +1,7 @@
 {:paths ["src" "resources"]
 
  :deps
- {org.clojure/clojure {:mvn/version "1.11.1"}}
+ {org.clojure/clojure {:mvn/version "1.11.3"}}
 
  :aliases
  {:dev
@@ -10,4 +10,4 @@
 
   :test
   {:extra-paths ["test"]
-   :extra-deps  {lambdaisland/kaocha {:mvn/version "1.87.1366"}}}}}
+   :extra-deps  {lambdaisland/kaocha {:mvn/version "1.91.1392"}}}}}

src/lambdaisland/cli.clj

@@ -46,7 +46,7 @@
   (let [desc #(str (first (str/split (:doc % "") #"\R"))
                    (when-let [d (:default %)] (str " (default " (pr-str d) ")")))]
     (println "NAME")
-    (println " " cmd-name " — " (first (str/split doc #"\R")))
+    (println " " cmd-name (if (str/blank? doc) "" (str " — " (first (str/split doc #"\R")))))
     (println)
 
     (println "SYNOPSIS")
@@ -61,15 +61,14 @@
                          (str/join " | " (map first command-pairs))
                          "]"))
                   " [<args>...]"))
-    (println)
-    (when-let [doc (next (str/split doc #"\R"))]
-      (println "DESCRIPTION")
-      (println (str/join "\n" (drop-while #(str/blank? %) doc)))
-      (println))
+    (when-let [doc (and (not (str/blank? doc))
+                        (next (str/split doc #"\R")))]
+      (println "\nDESCRIPTION")
+      (println (str/join "\n" (drop-while #(str/blank? %) doc))))
     (when (seq flagpairs)
       (let [has-short? (some short? (mapcat (comp :flags second) flagpairs))
             has-long?  (some long? (mapcat (comp :flags second) flagpairs))]
-        (println "FLAGS")
+        (println "\nFLAGS")
         (print-table
          (for [[_ {:keys [flags argdoc required] :as flagopts}] flagpairs]
            (let [short (some short? flags)
@@ -85,10 +84,9 @@
                    argdoc)
               (desc flagopts)
               (if required "(required)" "")
-              ]))))
-      (println))
+              ])))))
     (when (seq command-pairs)
-      (println "POSITIONAL ARGUMENTS")
+      (println "\nPOSITIONAL ARGUMENTS")
       (print-table
        (for [[cmd cmdopts] command-pairs]
          [(str cmd (if (:commands cmdopts)

test/lambdaisland/cli_test.clj

@@ -17,6 +17,11 @@
   {:commands ["run" {:command #'identity
                      :flags   ["-x" {:doc      "flag x"
                                      :required required}]}]})
+(with-out-str (cli/dispatch* (cmdspec-n false) ["run" "-hx"]))
+
+"NAME\n  cli run  — Returns its argument.\n\nSYNOPSIS\n  cli run [-x] [<args>...]\n\nFLAGS\n  -x,    flag x   (required)\n"
+"NAME\n  cli run  — Returns its argument.\n\nSYNOPSIS\n  cli run [-x] [<args>...]\n\nFLAGS\n  -x,    flag x   (required)\n"
+;; =>
 
 (deftest required-flag
   (testing "successful exit"
@@ -30,10 +35,10 @@
   (testing "help exit"
     (are [input args expected]
         (is (= expected (with-out-str (cli/dispatch* input args))))
-      (cmdspec-1 false) ["-h"]        "Usage: cli [-x] [<args>...]\n\n  -x,    flag x   \n\n"
-      (cmdspec-1 true)  ["-hx"]       "Usage: cli [-x] [<args>...]\n\n  -x,    flag x   (required)\n\n"
-      (cmdspec-n false) ["run" "-h"]  "Usage: cli run [-x] [<args>...]\n\nReturns its argument.\n\n  -x,    flag x   \n\n"
-      (cmdspec-n true)  ["run" "-hx"] "Usage: cli run [-x] [<args>...]\n\nReturns its argument.\n\n  -x,    flag x   (required)\n\n"))
+      (cmdspec-1 false) ["-h"]        "NAME\n  cli \n\nSYNOPSIS\n  cli [-x] [<args>...]\n\nFLAGS\n  -x,    flag x   \n"
+      (cmdspec-1 true)  ["-hx"]       "NAME\n  cli \n\nSYNOPSIS\n  cli [-x] [<args>...]\n\nFLAGS\n  -x,    flag x   (required)\n"
+      (cmdspec-n false) ["run" "-h"]  "NAME\n  cli run  — Returns its argument.\n\nSYNOPSIS\n  cli run [-x] [<args>...]\n\nFLAGS\n  -x,    flag x   \n"
+      (cmdspec-n true)  ["run" "-hx"] "NAME\n  cli run  — Returns its argument.\n\nSYNOPSIS\n  cli run [-x] [<args>...]\n\nFLAGS\n  -x,    flag x   (required)\n"))
 
   (testing "unsuccessful exit"
     (are [input args expected]