Merge pull request #112 from liquidz/dev

1.0.2

Author: liquidz

CHANGELOG.adoc

@@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. This change
 
 == Unreleased (dev)
 
+== 1.0.2 (2021-09-18)
+// {{{
+=== Changed
+* Bumped tools.deps.alpha to 0.12.1041.
+* Bumped deps-deploy to the latest commit.
+
+=== Fixed
+* https://github.com/liquidz/antq/issues/111[#111]: Fixed a bug that caused an error when updating `:git/sha`.
+// }}}
+
 == 1.0.1 (2021-09-16)
 // {{{
 === Changed

README.adoc

@@ -84,7 +84,7 @@ From Clojure CLI ver `1.10.3.933`, https://clojure.org/reference/deps_and_cli#to
 [source,sh]
 ----
 # install
-clojure -Ttools install com.github.liquidz/antq '{:git/tag "1.0.1"}' :as antq
+clojure -Ttools install com.github.liquidz/antq '{:git/tag "1.0.2"}' :as antq
 # uninstall
 clojure -Ttools remove :tool antq
 # execute

deps.edn

@@ -4,7 +4,7 @@
   org.clojure/data.xml {:mvn/version "0.2.0-alpha6"}
   org.clojure/data.zip {:mvn/version "1.0.0"}
   org.clojure/tools.cli {:mvn/version "1.0.206"}
-  org.clojure/tools.deps.alpha {:mvn/version "0.12.1036"}
+  org.clojure/tools.deps.alpha {:mvn/version "0.12.1041"}
   org.clojure/data.json {:mvn/version "2.4.0"}
   clj-commons/clj-yaml {:mvn/version "0.7.107"}
   version-clj/version-clj {:mvn/version "2.0.2"}
@@ -44,7 +44,7 @@
   :deploy
   {:extra-deps {slipset/deps-deploy {;; :mvn/version "RELEASE"
                                      :git/url "https://github.com/slipset/deps-deploy"
-                                     :sha "ea2aefc82a40e4d2cf4de24ec18a786108e1a430"}}
+                                     :sha "3d20d0ee86c35c431e4fcf5b0830a3785e8116c0"}}
    :exec-fn deps-deploy.deps-deploy/deploy
    :exec-args {}}
 

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.liquidz</groupId>
   <artifactId>antq</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <name>antq</name>
   <description>Point out your outdated dependencies</description>
   <url>https://github.com/liquidz/antq</url>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.clojure</groupId>
       <artifactId>tools.deps.alpha</artifactId>
-      <version>0.12.1036</version>
+      <version>0.12.1041</version>
     </dependency>
     <dependency>
       <groupId>org.clojure</groupId>

src/antq/upgrade/clojure.clj

@@ -10,23 +10,27 @@
   (->> loc z/up z/left z/sexpr
        (contains? #{:deps :extra-deps :replace-deps :override-deps})))
 
+(defn- find-version-key
+  [loc version-checked-dep]
+  (if (= :git-sha (:type version-checked-dep))
+    (or (z/find-value loc z/right :sha)
+        (z/find-value loc z/right :git/sha))
+    (z/find-value loc z/right :mvn/version)))
+
 (defn upgrade-dep
   [loc version-checked-dep]
-  (let [name-set (u.dep/name-candidates (:name version-checked-dep))
-        version-key (if (= :git-sha (:type version-checked-dep))
-                      :sha
-                      :mvn/version)]
+  (let [name-set (u.dep/name-candidates (:name version-checked-dep))]
     (loop [loc loc]
       (if-let [loc (z/find-value loc z/next name-set)]
         (recur (if (in-deps? loc)
-                 (-> loc
-                     ;; move to map
-                     (z/right) (z/down)
-                     ;; find target key
-                     (z/find-value z/right version-key)
-                     ;; replace
-                     (z/right)
-                     (z/replace (:latest-version version-checked-dep)))
+                 (some-> loc
+                         ;; move to map
+                         (z/right) (z/down)
+                         ;; find version key
+                         (find-version-key version-checked-dep)
+                         ;; replace
+                         (z/right)
+                         (z/replace (:latest-version version-checked-dep)))
                  (z/next loc)))
         (u.zip/move-to-root loc)))))
 

test/antq/upgrade/clojure_test.clj

@@ -22,6 +22,20 @@
                       :latest-version "new-sha"
                       :file (io/resource "dep/deps.edn")}))
 
+(def ^:private dummy-git-git-sha-dep
+  (r/map->Dependency {:project :clojure
+                      :type :git-sha
+                      :name "git/world"
+                      :latest-version "new-sha"
+                      :file (io/resource "dep/deps.edn")}))
+
+(def ^:private dummy-no-version-dep
+  (r/map->Dependency {:project :clojure
+                      :type :java
+                      :name "no-version"
+                      :latest-version "9.9.9"
+                      :file (io/resource "dep/deps.edn")}))
+
 (t/deftest upgrade-dep-test
   (t/testing "java"
     (let [from-deps (->> dummy-java-dep
@@ -35,7 +49,7 @@
                  {:name "foo/core" :version {:- "1.1.0" :+ "9.0.0"}}}
                (h/diff-deps from-deps to-deps)))))
 
-  (t/testing "git"
+  (t/testing "git :sha"
     (let [from-deps (->> dummy-git-dep
                          :file
                          (slurp)
@@ -44,7 +58,28 @@
                        (upgrade/upgrader)
                        (dep.clj/extract-deps ""))]
       (t/is (= #{{:name "git/hello" :version {:- "dummy-sha" :+ "new-sha"}}}
-               (h/diff-deps from-deps to-deps))))))
+               (h/diff-deps from-deps to-deps)))))
+
+  (t/testing "git :git/sha"
+    (let [from-deps (->> dummy-git-git-sha-dep
+                         :file
+                         (slurp)
+                         (dep.clj/extract-deps ""))
+          to-deps (->> dummy-git-git-sha-dep
+                       (upgrade/upgrader)
+                       (dep.clj/extract-deps ""))]
+      (t/is (= #{{:name "git/world" :version {:- "dummy-sha2" :+ "new-sha"}}}
+               (h/diff-deps from-deps to-deps)))))
+
+  (t/testing "no corresponding value"
+    (let [from-deps (->> dummy-no-version-dep
+                         :file
+                         (slurp)
+                         (dep.clj/extract-deps ""))
+          to-deps (->> dummy-no-version-dep
+                       (upgrade/upgrader)
+                       (dep.clj/extract-deps ""))]
+      (t/is (empty? (h/diff-deps from-deps to-deps))))))
 
 (t/deftest upgrade-dep-replce-deps-test
   (let [dummy-dep (assoc dummy-java-dep :name "rep")

test/resources/dep/deps.edn

@@ -10,7 +10,9 @@
         ver-not-string {:mvn/version :version}
         ver-empty {:mvn/version ""}
         ;; inferring from lib
-        com.github.liquidz/dummy {:tag "v1.2.3" :sha "123abcd"}}
+        com.github.liquidz/dummy {:tag "v1.2.3" :sha "123abcd"}
+        ;; no version
+        no-version {}}
 
  :aliases
  {:foo {:extra-deps {baz {:mvn/version "3.0.0"}}