🆕 Add :space-after-indicator? option to indeterminate progress indicator

Author: pmonks

src/progress/indeterminate.clj

@@ -117,12 +117,13 @@
   "Indeterminate progress indicator logic, for use in a `future` or `Thread` or
   wotnot."
   ([] (indeterminate-progress-indicator nil))
-  ([{:keys [delay-in-ms frames fg-colour bg-colour attributes]
-     :or   {delay-in-ms default-delay-ms
-            frames      (default-style styles)
-            fg-colour   :default
-            bg-colour   :default
-            attributes  [:default]}}]
+  ([{:keys [delay-in-ms frames fg-colour bg-colour attributes space-after-indicator?]
+     :or   {delay-in-ms            default-delay-ms
+            frames                 (default-style styles)
+            fg-colour              :default
+            bg-colour              :default
+            attributes             [:default]
+            space-after-indicator? true}}]
     (let [delay-in-ms (long (Math/round (double delay-in-ms)))]  ; Coerce delay-in-ms to a long (especially if it's a Clojure ratio)
       ; Setup logic
       (ansi/save-cursor!)
@@ -131,8 +132,8 @@
       (flush)   ; Flush any outstanding I/O to stdout before we start animating
       ; Main animation loop
       (loop [i 0]
-        (clojure.core/print (str (ansi/apply-colours-and-attrs fg-colour bg-colour attributes (nth frames i))
-                                 " "))
+        (clojure.core/print (str (ansi/apply-colours-and-attrs fg-colour bg-colour attributes (nth frames i))))
+        (when  space-after-indicator? (clojure.core/print " "))
         (ansi/show-cursor!)
         (flush)                 ; Flush I/O to stdout at least once per loop
         (when (pos? delay-in-ms) (Thread/sleep delay-in-ms))
@@ -195,7 +196,12 @@
   * `:attributes`  - the attributes of the indeterminate progress indicator
                      (default is `[:default]`) - see [the `jansi-clj`
                      docs](https://github.com/xsc/jansi-clj#attributes) for
-                     allowed values"
+                     allowed values
+  * `:space-after-indicator?` - whether a single space character should be
+                     printed after the indeterminate progress indicator. This
+                     can be more visually appealing when using Unicode frames as
+                     it creates some separation with the cursor.
+                     (default is `true`)"
   ([f] (animatef! nil f))
   ([opts f]
     (when f
@@ -227,7 +233,12 @@
   * `:attributes`  - the attributes of the indeterminate progress indicator
                      (default is `[:default]`) - see [the `jansi-clj`
                      docs](https://github.com/xsc/jansi-clj#attributes) for
-                     allowed values"
+                     allowed values
+  * `:space-after-indicator?` - whether a single space character should be
+                     printed after the indeterminate progress indicator. This
+                     can be more visually appealing when using Unicode frames as
+                     it creates some separation with the cursor.
+                     (default is `true`)"
   [& body]
   (if (= :opts (first body))
     `(animatef! ~(second body) (fn [] ~@(rest (rest body))))

test/progress/indeterminate_test.clj

@@ -69,6 +69,9 @@
     (testing "Custom attributes"
       (is (= nil (pi/animate! :opts {:attributes [:strikethrough :bold :underline]} (Thread/sleep 250)))))
 
+    (testing "No space after indicator"
+      (is (= nil (pi/animate! :opts {:space-after-indicator? false} (Thread/sleep 250)))))
+
     (testing "Custom everything"
       (is (= nil (pi/animate! :opts {:frames     (:box-fade pi/styles)
                                     :delay-in-ms (/ pi/default-delay-ms 4)  ; Hyperspeed!