Merge pull request #16 from scalacenter/coverage

Bump code coverage.
scalacenter · Oct 20, 2016 · 7e423ff · 7e423ff
2 parents 4479aaf + 83d5cd8
commit 7e423ff
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# scalafix [![codecov.io](https://codecov.io/github/scalacenter/scalafix/coverage.svg?branch=master)](https://codecov.io/github/scalacenter/scalafix?branch=master) [![Build Status](http://stats.lassie.io:8001/api/badges/scalacenter/scalafix/status.svg)](http://stats.lassie.io:8001/scalacenter/scalafix) [![Join the chat at https://gitter.im/scalacenter/scalafix](https://badges.gitter.im/scalacenter/scalafix.svg)](https://gitter.im/scalacenter/scalafix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# scalafix [![Build Status](http://stats.lassie.io:8001/api/badges/scalacenter/scalafix/status.svg)](http://stats.lassie.io:8001/scalacenter/scalafix) [![Join the chat at https://gitter.im/scalacenter/scalafix](https://badges.gitter.im/scalacenter/scalafix.svg)](https://gitter.im/scalacenter/scalafix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 The [first meeting of the Scala Center advisory board](http://scala-lang.org/blog/2016/05/30/scala-center-advisory-board.html#the-first-meeting)
 approved a proposal to define a migration path from Scala 2.x to Dotty.

diff --git a/build.sbt b/build.sbt
@@ -35,7 +35,7 @@ lazy val compilerOptions = Seq(
 
 lazy val commonSettings = Seq(
   ScoverageSbtPlugin.ScoverageKeys.coverageExcludedPackages :=
-    ".*Versions;scalafix\\.(sbt|util)",
+    ".*(Versions|termdisplay);scalafix\\.(sbt|util)",
   triggeredMessage in ThisBuild := Watched.clearWhenTriggered,
   scalacOptions in (Compile, console) := compilerOptions :+ "-Yrepl-class-based",
   testOptions in Test += Tests.Argument("-oD")

diff --git a/cli/src/main/scala/scalafix/cli/Cli.scala b/cli/src/main/scala/scalafix/cli/Cli.scala
@@ -14,6 +14,7 @@ import java.io.PrintStream
 import java.util.concurrent.atomic.AtomicInteger
 import ArgParserImplicits._
 import scala.util.control.NonFatal
+import scalafix.cli.termdisplay.TermDisplay
 
 import caseapp._
 import caseapp.core.Messages

diff --git a/...main/scala/scalafix/cli/TermDisplay.scala → ...calafix/cli/termdisplay/TermDisplay.scala b/...main/scala/scalafix/cli/TermDisplay.scala → ...calafix/cli/termdisplay/TermDisplay.scala
@@ -5,7 +5,7 @@
   * which in turn was copy/pasted from (MIT licence)
   * https://github.com/lihaoyi/Ammonite/blob/10854e3b8b454a74198058ba258734a17af32023/terminal/src/main/scala/ammonite/terminal/Utils.scala
   */
-package scalafix.cli
+package scalafix.cli.termdisplay
 
 import scala.annotation.tailrec
 import scala.collection.mutable.ArrayBuffer

diff --git a/cli/src/test/scala/scalafix/cli/CliSuite.scala b/cli/src/test/scala/scalafix/cli/CliSuite.scala
@@ -81,4 +81,9 @@ class CliSuite extends FunSuite with DiffAssertions {
     assertNoDiff(FileOps.readFile(file1), expected)
     assertNoDiff(FileOps.readFile(file2), expected)
   }
+
+  test("--rewrites") {
+    assert(Cli.parse(Seq("--rewrites", "VolatileLazyVal")).isRight)
+    assert(Cli.parse(Seq("--rewrites", "Foobar")).isLeft)
+  }
 }