Add deploy task, cleanup some things

Author: micha

boot/aether/src/boot/aether.clj

@@ -146,15 +146,26 @@
     with-out-str))
 
 (defn install
-  [jarfile]
-  (let [pomprop (pod/pom-properties jarfile)
-        gid     (.getProperty pomprop "groupId")
-        aid     (.getProperty pomprop "artifactId")
-        version (.getProperty pomprop "version")
+  [env jarfile]
+  (let [{:keys [project version]}
+        (-> jarfile pod/pom-properties pod/pom-properties-map)
         pomfile (doto (File/createTempFile "pom" ".xml")
-                  .deleteOnExit (spit (pod/pom-xml jarfile)))
-        project (symbol gid aid)]
+                  .deleteOnExit (spit (pod/pom-xml jarfile)))]
     (aether/install
       :coordinates [project version]
       :jar-file    (io/file jarfile)
-      :pom-file    (io/file pomfile))))
+      :pom-file    (io/file pomfile)
+      :local-repo  (or (:local-repo env) @local-repo nil))))
+
+(defn deploy
+  [env repo jarfile]
+  (let [{:keys [project version]}
+        (-> jarfile pod/pom-properties pod/pom-properties-map)
+        pomfile (doto (File/createTempFile "pom" ".xml")
+                  .deleteOnExit (spit (pod/pom-xml jarfile)))]
+    (aether/deploy
+      :coordinates [project version]
+      :jar-file    (io/file jarfile)
+      :pom-file    (io/file pomfile)
+      :repository  [repo]
+      :local-repo  (or (:local-repo env) @local-repo nil))))

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

