Merge remote-tracking branch 'scoverage/master' into 132-coverageMinimum

Author: RichardBradley

Diff for: README.md

@@ -14,7 +14,7 @@ discussion on scoverage.
 
 Add the plugin to your build with the following in project/plugins.sbt:
 ```scala
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.2")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.3")
 ```
 
 Then run the your tests with coverage enabled by entering:

Diff for: build.sbt

@@ -1,20 +1,21 @@
 name := "sbt-scoverage"
+
 organization := "org.scoverage"
+
 sbtPlugin := true
 
 scalacOptions := Seq("-unchecked", "-deprecation", "-feature", "-encoding", "utf8")
 
 resolvers ++= {
-  if(isSnapshot.value) Seq(Resolver.mavenLocal, Resolver.sonatypeRepo("snapshots"))
+  if (isSnapshot.value) Seq(Resolver.mavenLocal, Resolver.sonatypeRepo("snapshots"))
   else Seq.empty
 }
 
 libraryDependencies += "org.scoverage" %% "scalac-scoverage-plugin" % "1.1.1"
 
-publishMavenStyle := false
-publishArtifact in Test := false
+publishMavenStyle := true
 
-licenses +=("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0.html"))
+publishArtifact in Test := false
 
 ScriptedPlugin.scriptedSettings
 
@@ -25,6 +26,33 @@ scriptedLaunchOpts ++= Seq(
 
 releaseSettings
 
-bintrayOrganization := None
-bintrayRepository := "sbt-plugins"
+publishTo <<= version {
+  (v: String) =>
+    val nexus = "https://oss.sonatype.org/"
+    if (v.trim.endsWith("SNAPSHOT"))
+      Some("snapshots" at nexus + "content/repositories/snapshots")
+    else
+      Some("releases" at nexus + "service/local/staging/deploy/maven2")
+}
 
+pomExtra := {
+  <url>https://github.com/scoverage/sbt-scoverage</url>
+    <licenses>
+      <license>
+        <name>Apache 2</name>
+        <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        <distribution>repo</distribution>
+      </license>
+    </licenses>
+    <scm>
+      <url>git@github.com:scoverage/sbt-scoverage.git</url>
+      <connection>scm:git@github.com:scoverage/sbt-scoverage.git</connection>
+    </scm>
+    <developers>
+      <developer>
+        <id>sksamuel</id>
+        <name>sksamuel</name>
+        <url>http://github.com/sksamuel</url>
+      </developer>
+    </developers>
+}

Diff for: project/plugins.sbt

@@ -1,7 +1,7 @@
 libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
 
+addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
+
 addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
 
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")
-
-addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")

Diff for: src/main/scala/scoverage/ScoverageKeys.scala

@@ -16,4 +16,5 @@ object ScoverageKeys {
   lazy val coverageOutputHTML = settingKey[Boolean]("enables html report generation")
   lazy val coverageOutputDebug = settingKey[Boolean]("turn on the debug report")
   lazy val coverageCleanSubprojectFiles = settingKey[Boolean]("removes subproject data after an aggregation")
+  lazy val coverageOutputTeamCity = settingKey[Boolean]("turn on teamcity reporting")
 }

Diff for: src/main/scala/scoverage/ScoverageSbtPlugin.scala

@@ -2,6 +2,7 @@ package scoverage
 
 import sbt.Keys._
 import sbt._
+import scoverage.ScoverageKeys._
 import scoverage.report.{CoverageAggregator, CoberturaXmlWriter, ScoverageHtmlWriter, ScoverageXmlWriter}
 
 object ScoverageSbtPlugin extends AutoPlugin {
@@ -40,7 +41,8 @@ object ScoverageSbtPlugin extends AutoPlugin {
     coverageOutputHTML := true,
     coverageOutputCobertura := true,
     coverageOutputDebug := false,
-    coverageCleanSubprojectFiles := true
+    coverageCleanSubprojectFiles := true,
+    coverageOutputTeamCity := false
   )
 
   /**
@@ -72,6 +74,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
           coverageOutputXML.value,
           coverageOutputHTML.value,
           coverageOutputDebug.value,
+          coverageOutputTeamCity.value,
           log)
 
         checkCoverage(cov, log, coverageMinimum.value, coverageFailOnMinimum.value)
@@ -94,6 +97,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
           coverageOutputXML.value,
           coverageOutputHTML.value,
           coverageOutputDebug.value,
+          coverageOutputTeamCity.value,
           log)
         val cfmt = cov.statementCoverageFormatted
         log.info(s"Aggregation complete. Coverage was [$cfmt]")
@@ -145,6 +149,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
                            coverageOutputXML: Boolean,
                            coverageOutputHTML: Boolean,
                            coverageDebug: Boolean,
+                           coverageOutputTeamCity: Boolean,
                            log: Logger): Unit = {
     log.info(s"Generating scoverage reports...")
 
@@ -170,10 +175,38 @@ object ScoverageSbtPlugin extends AutoPlugin {
       log.info(s"Written HTML coverage report [${reportDir.getAbsolutePath}/index.html]")
       new ScoverageHtmlWriter(compileSourceDirectories, reportDir).write(coverage)
     }
+    if (coverageOutputTeamCity) {
+      log.info("Writing coverage report to teamcity")
+      reportToTeamcity(coverage, coverageOutputHTML, reportDir, crossTarget, log)
+    }
 
+    log.info(s"Statement coverage.: ${coverage.statementCoverageFormatted}%")
+    log.info(s"Branch coverage....: ${coverage.branchCoverageFormatted}%")
     log.info("Coverage reports completed")
   }
 
+  private def reportToTeamcity(coverage: Coverage,
+                               createCoverageZip: Boolean,
+                               reportDir: File,
+                               crossTarget: File,
+                               log: Logger) {
+
+
+    def statsKeyValue(key: String, value: Int): String =
+      s"##teamcity[buildStatisticValue key='${key}' value='${value}']"
+
+    // Log statement coverage as per: https://devnet.jetbrains.com/message/5467985
+    log.info(statsKeyValue("CodeCoverageAbsSCovered", coverage.invokedStatementCount))
+    log.info(statsKeyValue("CodeCoverageAbsSTotal", coverage.statementCount))
+
+    // Log branch coverage as a custom metrics (in percent)
+    log.info(statsKeyValue("CodeCoverageBranch", "%.0f".format(coverage.branchCoveragePercent).toInt))
+
+    // Create the coverage report for teamcity (HTML files)
+    if (createCoverageZip)
+      IO.zip(Path.allSubpaths(reportDir), crossTarget / "coverage.zip")
+  }
+
   private def loadCoverage(crossTarget: File, log: Logger): Option[Coverage] = {
 
     val dataDir = crossTarget / "/scoverage-data"

Diff for: version.sbt

@@ -1 +1 @@
-version in ThisBuild := "1.3.2"
+version in ThisBuild := "1.3.4"