Merge pull request #353 from ysb33r/appveyor-cleanup

Making tests work on Appveyor again

Author: rtyler

base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyPrepareGemsIntegrationSpec.groovy

@@ -20,7 +20,7 @@ class JRubyPrepareGemsIntegrationSpec extends IntegrationSpecification {
         setup:
         withDependencies "gems ${slimGem}"
         withPreamble """
-            jruby.gemInstallDir = '${projectDir.absolutePath}'
+            jruby.gemInstallDir = '${pathAsUriStr(projectDir)}'.toURI()
         """
 
         when:
@@ -35,7 +35,7 @@ class JRubyPrepareGemsIntegrationSpec extends IntegrationSpecification {
         setup:
         withDefaultRepositories()
         withPreamble """
-            jruby.gemInstallDir = '${projectDir.absolutePath}'
+            jruby.gemInstallDir = '${pathAsUriStr(projectDir)}'.toURI()
         """
         withDependencies """
             gems "rubygems:sinatra:1.4.5"
@@ -57,7 +57,7 @@ class JRubyPrepareGemsIntegrationSpec extends IntegrationSpecification {
         setup:
         withDefaultRepositories()
         withPreamble """
-            jruby.gemInstallDir = '${projectDir.absolutePath}'
+            jruby.gemInstallDir = '${pathAsUriStr(projectDir)}'.toURI()
         """
         withDependencies 'gems "rubygems:jar-dependencies:0.1.16.pre"'
 
@@ -74,7 +74,7 @@ class JRubyPrepareGemsIntegrationSpec extends IntegrationSpecification {
         setup:
         withDefaultRepositories()
         withPreamble """
-            jruby.gemInstallDir = '${projectDir.absolutePath}'
+            jruby.gemInstallDir = '${pathAsUriStr(projectDir)}'.toURI()
         """
         withDependencies 'gems "rubygems:childprocess:1.0.1"'
 

base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyPrepareJarsIntegrationSpec.groovy

@@ -12,7 +12,7 @@ class JRubyPrepareJarsIntegrationSpec extends IntegrationSpecification {
         given:
         buildFile.text = """
             ${projectWithLocalRepo}
-            jruby.gemInstallDir = '${projectDir.absolutePath}'
+            jruby.gemInstallDir = '${pathAsUriStr(projectDir)}'.toURI()
 
             dependencies {
                 gems 'io.dropwizard.metrics:metrics-core:3.1.0'

base-plugin/src/integTest/groovy/com/github/jrubygradle/testhelper/IntegrationSpecification.groovy

@@ -54,14 +54,22 @@ class IntegrationSpecification extends Specification {
         "'${VersionFinder.findDependency(flatRepoLocation, organisation, artifact, extension)}'"
     }
 
+    String pathAsUriStr(final File path) {
+        path.absoluteFile.toURI().toString()
+    }
+
     String getProjectWithLocalRepo() {
         """
         plugins {
             id 'com.github.jruby-gradle.base'
         }
 
         jruby.defaultRepositories = false
-        repositories.flatDir dirs: '${flatRepoLocation.absolutePath}'
+        repositories {
+            flatDir {
+                dirs '${pathAsUriStr(flatRepoLocation)}'.toURI()
+            }
+        }
         """
     }
 
@@ -72,8 +80,15 @@ class IntegrationSpecification extends Specification {
         }
 
         jruby.defaultRepositories = false
-        repositories.maven { url 'file://${mavenRepoLocation.absolutePath}' } 
-        repositories.flatDir dirs: '${flatRepoLocation.absolutePath}'
+
+        repositories { 
+            flatDir { 
+                dirs '${pathAsUriStr(flatRepoLocation)}'.toURI()
+            }
+            maven { 
+                url '${pathAsUriStr(mavenRepoLocation)}'.toURI()
+            } 
+        }
         """
     }
 
@@ -84,7 +99,7 @@ class IntegrationSpecification extends Specification {
         }
 
         jruby.defaultRepositories = true
-        repositories.maven { url 'file://${mavenRepoLocation.absolutePath}' } 
+        repositories.maven { url '${pathAsUriStr(mavenRepoLocation)}'.toURI() } 
         """
     }
 

base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPrepare.groovy

@@ -8,7 +8,6 @@ import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Optional
-import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 
 /**
@@ -19,9 +18,12 @@ import org.gradle.api.tasks.TaskAction
 @CompileStatic
 class JRubyPrepare extends DefaultTask {
 
+    JRubyPrepare() {
+        outputs.dir({ JRubyPrepare t -> new File(t.getOutputDir(), 'gems') }.curry(this))
+    }
+
     /** Target directory for GEMs. Extracted GEMs should end up in {@code outputDir + "/gems"}
      */
-    @OutputDirectory
     File getOutputDir() {
         project.file(this.outputDir)
     }

build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'org.ysb33r.gradletest' version '2.0-rc.4' apply false
     id 'com.jfrog.bintray' version '1.8.4' apply false
     id 'org.ajoberstar.github-pages' version '1.2.0' apply false
+    id 'org.ysb33r.cloudci.appveyor.testreporter' version '2.5' apply false
 }
 
 buildScan {
@@ -44,6 +45,7 @@ subprojects {
         apply plugin: 'com.jfrog.bintray'
         apply plugin: 'org.ysb33r.gradletest'
         apply plugin: 'maven-publish'
+        apply plugin: 'org.ysb33r.cloudci.appveyor.testreporter'
         apply from: "${rootProject.projectDir}/gradle/integration-tests.gradle"
 
         dependencies {

gradle/codenarc.groovy

@@ -243,7 +243,6 @@ ruleset {
     SystemOutPrint
     SystemRunFinalizersOnExit
     TernaryCouldBeElvis
-    ThisReferenceEscapesConstructor
     ThreadGroup
     ThreadLocalNotStaticFinal
     ThreadYield

jar-plugin/src/integTest/groovy/com/github/jrubygradle/jar/JRubyJarTestKitSpec.groovy

@@ -169,9 +169,13 @@ class JRubyJarTestKitSpec extends IntegrationSpecification {
 
     private void withLocalRepositories() {
         this.repoSetup = """
-            repositories {
-                repositories.flatDir dirs: '${flatRepoLocation.absolutePath}'
-                repositories.maven { url 'file://${mavenRepoLocation.absolutePath}' } 
+            repositories { 
+                flatDir { 
+                    dirs '${pathAsUriStr(flatRepoLocation)}' 
+                }
+                maven { 
+                    url '${pathAsUriStr(mavenRepoLocation)}'
+                } 
             }
         """
     }

jar-plugin/src/integTest/groovy/com/github/jrubygradle/jar/helpers/IntegrationSpecification.groovy

@@ -46,6 +46,10 @@ class IntegrationSpecification extends Specification {
                 .forwardOutput()
     }
 
+    String pathAsUriStr(final File path) {
+        path.absoluteFile.toURI().toString()
+    }
+
     private Map<String, String> loadTestProperties() {
         this.class.getResource('/jruby-gradle-testconfig.properties').withInputStream { strm ->
             Properties props = new Properties()