fix: Fix upgrader to work with deps containing metadata

cf. #189
liquidz · Nov 16, 2022 · 48cc2e3 · 48cc2e3
1 parent ffc790a
commit 48cc2e3
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 1 deletion.
diff --git a/src/antq/upgrade/clojure.clj b/src/antq/upgrade/clojure.clj
@@ -57,6 +57,14 @@
       :else
       loc)))
 
+(defn- skip-meta
+  [loc]
+  (if (= :meta (z/tag loc))
+    (-> loc
+        (z/down)
+        (z/right))
+    loc))
+
 (defn upgrade-dep
   [loc version-checked-dep]
   (let [name-set (u.dep/name-candidates (:name version-checked-dep))]
@@ -65,7 +73,9 @@
         (recur (if (in-deps? loc)
                  (or (some-> loc
                              ;; move to map
-                             (z/right) (z/down)
+                             (z/right)
+                             (skip-meta)
+                             (z/down)
                              (replace-versions version-checked-dep))
                      (z/next loc))
                  (z/next loc)))

diff --git a/test/antq/upgrade/clojure_test.clj b/test/antq/upgrade/clojure_test.clj
@@ -46,6 +46,20 @@
                       :file (io/resource "dep/test_deps.edn")
                       :extra {:sha "123456789x123456789x123456789x123456789x"}}))
 
+(def ^:private dummy-short-meta-dep
+  (r/map->Dependency {:project :clojure
+                      :type :java
+                      :name "short-meta"
+                      :latest-version "9.0.0"
+                      :file (io/resource "dep/test_deps.edn")}))
+
+(def ^:private dummy-full-meta-dep
+  (r/map->Dependency {:project :clojure
+                      :type :java
+                      :name "full-meta"
+                      :latest-version "9.0.0"
+                      :file (io/resource "dep/test_deps.edn")}))
+
 (def ^:private dummy-no-version-dep
   (r/map->Dependency {:project :clojure
                       :type :java
@@ -123,6 +137,28 @@
                           :+ "9876543210abcdefghijklmnopqrstuvwxyz1234"}}}
                  (h/diff-deps from-deps to-deps))))))
 
+  (t/testing "short meta"
+    (let [from-deps (->> dummy-short-meta-dep
+                         :file
+                         (slurp)
+                         (dep.clj/extract-deps ""))
+          to-deps (->> dummy-short-meta-dep
+                       (upgrade/upgrader)
+                       (dep.clj/extract-deps ""))]
+      (t/is (= #{{:name "short-meta/short-meta" :version {:- "2.5.8" :+ "9.0.0"}}}
+               (h/diff-deps from-deps to-deps)))))
+
+  (t/testing "full meta"
+    (let [from-deps (->> dummy-full-meta-dep
+                         :file
+                         (slurp)
+                         (dep.clj/extract-deps ""))
+          to-deps (->> dummy-full-meta-dep
+                       (upgrade/upgrader)
+                       (dep.clj/extract-deps ""))]
+      (t/is (= #{{:name "full-meta/full-meta" :version {:- "2.6.9" :+ "9.0.0"}}}
+               (h/diff-deps from-deps to-deps)))))
+
   (t/testing "no corresponding value"
     (let [from-deps (->> dummy-no-version-dep
                          :file

diff --git a/test/resources/dep/test_deps.edn b/test/resources/dep/test_deps.edn
@@ -20,6 +20,10 @@
         ;; local/root
         local-repo/local-repo {:local/root "./local"}
 
+        ;; metadata
+        short-meta ^:foo/bar {:mvn/version "2.5.8"}
+        full-meta ^{:foo/bar true} {:mvn/version "2.6.9"}
+
         ;; should be ignored
         local-repo/non-existing {:local/root "/path/to/non-existing-local/repo"}
         ;; invalid versions should be ignored