Merge pull request #13 from scalableminds/versioning

in CI build, use incremented git tag version as build version. locally, use DEV-<branchname>

Author: jstriebel

.circleci/config.yml

@@ -21,6 +21,7 @@ jobs:
       SBT_VERSION_TAG: sbt-0.13.15_mongo-3.2.17_node-8.x_jdk-8
       USER_UID: 1001
       USER_GID: 1001
+      TARGET_DIR: &target_dir target/scala-2.12
     steps:
       - checkout
       - attach_workspace:
@@ -34,10 +35,14 @@ jobs:
       - run:
           name: Build server
           command: docker-compose run sbt sbt assembly
+      - run:
+          name: Get FossilDB version
+          command: docker-compose run sbt java -jar $TARGET_DIR/fossildb.jar --version > $TARGET_DIR/version
       - persist_to_workspace:
-          root: target/scala-2.12
+          root: *target_dir
           paths:
             - fossildb.jar
+            - version
       - save_cache:
           key: cache-{{ .Branch }}
           paths:
@@ -139,7 +144,7 @@ jobs:
             -r fossildb
             -c $(git rev-parse HEAD)
             -b "executable jar of __fossildb__"
-            $(git semver next)
+            $(cat /tmp/workspace/version)
             /tmp/workspace/fossildb.jar
 
 workflows:

build.sbt

@@ -3,7 +3,19 @@ import sbtbuildinfo.{BuildInfoKey, BuildInfoOption}
 
 name := "fossildb"
 
-version := "0.1"
+def getVersionFromGit: String = {
+  def run(cmd: String): String = (new java.io.BufferedReader(new java.io.InputStreamReader(java.lang.Runtime.getRuntime().exec(cmd).getInputStream()))).readLine()
+  def getBranch = run("git rev-parse --abbrev-ref HEAD")
+
+  if (sys.env.get("CI").isDefined && getBranch == "master") {
+    val oldVersion = run("git describe --tags --abbrev=0").split('.').toList.map(_.toInt)
+    (oldVersion.init :+ (oldVersion.last + 1)).mkString(".")
+  } else {
+    "DEV-" + getBranch
+  }
+}
+
+version := getVersionFromGit
 
 scalaVersion := "2.12.4"
 

src/main/scala/com/scalableminds/fossildb/FossilDB.scala

@@ -15,23 +15,26 @@ case class Config(port: Int = ConfigDefaults.port, dataDir: String = ConfigDefau
 object FossilDB extends LazyLogging {
   def main(args: Array[String]) = {
 
-    parseArguments(args) match {
-      case Some(config) => {
-        logger.info("Starting FossilDB")
-        logger.info("BuildInfo: (" + BuildInfo + ")")
-        logger.info("Config: " + config)
+    if (args.contains("--version"))
+      println(BuildInfo.version)
+    else {
+      parseArguments(args) match {
+        case Some(config) => {
+          logger.info("Starting FossilDB")
+          logger.info("BuildInfo: (" + BuildInfo + ")")
+          logger.info("Config: " + config)
 
-        val storeManager = new StoreManager(Paths.get(config.dataDir), Paths.get(config.backupDir), config.columnFamilies)
+          val storeManager = new StoreManager(Paths.get(config.dataDir), Paths.get(config.backupDir), config.columnFamilies)
 
-        val server = new FossilDBServer(storeManager, config.port, ExecutionContext.global)
+          val server = new FossilDBServer(storeManager, config.port, ExecutionContext.global)
 
-        server.start()
-        server.blockUntilShutdown()
+          server.start()
+          server.blockUntilShutdown()
 
       }
-      case None => ()
+        case None => ()
+      }
     }
-
   }
 
   def parseArguments(args: Array[String]) = {