Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions bbin
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,13 @@ WARNING: (We won't make any changes without asking you first.)
(->> (reduce #(str/replace %1 %2 "") lib (keys providers))
symbol))

(defn- get-lib-provider [lib]
(if-let [provider (some #(when (re-seq (key %) (str lib)) %) providers)]
provider
(throw (ex-info "Unable to find an appropriate provider" {:lib lib}))))

(defn git-http-url [lib]
(let [provider (some #(when (re-seq (key %) (str lib)) %) providers)
(let [provider (get-lib-provider lib)
s (clean-lib-str (str lib))]
(case (val provider)
:github (str "https://github.com/" s ".git")
Expand All @@ -171,7 +176,7 @@ WARNING: (We won't make any changes without asking you first.)
:sourcehut (str "https://git.sr.ht/~" s))))

(defn git-ssh-url [lib]
(let [provider (some #(when (re-seq (key %) (str lib)) %) providers)
(let [provider (get-lib-provider lib)
s (clean-lib-str (str lib))]
(case (val provider)
:github (str "git@github.com:" s ".git")
Expand All @@ -187,7 +192,7 @@ WARNING: (We won't make any changes without asking you first.)
(ensure-git-dir client url)
url)
(catch Exception e
(if (re-seq #"^Unable to clone " (ex-message e))
(if (re-seq #"^Unable to " (ex-message e))
(let [url (git-ssh-url lib)]
(ensure-git-dir client url)
url)
Expand Down
11 changes: 8 additions & 3 deletions src/babashka/bbin/git.clj
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,13 @@
(->> (reduce #(str/replace %1 %2 "") lib (keys providers))
symbol))

(defn- get-lib-provider [lib]
(if-let [provider (some #(when (re-seq (key %) (str lib)) %) providers)]
provider
(throw (ex-info "Unable to find an appropriate provider" {:lib lib}))))

(defn git-http-url [lib]
(let [provider (some #(when (re-seq (key %) (str lib)) %) providers)
(let [provider (get-lib-provider lib)
s (clean-lib-str (str lib))]
(case (val provider)
:github (str "https://github.com/" s ".git")
Expand All @@ -64,7 +69,7 @@
:sourcehut (str "https://git.sr.ht/~" s))))

(defn git-ssh-url [lib]
(let [provider (some #(when (re-seq (key %) (str lib)) %) providers)
(let [provider (get-lib-provider lib)
s (clean-lib-str (str lib))]
(case (val provider)
:github (str "git@github.com:" s ".git")
Expand All @@ -80,7 +85,7 @@
(ensure-git-dir client url)
url)
(catch Exception e
(if (re-seq #"^Unable to clone " (ex-message e))
(if (re-seq #"^Unable to " (ex-message e))
(let [url (git-ssh-url lib)]
(ensure-git-dir client url)
url)
Expand Down
8 changes: 8 additions & 0 deletions test/babashka/bbin/scripts/git_dir_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,11 @@
(is (= git-ssh-url-lib out))
(is (fs/exists? bin-file))
(is (= "Hello world!" (tu/run-bin-script 'hello))))))

(deftest install-lib-fail-if-provider-not-found
(testing "install lib name fails provider lookup"
(tu/reset-test-dir)
(dirs/ensure-bbin-dirs {})
(let [cli-opts {:script/lib "something-broken"}]
(is (thrown? Exception "Unable to find an appropriate provider" (tu/run-install cli-opts)))
)))
Loading