fix install-latest of new tool with mixed versions available

Author: puredanger

src/clojure/tools/tools/api.clj

@@ -76,11 +76,16 @@
   (let [current (tool/resolve-tool as)
         coord (or coord (:coord current))
         coord-type (ext/coord-type coord)
-        latest-coord (->> (ext/find-all-versions lib coord master-edn)
-                          (filter release-version?)
-                          (filter #(= coord-type (ext/coord-type %)))
-                          last
-                          (merge coord))]
+        release-coords (->> (ext/find-all-versions lib coord master-edn)
+                         (filter release-version?))
+        ;; try to match existing coord-type if there is one, else prefer git
+        available-coords (if coord-type
+                           (filter #(= coord-type (ext/coord-type %)) release-coords)
+                           (let [git-coords (filter #(= :git (ext/coord-type %)) release-coords)]
+                             (if (seq git-coords) git-coords release-coords)))
+        latest-coord (->> available-coords
+                       last
+                       (merge coord))]
     (if latest-coord
       (if (and current (= lib (:lib current)) (zero? (ext/compare-versions lib (:coord current) latest-coord master-edn)))
         (println (str as ":") "Skipping, newest installed" (ext/coord-summary lib latest-coord))
@@ -149,7 +154,7 @@
   (def master-edn
     (let [{:keys [root-edn user-edn]} (deps/find-edn-maps)]
       (deps/merge-edns [root-edn user-edn])))
-  (install-1 'com.github.seancorfield/deps-new "deps-new" master-edn)
+  (install-1 'com.github.seancorfield/deps-new nil "deps-new" master-edn)
   (ext/find-all-versions 'com.github.seancorfield/deps-new nil master-edn)
   (install-latest nil)
   (install {'com.github.seancorfield/deps-new {:git/tag "v0.4.9" :git/sha "ba30a76"} :as "deps-new"})

test-data/empty/.HOLD

@@ -4,6 +4,7 @@
     [clojure.java.io :as jio]
     [clojure.string :as str]
     [clojure.test :refer :all]
+    [clojure.tools.deps.extensions.git :as git]
     [clojure.tools.tools.api :as api])
   (:import
     [java.io File]
@@ -79,14 +80,29 @@
        (finally
          (System/setProperty "user.home" old-home#)))))
 
+(println "!! env paths" (System/getenv "CLJ_CONFIG") (System/getenv "XDG_CONFIG_HOME"))
+
+;; when new tool has both git and maven versions, prefer git and install
+(deftest install-latest-new-mixed
+  (let-tools-dir [tools "test-data/empty"]
+    (api/install-latest {:lib 'com.github.seancorfield/clj-new
+                         :as 'clj-new})
+    (let [new-edn (edn/read-string (slurp (jio/file tools "clj-new.edn")))]
+      (clojure.pprint/pprint new-edn)
+      ;; has a :git/tag
+      (is (= 'com.github.seancorfield/clj-new (-> new-edn :lib)))
+      (is (= "https://github.com/seancorfield/clj-new.git" (-> new-edn :lib git/auto-git-url)))
+      (is (-> new-edn :coord :git/tag))
+      (is (-> new-edn :coord :git/sha)))))
+
 ;; when out of date tool has both git and maven versions, only consider updates
 ;; to version with the same coordinate type. here, git is installed
-(deftest install-latest-mixed
+(deftest install-latest-existing-tool-mixed
   (let-tools-dir [tools "test-data/tools1"]
     (let [old-edn (edn/read-string (slurp (jio/file tools "clj-new.edn")))
           old-tag (-> old-edn :coord :git/tag)]
       (api/install-latest {:tool "clj-new"})
       (let [new-edn (edn/read-string (slurp (jio/file tools "clj-new.edn")))
             new-tag (-> new-edn :coord :git/tag)]
         (is new-tag) ;; has a :git/tag
-        (is (not= old-tag new-tag)))))) ;; ... that has been updated
+        (is (not= old-tag new-tag)))))) ;; ... that has been updated