fix example / remove buildNumbers use git commit hash instead (#59)

* fix example / remove buildNumbers use git commit hash instead

* fix tests on travis

.travis.yml

@@ -14,6 +14,7 @@ cache:
 
 script:
   - sbt clean coverage test
+  - cd example && sbt clean test
 
 after_success:
   - sbt coverageReport coverageAggregate codacyCoverage

distributed/src/test/scala/asobu/distributed/service/SyntaxSpec.scala

@@ -9,29 +9,26 @@ import asobu.distributed.service.Action.DistributedRequest
 import asobu.distributed.service.ActionExtractorSpec._
 import asobu.distributed.{EndpointDefinition, PredefinedDefs, util}
 import asobu.distributed.util.{MockRoute, ScopeWithActor, SerializableTest, SpecWithActorCluster}
-import asobu.dsl.ExtractResult
+
 import asobu.dsl.extractors.JsonBodyExtractor
 import org.specs2.concurrent.ExecutionEnv
 import org.specs2.mutable.Specification
 import org.specs2.specification.mutable.ExecutionEnvironment
 import play.api.libs.json.{JsNumber, JsString, Json}
 import play.api.mvc.Results.Ok
 import play.core.routing.RouteParams
-import play.routes.compiler.{HandlerCall, HttpVerb, PathPattern, Route}
-import shapeless._
 import shapeless.record.Record
 
-import concurrent.duration._
 import scala.concurrent.Future
 import play.api.test.FakeRequest
 import cats.std.future._
 import util.implicits._
+import concurrent.duration._
 
 class SyntaxSpec extends SpecWithActorCluster with SerializableTest with ExecutionEnvironment {
   import asobu.distributed.service.SyntaxSpec._
   implicit val format = Json.format[Input]
   import asobu.dsl.DefaultExtractorImplicits._
-
   implicit val erc: EndpointsRegistryClient = new EndpointsRegistryClient {
     def add(endpointDefinition: EndpointDefinition): Future[Unit] = Future.successful(())
 
@@ -92,14 +89,14 @@ class SyntaxSpec extends SpecWithActorCluster with SerializableTest with Executi
 
       val remoteResult = endpoint.remoteExtractor(nullInterpreter).run((params, req)).toEither
 
-      remoteResult must beRight(expectedExtracted: Any).await
+      remoteResult must beRight(expectedExtracted: Any).await(retries = 0, timeout = 3.seconds)
 
       val distributedRequest = DistributedRequest(expectedExtracted, req.body)
 
       import scala.concurrent.ExecutionContext.Implicits.global
       val localResult = action.extractors.localExtract(distributedRequest).toEither
 
-      localResult must beRight(LargeInput(a = "avalue", b = 10, flagInHeader = true)).await
+      localResult must beRight(LargeInput(a = "avalue", b = 10, flagInHeader = true)).await(retries = 0, timeout = 3.seconds)
 
     }
   }

example/backend/src/main/scala/backend/Backend.scala

@@ -52,7 +52,9 @@ object Backend extends App {
     Some(doc)
   }
 
-  implicit val bi: BuildNumber = BuildInfo
+  implicit val bi: BuildNumber = new BuildNumber {
+    override def buildInfoBuildNumber: Int = BuildInfo.gitCommit.hashCode
+  }
 
   import system.dispatcher
 

example/build.sbt

@@ -1,4 +1,6 @@
 import NativePackagerHelper._
+import com.typesafe.sbt.SbtGit.GitKeys.gitHeadCommit
+
 
 val resolverSetting = resolvers ++= Seq(
   Resolver.sonatypeRepo("releases"),
@@ -15,11 +17,12 @@ val commonSettings = Seq(
 
   // build info
   buildInfoPackage := "meta",
-  buildInfoOptions ++= Seq(BuildInfoOption.ToJson,
-                          BuildInfoOption.Traits("asobu.distributed.service.BuildNumber")),
+  buildInfoOptions ++= Seq(BuildInfoOption.ToJson),
   buildInfoKeys := Seq[BuildInfoKey](
-    name, version, scalaVersion, buildInfoBuildNumber
-  ),
+    name, version, scalaVersion
+  )++ gitHeadCommit.value.map {
+    value ⇒ BuildInfoKey("gitCommit" → value)
+  }.toSeq,
   resolverSetting
 )
 

example/project/dependencies.scala

@@ -15,7 +15,7 @@ object Dependencies {
   )
 
   val playSwagger = Seq(
-    "com.iheart" %% "play-swagger" % "0.3.1",
+    "com.iheart" %% "play-swagger" % "0.3.3-PLAY2.5",
     "org.webjars" % "swagger-ui" % "2.1.4"
   )
 

example/project/plugins.sbt

@@ -7,8 +7,10 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/release
 // Use the Play sbt plugin for Play projects
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.3")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.1")
 
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
 
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
+
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")