Merge pull request #1 from SimplyScala/master

fix baseDir bug for multi-module porject & improve OverAllCheckTask

Author: 0xRoch

.gitignore

@@ -0,0 +1,7 @@
+build
+.gradle
+
+*.iml
+*.ipr
+*.iws
+*.idea

README.md

@@ -33,3 +33,18 @@ This creates an additional task testCoverage which will run tests against instru
 - [x] running JUnit tests against instrumented scala code
 - [x] failing the build on lack of coverage
 
+Then launch command :
+`gradle testScct` or `gradle checkScct` 
+
+
+CheckScct
+---------
+
+By default, when you launch `gradle checkScct` build fail if only 75% of project is covered by tests.
+
+To configure it as you want, add this configuration :
+```
+checkScct {
+    minimumLineRate = 0.5
+}
+```

build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'idea'
 apply plugin: 'maven'
 apply plugin: 'signing'
 apply plugin: 'groovy'
-apply plugin: 'release'
+//apply plugin: 'release'
 
 group 'com.github.maiflai'
 
@@ -36,11 +36,11 @@ artifacts {
     archives sourcesJar
 }
 
-signing {
+/*signing {
     sign configurations.archives
-}
+}*/
 
-uploadArchives {
+/*uploadArchives {
     repositories {
         mavenDeployer {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
@@ -80,4 +80,4 @@ uploadArchives {
             }
         }
     }
-}
+}*/

src/main/groovy/com/github/maiflai/OverallCheckTask.groovy

@@ -8,22 +8,20 @@ import org.gradle.api.tasks.TaskAction
  * Throws a GradleException if overall line coverage dips below the configured percentage.
  */
 class OverallCheckTask extends DefaultTask {
-
     File cobertura
-    double minimumLineRate = 1
+    double minimumLineRate = 0.75
 
     @TaskAction
     void requireLineCoverage() {
-
         def reportDirName = project.extensions[ScctPlugin.CONFIGURATION_NAME].reportDirName
-        if (cobertura == null){
-            cobertura = project.file("$project.buildDir/reports/$reportDirName/cobertura.xml")
-        }
+
+        if (cobertura == null) cobertura = project.file("$project.buildDir/reports/$reportDirName/cobertura.xml")
 
         def xml = new XmlParser().parse(cobertura)
         def overallLineRate = xml.attribute('line-rate').toDouble()
         def difference = (minimumLineRate - overallLineRate)
-        if (difference > 0.001) throw new GradleException("Line coverage of $overallLineRate is below $minimumLineRate by $difference")
-    }
 
-}
+        if (difference > 1e-7)
+            throw new GradleException("Only ${overallLineRate * 100}% of project is covered by tests instead of ${(minimumLineRate * 100).toInteger()}%!")
+    }
+}

src/main/groovy/com/github/maiflai/ScctExtension.groovy

@@ -1,9 +1,7 @@
 package com.github.maiflai
 
 import org.gradle.api.Action
-import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.Task
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.scala.ScalaPlugin
 import org.gradle.api.tasks.SourceSet
@@ -64,6 +62,8 @@ class ScctExtension {
             }
             t.tasks[ScctPlugin.TEST_NAME].configure {
                 systemProperty 'scct.report.dir', "${t.buildDir}/reports/${t.extensions[ScctPlugin.CONFIGURATION_NAME].reportDirName}"
+                systemProperty 'scct.basedir', "${t.rootDir.absolutePath}"  // for multi-module checking
+
                 def existingClasspath = classpath
                 classpath = t.files(t.sourceSets[ScctPlugin.CONFIGURATION_NAME].output.classesDir) +
                         project.configurations[ScctPlugin.CONFIGURATION_NAME] +
@@ -73,8 +73,4 @@ class ScctExtension {
     }
 
     String reportDirName = 'scct'
-
-
-}
-
-
+}

src/main/groovy/com/github/maiflai/ScctPlugin.groovy

@@ -4,7 +4,6 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 
 class ScctPlugin implements Plugin<Project> {
-
     static String CONFIGURATION_NAME = 'scct'
 
     static String TEST_NAME = 'testScct'
@@ -17,5 +16,4 @@ class ScctPlugin implements Plugin<Project> {
             t.extensions.create(CONFIGURATION_NAME, ScctExtension, t)
         }
     }
-
-}
+}