ansi colorize; add :wagons env key; include s3-wagon-private in worker

Author: micha

boot/aether/src/boot/aether.clj

@@ -5,6 +5,7 @@
    [cemerick.pomegranate.aether :as aether]
    [boot.util                   :as util]
    [boot.pod                    :as pod]
+   [boot.from.io.aviso.ansi     :as ansi]
    [boot.kahnsort               :as ksort])
   (:import
    [java.io File]
@@ -129,8 +130,9 @@
   [tree & [prefixes]]
   (loop [[[coord branch] & more] (seq tree)]
     (when coord
-      (let [pfx (cond (not prefixes) "" (seq more) "├── " :else "└── ")]
-        (println (str (apply str prefixes) pfx coord)))
+      (let [pfx (cond (not prefixes) "" (seq more) "├── " :else "└── ")
+            pfx (ansi/blue (str (apply str prefixes) pfx))]
+        (println (str pfx (util/pr-color-str coord))))
       (when branch
         (let [pfx (cond (not prefixes) "" (seq more) "│   " :else "    ")]
           (print-tree branch (concat prefixes (list pfx)))))
@@ -172,14 +174,19 @@
 
 (def ^:private wagon-files (atom #{}))
 
+(defn load-wagon-mappings
+  [& [mapping]]
+  (locking wagon-files
+    (->> (pod/resources "leiningen/wagons.clj")
+      (remove (partial contains? @wagon-files))
+      (map #(do (swap! wagon-files conj %)
+                (->> % io/input-stream slurp read-string)))
+      (reduce into {})
+      (mapv (fn [[k v]] (aether/register-wagon-factory! k (eval v))))))
+  (doseq [[scheme factory] mapping]
+    (aether/register-wagon-factory! scheme (eval factory))))
+
 (defn add-wagon
   [env coord & [mapping]]
   (pod/add-dependencies (assoc env :dependencies [coord]))
-  (let [m (or mapping (locking wagon-files
-                        (->> (pod/resources "leiningen/wagons.clj")
-                          (remove (partial contains? @wagon-files))
-                          (map #(do (swap! wagon-files conj %)
-                                    (->> % io/input-stream slurp read-string)))
-                          (reduce into {}))))]
-    (doseq [[scheme factory] m]
-      (aether/register-wagon-factory! scheme (eval factory)))))
+  (load-wagon-mappings mapping))

boot/core/src/boot/core.clj

@@ -52,6 +52,18 @@
           n (get new k ::noval)]
       (if (not= o n) (on-env! k o n new)))))
 
+(defn- add-wagon!
+  "FIXME: document this."
+  ([maven-coord scheme-map]
+     (add-wagon! nil [maven-coord] (get-env) scheme-map))
+  ([old new env]
+     (add-wagon! old new env nil))
+  ([old new env scheme-map]
+     (doseq [maven-coord new]
+       (pod/call-worker
+         `(boot.aether/add-wagon ~env ~maven-coord ~scheme-map)))
+     new))
+
 (defn- order-set-env-keys
   [kvs]
   (let [dk :dependencies]
@@ -103,6 +115,7 @@
 (defmethod merge-env! ::default     [key old new env] new)
 (defmethod merge-env! :src-paths    [key old new env] (into (or old #{}) new))
 (defmethod merge-env! :dependencies [key old new env] (add-dependencies! old new env))
+(defmethod merge-env! :wagons       [key old new env] (add-wagon! old new env))
 
 ;; ## Boot API Functions
 ;;
@@ -144,12 +157,6 @@
   [dst & [srcs]]
   (tmp/add-sync! @tmpregistry dst srcs))
 
-(defn add-wagon!
-  "FIXME: document this."
-  [maven-coord & [scheme-map]]
-  (pod/call-worker
-    `(boot.aether/add-wagon ~(get-env) ~maven-coord ~scheme-map)))
-
 ;; ## Task helpers – managed temp files
 
 (def ^:private consumed-files (atom #{}))

boot/core/src/boot/main.clj

@@ -82,7 +82,10 @@
               bootforms   (some->> arg0 slurp util/read-string-all)
               userforms   (when profile? (some->> userscript slurp util/read-string-all))
               scriptforms (emit boot? args userforms bootforms)
-              scriptstr   (str (string/join "\n\n" (map pr-str scriptforms)) "\n")]
+              scriptstr   (str (string/join "\n\n" (map pr-str scriptforms)) "\n")
+              initial-env (->> [:src-paths :tgt-path :dependencies]
+                             (reduce #(if-let [v (opts %2)] (assoc %1 %2 v) %1) {})
+                             (merge {} (:set-env opts)))]
 
           (swap! util/verbose-exceptions + (or (:verbose opts) 0))
           (when (:boot-script opts) (util/exit-ok (print scriptstr)))
@@ -94,10 +97,8 @@
           (#'core/init!)
 
           (let [tmpf (.getPath (file/tmpfile "boot.user" ".clj"))]
-            (core/set-env! :boot-user-ns-file tmpf)
-            (doseq [[k v] (:set-env opts)] (core/set-env! k v))
-            (doseq [k [:src-paths :tgt-path :dependencies]]
-              (when-let [v (opts k)] (core/set-env! k v)))
+            (pod/call-worker `(boot.aether/load-wagon-mappings))
+            (apply core/set-env! (->> initial-env (mapcat identity) seq))
             (try (doto tmpf (spit scriptstr) (load-file))
                  (catch clojure.lang.Compiler$CompilerException cx
                    (let [l (.-line cx)

boot/core/src/boot/task/built_in.clj

@@ -90,21 +90,21 @@
               `(boot.notify/failure! ~theme ~failure))
             (throw t)))))))
 
