Merge pull request #140 from thomaska/added_teamcity_support

Added teamcity support - applied @wennergr commit

Author: sksamuel

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 {
@@ -42,7 +43,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)
       case None => log.warn("No coverage data, skipping reports")
     }
@@ -91,6 +94,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]")
@@ -127,6 +131,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
             coverageOutputXML.value,
             coverageOutputHTML.value,
             coverageOutputDebug.value,
+            coverageOutputTeamCity.value,
             log
           )
           checkCoverage(c, log, coverageMinimum.value, coverageFailOnMinimum.value)
@@ -163,6 +168,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
                            coverageOutputXML: Boolean,
                            coverageOutputHTML: Boolean,
                            coverageDebug: Boolean,
+                           coverageOutputTeamCity: Boolean,
                            log: Logger): Unit = {
     log.info(s"Generating scoverage reports...")
 
@@ -188,10 +194,37 @@ 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) {
+
+    // Teamcity only have a definition of line/method and class coverage
+
+    // Log branch coverage as line coverage
+    log.info(s"##teamcity[buildStatisticValue key='CodeCoverageAbsMCovered' value='${coverage.invokedStatementCount}']")
+    log.info(s"##teamcity[buildStatisticValue key='CodeCoverageAbsMTotal' value='${coverage.statementCount}']")
+
+    // Log statement coverage as method coverage
+    log.info(s"##teamcity[buildStatisticValue key='CodeCoverageAbsLCovered' value='${coverage.invokedBranchesCount}']")
+    log.info(s"##teamcity[buildStatisticValue key='CodeCoverageAbsLTotal' value='${coverage.branchCount}']")
+
+    // 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"