scoverage requires a separate reporting step

Author: maiflai

Diff for: build.gradle

@@ -7,6 +7,10 @@ buildscript {
     }
 }
 
+repositories {
+    mavenCentral()
+}
+
 ext {
     sonatypeUser = System.env.SONATYPE_USER
     sonatypePass = System.env.SONATYPE_PASS
@@ -19,9 +23,15 @@ apply plugin: 'release'
 
 group 'org.scoverage'
 
+configurations {
+    scoverage
+    compile.extendsFrom scoverage
+}
+
 dependencies {
     compile gradleApi()
     compile localGroovy()
+    scoverage 'org.scoverage:scalac-scoverage-plugin_2.10:0.99.5'
 }
 
 task groovydocJar(type: Jar, dependsOn: groovydoc) {

Diff for: src/main/groovy/org/scoverage/OverallCheckTask.groovy

@@ -13,9 +13,9 @@ class OverallCheckTask extends DefaultTask {
 
     @TaskAction
     void requireLineCoverage() {
-        def dataDirName = project.extensions[ScoveragePlugin.CONFIGURATION_NAME].dataDirName
+        def extension = ScoveragePlugin.extensionIn(project)
 
-        if (cobertura == null) cobertura = project.file("$project.buildDir/reports/$dataDirName/cobertura.xml")
+        if (cobertura == null) cobertura = new File(extension.dataDir, 'cobertura.xml')
 
         def xml = new XmlParser().parse(cobertura)
         def overallLineRate = xml.attribute('line-rate').toDouble()

Diff for: src/main/groovy/org/scoverage/ScoverageExtension.groovy

@@ -2,8 +2,10 @@ package org.scoverage
 
 import org.gradle.api.Action
 import org.gradle.api.Project
+import org.gradle.api.artifacts.ResolvedConfiguration
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.scala.ScalaPlugin
+import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.testing.Test
 
@@ -14,6 +16,14 @@ import org.gradle.api.tasks.testing.Test
  */
 class ScoverageExtension {
 
+    /** a directory to write working files to */
+    File dataDir
+    /** a directory to write final output to */
+    File reportDir
+    /** sources to highlight */
+    SourceSet sourceSet
+
+
     ScoverageExtension(Project project) {
 
         project.plugins.apply(JavaPlugin.class);
@@ -22,11 +32,11 @@ class ScoverageExtension {
 
         project.configurations.create(ScoveragePlugin.CONFIGURATION_NAME) {
             visible = false
-            transitive = false
+            transitive = true
             description = 'Scoverage dependencies'
         }
 
-        project.sourceSets.create(ScoveragePlugin.CONFIGURATION_NAME) {
+        sourceSet = project.sourceSets.create(ScoveragePlugin.CONFIGURATION_NAME) {
             def mainSourceSet = project.sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
 
             java.source(mainSourceSet.java)
@@ -44,34 +54,63 @@ class ScoverageExtension {
             dependsOn(project.tasks[ScoveragePlugin.TEST_NAME])
         }
 
+        project.tasks.create(ScoveragePlugin.REPORT_NAME, JavaExec.class) {
+            dependsOn(project.tasks[ScoveragePlugin.TEST_NAME])
+        }
+
+        dataDir = new File(project.buildDir, 'scoverage')
+        reportDir = new File(project.buildDir, 'reports' + File.separatorChar + 'scoverage')
+
     }
 
     private Action<Project> configureRuntimeOptions = new Action<Project>() {
 
         @Override
         void execute(Project t) {
+
+            def extension = ScoveragePlugin.extensionIn(t)
+            extension.dataDir.mkdirs()
+            extension.reportDir.mkdirs()
+
+            ResolvedConfiguration s = t.configurations[ScoveragePlugin.CONFIGURATION_NAME].resolvedConfiguration
+            String pluginPath = s.getFirstLevelModuleDependencies().iterator().next().moduleArtifacts.iterator().next().file.absolutePath
+
             t.tasks[ScoveragePlugin.COMPILE_NAME].configure {
-                List<String> plugin = ['-Xplugin:' + t.configurations[ScoveragePlugin.CONFIGURATION_NAME].singleFile]
+
+
+                List<String> plugin = ['-Xplugin:' + pluginPath]
                 List<String> parameters = scalaCompileOptions.additionalParameters
                 if (parameters != null) {
                     plugin.addAll(parameters)
                 }
+                plugin.add("-P:scoverage:dataDir:${extension.dataDir.absolutePath}".toString())
+                plugin.add('-P:scoverage:excludedPackages:')
                 scalaCompileOptions.additionalParameters = plugin
                 // exclude the scala libraries that are added to enable scala version detection
                 classpath += t.configurations[ScoveragePlugin.CONFIGURATION_NAME]
             }
-            t.tasks[ScoveragePlugin.TEST_NAME].configure {
-                // TODO : fix this
-                systemProperty 'scoverage.dataDir', "${t.buildDir}/reports/${t.extensions[ScoveragePlugin.CONFIGURATION_NAME].dataDirName}"
-                systemProperty 'scoverage.basedir', "${t.rootDir.absolutePath}"  // for multi-module checking
 
+            t.tasks[ScoveragePlugin.TEST_NAME].configure {
                 def existingClasspath = classpath
                 classpath = t.files(t.sourceSets[ScoveragePlugin.CONFIGURATION_NAME].output.classesDir) +
-                project.configurations[ScoveragePlugin.CONFIGURATION_NAME] +
-                existingClasspath
+                        project.configurations[ScoveragePlugin.CONFIGURATION_NAME] +
+                        existingClasspath
+            }
+
+            t.tasks[ScoveragePlugin.REPORT_NAME].configure {
+                classpath = project.buildscript.configurations.classpath +
+                        project.configurations[ScoveragePlugin.CONFIGURATION_NAME]
+                main = 'org.scoverage.ScoverageReport'
+                args = [
+                        extension.sourceSet.allSource.iterator().next().absolutePath,
+                        extension.dataDir.absolutePath,
+                        extension.reportDir.absolutePath
+                ]
+                inputs.dir(extension.dataDir)
+                outputs.dir(extension.reportDir)
             }
+
         }
     }
 
-    String dataDirName = 'scoverage'
 }

Diff for: src/main/groovy/org/scoverage/ScoveragePlugin.groovy

@@ -7,6 +7,7 @@ class ScoveragePlugin implements Plugin<Project> {
     static String CONFIGURATION_NAME = 'scoverage'
 
     static String TEST_NAME = 'testScoverage'
+    static String REPORT_NAME = 'reportScoverage'
     static String CHECK_NAME = 'checkScoverage'
     static String COMPILE_NAME = 'compileScoverageScala'
 
@@ -16,4 +17,8 @@ class ScoveragePlugin implements Plugin<Project> {
             t.extensions.create(CONFIGURATION_NAME, ScoverageExtension, t)
         }
     }
+
+    protected static ScoverageExtension extensionIn(Project project) {
+        project.extensions[CONFIGURATION_NAME]
+    }
 }

Diff for: src/main/groovy/org/scoverage/ScoverageReport.java

@@ -0,0 +1,36 @@
+package org.scoverage;
+
+import scala.collection.Seq;
+import scala.collection.Set;
+import scoverage.Coverage;
+import scoverage.IOUtils;
+import scoverage.report.CoberturaXmlWriter;
+import scoverage.report.ScoverageHtmlWriter;
+
+import java.io.File;
+import java.util.Arrays;
+
+/**
+ * late binding of scoverage core libraries (without a dependency on groovy)
+ */
+public class ScoverageReport {
+
+    public static void main(String... args) {
+        File sourceDir = new File(args[0]);
+        File dataDir = new File(args[1]);
+        File reportDir = new File(args[2]);
+
+        File coverageFile = IOUtils.coverageFile(dataDir);
+        File[] array = IOUtils.findMeasurementFiles(dataDir);
+        // TODO: patch scoverage core to use a consistent collection type?
+        Seq<File> measurementFiles = scala.collection.JavaConversions.asScalaBuffer(Arrays.asList(array));
+
+        Coverage coverage = IOUtils.deserialize(coverageFile);
+
+        Set<Object> measurements = IOUtils.invoked(measurementFiles);
+        coverage.apply(measurements);
+
+        new ScoverageHtmlWriter(sourceDir, reportDir).write(coverage);
+        new CoberturaXmlWriter(sourceDir, reportDir).write(coverage);
+    }
+}