Merge pull request #113 from gregsymons/coverage-off

Coverage off

Author: sksamuel

.travis.yml

@@ -1,7 +1,11 @@
 language: scala
 
+script: sbt ++$TRAVIS_SCALA_VERSION test scripted
+
 after_script:
-  - if [[ $TRAVIS_TEST_RESULT == 0 && "$TRAVIS_BRANCH" == "master" ]]; then sbt "^publish"; fi
+  - if [[ $TRAVIS_TEST_RESULT == 0 && 
+          "$TRAVIS_REPO_SLUG" == "scoverage/sbt-scoverage" &&
+          "$TRAVIS_BRANCH" == "master" ]]; then sbt "^publish"; fi
 
 scala:
-  - "2.10.4"
+  - "2.10.4"

README.md

@@ -34,6 +34,10 @@ $ sbt coverageReport
 
 to generate the reports. You will find the coverage reports inside `target/scoverage-report`. There are HTML and XML reports. The XML is useful if you need to programatically use the results, or if you're writing a tool.
 
+If you're running the coverage reports from within an sbt console session (as
+opposed to one command per sbt launch), then the `coverage` task is sticky. To
+turn it back off when you're done running reports, use the `coverageOff` task.
+
 If you want to see a project that is already setup to use scoverage in both sbt and maven, then clone [the scoverage samples project](https://github.com/scoverage/scoverage-samples).
 
 ## Notes on upgrading to version 1.0.0

build.sbt

@@ -2,7 +2,7 @@ name := "sbt-scoverage"
 
 organization := "org.scoverage"
 
-scalaVersion := "2.10.4"
+scalaVersion := "2.10.5"
 
 scalacOptions := Seq("-unchecked", "-deprecation", "-feature", "-encoding", "utf8")
 
@@ -16,7 +16,7 @@ resolvers <++= isSnapshot(
 )
 
 libraryDependencies ++= Seq(
-  "org.scoverage" %% "scalac-scoverage-plugin" % "1.0.5-SNAPSHOT"
+  "org.scoverage" %% "scalac-scoverage-plugin" % "1.1.0"
 )
 
 publishTo := {

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.5
+sbt.version=0.13.7

src/main/scala/scoverage/ScoverageSbtPlugin.scala

@@ -11,10 +11,11 @@ class ScoverageSbtPlugin extends sbt.AutoPlugin {
   val OrgScoverage = "org.scoverage"
   val ScalacRuntimeArtifact = "scalac-scoverage-runtime"
   val ScalacPluginArtifact = "scalac-scoverage-plugin"
-  val ScoverageVersion = "1.0.5-SNAPSHOT"
+  val ScoverageVersion = "1.1.0"
 
   object ScoverageKeys {
     lazy val coverage = taskKey[Unit]("enable compiled code with instrumentation")
+    lazy val coverageOff = taskKey[Unit]("disable compiled code with instrumentation")
     lazy val coverageReport = taskKey[Unit]("run report generation")
     lazy val coverageAggregate = taskKey[Unit]("aggregate reports from subprojects")
     val coverageExcludedPackages = settingKey[String]("regex for excluded packages")
@@ -42,6 +43,10 @@ class ScoverageSbtPlugin extends sbt.AutoPlugin {
       enabled = true
     },
 
+    coverageOff := {
+      enabled = false
+    },
+
     coverageReport := {
       val target = crossTarget.value
       val s = (streams in Global).value

src/sbt-test/scoverage/bad-coverage/build.sbt

@@ -4,8 +4,6 @@ scalaVersion := "2.10.4"
 
 libraryDependencies += "org.specs2" %% "specs2" % "2.3.13" % "test"
 
-instrumentSettings
+ScoverageSbtPlugin.ScoverageKeys.coverageMinimum := 80
 
-ScoverageKeys.minimumCoverage := 80
-
-ScoverageKeys.failOnMinimumCoverage := true
+ScoverageSbtPlugin.ScoverageKeys.coverageFailOnMinimum := true

src/sbt-test/scoverage/bad-coverage/test

@@ -1,3 +1,4 @@
 # run scoverage
 > clean
--> scoverage:test
+> coverage
+-> test

src/sbt-test/scoverage/coverage-off/build.sbt

@@ -0,0 +1,9 @@
+version := "0.1"
+
+scalaVersion := "2.10.4"
+
+libraryDependencies += "org.specs2" %% "specs2" % "2.3.13" % "test"
+
+ScoverageSbtPlugin.ScoverageKeys.coverageMinimum := 80
+
+ScoverageSbtPlugin.ScoverageKeys.coverageFailOnMinimum := true

src/sbt-test/scoverage/coverage-off/project/plugins.sbt

@@ -0,0 +1,15 @@
+// The Typesafe repository
+resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
+
+//scoverage needs this
+resolvers += Classpaths.sbtPluginReleases
+
+{
+  val pluginVersion = System.getProperty("plugin.version")
+  if(pluginVersion == null)
+    throw new RuntimeException("""|The system property 'plugin.version' is not defined.
+                                 |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
+  else addSbtPlugin("org.scoverage" %% "sbt-scoverage" % pluginVersion)
+}
+
+

src/sbt-test/scoverage/coverage-off/src/main/scala/GoodCoverage.scala

@@ -0,0 +1,6 @@
+object GoodCoverage {
+
+  def sum(num1: Int, num2: Int) = {
+    num1 + num2
+  }
+}