Merge pull request #226 from liquidz/dev

Next release

Author: liquidz

CHANGELOG.adoc

@@ -1,6 +1,14 @@
 All notable changes to this project will be documented in this file. This change log follows the conventions of http://keepachangelog.com/[keepachangelog.com].
 
 == Unreleased (dev)
+// {{{
+=== Changed
+* Bumped rewrite-indented to 0.2.36.
+
+=== Fixed
+* https://github.com/liquidz/antq/issues/192[#192]: Fixed to be able to upgrade third party actions which containing a name attribute.
+* https://github.com/liquidz/antq/issues/225[#225]: Fixed to handle `:git/url` when scanning transitive dependencies.
+// }}}
 
 == 2.5.1089 (2023-06-16)
 // {{{

deps.edn

@@ -10,7 +10,7 @@
   clj-commons/clj-yaml {:mvn/version "1.0.26"}
   version-clj/version-clj {:mvn/version "2.0.2"}
   rewrite-clj/rewrite-clj {:mvn/version "1.1.47"}
-  com.github.liquidz/rewrite-indented {:mvn/version "0.1.29"}}
+  com.github.liquidz/rewrite-indented {:mvn/version "0.2.36"}}
 
  :tools/usage
  {:ns-default antq.tool}

src/antq/dep/transitive.clj

