Merge pull request #21 from 2m/wip-update-scalafmt-2m

2m · web-flow · commit f30601cdfbb0 · 2019-04-19T20:51:25.000+03:00
Latest scalafmt and travis stages
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,3 +1,5 @@
+version = 2.0.0-RC6
+
 style = defaultWithAlign
 
 align.tokens               = ["%", "%%"]
diff --git a/.travis.yml b/.travis.yml
@@ -1,26 +1,41 @@
 language: scala
-
-scala:
-  - "2.12.4"
-
-jdk:
-  - oraclejdk8
-
-before_script:
-  # start X for the clipboard access in tests
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
-
-script: sbt test scripted
-
-deploy:
-  provider: script
-  script:
-    - sbt core/publish core/bintraySyncMavenCentral plugin/publish
-  on:
-    tags: true
-    repo: 2m/authors
+jdk: oraclejdk8
+
+jobs:
+   include:
+     - stage: check
+       script: sbt scalafmtCheck || { echo "[error] Unformatted code found. Please run 'Test/compile' and commit the reformatted code."; false; }
+       name: "Code style check (fixed with `sbt Test/compile`)"
+     - script: sbt scalafmtSbtCheck || { echo "[error] Unformatted sbt code found. Please run 'scalafmtSbt' and commit the reformatted code."; false; }
+       name: "Build code style check (fixed with `sbt scalafmtSbt`)"
+
+     - stage: test
+       script: sbt test
+       name: Run all unit tests
+     - before_script:
+       # start X for the clipboard access in tests
+       - "export DISPLAY=:99.0"
+       - "sh -e /etc/init.d/xvfb start"
+       - sleep 3 # give xvfb some time to start
+       script: sbt scripted
+       name: Run all sbt scripted tests
+
+     - stage: publish
+       script: sbt core/publish core/bintraySyncMavenCentral plugin/publish
+       name: Publish artifacts
+
+stages:
+  # runs on master commits and PRs
+  - name: check
+    if: NOT tag =~ ^v
+
+  # runs on master commits and PRs
+  - name: test
+    if: NOT tag =~ ^v
+
+  # runs on main repo master commits or version-tagged commits
+  - name: publish
+    if: repo = 2m/authors AND ( ( branch = master AND type = push ) OR tag =~ ^v )
 
 before_cache:
   - find $HOME/.ivy2 -name "ivydata-*.properties" -print -delete
@@ -30,6 +45,7 @@ cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt/boot
+    - $HOME/.sbt/launchers
 
 env:
   global:
