yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

with-project returns values for all profile groups

Browse source 
with-profile was discarding return values for the result of each profile
group application.
This commit is contained in:
Hugo Duncan 2014-09-16 06:08:54 -04:00
parent 1e1e5bcd32
commit dbf375f678
1 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/leiningen/with_profile.clj
View file

@ -43,6 +43,25 @@
"Profiles in with-profile must either all be qualified, or none qualified"
{:exit-code 1})))))
(defn- apply-task-with-profiles
[project profiles task-name args failures multi-group]
(when multi-group
(main/info (format "Performing task '%s' with profile(s): '%s'"
task-name
(string/join "," (map name profiles)))))
(binding [main/*exit-process?* false]
(try
(with-profiles* project profiles task-name args)
(catch Exception e
(main/info
(format "Error encountered performing task '%s' with profile(s): '%s'"
task-name (string/join "," (map name profiles))))
(if (and (:exit-code (ex-data e)) (not main/*debug*))
(main/info (.getMessage e))
(.printStackTrace e))
(swap! failures inc)))))
(defn ^:no-project-needed ^:higher-order with-profile
"Apply the given task with the profile(s) specified.
@ -62,22 +81,12 @@ To list all profiles or show a single one, see the show-profiles task.
For a detailed description of profiles, see `lein help profiles`."
[project profiles task-name & args]
(let [profile-groups (seq (.split profiles ":"))
failures (atom 0)]
(doseq [profiles (map (partial profiles-in-group project) profile-groups)]
(when (> (count profile-groups) 1)
(main/info (format "Performing task '%s' with profile(s): '%s'"
task-name (string/join "," (map name profiles)))))
(binding [main/*exit-process?* false]
(try
(with-profiles* project profiles task-name args)
(catch Exception e
(main/info
(format
"Error encountered performing task '%s' with profile(s): '%s'"
task-name (string/join "," (map name profiles))))
(if (and (:exit-code (ex-data e)) (not main/*debug*))
(main/info (.getMessage e))
(.printStackTrace e))
(swap! failures inc)))))
failures (atom 0)
result (->> profile-groups
(map (partial profiles-in-group project))
(mapv #(apply-task-with-profiles
project % task-name args failures
(> (count profile-groups) 1))))]
(when (pos? @failures)
(main/abort))))
(main/abort))
result))