@@ -22,14 +22,20 @@
 
 (defmethod dep->dep-map :git-sha
   [dep]
-  {(symbol (:name dep))
-   {:git/sha (:version dep)}})
+  (let [extra-url (get-in dep [:extra :url])]
+    {(symbol (:name dep))
+     (cond-> {:git/sha (:version dep)}
+       (seq extra-url)
+       (assoc :git/url extra-url))}))
 
 (defmethod dep->dep-map :git-tag-and-sha
   [dep]
-  {(symbol (:name dep))
-   {:git/tag (:version dep)
-    :git/sha (get-in dep [:extra :sha])}})
+  (let [extra-url (get-in dep [:extra :url])]
+    {(symbol (:name dep))
+     (cond-> {:git/tag (:version dep)
+              :git/sha (get-in dep [:extra :sha])}
+       (seq extra-url)
+       (assoc :git/url extra-url))}))
 
 ;; ===== resolved-dep->dep =====
 (defn- parent-name

src/antq/upgrade/github_action.clj

@@ -56,7 +56,7 @@
       (loop [loc loc]
         (if-let [loc (ri.zip/find-next-string loc #(re-seq target-re %))]
           (recur (cond-> loc
-                   (some? (ri.zip/find-ancestor-string loc (action? "DeLaGuardo/setup-clojure")))
+                   (some? (ri.zip/find-previous-string loc (action? "DeLaGuardo/setup-clojure")))
                    (ri.zip/update (update-value (:latest-version version-checked-dep)))
 
                    :always
@@ -68,7 +68,7 @@
   (loop [loc loc]
     (if-let [loc (ri.zip/find-next-string loc #(re-seq #"version\s*:" %))]
       (recur (cond-> loc
-               (some? (ri.zip/find-ancestor-string loc (action? "DeLaGuardo/setup-clj-kondo")))
+               (some? (ri.zip/find-previous-string loc (action? "DeLaGuardo/setup-clj-kondo")))
                (ri.zip/update (update-value (:latest-version version-checked-dep)))
 
                :always
@@ -81,7 +81,7 @@
     (if-let [loc (or (ri.zip/find-next-string loc #(re-seq #"graalvm\s*:" %))
                      (ri.zip/find-next-string loc #(re-seq #"graalvm-version\s*:" %)))]
       (recur (cond-> loc
-               (some? (ri.zip/find-ancestor-string loc (action? "DeLaGuardo/setup-graalvm")))
+               (some? (ri.zip/find-previous-string loc (action? "DeLaGuardo/setup-graalvm")))
                (ri.zip/update (update-value (:latest-version version-checked-dep)))
 
                :always
@@ -93,7 +93,7 @@
   (loop [loc loc]
     (if-let [loc (ri.zip/find-next-string loc #(re-seq #"cljstyle-version\s*:" %))]
       (recur (cond-> loc
-               (some? (ri.zip/find-ancestor-string loc (action? "0918nobita/setup-cljstyle")))
+               (some? (ri.zip/find-previous-string loc (action? "0918nobita/setup-cljstyle")))
                (ri.zip/update (update-value (:latest-version version-checked-dep)))
 
                :always

test/antq/dep/transitive_test.clj

@@ -27,6 +27,41 @@
                          :dependents ['foo/bob]}}
     {}))
 
+(t/deftest dep->dep-map-test
+  (t/testing "java"
+    (t/is (= {'foo/bar {:mvn/version "1.2.3"}}
+             (#'sut/dep->dep-map {:type :java
+                                  :name "foo/bar"
+                                  :version "1.2.3"}))))
+  (t/testing "git-sha with git/url"
+    (t/is (= {'foo/bar {:git/sha "86eddb89f2a2018fd984dffaadfec13e6735e92f"
+                        :git/url "https://github.com/liquidz/antq"}}
+             (#'sut/dep->dep-map {:type :git-sha
+                                  :name "foo/bar"
+                                  :version "86eddb89f2a2018fd984dffaadfec13e6735e92f"
+                                  :extra {:url "https://github.com/liquidz/antq"}}))))
+  (t/testing "git-sha without git/url"
+    (t/is (= {'com.github.liquidz/antq {:git/sha "86eddb89f2a2018fd984dffaadfec13e6735e92f"}}
+             (#'sut/dep->dep-map {:type :git-sha
+                                  :name "com.github.liquidz/antq"
+                                  :version "86eddb89f2a2018fd984dffaadfec13e6735e92f"}))))
+  (t/testing "git-tag-and-sha with git/url"
+    (t/is (= {'foo/bar {:git/tag "1.2.3"
+                        :git/sha "86eddb8"
+                        :git/url "https://github.com/liquidz/antq"}}
+             (#'sut/dep->dep-map {:type :git-tag-and-sha
+                                  :name "foo/bar"
+                                  :version "1.2.3"
+                                  :extra {:sha "86eddb8"
+                                          :url "https://github.com/liquidz/antq"}}))))
+  (t/testing "git-tag-and-sha without git/url"
+    (t/is (= {'com.github.liquidz/antq {:git/tag "1.2.3"
+                                        :git/sha "86eddb8"}}
+             (#'sut/dep->dep-map {:type :git-tag-and-sha
+                                  :name "com.github.liquidz/antq"
+                                  :version "1.2.3"
+                                  :extra {:sha "86eddb8"}})))))
+
 (t/deftest resolve-transitive-deps-test
   (with-redefs [deps/resolve-deps mock-resolve-deps]
     (t/is (= [(r/map->Dependency {:type :java

test/antq/upgrade/github_action_test.clj

@@ -95,7 +95,8 @@
             to-deps (->> dummy-clojure-cli-dep
                          (upgrade/upgrader)
                          (dep.gha/extract-deps ""))]
-        (t/is (= #{{:name "clojure/brew-install" :version {:- 1 :+ "9.0.0"}}}
+        (t/is (= #{{:name "clojure/brew-install" :version {:- 1 :+ "9.0.0"}}
+                   {:name "clojure/brew-install" :version {:- -1 :+ "9.0.0"}}}
                  (h/diff-deps from-deps to-deps)))))
 
     (t/testing "leiningen"
@@ -105,7 +106,8 @@
             to-deps (->> dummy-leiningen-dep
                          (upgrade/upgrader)
                          (dep.gha/extract-deps ""))]
-        (t/is (= #{{:name "technomancy/leiningen" :version {:- 2 :+ "9.0.0"}}}
+        (t/is (= #{{:name "technomancy/leiningen" :version {:- 2 :+ "9.0.0"}}
+                   {:name "technomancy/leiningen" :version {:- -2 :+ "9.0.0"}}}
                  (h/diff-deps from-deps to-deps)))))
 
     (t/testing "boot"
@@ -115,7 +117,8 @@
             to-deps (->> dummy-boot-dep
                          (upgrade/upgrader)
                          (dep.gha/extract-deps ""))]
-        (t/is (= #{{:name "boot-clj/boot" :version {:- 3 :+ "9.0.0"}}}
+        (t/is (= #{{:name "boot-clj/boot" :version {:- 3 :+ "9.0.0"}}
+                   {:name "boot-clj/boot" :version {:- -3 :+ "9.0.0"}}}
                  (h/diff-deps from-deps to-deps))))))
 
   (t/testing "clj-kondo"
@@ -125,7 +128,8 @@
           to-deps (->> dummy-clj-kondo-dep
                        (upgrade/upgrader)
                        (dep.gha/extract-deps ""))]
-      (t/is (= #{{:name "clj-kondo/clj-kondo" :version {:- "5" :+ "9.0.0"}}}
+      (t/is (= #{{:name "clj-kondo/clj-kondo" :version {:- "5" :+ "9.0.0"}}
+                 {:name "clj-kondo/clj-kondo" :version {:- "-5" :+ "9.0.0"}}}
                (h/diff-deps from-deps to-deps)))))
 
   (t/testing "graalvm"
@@ -135,7 +139,8 @@
           to-deps (->> dummy-graalvm-dep
                        (upgrade/upgrader)
                        (dep.gha/extract-deps ""))]
-      (t/is (= #{{:name "graalvm/graalvm-ce-builds" :version {:- "6" :+ "9.0.0"}}}
+      (t/is (= #{{:name "graalvm/graalvm-ce-builds" :version {:- "6" :+ "9.0.0"}}
+                 {:name "graalvm/graalvm-ce-builds" :version {:- "-6" :+ "9.0.0"}}}
                (h/diff-deps from-deps to-deps)))))
 
   (t/testing "cljstyle"
@@ -145,5 +150,6 @@
           to-deps (->> dummy-cljstyle-dep
                        (upgrade/upgrader)
                        (dep.gha/extract-deps ""))]
-      (t/is (= #{{:name "greglook/cljstyle" :version {:- "7" :+ "9.0.0"}}}
+      (t/is (= #{{:name "greglook/cljstyle" :version {:- "7" :+ "9.0.0"}}
+                 {:name "greglook/cljstyle" :version {:- "-7" :+ "9.0.0"}}}
                (h/diff-deps from-deps to-deps))))))

test/resources/dep/test_github_action_third_party.yml

@@ -19,3 +19,23 @@ jobs:
       - uses: 0918nobita/setup-cljstyle@master
         with:
           cljstyle-version: "7"
+
+      - name: with name
+        uses: DeLaGuardo/setup-clojure@master
+        with:
+          cli: -1
+          lein: -2
+          boot: -3
+          bb: -4
+      - name: with name
+        uses: DeLaGuardo/setup-clj-kondo@master
+        with:
+          version: '-5'
+      - name: with name
+        uses: DeLaGuardo/setup-graalvm@master
+        with:
+          graalvm: -6
+      - name: with name
+        uses: 0918nobita/setup-cljstyle@master
+        with:
+          cljstyle-version: "-7"