Update dep.pom to handle repositories #10

liquidz · Jul 18, 2020 · fb80606 · fb80606
1 parent e94c2a7
commit fb80606
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/src/antq/dep/pom.clj b/src/antq/dep/pom.clj
@@ -8,18 +8,27 @@
 
 (def ^:private project-file "pom.xml")
 
+(defn extract-repos
+  [xml]
+  (->> xml
+       (u.xml/get-tags :repository)
+       (map #(u.xml/get-values [:id :url] (:content %)))
+       (reduce #(assoc %1 (first %2) {:url (second %2)}) {})))
+
 (defn extract-deps
   [pom-xml-content-str]
-  (->> pom-xml-content-str
-       xml/parse-str
-       xml-seq
-       (u.xml/get-tags :dependency)
-       (map #(u.xml/get-values [:groupId :artifactId :version] (:content %)))
-       (map (fn [[group-id artifact-id version]]
-              (r/map->Dependency {:type :java
-                                  :file project-file
-                                  :name (str group-id "/" artifact-id)
-                                  :version version})))))
+  (let [xml (->> pom-xml-content-str
+                 xml/parse-str
+                 xml-seq)
+        repos (extract-repos xml)]
+    (->> (u.xml/get-tags :dependency xml)
+         (map #(u.xml/get-values [:groupId :artifactId :version] (:content %)))
+         (map (fn [[group-id artifact-id version]]
+                (r/map->Dependency {:type :java
+                                    :file project-file
+                                    :name (str group-id "/" artifact-id)
+                                    :version version
+                                    :repositories repos}))))))
 
 (defn load-deps
   ([] (load-deps "."))

diff --git a/test/antq/dep/pom_test.clj b/test/antq/dep/pom_test.clj
@@ -7,7 +7,10 @@
 
 (defn- dependency
   [m]
-  (r/map->Dependency (merge {:type :java :file "pom.xml"} m)))
+  (r/map->Dependency (merge {:type :java
+                             :file "pom.xml"
+                             :repositories {"antq-test" {:url "s3://antq-repo/"}}}
+                            m)))
 
 (t/deftest extract-deps-test
   (let [deps (sut/extract-deps

diff --git a/test/resources/dep/pom.xml b/test/resources/dep/pom.xml
@@ -22,4 +22,10 @@
       <version>3.0.0</version>
     </dependency>
   </dependencies>
+  <repositories>
+    <repository>
+      <id>antq-test</id>
+      <url>s3://antq-repo/</url>
+    </repository>
+  </repositories>
 </project>