Pass any :environment key in project.clj to the converge and lif tasks

In order to allow environment definitions in project.clj, and to enable environments to be supplied by the cake context feature, the :environment key values from project.clj are passed to the converge and lift commands invoked by the converge and lift tasks (used by the lein and cake plugins)
pallet · Mar 14, 2011 · dc58820 · dc58820
1 parent 001bd0b
commit dc58820
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/pallet/task/converge.clj b/src/pallet/task/converge.clj
@@ -31,4 +31,10 @@
   [request & args]
   (let [args (build-args args)]
     (apply core/converge
-           (concat args (apply concat (dissoc request :config :project))))))
+           (concat args
+                   (apply concat
+                          (->
+                           request
+                           (dissoc :config :project)
+                           (assoc :environment
+                             (-> request :project :environment))))))))
diff --git a/src/pallet/task/lift.clj b/src/pallet/task/lift.clj
@@ -31,4 +31,10 @@
   [request & args]
   (let [args (build-args args)]
     (apply core/lift
-           (concat args (apply concat (dissoc request :config :project))))))
+           (concat args
+                   (apply concat
+                          (->
+                           request
+                           (dissoc :config :project)
+                           (assoc :environment
+                             (-> request :project :environment))))))))