support for runtime loading of wagons

Author: micha

boot/aether/src/boot/aether.clj

@@ -27,7 +27,7 @@
 (defn transfer-listener
   [{type :type meth :method {name :name repo :repository} :resource err :error}]
   (when (and (.endsWith name ".jar") (= type :started))
-    (util/info "Retrieving %s from %s\n" name repo)))
+    (util/info "Retrieving %s from %s\n" (.getName (io/file name)) repo)))
 
 (defn ^{:boot/from :technomancy/leiningen} build-url
   "Creates java.net.URL from string"
@@ -169,3 +169,17 @@
       :pom-file    (io/file pomfile)
       :repository  [repo]
       :local-repo  (or (:local-repo env) @local-repo nil))))
+
+(def ^:private wagon-files (atom #{}))
+
+(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)))))

boot/core/src/boot/core.clj

@@ -36,7 +36,7 @@
   "Add Maven dependencies to the classpath, fetching them if necessary."
   [old new env]
   (->> new rm-clojure-dep (assoc env :dependencies) pod/add-dependencies)
-  (into (or old []) new))
+  new)
 
 (defn- add-directories!
   "Add URLs (directories or jar files) to the classpath."
@@ -57,15 +57,6 @@
   (let [dk :dependencies]
     (->> kvs (sort-by first #(cond (= %1 dk) 1 (= %2 dk) -1 :else 0)))))
 
-(def ^:private base-env
-  "Returns initial boot environment settings."
-  (fn []
-    '{:dependencies []
-      :src-paths    #{}
-      :tgt-path     "target"
-      :repositories [["clojars"       "http://clojars.org/repo/"]
-                     ["maven-central" "http://repo1.maven.org/maven2/"]]}))
-
 ;; ## Boot Environment
 ;;
 ;; _These functions are used internally by boot and are not part of the public
@@ -74,7 +65,7 @@
 (declare ^{:dynamic true :doc "The running version of boot."} *boot-version*)
 (declare ^{:dynamic true :doc "Command line options for boot itself."} *boot-opts*)
 
-(def boot-env
+(def ^:private boot-env
   "Atom containing environment key/value pairs. Do not manipulate this atom
   directly. Use `set-env!` (below) instead."
   (atom nil))
@@ -84,7 +75,13 @@
   There should be no need to call this function directly."
   [& kvs]
   (doto boot-env
-    (reset! (merge (base-env) (apply hash-map kvs)))
+    (reset!
+      (->> (apply hash-map kvs)
+        (merge {:dependencies []
+                :src-paths    #{}
+                :tgt-path     "target"
+                :repositories [["clojars"       "http://clojars.org/repo/"]
+                               ["maven-central" "http://repo1.maven.org/maven2/"]]})))
     (add-watch ::boot #(configure!* %3 %4))))
 
 (defmulti on-env!
@@ -111,19 +108,6 @@
 ;;
 ;; _Functions provided for use in boot tasks._
 
-;; Maven Repository Global Configuration
-
-(defn set-offline!
-  "Set/unset offline mode for dependency resolution."
-  [x]
-  (pod/call-worker `(boot.aether/set-offline! ~x)))
-
-(defn set-update!
-  "Set the snapshot update frequency for dependency resolution. Accepted values
-  of x are `:always`, `:daily`, or `:never`."
-  [x]
-  (pod/call-worker `(boot.aether/set-update! ~x)))
-
 ;; ## Boot Environment Management Functions
 
 (defn get-env
@@ -160,7 +144,13 @@
   [dst & [srcs]]
   (tmp/add-sync! @tmpregistry dst srcs))
 
-;; ## Task helpers
+(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 #{}))
 
@@ -195,24 +185,15 @@
   [f]
   (tmp/tmpfile? @tmpregistry f))
 
-(defn mktmp!
-  "Create a temp file and return its `File` object. If `mktmp!` has already 
-  been called with the given `key` the tmpfile will be truncated. The optional
-  `name` argument can be used to customize the temp file name (useful for
-  creating temp files with a specific file extension, for example)."
-  [key & [name]]
-  (tmp/mk! @tmpregistry key name))
-
 (defn mktmpdir!
   "Create a temp directory and return its `File` object. If `mktmpdir!` has
   already been called with the given `key` the directory's contents will be
-  deleted. The optional `name` argument can be used to customize the temp
-  directory name, as with `mktmp!` above."
-  [key & [name]]
-  (tmp/mkdir! @tmpregistry key name))
+  deleted."
+  [key]
+  (tmp/mkdir! @tmpregistry key))
 
-(def tgtdirs
-  "Atom containing a vector of File objects--directories created by `mktgtdir!`.
+(def ^:private tgtdirs
+  "Atom containing a vector of File objects–directories created by `mktgtdir!`.
   This atom is managed by boot and shouldn't be manipulated directly."
   (atom []))
 

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

@@ -301,7 +301,7 @@
           (assert "no serve function specified"))
         (util/info "Adding servlet impl...\n")
         (pod/copy-dependency-jar-entries
-          (core/get-env) tgt implp implv #"^tailrecursion/.*\.(class|clj)$")
+          (core/get-env) tgt [implp implv] #"^tailrecursion/.*\.(class|clj)$")
         (util/info "Writing %s...\n" (.getName xmlfile))
         (pod/call-worker
           `(boot.web/spit-web! ~(.getPath xmlfile) ~serve ~create ~destroy))))))

boot/pod/src/boot/pod.clj

@@ -144,20 +144,23 @@
     (.offer @shutdown-hooks f)
     (->> f Thread. (.addShutdownHook (Runtime/getRuntime)))))
 
+(defn- eval-fn-call
+  [[f & args]]
+  (when-let [ns (namespace f)] (require (symbol ns)))
+  (if-let [f (resolve f)]
+    (apply f args)
+    (throw (Exception. (format "can't resolve symbol (%s)" f)))))
+
 (defn call-in
   ([expr]
-     (let [[f & args] (read-string expr)]
-       (when-let [ns (namespace f)] (require (symbol ns)))
-       (if-let [f (resolve f)]
-         (pr-str (apply f args))
-         (throw (Exception. (format "can't resolve symbol (%s)" f))))))
+     (pr-str (eval-fn-call (read-string expr))))
   ([pod expr]
      (let [ret (.invoke pod "boot.pod/call-in" (pr-str expr))]
       (util/guard (read-string ret)))))
 
 (defn call-worker
   [expr]
-  (call-in @worker-pod expr))
+  (if @worker-pod (call-in @worker-pod expr) (eval-fn-call expr)))
 
 (defn eval-in*
   ([expr-str]
@@ -183,7 +186,7 @@
   (->> env resolve-dependencies (map (comp io/file :jar))))
 
 (defn resolve-dependency-jar
-  [env project version]
+  [env [project version]]
   (let [jarname (format "%s-%s.jar" (name project) version)]
     (->> [[project version]]
       (assoc env :dependencies)
@@ -214,11 +217,11 @@
   (call-worker `(boot.aether/jar-entries-in-dep-order ~env)))
 
 (defn copy-dependency-jar-entries
-  [env outdir project version & regexes]
+  [env outdir coord & regexes]
   (let [keep? (if-not (seq regexes)
                 (constantly true)
                 (apply some-fn (map #(partial re-find %) regexes)))
-        ents  (->> (resolve-dependency-jar env project version)
+        ents  (->> (resolve-dependency-jar env coord)
                 jar-entries
                 (filter (comp keep? first))
                 (map (fn [[k v]] [v (.getPath (io/file outdir k))])))]