Merge pull request #40 from pmonks/dev

Release 2.0.297

Author: pmonks

deps.edn

@@ -9,12 +9,9 @@
 ;
 
 {:deps
-   {jansi-clj/jansi-clj           {:mvn/version "1.0.5"}
+   {jansi-clj/jansi-clj           {:mvn/version "2.0.0"}
     com.github.pmonks/clj-wcwidth {:mvn/version "1.0.125"}
-    com.github.pmonks/embroidery  {:mvn/version "1.0.44"}
-
-    ; Force the latest version of JANSI, since jansi-clj is out of date
-    org.fusesource.jansi/jansi    {:mvn/version "2.4.2"}}
+    com.github.pmonks/embroidery  {:mvn/version "1.0.44"}}
  :aliases
    {:build {:deps       {com.github.pmonks/pbr {:mvn/version "RELEASE"}}
             :ns-default pbr.build}}}

spinner-demo.gif

@@ -1,7 +1,7 @@
 Require clojure
 Output spinner-demo.gif
 Sleep 50ms
-Type "clojure -M demo.clj"
+Type "clojure -J--enable-native-access=ALL-UNNAMED -M demo.clj"
 Sleep 250ms
 Enter
 Wait@90s

spinner-demo.tape

@@ -10,15 +10,19 @@
 
 (ns progress.ansi
   "Handy ANSI related functionality. Note: requiring this namespace has the side
-  effect of enabling [JANSI](https://github.com/fusesource/jansi?tab=readme-ov-file#example-usage)."
+  effect of enabling [JANSI](https://github.com/fusesource/jansi?tab=readme-ov-file#example-usage).
+
+  Note:
+
+  * "
   (:require [clojure.string :as s]
             [jansi-clj.core :as jansi]))
 
 (jansi/enable!)
 
 (def available?
   "Are ANSI escape sequences available on this JVM's stdout?"
-  (case (.name (.getType (org.fusesource.jansi.AnsiConsole/out)))
+  (case (.name (.getType (org.jline.jansi.AnsiConsole/out)))
     "Unsupported" false
     "Redirected"  false
     true))

src/progress/ansi.clj

@@ -235,10 +235,9 @@
     {:keys [style label line width total units counter? preserve? redraw-rate]
        :or {style       (get styles default-style)
             total       100
-            width       (let [console-width (org.fusesource.jansi.AnsiConsole/getTerminalWidth)]
-                          (if (pos? console-width)
-                            (- console-width 2)  ; Allow space for the cursor
-                            72))
+            width       (if-let [w (jansi/terminal-width)]
+                          (- w 2)  ; Allow space for the cursor
+                          72)
             counter?    true
             preserve?   false
             redraw-rate 10}}

src/progress/determinate.clj

@@ -16,7 +16,11 @@
             [progress.indeterminate :as pi]))
 
 (jansi/erase-screen!)
-(println "\n☔️ Running tests on Clojure" (clojure-version) "/ JVM" (System/getProperty "java.version") (str "(" (System/getProperty "java.vm.name") " v" (System/getProperty "java.vm.version") ")"))
+
+(println "\n☔️ Running tests on Clojure" (clojure-version)
+         "/ JVM" (System/getProperty "java.version") (str "(" (System/getProperty "java.vm.name") " " (System/getProperty "java.vm.version") ")")
+         "/ ANSI escape sequences available?" (if ansi/available? "✅" (str "❌ (" (.name (.getType (org.jline.jansi.AnsiConsole/out))) ")")))
+
 (println
   (jansi/yellow-bg-bright
     (jansi/red