Merge remote branch 'mattrepl/master'

src/leiningen/deploy.clj

@@ -5,7 +5,7 @@
         [leiningen.jar :only [jar]]
         [leiningen.pom :only [pom snapshot?]]
         [leiningen.util.maven :only [make-model make-artifact]]
-        [leiningen.deps :only [make-repository]]
+        [leiningen.deps :only [make-repository make-auth]]
         [clojure.java.io :only [file]])
   (:import [org.apache.maven.artifact.ant DeployTask Pom Authentication]
            [org.apache.maven.project MavenProject]))
@@ -19,18 +19,6 @@
   (let [options (apply hash-map options)]
     (zipmap (map keyword (keys options)) (vals options))))
 
-(defn make-auth [url options]
-  (let [auth (Authentication.)
-        user-options (when-let [user-opts (resolve 'user/leiningen-auth)]
-                       (get @user-opts url))
-        {:keys [username password passphrase
-                private-key]} (merge user-options options)]
-    (when username (.setUserName auth username))
-    (when password (.setPassword auth password))
-    (when passphrase (.setPassphrase auth passphrase))
-    (when private-key (.setPrivateKey auth private-key))
-    auth))
-
 (defn make-target-repo [project options]
   (let [deploy-opts (merge (:deploy-to project) options)
         repo-url (if (snapshot? project)
@@ -67,6 +55,6 @@ to avoid checking sensitive information into source control:
        (.execute)))
   ([project]
      (if-let [target (:deploy-to project)]
-       (deploy target)
+       (apply deploy project target)
        (do (println "Either set :deploy-to in project.clj or"
                     "provide deploy target options.") 1))))

src/leiningen/deps.clj

@@ -23,6 +23,18 @@
                                                     (.setPassword password))))))
     repo))
 
+(defn make-auth [url options]
+  (let [auth (Authentication.)
+        user-options (when-let [user-opts (resolve 'user/leiningen-auth)]
+                       (get @user-opts url))
+        {:keys [username password passphrase
+                private-key]} (merge user-options options)]
+    (when username (.setUserName auth username))
+    (when password (.setPassword auth password))
+    (when passphrase (.setPassphrase auth passphrase))
+    (when private-key (.setPrivateKey auth private-key))
+    auth))
+
 ;; Add symlinking to Lancet's toolbox.
 (lancet/define-ant-task symlink symlink)
 
@@ -60,8 +72,12 @@
     (.setBasedir lancet/ant-project (:root project))
     (.setFilesetId deps-task "dependency.fileset")
     (.setPathId deps-task (:name project))
-    (doseq [r (map make-repository (repositories-for project))]
-      (.addConfiguredRemoteRepository deps-task r))
+    (doseq [[id settings] (repositories-for project)]
+      (let [r (make-repository [id settings])
+            repo-url (if (string? settings) settings (:url settings))]
+        (when-let [auth (make-auth repo-url (if (map? settings) settings {}))]
+          (.addAuthentication r auth))
+        (.addConfiguredRemoteRepository deps-task r)))
     (doseq [dep (project deps-set)]
       (.addDependency deps-task (make-dependency dep)))
     deps-task))