@@ -132,6 +132,7 @@
         ign?     (git/make-gitignore-matcher (core/get-env :src-paths))]
     (fn [continue]
       (fn [event]
+        (util/info "Starting file watcher (CTRL-C to quit)...\n")
         (loop [ret (util/guard [(.take q)])]
           (when ret
             (if-let [more (.poll q (or debounce 10) TimeUnit/MILLISECONDS)]
@@ -209,6 +210,7 @@
             xmlfile   (io/file pomdir "pom.xml")
             propfile  (io/file pomdir "pom.properties")]
         (when-not (and (.exists xmlfile) (.exists propfile))
+          (util/info "Writing %s and %s...\n" (.getName xmlfile) (.getName propfile))
           (pod/call-worker
             `(boot.pom/spit-pom! ~(.getPath xmlfile) ~(.getPath propfile) ~opts)))))))
 
@@ -225,6 +227,7 @@
 
   (let [tgt (core/mktgtdir! ::add-dir-tgt)]
     (core/with-pre-wrap
+      (util/info "Adding resource directories...\n")
       (binding [file/*filters* (mapv re-pattern filters)]
         (apply file/sync :time tgt dirs)))))
 
@@ -241,6 +244,7 @@
   (let [tgt (core/mktgtdir! ::add-srcs-tgt)]
     (core/with-pre-wrap
       (when-let [dirs (seq (remove core/tmpfile? (core/get-env :src-paths)))]
+        (util/info "Adding src files...\n")
         (binding [file/*filters* (mapv re-pattern filters)]
           (apply file/sync :time tgt dirs))))))
 
@@ -270,6 +274,7 @@
             urls   (-> (core/get-env)
                      (update-in [:dependencies] (partial filter scope?))
                      pod/jar-entries-in-dep-order)]
+        (util/info "Adding uberjar entries...\n")
         (doseq [[relpath url-str] urls]
           (when (or (empty? filters) (keep? relpath))
             (let [segs    (file/split-path relpath)
@@ -294,8 +299,10 @@
       (when-not (.exists xmlfile)
         (-> (and (symbol? serve) (namespace serve))
           (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)$")
+        (util/info "Writing %s...\n" (.getName xmlfile))
         (pod/call-worker
           `(boot.web/spit-web! ~(.getPath xmlfile) ~serve ~create ~destroy))))))
 
@@ -315,6 +322,7 @@
         (when-not (.exists jarfile)
           (let [index (->> (core/tgt-files)
                         (map (juxt core/relative-path (memfn getPath))))]
+            (util/info "Writing %s...\n" (.getName jarfile))
             (pod/call-worker
               `(boot.jar/spit-jar! ~(.getPath jarfile) ~index ~manifest ~main))
             (doseq [[_ f] index] (core/consume-file! (io/file f)))))))))
@@ -335,12 +343,18 @@
                            r
                            (.getPath (apply io/file "WEB-INF" "classes" r'))))
                 index (->> (core/tgt-files) (map (juxt ->war (memfn getPath))))]
+            (util/info "Writing %s...\n" (.getName warfile))
             (pod/call-worker
               `(boot.jar/spit-jar! ~(.getPath warfile) ~index {} nil))
             (doseq [[_ f] index] (core/consume-file! (io/file f)))))))))
 
 (core/deftask install
-  "Install project jar to local Maven repository."
+  "Install project jar to local Maven repository.
+
+  The file option allows installation of arbitrary jar files. If no file option
+  is given then any jar artifacts created during the build will be installed.
+
+  Note that installation requires the jar to contain a pom.xml file."
 
   [f file PATH str "The jar file to install."]
 
@@ -351,20 +365,39 @@
       (doseq [jarfile jarfiles]
         (util/info "Installing %s...\n" (.getName jarfile))
         (pod/call-worker
-          `(boot.aether/install ~(.getPath jarfile)))))))
+          `(boot.aether/install ~(core/get-env) ~(.getPath jarfile)))))))
+
+(core/deftask deploy
+  "Deploy project jar to a Maven repository.
+
+  Both the file and repo options are required. The jar file must contain a
+  pom.xml entry."
+
+  [f file PATH  str "The jar file to deploy."
+   r repo ALIAS str "The alias of the deploy repository."]
+
+  (core/with-pre-wrap
+    (let [f (io/file file)
+          r (-> (->> (core/get-env :repositories) (into {})) (get repo))]
+      (when-not (and r (.exists f))
+        (throw (Exception. "missing jar file or repo alias option")))
+      (util/info "Deploying %s...\n" (.getName f))
+      (pod/call-worker
+        `(boot.aether/deploy ~(core/get-env) ~[repo r] ~(.getPath f))))))
 
 (core/deftask push
-  "Push project jar to Clojars."
+  "Push project jar to Clojars.
+
+  The file option is required, and the jar file must contain a pom.xml entry."
 
-  [f file PATH str "The jar file to push to Clojars."]
+  [f file PATH str "The path to the jar file."]
 
   (let [tmp (core/mktmpdir! ::push-tmp)]
     (core/with-pre-wrap
-      (let [jarfiles (or (and file [(io/file file)])
-                       (->> (core/tgt-files) (core/by-ext [".jar"])))]
-        (when-not (seq jarfiles) (throw (Exception. "can't find jar file")))
-        (doseq [jarfile jarfiles]
-          (if-let [xml (pod/pom-xml jarfile)]
-            (let [pom (doto (io/file tmp "pom.xml") (spit xml))]
-              ((helpers/sh "scp" (.getPath jarfile) (.getPath pom) "[email protected]:")))
-            (throw (Exception. "jar file has no pom.xml"))))))))
+      (let [jarfile (io/file file)]
+        (when-not (.exists jarfile) (throw (Exception. "can't find jar file")))
+        (if-let [xml (pod/pom-xml jarfile)]
+          (let [pom (doto (io/file tmp "pom.xml") (spit xml))]
+            (util/info "Pushing %s to Clojars...\n" (.getName jarfile))
+            ((helpers/sh "scp" (.getPath jarfile) (.getPath pom) "[email protected]:")))
+          (throw (Exception. "jar file does not contain a pom.xml entry")))))))

boot/pod/src/boot/jar.clj

@@ -36,7 +36,6 @@
   (let [manifest  (create-manifest main attr)
         jarfile   (io/file jarpath)]
     (io/make-parents jarfile)
-    (util/info "Writing %s...\n" (.getName jarfile))
     (with-open [s (JarOutputStream. (io/output-stream jarfile) manifest)]
       (doseq [[jarpath srcpath] files :let [f (io/file srcpath)]]
         (let [entry (doto (JarEntry. jarpath) (.setTime (.lastModified f)))]
@@ -46,4 +45,4 @@
               (if-not (and (instance? ZipException t)
                         (.startsWith (.getMessage t) "duplicate entry:"))
                 (throw t)
-                (println (.getMessage t))))))))))
+                (util/warn "%s\n" (.getMessage t))))))))))

boot/pod/src/boot/pod.clj

@@ -104,14 +104,16 @@
                (.getInputStream jarfile))))))
 
 (defn pom-properties-map
-  [pom-properties-path]
-  (let [p   (doto (Properties.) (.load (io/input-stream pom-properties-path)))
-        gid (.getProperty p "groupId")
-        aid (.getProperty p "artifactId")]
+  [prop-or-jarpath]
+  (let [prop (if (instance? Properties prop-or-jarpath)
+               prop-or-jarpath
+               (doto (Properties.) (.load (io/input-stream prop-or-jarpath))))
+        gid  (.getProperty prop "groupId")
+        aid  (.getProperty prop "artifactId")]
     {:group-id    gid
      :artifact-id aid
      :project     (symbol gid aid)
-     :version     (.getProperty p "version")}))
+     :version     (.getProperty prop "version")}))
 
 (defn pom-xml
   [jarpath]

boot/worker/src/boot/pom.clj

@@ -67,8 +67,6 @@
                     (.setProperty "version"    version))
         xmlfile   (doto (io/file xmlpath) io/make-parents)
         propfile  (doto (io/file proppath) io/make-parents)]
-    (util/info "Writing %s...\n" (.getName xmlfile))
     (spit xmlfile (pr-str (pom-xml env)))
-    (util/info "Writing %s...\n" (.getName propfile))
     (with-open [s (io/output-stream propfile)]
       (.store prop s (str gid "/" aid " " version " property file")))))

boot/worker/src/boot/web.clj

@@ -30,7 +30,6 @@
 
 (defn spit-web! [webxmlfile serve create destroy]
   (let [xmlfile  (io/file webxmlfile)]
-    (util/info "Writing web.xml...\n")
     (spit
       (doto xmlfile io/make-parents)
       (pr-str (web-xml "boot-webapp" "boot-webapp" serve create destroy)))))