diff --git a/build.sbt b/build.sbt
@@ -5,6 +5,9 @@ lazy val authors = project
 lazy val core = project
   .settings(
     name := "authors-core",
+    // stick to 2.12.4 until 2.12.9 comes out with the following fixed:
+    // https://github.com/scala/bug/issues/11373
+    scalaVersion := "2.12.4",
     resolvers += Resolver.bintrayRepo("jypma", "maven"), {
       val Akka = "2.5.22"
       val AkkaHttp = "10.1.8"
@@ -13,9 +16,9 @@ lazy val core = project
         "com.typesafe.akka"    %% "akka-stream"              % Akka,
         "com.typesafe.akka"    %% "akka-slf4j"               % Akka,
         "com.typesafe.akka"    %% "akka-http"                % AkkaHttp,
-        "com.tradeshift"       %% "ts-reaktive-marshal-akka" % "0.11.0" exclude("org.slf4j", "slf4j-log4j12"),
+        "com.tradeshift"       %% "ts-reaktive-marshal-akka" % "0.11.0" exclude ("org.slf4j", "slf4j-log4j12"),
         "com.madgag.scala-git" %% "scala-git"                % "4.0",
-        "ch.qos.logback"       %  "logback-classic"          % "1.2.3",
+        "ch.qos.logback"       % "logback-classic"           % "1.2.3",
         "org.scalatest"        %% "scalatest"                % "3.0.7" % "test",
         "com.typesafe.akka"    %% "akka-testkit"             % Akka % "test"
       )
@@ -41,10 +44,12 @@ inThisBuild(
     licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")),
     homepage := Some(url("https://github.com/2m/authors")),
     scmInfo := Some(ScmInfo(url("https://github.com/2m/authors"), "git@github.com:2m/authors.git")),
-    developers += Developer("contributors",
-                            "Contributors",
-                            "https://gitter.im/2m/authors",
-                            url("https://github.com/2m/authors/graphs/contributors")),
+    developers += Developer(
+        "contributors",
+        "Contributors",
+        "https://gitter.im/2m/authors",
+        url("https://github.com/2m/authors/graphs/contributors")
+      ),
     bintrayOrganization := Some("2m"),
     scalafmtOnCompile := true,
     // show full stack traces and test case durations
diff --git a/core/src/main/scala/Authors.scala b/core/src/main/scala/Authors.scala
@@ -92,8 +92,10 @@ object Authors {
 }
 
 object DiffSource {
-  def apply(repo: String, from: String, to: String)(implicit ec: ExecutionContext,
-                                                    sys: ActorSystem): Source[ByteString, NotUsed] =
+  def apply(repo: String, from: String, to: String)(
+      implicit ec: ExecutionContext,
+      sys: ActorSystem
+  ): Source[ByteString, NotUsed] =
     Source
       .fromFuture(
         Marshal(Uri(s"/repos/$repo/compare/$from...$to"))
@@ -121,10 +123,12 @@ object StatsAggregator {
       .reduce(
         (aggr, elem) =>
           aggr.copy(
-            stats = Stats(additions = aggr.stats.additions + elem.stats.additions,
-                          deletions = aggr.stats.deletions + elem.stats.deletions,
-                          aggr.stats.commits + elem.stats.commits)
-        )
+            stats = Stats(
+              additions = aggr.stats.additions + elem.stats.additions,
+              deletions = aggr.stats.deletions + elem.stats.deletions,
+              aggr.stats.commits + elem.stats.commits
+            )
+          )
       )
       .mergeSubstreams
 }
@@ -134,12 +138,12 @@ object MarkdownConverter {
     Flow[AuthorStats]
       .map { author =>
         val authorId = author.githubAuthor.map { gh =>
-          // using html instead of markdown, because default
-          // avatars come from github not resized
-          s"""[<img width="20" alt="${gh.login}" src="${gh.avatar}&amp;s=40"/> **${gh.login}**](${gh.url})"""
-        } getOrElse {
-          author.gitAuthor.name
-        }
+            // using html instead of markdown, because default
+            // avatars come from github not resized
+            s"""[<img width="20" alt="${gh.login}" src="${gh.avatar}&amp;s=40"/> **${gh.login}**](${gh.url})"""
+          } getOrElse {
+            author.gitAuthor.name
+          }
 
         s"| $authorId | ${author.stats.commits} | ${author.stats.additions} | ${author.stats.deletions} |"
       }
diff --git a/core/src/main/scala/GithubProtocol.scala b/core/src/main/scala/GithubProtocol.scala
@@ -25,12 +25,14 @@ object GithubProtocol {
       option(
         field("author", githubAuthorProto)
       ),
-      field("commit",
-            `object`(
-              field("author", gitAuthorProto),
-              field("message", stringValue),
-              (gitAuthor: GitAuthor, message: String) => (gitAuthor, message)
-            )),
+      field(
+        "commit",
+        `object`(
+          field("author", gitAuthorProto),
+          field("message", stringValue),
+          (gitAuthor: GitAuthor, message: String) => (gitAuthor, message)
+        )
+      ),
       field("sha", stringValue),
       (githubAuthor: VavrOption[GithubAuthor], gitAuthorAndMessage: (GitAuthor, String), sha: String) =>
         Commit(sha, gitAuthorAndMessage._2, gitAuthorAndMessage._1, githubAuthor)
diff --git a/core/src/test/scala/AuthorsSpec.scala b/core/src/test/scala/AuthorsSpec.scala
@@ -53,14 +53,18 @@ class AuthorsSpec
       implicit val repo = Authors.gitRepo(".git/modules/core/src/test/resources/authors-test-repo")
       val stats = Source(
         List(
-          Commit("f576a45",
-                 "message",
-                 GitAuthor("test", "test@test.lt"),
-                 Some(GithubAuthor("test", "http://users/test", "http://avatars/test"))),
-          Commit("bce0e63",
-                 "message",
-                 GitAuthor("test", "test@test.lt"),
-                 Some(GithubAuthor("test", "http://users/test", "http://avatars/test")))
+          Commit(
+            "f576a45",
+            "message",
+            GitAuthor("test", "test@test.lt"),
+            Some(GithubAuthor("test", "http://users/test", "http://avatars/test"))
+          ),
+          Commit(
+            "bce0e63",
+            "message",
+            GitAuthor("test", "test@test.lt"),
+            Some(GithubAuthor("test", "http://users/test", "http://avatars/test"))
+          )
         )
       ).via(StatsAggregator())
         .runWith(Sink.head)
@@ -76,14 +80,18 @@ class AuthorsSpec
       implicit val repo = Authors.gitRepo(".git/modules/core/src/test/resources/authors-test-repo")
       val stats = Source(
         List(
-          Commit("f576a45",
-                 "message",
-                 GitAuthor("test", "test1@test.lt"),
-                 Some(GithubAuthor("test", "http://users/test", "http://avatars/test"))),
-          Commit("bce0e63",
-                 "message",
-                 GitAuthor("test", "test2@test.lt"),
-                 Some(GithubAuthor("test", "http://users/test", "http://avatars/test")))
+          Commit(
+            "f576a45",
+            "message",
+            GitAuthor("test", "test1@test.lt"),
+            Some(GithubAuthor("test", "http://users/test", "http://avatars/test"))
+          ),
+          Commit(
+            "bce0e63",
+            "message",
+            GitAuthor("test", "test2@test.lt"),
+            Some(GithubAuthor("test", "http://users/test", "http://avatars/test"))
+          )
         )
       ).via(StatsAggregator())
         .runWith(Sink.head)
@@ -99,10 +107,12 @@ class AuthorsSpec
       implicit val repo = Authors.gitRepo(".git/modules/core/src/test/resources/authors-test-repo")
       val stats = Source(
         List(
-          Commit("901392a",
-                 "message",
-                 GitAuthor("test", "test1@test.lt"),
-                 Some(GithubAuthor("test", "http://users/test", "http://avatars/test")))
+          Commit(
+            "901392a",
+            "message",
+            GitAuthor("test", "test1@test.lt"),
+            Some(GithubAuthor("test", "http://users/test", "http://avatars/test"))
+          )
         )
       ).via(StatsAggregator())
         .runWith(Sink.head)
diff --git a/plugin/src/main/scala/AuthorsPlugin.scala b/plugin/src/main/scala/AuthorsPlugin.scala
@@ -46,6 +46,6 @@ object AuthorsPlugin extends AutoPlugin {
 
       Await.result(summary, 30.seconds)
     },
-    aggregate in authors := false,
+    aggregate in authors := false
   )
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,4 @@
 addSbtPlugin("com.dwijnand"              % "sbt-dynver"   % "3.3.0")
-addSbtPlugin("com.dwijnand"              % "sbt-travisci" % "1.2.0")
-addSbtPlugin("com.geirsson"              % "sbt-scalafmt" % "1.4.0")
+addSbtPlugin("org.scalameta"             % "sbt-scalafmt" % "2.0.0")
 addSbtPlugin("org.foundweekends"         % "sbt-bintray"  % "0.5.4")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.6")

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+version = 2.0.0-RC6`
	`2`	`+`
`1`	`3`	`style = defaultWithAlign`
`2`	`4`
`3`	`5`	`align.tokens = ["%", "%%"]`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ object AuthorsPlugin extends AutoPlugin {`
`46`	`46`
`47`	`47`	`Await.result(summary, 30.seconds)`
`48`	`48`	`},`
`49`		`- aggregate in authors := false,`
	`49`	`+ aggregate in authors := false`
`50`	`50`	`)`
`51`	`51`	`}`