Feature cgit

src/vulcan/semver.clj

@@ -45,18 +45,21 @@
   (first (release-tags path)))
 
 (defn latest-release-version [path]
-  (let [[_ rel-maj rel-min] (first
-                             (re-seq
-                              release-tag-regex
-                              (latest-release-tag path)))]
-    [(as-int rel-maj) (as-int rel-min)]))
+  (if-let [release-tag (latest-release-tag path)]
+    (let [[_ rel-maj rel-min] (first
+                               (re-seq release-tag-regex release-tag))]
+      [(as-int rel-maj) (as-int rel-min)])
+    [0 1]))
 
 (defn next-semver-version [path]
   (let [earlier-commit (or (latest-semver-tag path) (git/empty-tree-hash))
         dist (git/distance path earlier-commit)
         delta (if (pos? dist) 1 0)
         [maj min patch] (parse-semver earlier-commit)
-        [rel-maj rel-min] (latest-release-version path)]
+        [rel-maj rel-min] (latest-release-version path)
+        patch (if (or (< maj rel-maj) (< min rel-min))
+                0
+                patch)]
     [(max rel-maj maj)
      (max rel-min min)
      (+ patch delta)]))

src/vulcan/semver/git/cgit.clj

@@ -5,21 +5,25 @@
    [clojure.java.shell :as sh]
    [vulcan.semver.git.core :refer :all]))
 
-(defn git-cmd [cmd & args]
-  (let [{:keys [exit out err]} (apply sh/sh "git" cmd args)]
-    (if (= 0 exit)
-      (str/trim-newline out)
-      (throw
-       (ex-info "Git command execution error"
-                {:status :error :err err})))))
+(defn git-cmd [path cmd & args]
+  (let [f #(let [{:keys [exit out err]} (apply sh/sh "git" cmd args)]
+             (if (= 0 exit)
+               (str/trim-newline out)
+               (throw
+                (ex-info "Git command execution error"
+                         {:status :error :err err}))))]
+    (if path
+      (sh/with-sh-dir path (f))
+      (f))))
 
 (defn as-repo [path] path)
 
 (defn empty-tree-hash []
-  (git-cmd "hash-object" "-t" "tree" "/dev/null"))
+  (git-cmd nil "hash-object" "-t" "tree" "/dev/null"))
 
 (defn revlist [path earlier later]
-  (-> (git-cmd "rev-list"
+  (-> (git-cmd path
+               "rev-list"
                (str earlier ".." later)
                "--count")
       Integer/parseInt))
@@ -31,7 +35,7 @@
    (revlist path earlier later)))
 
 (defn tags [path raw?]
-  (-> (git-cmd "tag" "--sort=-creatordate")
+  (-> (git-cmd path "tag" "--sort=-creatordate")
       str/split-lines))
 
 (deftype CGitClient []