Merge pull request #36 from borkdude/babashka

Babashka compatibility

Author: plexus

.github/workflows/bb.yml

@@ -0,0 +1,52 @@
+name: bb
+
+on: [push, pull_request]
+
+jobs:
+
+  clojure:
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      # It is important to install java before installing clojure tools which needs java
+      # exclusions: babashka, clj-kondo and cljstyle
+      - name: Prepare java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+
+      - name: Install clojure tools
+        uses: DeLaGuardo/[email protected]
+        with:
+          # Install just one or all simultaneously
+          # The value must indicate a particular version of the tool, or use 'latest'
+          # to always provision the latest version
+          bb: latest
+
+      # Optional step:
+      - name: Cache clojure dependencies
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.m2/repository
+            ~/.gitlibs
+            ~/.deps.clj
+          # List all files containing dependencies:
+          key: cljdeps-${{ hashFiles('deps.edn') }}
+          # key: cljdeps-${{ hashFiles('deps.edn', 'bb.edn') }}
+          # key: cljdeps-${{ hashFiles('project.clj') }}
+          # key: cljdeps-${{ hashFiles('build.boot') }}
+          restore-keys: cljdeps-
+
+      - name: Execute bb tests
+        run: |
+          bb test:bb

.gitignore

@@ -16,7 +16,7 @@ package.json
 yarn.lock
 .shadow-cljs
 resources/public/ui
-test
 resources/public/
 .store
 package-lock.json
+.cache

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ## Fixed
 
+- Babashka compatibility
+
 ## Changed
 
 # 2.5.151 (2022-11-21 / 92232a1)
@@ -132,4 +134,4 @@
 
 ## Added
 
-- Extracted from Kaocha, and added a top-level namespace.
+- Extracted from Kaocha, and added a top-level namespace.

bb.edn

@@ -1,3 +1,9 @@
 {:deps
  {lambdaisland/open-source {:git/url "https://github.com/lambdaisland/open-source"
-                            :git/sha "f2133b2a88bff3898e027c9b50516161c237792e"}}}
+                            :git/sha "f2133b2a88bff3898e027c9b50516161c237792e"}}
+ :tasks
+ {test:bb {:doc "Run babashka tests with custom runner"
+           :extra-paths ["src" "test"]
+           :extra-deps {current/project {:local/root "."}
+                        org.clojure/test.check    {:mvn/version "1.1.1"}}
+           :task (exec 'lambdaisland.deep-diff2.runner/run-tests)}}}

deps.edn

@@ -1,7 +1,7 @@
 {:paths ["resources" "src"]
  :deps  {fipp/fipp                   {:mvn/version "0.6.26"}
          org.clojure/core.rrb-vector {:mvn/version "0.1.2"}
-         lambdaisland/clj-diff       {:mvn/version "1.3.67"}
+         lambdaisland/clj-diff       {:mvn/version "1.4.78"}
          mvxcvi/arrangement          {:mvn/version "2.1.0"}}
 
  :aliases {:cljs

src/lambdaisland/deep_diff2/puget/printer.cljc

@@ -296,44 +296,45 @@
   "Map of print handlers for Java/JavaScript types. This supports syntax for regular
   expressions, dates, UUIDs, and futures."
   #?(:clj
-     {java.lang.Class
-      (fn class-handler
-        [printer value]
-        (format-unknown printer value "Class" (get-type-name value)))
-
-      java.util.concurrent.Future
-      (fn future-handler
-        [printer value]
-        (let [doc (if (future-done? promise)
-                    (format-doc printer @value)
-                    (color/document printer :nil "pending"))]
-          (format-unknown printer value "Future" doc)))
-
-      java.util.UUID
-      (tagged-handler 'uuid str)
-
-      java.util.Date
-      (tagged-handler
-       'inst
-       #(-> (java.text.SimpleDateFormat. inst-pattern)
-            (doto (.setTimeZone (java.util.TimeZone/getTimeZone "GMT")))
-            (.format ^java.util.Date %)))
-
-      java.util.GregorianCalendar
-      (tagged-handler
-       'inst
-       #(let [formatted (format "%1$tFT%1$tT.%1$tL%1$tz" %)
-              offset-minutes (- (.length formatted) 2)]
-          (str (subs formatted 0 offset-minutes)
-               ":"
-               (subs formatted offset-minutes))))
-
-      java.sql.Timestamp
-      (tagged-handler
-       'inst
-       (fn [ts]
-         (str (.format ^SimpleDateFormat (utc-timestamp-format) ts)
-              (format ".%09d-00:00" (.getNanos ^Timestamp ts)))))}
+     (->
+      {java.lang.Class
+       (fn class-handler
+         [printer value]
+         (format-unknown printer value "Class" (get-type-name value)))
+
+       java.util.concurrent.Future
+       (fn future-handler
+         [printer value]
+         (let [doc (if (future-done? promise)
+                     (format-doc printer @value)
+                     (color/document printer :nil "pending"))]
+           (format-unknown printer value "Future" doc)))
+
+       java.util.UUID
+       (tagged-handler 'uuid str)
+
+       java.util.Date
+       (tagged-handler
+        'inst
+        #(-> (java.text.SimpleDateFormat. inst-pattern)
+             (doto (.setTimeZone (java.util.TimeZone/getTimeZone "GMT")))
+             (.format ^java.util.Date %)))
+
+       java.sql.Timestamp
+       (tagged-handler
+        'inst
+        (fn [ts]
+          (str (.format ^SimpleDateFormat (utc-timestamp-format) ts)
+               (format ".%09d-00:00" (.getNanos ^Timestamp ts)))))}
+      #?(:bb identity
+         :clj (assoc java.util.GregorianCalendar
+                     (tagged-handler
+                      'inst
+                      #(let [formatted (format "%1$tFT%1$tT.%1$tL%1$tz" %)
+                             offset-minutes (- (.length formatted) 2)]
+                         (str (subs formatted 0 offset-minutes)
+                              ":"
+                              (subs formatted offset-minutes)))))))
 
      :cljs
      {inst?

test/lambdaisland/deep_diff2/runner.clj

@@ -0,0 +1,14 @@
+(ns lambdaisland.deep-diff2.runner
+  "Test runner for babashka, until kaocha works with bb :)"
+  (:require [clojure.test :as t]))
+
+(defn run-tests [_]
+  (let [test-nss '[lambdaisland.deep-diff2.diff-test
+                   #_lambdaisland.deep-diff2.printer-test
+                   lambdaisland.deep-diff2.puget-test]]
+    (doseq [test-ns test-nss]
+      (require test-ns))
+    (let [{:keys [fail error]}
+          (apply t/run-tests test-nss)]
+      (when (and fail error (pos? (+ fail error)))
+        (throw (ex-info "Tests failed" {:babashka/exit 1}))))))