Better error handling when invoking git. Don't depend on bash anymore

Author: dobladez

src/main/clojure/buildversion_plugin/git.clj

@@ -10,12 +10,19 @@
 (defn run-git
   ([args] (run-git "." args))
   ([project-dir args] 
-     (sh/proc "bash" "-c" (str "cd " project-dir "; git " args))))
+     (apply sh/proc `("git"  ~@args :dir ~project-dir))))
 
 (defn run-git-wait
   ([args] (run-git-wait "." args))
   ([project-dir args]
-     (sh/stream-to-string (run-git project-dir args) :out)))
+     (let [proc (run-git project-dir args)
+           ok (zero? (sh/exit-code proc))
+           stdout (sh/stream-to-string proc :out)
+           stderr (sh/stream-to-string proc :err)]
+       (if ok
+         stdout
+         (throw (RuntimeException.
+                 (str "Execution of Git command failed: " stderr)))))))
 
 (defn git-describe-log-lines [log-lines-seq]
   "Given a seq of \"git log\" output lines, return map with :git-tag (most recent tag)
@@ -31,7 +38,7 @@
   "Return map with :git-tag (most recent tag on current branch (always following \"first-parent\" on merges))
 and :git-tag-delta (number of commits -couting on first-parent paths only- from :git-tag to HEAD) "
 
-  (let [p (run-git dir "log --oneline --decorate=short --first-parent")
+  (let [p (run-git dir ["log" "--oneline" "--decorate=short" "--first-parent"])
         lines (line-seq (reader (:out p)))
         [tag delta] (git-describe-log-lines lines)]
     (sh/destroy p)
@@ -41,7 +48,7 @@ and :git-tag-delta (number of commits -couting on first-parent paths only- from
   "Infer the current project version from tags on the source-control system"
 
   (let [tstamp-format (:tstamp-format config-map)
-        commit-tstamp (-> (run-git-wait dir "log -n 1 --format='%ct'")
+        commit-tstamp (-> (run-git-wait dir ["log" "-n" "1" "--format=%ct"])
                           trim-newline
                           (Long/parseLong)
                           (* 1000)
@@ -51,7 +58,7 @@ and :git-tag-delta (number of commits -couting on first-parent paths only- from
                                    commit-tstamp)
 
         [short-hash long-hash] (split
-                                (run-git-wait dir "log -n 1 --format='%h %H'")
+                                (run-git-wait dir [ "log" "-n" "1" "--format=%h %H" ])
                                 #" " )
 
         versioning-properties {:build-tag "N/A"

src/test/clojure/buildversion_plugin/test/git.clj

@@ -47,7 +47,7 @@
 ;;
 (defn- get-commit-hash-by-description [descr]
   "Given a git commit description, it returns the hash of a commit matching that description"
-  (let [git (git/run-git-wait sample-project-dir (str "log --all --format=format:%H --grep='^" descr "$'"))
+  (let [git (git/run-git-wait sample-project-dir ["log" "--all" "--format=format:%H" (str "--grep=^" descr "$")])
         commit-hash git]
     (is (not (blank? commit-hash)) (str "Couldn't find hash for commit descr" descr))
     commit-hash))
@@ -56,7 +56,7 @@
   "Checkout on a particular commit and validate inferred versions match the given regexp patterns"
 
   (let [commit-hash (get-commit-hash-by-description commit-descr)
-        checkout (git/run-git sample-project-dir (str "checkout " commit-hash))
+        checkout (git/run-git sample-project-dir [ "checkout" commit-hash])
         checkout-OK (zero? (sh/exit-code checkout))
         actual-versions (git/infer-project-version sample-project-dir {})]
 
@@ -72,7 +72,7 @@
 ;;
 (deftest test-run-git
   (is (re-seq #"git version [\d\.]+"
-              (git/run-git-wait sample-project-dir "--version"))))
+              (git/run-git-wait sample-project-dir ["--version"]))))
 
 (deftest test-infer-project-versions
 
@@ -116,7 +116,7 @@
   ;; (see sample-git-project-fixture above)
   (are [commitish expected-tag expected-delta]
        (do
-         (git/run-git-wait sample-project-dir (str "checkout " commitish))
+         (git/run-git-wait sample-project-dir [ "checkout" commitish])
          (= (git/git-describe-first-parent sample-project-dir)
             {:git-tag expected-tag  :git-tag-delta expected-delta}))