Merge pull request #31 from PractiTest/feature/automated-version-scripts

Changed version calculation code a bit

Author: deshilovPT

build.clj

@@ -1,28 +1,42 @@
 (ns build
   (:require
+    [clojure.java.io :as io]
     [clojure.tools.build.api :as b]))
 
 (def lib 'practitest/practitest-firecracker)
-(def version (format "2.2.%s" (b/git-count-revs nil)))
+
+; Create new tag v<Major>.<Minor> when starting working on new major/minor version branch
+(def major-version 2)
+(def minor-version 2)
+
+(def commits-count (b/git-process {:git-args (format "rev-list v%s.%s..HEAD --count" major-version minor-version)}))
+(def version (format "%s.%s.%s" major-version minor-version commits-count))
 (def class-dir "target/classes")
 (def uber-file (format "target/%s-%s-standalone.jar" (name lib) version))
 
 ;; delay to defer side effects (artifact downloads)
 (def basis (delay (b/create-basis {:project "deps.edn"})))
 
 (defn clean [_]
+  (println "Cleaning directories")
   (b/delete {:path "target"}))
 
 (defn uber [_]
+  (println "Building uberjar for" version)
   (clean nil)
   (b/copy-dir {:src-dirs ["src"]
                :target-dir class-dir})
   (b/copy-dir {:src-dirs ["resources"]
                :target-dir class-dir})
+  (println "Compiling clojure code")
   (b/compile-clj {:basis @basis
                   :ns-compile '[practitest-firecracker.core]
                   :class-dir class-dir})
+  (println "Packing JAR file")
+  (spit (io/file class-dir "practitest_firecracker" "firecracker_version.txt")
+        version)
   (b/uber {:class-dir class-dir
            :uber-file uber-file
            :basis @basis
+           :manifest {"Implementation-Version" version}
            :main 'practitest-firecracker.core}))

src/practitest_firecracker/api.clj

@@ -5,7 +5,7 @@
     [throttler.core :refer [fn-throttler]]
     [clojure.tools.logging :as log]
     [practitest-firecracker.const :refer :all]
-    [practitest-firecracker.utils :refer [exit group-errors pformat transform-keys]]))
+    [practitest-firecracker.utils :refer [exit group-errors pformat transform-keys get-current-version]]))
 
 (def backoff-timeout "Backoff timeout in seconds" 20)
 (def max-attempts "Number of attempts to run" 10)
@@ -30,8 +30,8 @@
          params (cond-> {:basic-auth       credentials
                          :throw-exceptions false
                          :as               :json}
-                        query-params (assoc :query-params (conj query-params {:source "firecracker" :firecracker-version fc-version}))
-                        form-params (assoc :form-params (conj form-params {:source "firecracker" :firecracker-version fc-version}) :content-type :json))]
+                        query-params (assoc :query-params (conj query-params {:source "firecracker" :firecracker-version (get-current-version)}))
+                        form-params (assoc :form-params (conj form-params {:source "firecracker" :firecracker-version (get-current-version)}) :content-type :json))]
     (if (nil? uri)
       results
       (let [{:keys [status body]} (method uri params)]

src/practitest_firecracker/const.clj

@@ -1,7 +1,5 @@
 (ns practitest-firecracker.const)
 
-(def ^:const fc-version "2.2.1")
-
 (def ^:const testset-instances-uri "/projects/%d/instances.json")
 (def ^:const test-uri "/projects/%d/tests/%d.json")
 (def ^:const test-steps-uri "/projects/%d/steps.json")

src/practitest_firecracker/core.clj

@@ -10,12 +10,11 @@
    [practitest-firecracker.parser.core :refer [send-directory parse-files]]
    [practitest-firecracker.parser.gherkin :as gherkin]
    [practitest-firecracker.api         :refer [make-client]]
-   [practitest-firecracker.utils       :refer [exit]]
+   [practitest-firecracker.utils       :refer [exit get-current-version]]
    [clojure.pprint                     :as     pprint]
    [clojure.java.io                    :as     io]
    [clj-time.core                      :as     t]
-   [clojure.tools.logging              :as log]
-   [practitest-firecracker.const       :refer [fc-version]])
+   [clojure.tools.logging              :as     log])
   (:import (org.slf4j LoggerFactory)
            (ch.qos.logback.classic Level Logger))
   (:gen-class))
@@ -74,11 +73,11 @@
               (pprint/pprint {"=============== args: ===============" args}))
 
             "version"
-            (log/info "Version: " fc-version)
+            (log/info "Version:" (get-current-version))
 
             "create-and-populate-testset"
             (do
-              (log/info "Start Running Firecracker, Version: " fc-version)
+              (log/info "Start Running Firecracker, Version: " (get-current-version))
               (timef
                "create-and-populate-testset"
                (-> (create-testsets client options additional-reports)

src/practitest_firecracker/utils.clj

@@ -1,6 +1,7 @@
 (ns practitest-firecracker.utils
   (:require
     [clj-time.core :as t]
+    [clojure.java.io :as io]
     [clojure.pprint :as pprint]
     [clojure.string :as string]
     [cheshire.core :as json]))
@@ -53,3 +54,10 @@
         (assoc a (apply f k args) v))
       {}
       m)))
+
+(defn- get-current-version* []
+  (if-let [version-file (io/resource "practitest_firecracker/firecracker_version.txt")]
+    (slurp version-file)
+    "2.0-Devel"))
+
+(def get-current-version (memoize get-current-version*))