parent
10c315663f
commit
3ded3b9546
4 changed files with 21 additions and 7 deletions
|
|
@ -17,8 +17,9 @@ A preview of the next release can be installed from
|
||||||
- Bump integrant CI tests
|
- Bump integrant CI tests
|
||||||
- [#1600](https://github.com/babashka/babashka/issues/1600): use pagesize of 64K on linux aarch64, so it works on Asahi linux
|
- [#1600](https://github.com/babashka/babashka/issues/1600): use pagesize of 64K on linux aarch64, so it works on Asahi linux
|
||||||
- Expose `selmer.parser/resolve-arg`
|
- Expose `selmer.parser/resolve-arg`
|
||||||
- #1610: expose `babashka.http-client.websocket` namespace
|
- [#1610](https://github.com/babashka/babashka/issues/1610): expose `babashka.http-client.websocket` namespace
|
||||||
- Bump `babashka.http-client` to `0.4.14`
|
- Bump `babashka.http-client` to `0.4.14`
|
||||||
|
- [#1568](https://github.com/babashka/babashka/issues/1568): warn when task overrides built-in command
|
||||||
|
|
||||||
## 1.3.182 (2023-07-20)
|
## 1.3.182 (2023-07-20)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
org.clojure/data.csv {:mvn/version "1.0.0"},
|
org.clojure/data.csv {:mvn/version "1.0.0"},
|
||||||
cheshire/cheshire {:mvn/version "5.11.0"}
|
cheshire/cheshire {:mvn/version "5.11.0"}
|
||||||
org.clojure/data.xml {:mvn/version "0.2.0-alpha8"}
|
org.clojure/data.xml {:mvn/version "0.2.0-alpha8"}
|
||||||
clj-commons/clj-yaml {:mvn/version "1.0.26"}
|
clj-commons/clj-yaml {:mvn/version "1.0.27"}
|
||||||
com.cognitect/transit-clj {:mvn/version "1.0.333"}
|
com.cognitect/transit-clj {:mvn/version "1.0.333"}
|
||||||
org.clojure/test.check {:mvn/version "1.1.1"}
|
org.clojure/test.check {:mvn/version "1.1.1"}
|
||||||
nrepl/bencode {:mvn/version "1.1.0"}
|
nrepl/bencode {:mvn/version "1.1.0"}
|
||||||
|
|
@ -51,7 +51,7 @@
|
||||||
insn/insn {:mvn/version "0.5.2"}
|
insn/insn {:mvn/version "0.5.2"}
|
||||||
org.clojure/core.rrb-vector {:mvn/version "0.1.2"}
|
org.clojure/core.rrb-vector {:mvn/version "0.1.2"}
|
||||||
org.babashka/cli {:mvn/version "0.7.51"}
|
org.babashka/cli {:mvn/version "0.7.51"}
|
||||||
org.babashka/http-client {:mvn/version "0.4.13"}
|
org.babashka/http-client {:mvn/version "0.4.14"}
|
||||||
;; native image bloat with ordered 1.5.10
|
;; native image bloat with ordered 1.5.10
|
||||||
org.flatland/ordered {:mvn/version "1.5.9"}}
|
org.flatland/ordered {:mvn/version "1.5.9"}}
|
||||||
:aliases {:babashka/dev
|
:aliases {:babashka/dev
|
||||||
|
|
@ -109,7 +109,7 @@
|
||||||
exoscale/coax {:mvn/version "1.0.0-alpha14"}
|
exoscale/coax {:mvn/version "1.0.0-alpha14"}
|
||||||
orchestra/orchestra {:mvn/version "2021.01.01-1"}
|
orchestra/orchestra {:mvn/version "2021.01.01-1"}
|
||||||
expound/expound {:mvn/version "0.8.10"}
|
expound/expound {:mvn/version "0.8.10"}
|
||||||
integrant/integrant {:mvn/version "0.8.0"}
|
integrant/integrant {:git/url "https://github.com/weavejester/integrant", :git/sha "a9fd7c02bd7201f36344b47142badc3c3ef22f88"}
|
||||||
com.stuartsierra/dependency {:mvn/version "1.0.0"}
|
com.stuartsierra/dependency {:mvn/version "1.0.0"}
|
||||||
listora/again {:mvn/version "1.0.0"}
|
listora/again {:mvn/version "1.0.0"}
|
||||||
org.clojure/tools.gitlibs {:mvn/version "2.4.172"}
|
org.clojure/tools.gitlibs {:mvn/version "2.4.172"}
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,7 @@
|
||||||
[babashka.wait :refer [wait-namespace]]
|
[babashka.wait :refer [wait-namespace]]
|
||||||
[clojure.edn :as edn]
|
[clojure.edn :as edn]
|
||||||
[clojure.java.io :as io]
|
[clojure.java.io :as io]
|
||||||
|
[clojure.set :as set]
|
||||||
[clojure.string :as str]
|
[clojure.string :as str]
|
||||||
[edamame.core :as edamame]
|
[edamame.core :as edamame]
|
||||||
[hf.depstar.uberjar :as uberjar]
|
[hf.depstar.uberjar :as uberjar]
|
||||||
|
|
@ -729,7 +730,14 @@ Use bb run --help to show this help output.
|
||||||
([options] (parse-opts options nil))
|
([options] (parse-opts options nil))
|
||||||
([options opts-map]
|
([options opts-map]
|
||||||
(let [opt (first options)
|
(let [opt (first options)
|
||||||
tasks (into #{} (map str) (keys (:tasks @common/bb-edn)))]
|
task-map (:tasks @common/bb-edn)
|
||||||
|
tasks (into #{} (map str) (keys task-map))]
|
||||||
|
(when-let [commands (seq (filter (fn [task]
|
||||||
|
(and (command? task)
|
||||||
|
(not (:override-builtin (get task-map (symbol task))))))
|
||||||
|
tasks))]
|
||||||
|
(binding [*out* *err*]
|
||||||
|
(println "[babashka] WARNING: task(s)" (str/join ", " (map #(format "'%s'" %) commands)) "override built-in command(s). Use :override-builtin true to disable warning.")))
|
||||||
(if-not opt opts-map
|
(if-not opt opts-map
|
||||||
;; FILE > TASK > SUBCOMMAND
|
;; FILE > TASK > SUBCOMMAND
|
||||||
(cond
|
(cond
|
||||||
|
|
@ -742,7 +750,6 @@ Use bb run --help to show this help output.
|
||||||
(assoc opts-map
|
(assoc opts-map
|
||||||
:run opt
|
:run opt
|
||||||
:command-line-args (next options))
|
:command-line-args (next options))
|
||||||
|
|
||||||
(command? opt)
|
(command? opt)
|
||||||
(recur (cons (str "--" opt) (next options)) opts-map)
|
(recur (cons (str "--" opt) (next options)) opts-map)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,8 @@
|
||||||
[borkdude.deps]
|
[borkdude.deps]
|
||||||
[clojure.edn :as edn]
|
[clojure.edn :as edn]
|
||||||
[clojure.string :as str]
|
[clojure.string :as str]
|
||||||
[clojure.test :as test :refer [deftest is testing]]))
|
[clojure.test :as test :refer [deftest is testing]]
|
||||||
|
[babashka.test-utils :as tu]))
|
||||||
|
|
||||||
(defn bb [& args]
|
(defn bb [& args]
|
||||||
(let [args (map str args)
|
(let [args (map str args)
|
||||||
|
|
@ -531,3 +532,8 @@ even more stuff here\"
|
||||||
|
|
||||||
(deftest non-existing-tasks-in-run-gives-exit-code-1
|
(deftest non-existing-tasks-in-run-gives-exit-code-1
|
||||||
(is (thrown? Exception (bb "-Sdeps" "{:tasks {foo {:task (run (quote bar))}}}" "foo"))))
|
(is (thrown? Exception (bb "-Sdeps" "{:tasks {foo {:task (run (quote bar))}}}" "foo"))))
|
||||||
|
|
||||||
|
(deftest warning-on-override-task
|
||||||
|
(when-not tu/native?
|
||||||
|
(binding [*out* *err*]
|
||||||
|
(is (str/includes? (with-out-str (bb "-Sdeps" "{:tasks {run {:task 1}}}" "run")) "'run' override")))))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue