Merge pull request #505 from clojars/atomic-deploys

Make deployment atomic

project.clj

@@ -6,7 +6,7 @@
                  [org.apache.maven/maven-model "3.0.4"
                   :exclusions
                   [org.codehaus.plexus/plexus-utils]]
-                 [com.cemerick/pomegranate "0.0.13"
+                 [com.cemerick/pomegranate "0.3.0"
                   :exclusions
                   [org.apache.httpcomponents/httpcore
                    commons-logging]]

src/clojars/auth.clj

@@ -2,21 +2,19 @@
   (:require [cemerick.friend :as friend]
             [clojars.db :refer [group-membernames]]))
 
-(defmacro with-account [body]
-  `(friend/authenticated (try-account ~body)))
+(defn try-account [f]
+  (f (:username (friend/current-authentication))))
 
-(defmacro try-account [body]
-  `(let [~'account (:username (friend/current-authentication))]
-     ~body))
+(defn with-account [f]
+  (friend/authenticated (try-account f)))
 
 (defn authorized? [db account group]
   (if account
     (let [names (group-membernames db group)]
       (or (some #{account} names) (empty? names)))))
 
-(defmacro require-authorization [db group & body]
-  `(if (authorized? ~db ~'account ~group)
-     (do ~@body)
-     (friend/throw-unauthorized friend/*identity*
-                                {:cemerick.friend/exprs (quote [~@body])
-                                 :cemerick.friend/required-roles ~group})))
+(defn require-authorization [db account group f]
+  (if (authorized? db account group)
+    (f)
+    (friend/throw-unauthorized friend/*identity*
+      {:cemerick.friend/required-roles group})))

src/clojars/file_utils.clj

@@ -7,7 +7,7 @@
   [file type]
   (let [file' (io/file file)]
     (io/file (.getParentFile file')
-             (format "%s.%s" (.getName file') (name type)))))
+      (format "%s.%s" (.getName file') (name type)))))
 
 (defn- create-sum [f file type]
   (let [file' (io/file file)]
@@ -35,17 +35,22 @@
 
 (defn valid-sum?
   "Checks to see if a sum of type `type` exists and is valid for `file`"
-  [file type]
-  (let [sig-file (sum-file file type)]
-    (and (.exists sig-file)
-         (= ((sum-generators type) (io/file file))
-            (slurp sig-file)))))
+  ([file type]
+   (valid-sum? file type true))
+  ([file type fail-if-missing?]
+   (let [sig-file (sum-file file type)]
+     (if (.exists sig-file)
+       (= ((sum-generators type) (io/file file))
+         (slurp sig-file))
+       (not fail-if-missing?)))))
 
 (defn valid-sums?
   "Checks to see if both md5 and sha1 sums exist and are valid for `file`"
-  [file]
-  (reduce (fn [valid? sig-type]
-            (and valid?
-                 (valid-sum? file sig-type)))
-          true
-          [:md5 :sha1]))
+  ([file]
+   (valid-sums? file true))
+  ([file fail-if-missing?]
+   (reduce (fn [valid? sig-type]
+             (and valid?
+               (valid-sum? file sig-type fail-if-missing?)))
+     true
+     [:md5 :sha1])))

src/clojars/maven.clj

@@ -48,6 +48,7 @@
      :licenses     (mapv license-to-seq (.getLicenses model))
      :scm          (scm-to-map (.getScm model))
      :authors      (mapv #(.getName %) (.getContributors model))
+     :packaging    (keyword (.getPackaging model))
      :dependencies (mapv
                      (fn [d] {:group_name (.getGroupId d)
                               :jar_name   (.getArtifactId d)

src/clojars/routes/artifact.clj

@@ -10,31 +10,26 @@
 (defn show [db reporter stats group-id artifact-id]
   (if-let [artifact (db/find-jar db group-id artifact-id)]
     (auth/try-account
-     (view/show-jar db
-                    reporter
-                    stats
-                    account
-                    artifact
-                    (db/recent-versions db group-id artifact-id 5)
-                    (db/count-versions db group-id artifact-id)))))
+      #(view/show-jar db
+         reporter
+         stats
+         %
+         artifact
+         (db/recent-versions db group-id artifact-id 5)
+         (db/count-versions db group-id artifact-id)))))
 
 (defn list-versions [db group-id artifact-id]
   (if-let [artifact (db/find-jar db group-id artifact-id)]
     (auth/try-account
-     (view/show-versions account
-                         artifact
-                         (db/recent-versions db group-id artifact-id)))))
+      #(view/show-versions % artifact
+         (db/recent-versions db group-id artifact-id)))))
 
 (defn show-version [db reporter stats group-id artifact-id version]
   (if-let [artifact (db/find-jar db group-id artifact-id version)]
     (auth/try-account
-     (view/show-jar db
-                    reporter
-                    stats
-                    account
-                    artifact
-                    (db/recent-versions db group-id artifact-id 5)
-                    (db/count-versions db group-id artifact-id)))))
+     #(view/show-jar db reporter stats % artifact
+        (db/recent-versions db group-id artifact-id 5)
+        (db/count-versions db group-id artifact-id)))))
 
 (defn response-based-on-format
   "render appropriate response based on the file type suffix provided:

src/clojars/routes/group.clj

@@ -10,22 +10,24 @@
    (GET ["/groups/:groupname", :groupname #"[^/]+"] [groupname]
         (if-let [membernames (seq (db/group-membernames db groupname))]
           (auth/try-account
-           (view/show-group db account groupname membernames))))
+           #(view/show-group db % groupname membernames))))
    (POST ["/groups/:groupname", :groupname #"[^/]+"] [groupname username]
          (if-let [membernames (seq (db/group-membernames db groupname))]
            (auth/try-account
-            (auth/require-authorization
-             db
-             groupname
-             (cond
-               (some #{username} membernames)
-               (view/show-group db account groupname membernames
-                                "They're already a member!")
-               (db/find-user db username)
-               (do (db/add-member db groupname username account)
-                   (view/show-group db account groupname
-                                    (conj membernames username)))
-               :else
-               (view/show-group db account groupname membernames
-                                (str "No such user: "
-                                     username)))))))))
+             (fn [account]
+               (auth/require-authorization
+                 db
+                 account
+                 groupname
+                 #(cond
+                   (some #{username} membernames)
+                   (view/show-group db account groupname membernames
+                     "They're already a member!")
+                   (db/find-user db username)
+                   (do (db/add-member db groupname username account)
+                       (view/show-group db account groupname
+                         (conj membernames username)))
+                   :else
+                   (view/show-group db account groupname membernames
+                     (str "No such user: "
+                       username))))))))))