Merge pull request #263 from liquidz/fix-261

Next release
liquidz · Sep 20, 2024 · 50c5bf5 · 50c5bf5
2 parents 197c707 + df8a718
commit 50c5bf5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -1,6 +1,13 @@
 All notable changes to this project will be documented in this file. This change log follows the conventions of http://keepachangelog.com/[keepachangelog.com].
 
 == Unreleased (dev)
+// {{{
+=== Changed
+* Bumped clj-yaml to 1.0.28.
+
+=== Fixed
+* https://github.com/liquidz/antq/issues/261[#261]: Fixed to work correctly when used as a tool.
+// }}}
 
 == 2.9.1227 (2024-09-07)
 // {{{

diff --git a/deps.edn b/deps.edn
@@ -7,7 +7,7 @@
   org.clojure/core.async {:mvn/version "1.6.681"}
   org.clojure/tools.deps {:mvn/version "0.21.1449"}
   org.clojure/data.json {:mvn/version "2.5.0"}
-  clj-commons/clj-yaml {:mvn/version "1.0.27"}
+  clj-commons/clj-yaml {:mvn/version "1.0.28"}
   version-clj/version-clj {:mvn/version "2.0.3"}
   rewrite-clj/rewrite-clj {:mvn/version "1.1.48"}
   com.github.liquidz/rewrite-indented {:mvn/version "0.2.44"}

diff --git a/src/antq/core.clj b/src/antq/core.clj
@@ -231,9 +231,13 @@
                   :latest-name verified-name))
         deps))
 
+(defn- system-exit
+  [n]
+  (System/exit n))
+
 (defn exit
   [outdated-deps]
-  (System/exit (if (seq outdated-deps) 1 0)))
+  (system-exit (if (seq outdated-deps) 1 0)))
 
 (defn fetch-deps
   [options]
@@ -303,7 +307,7 @@
       errors
       (do (doseq [e errors]
             (log/error e))
-          (System/exit 1))
+          (system-exit 1))
 
       (seq deps)
       (let [alog (log/start-async-logger!)
@@ -323,7 +327,7 @@
 
       :else
       (do (log/info "No project file")
-          (System/exit 1)))))
+          (system-exit 1)))))
 
 (defn -main
   [& args]

diff --git a/src/antq/tool.clj b/src/antq/tool.clj
@@ -51,7 +51,11 @@
   [& [options]]
   (let [options (prepare-options options)]
     (binding [log/*verbose* (:verbose options false)]
-      (core/main* options nil))))
+      (with-redefs [core/system-exit (fn [n]
+                                       (when (not= 0 n)
+                                         (throw (ex-info "Exited" {:code n})))
+                                       n)]
+        (core/main* options nil)))))
 
 (defn help
   [& _]