-(core/deftask print-deps
+(core/deftask pr-deps
   "Print the project's dependency graph."
   []
   (core/with-pre-wrap
     (print (pod/call-worker `(boot.aether/dep-tree ~(core/get-env))))))
 
-(core/deftask print-env
+(core/deftask pr-env
   "Print the boot environment map."
   []
-  (core/with-pre-wrap (prn (core/get-env))))
+  (core/with-pre-wrap (println (util/pr-color-str (core/get-env)))))
 
-(core/deftask print-event
+(core/deftask pr-event
   "Print the event map."
   []
-  (core/with-pre-wrap (prn core/*event*)))
+  (core/with-pre-wrap (println (util/pr-color-str core/*event*))))
 
 (core/deftask wait
   "Wait before calling the next handler.

boot/pod/src/boot/util.clj

@@ -3,6 +3,7 @@
    [clojure.java.io              :as io]
    [clojure.set                  :as set]
    [clojure.pprint               :as pprint]
+   [boot.from.io.aviso.ansi      :as ansi]
    [boot.from.io.aviso.repl      :as repl]
    [boot.from.io.aviso.exception :as pretty])
   (:import
@@ -78,6 +79,20 @@
         {:properties true :filter repl/standard-frame-filter})
     (pretty/write-exception *err* ex {:properties true})))
 
+(defn pr-color-str
+  [form]
+  (cond
+    (symbol?  form) (ansi/bold-white (pr-str form))
+    (keyword? form) (ansi/yellow (pr-str form))
+    (string?  form) (ansi/green (pr-str form))
+    (char?    form) (ansi/red (pr-str form))
+    (number?  form) (ansi/cyan (pr-str form))
+    (seq?     form) (str "(" (apply str (interpose " " (map pr-color-str form))) ")")
+    (vector?  form) (str "[" (apply str (interpose " " (map pr-color-str form))) "]")
+    (set?     form) (str "#{" (apply str (interpose " " (map pr-color-str form))) "}")
+    (map?     form) (str "{" (apply str (interpose " " (map pr-color-str (mapcat identity form)))) "}")
+    :else (pr-str form)))
+
 (defn auto-flush
   [writer]
   (proxy [java.io.PrintWriter] [writer]

boot/worker/project.clj

@@ -4,6 +4,7 @@
   :dependencies [[org.clojure/clojure                   "1.6.0"          :scope "provided"]
                  [boot/base                             "2.0.0-SNAPSHOT" :scope "provided"]
                  [boot/aether                           "2.0.0-SNAPSHOT" :scope "compile"]
+                 [s3-wagon-private                      "1.1.2"          :scope "compile"]
                  [net.java.dev.jna/jna                  "4.1.0"          :scope "compile"]
                  [reply                                 "0.3.4"          :scope "compile"]
                  [alandipert/desiderata                 "1.0.2"          :scope "compile"]