Update dep.boot to handle repositories #10

liquidz · Jul 19, 2020 · ab95c87 · ab95c87
1 parent 3e8b39f
commit ab95c87
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/src/antq/dep/boot.clj b/src/antq/dep/boot.clj
@@ -9,25 +9,35 @@
 (defn extract-deps
   [build-boot-content-str]
   (let [dep-form? (atom false)
-        deps (atom [])]
+        repos-form? (atom false)
+        deps (atom [])
+        repos (atom [])]
     (walk/prewalk (fn [form]
                     (cond
                       (keyword? form)
-                      (reset! dep-form? (= :dependencies form))
+                      (do (reset! dep-form? (= :dependencies form))
+                          (reset! repos-form? (= :repositories form)))
 
                       (and @dep-form?
                            (vector? form)
                            (vector? (first form)))
-                      (swap! deps concat form))
+                      (swap! deps concat form)
+
+                      (and @repos-form?
+                           (vector? form)
+                           (string? (first form)))
+                      (swap! repos concat form))
                     form)
                   (read-string (str "(list " build-boot-content-str " )")))
-    (for [[dep-name version] @deps]
-      (r/map->Dependency {:type :java
-                          :file project-file
-                          :name  (if (qualified-symbol? dep-name)
-                                   (str dep-name)
-                                   (str dep-name "/" dep-name))
-                          :version version}))))
+    (let [repositories (apply hash-map @repos)]
+      (for [[dep-name version] @deps]
+        (r/map->Dependency {:type :java
+                            :file project-file
+                            :name  (if (qualified-symbol? dep-name)
+                                     (str dep-name)
+                                     (str dep-name "/" dep-name))
+                            :version version
+                            :repositories repositories})))))
 
 (defn load-deps
   ([] (load-deps "."))

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

diff --git a/test/resources/dep/build.boot b/test/resources/dep/build.boot
@@ -5,4 +5,7 @@
                   [bar "2.0.0"]
                   [baz "3.0.0" :scope "test"]])
 
+(set-env!
+  :repositories #(conj % '["antq-test" {:url "s3://antq-repo/"}]))
+
 (def bar ::bar)