Merge pull request #1 from jruby-gradle/master

updates

Author: StevenCregan

Jenkinsfile

@@ -0,0 +1,35 @@
+#!/usr/bin/env groovy
+
+node('docker') {
+    stage 'Checkout source'
+    checkout scm
+
+    stage 'Build and test'
+    List<String> javas = ['7', '8']
+    List<String> plugins = ['base', 'war', 'jar']
+    Map parallelSteps = [:]
+
+    for (int j = 0; j < javas.size(); j++) {
+        for (int i = 0; i < plugins.size(); i++) {
+            def javaVersion = "${javas.get(j)}-jdk"
+            def plugin = "jruby-gradle-${plugins.get(i)}-plugin"
+            parallelSteps["${javaVersion}-${plugin}"] = {
+                node('docker') {
+                    checkout scm
+                    try {
+                        docker.image("openjdk:${javaVersion}").inside {
+                            timeout(45) {
+                                sh "./gradlew -Si ${plugin}:check ${plugin}:gradleTest ${plugin}:assemble"
+                            }
+                        }
+                    }
+                    finally {
+                        junit '**/build/test-results/**/*.xml'
+                        archiveArtifacts artifacts: '**/build/libs/*.jar,build/*.zip', fingerprint: true
+                    }
+                }
+            }
+        }
+    }
+    parallel(parallelSteps)
+}

build.gradle

@@ -15,7 +15,7 @@ buildscript {
 apply plugin: 'idea'
 
 group = 'com.github.jruby-gradle'
-version = '1.2.1'
+version = '1.3.3'
 defaultTasks 'check', 'assemble'
 
 if (!releaseBuild) {

docs/index.adoc

@@ -27,7 +27,7 @@ execute a Ruby script, which has Ruby-based dependencies:
 .build.gradle (link:https://github.com/jruby-gradle/jruby-gradle-plugin/blob/master/examples/run-simple-ruby-script/build.gradle[full source])
 [source, gradle]
 ----
-include::../examples/run-simple-ruby-script/build.gradle[lines=16..30]
+include::../examples/run-simple-ruby-script/build.gradle[lines=6..30]
 ----
 
 .print-script.rb (link:https://github.com/jruby-gradle/jruby-gradle-plugin/blob/master/examples/run-simple-ruby-script/print-script[full source])
@@ -47,7 +47,7 @@ image::images/print-script-output.png[]
 .build.gradle (link:https://github.com/jruby-gradle/jruby-gradle-plugin/blob/master/examples/self-executing-jar/build.gradle[full source])
 [source, gradle]
 ----
-include::../examples/self-executing-jar/build.gradle[lines=17..33]
+include::../examples/self-executing-jar/build.gradle[lines=6..40]
 ----
 
 .entrypoint.rb (link:https://github.com/jruby-gradle/jruby-gradle-plugin/blob/master/examples/self-executing-jar/entrypoint.rb[full source])

gradle.properties

@@ -8,6 +8,6 @@ releaseBuild=false
 
 targetCompatibility=1.7
 sourceCompatibility=1.7
-jrubyVersion=9.1.2.0
+jrubyVersion=9.1.4.0
 jettyVersion=9.2.12.v20150709
 rubygemsProxy=http://rubygems.lasagna.io/proxy/maven/releases

jruby-gradle-base-plugin/build.gradle

@@ -65,7 +65,7 @@ dependencies {
 
     // NOTE: Leave this at .11 as it must be an older version. if
     // you change it here you will also need to update JRubyExecIntegrationSpec
-    integrationTestGems "org.jruby:jruby-complete:1.7.11"
+    integrationTestGems "org.jruby:jruby-complete:1.7.19"
 
     // NOTE: older jruby versions needs this for exec to work properly
     integrationTestGems "rubygems:jar-dependencies:0.1.15"

jruby-gradle-base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyExecExtensionIntegrationSpec.groovy

@@ -93,7 +93,8 @@ class JRubyExecExtensionIntegrationSpec extends Specification {
         }
 
         then:
-        outputBuffer == "[\"${new File(TEST_JARS_DIR, 'org/bouncycastle/bcprov-jdk15on/1.46/bcprov-jdk15on-1.46.jar').toURL()}\"]"
+        def outputFile = new File(TEST_JARS_DIR, 'org/bouncycastle/bcprov-jdk15on/1.46/bcprov-jdk15on-1.46.jar')
+        outputBuffer == "[\"${outputFile.toURI().toURL()}\"]"
     }
 
     def "Running a script that requires a gem, a separate jRuby and a separate configuration"() {

jruby-gradle-base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyExecIntegrationSpec.groovy

@@ -44,7 +44,7 @@ class JRubyExecIntegrationSpec extends Specification {
         given: "Version is set on the task"
         Configuration config
         final String configName = 'integ-exec-config'
-        final String newVersion = '1.7.11'
+        final String newVersion = '1.7.19'
         Pattern pattern = Pattern.compile(/.*(jruby-complete-.+.jar)/)
 
         when:
@@ -160,7 +160,7 @@ class JRubyExecIntegrationSpec extends Specification {
 
     def "Running a script that requires a gem, a separate JRuby and a separate configuration"() {
         given:
-        final String newVersion = '1.7.11'
+        final String newVersion = '1.7.19'
         assert project.jruby.execVersion != newVersion
         project.with {
             configurations.create('RubyWax')
@@ -191,7 +191,7 @@ class JRubyExecIntegrationSpec extends Specification {
              * least one version of JRuby installed
              */
             jruby {
-                execVersion '1.7.11'
+                execVersion '1.7.19'
                 defaultRepositories false
             }
 

jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/GemUtils.groovy

@@ -95,7 +95,10 @@ class GemUtils {
                 // jbundler and/or jar-dependencies will not attempt to invoke
                 // Maven on a gem's behalf to install a Java dependency that we
                 // should already have taken care of, see #79
-                setEnvironment 'JBUNDLE_SKIP' : true, 'JARS_SKIP' : true
+                environment JBUNDLE_SKIP : true,
+                            JARS_SKIP : true,
+                            GEM_HOME : destDir.absolutePath,
+                            GEM_PATH : destDir.absolutePath
                 main JRUBY_MAINCLASS
                 classpath jRubyClasspath
                 args '-S', GEM, 'install'

jruby-gradle-base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPluginExtension.groovy

@@ -7,7 +7,7 @@ import org.gradle.api.Project
  * Class providing the jruby{} DSL extension to the Gradle build script
  */
 class JRubyPluginExtension {
-    static final String DEFAULT_JRUBY_VERSION = '9.1.2.0'
+    static final String DEFAULT_JRUBY_VERSION = '9.1.4.0'
 
     /** The default version of jruby that will be used  */
     String defaultVersion = DEFAULT_JRUBY_VERSION