Merge pull request #1 from ghmulti/master

exception handling, logging

Author: AngryGami

.gitignore

@@ -2,9 +2,11 @@
 /lib
 /classes
 /checkouts
+.idea
 pom.xml
 *.jar
 *.class
 .lein-deps-sum
 .lein-failures
-.lein-plugins
+.lein-plugins
+*.iml

src/lein_git_version_generate/plugin.clj

@@ -4,10 +4,12 @@
    clojure.pprint
    [leiningen.git-version :only [git-version]]))
 
-(defn wrap-with-hook [f & args] 
-  (do 
-     (apply git-version args)
-     (apply f args)))
+(defn wrap-with-hook [f & args]
+  (do
+    (try
+      (apply git-version args)
+      (catch Exception e (println "lein-git-version plugin: exception " (.getMessage e))))
+    (apply f args)))
 
 (defn hooks []
   (robert.hooke/add-hook #'leiningen.compile/compile #'wrap-with-hook))

src/leiningen/git_version.clj

@@ -10,24 +10,23 @@
   (:use
    [clojure.java.shell :only [sh]]))
 
+(defn shcall [& args]
+  (let [{exit :exit out :out err :err} (apply sh args)
+        exitcode (clojure.string/trim (str exit))]
+    (when-not (= "0" exitcode) (println "lein-git-version plugin: sh call " args " exit code " exitcode " error " err))
+    (apply str (rest (clojure.string/trim out)))))
+
 (defn get-git-version
   []
-  (apply str (rest (clojure.string/trim
-                    (:out (sh
-                           "git" "describe" "--match" "v*.*"
-                           "--abbrev=4" "--dirty=**DIRTY**"))))))
+  (shcall "git" "describe" "--match" "v*.*" "--abbrev=4" "--dirty=**DIRTY**"))
 
 (defn get-git-ref
   []
-  (apply str (clojure.string/trim
-                    (:out (sh
-                           "git" "rev-parse" "--verify" "HEAD")))))
+  (shcall "git" "rev-parse" "--verify" "HEAD"))
 
 (defn get-git-status
   []
-  (apply str (clojure.string/trim
-                    (:out (sh
-                           "git" "status" "--porcelain")))))
+  (shcall "git" "status" "--porcelain"))
 
 ;(defn git-version
 ;  "Show project version, as tagged in git."