Merge pull request #48 from ysb33r/master

JRubyWar, JRubyJar removed

Author: R. Tyler Croy

build.gradle

@@ -10,7 +10,7 @@ buildscript {
 }
 
 group = 'com.github.jruby-gradle'
-version = '0.1.0'
+version = '0.1.1'
 
 if (System.env.RELEASE != '1') {
     version = "${version}-SNAPSHOT"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Aug 15 18:13:15 BST 2014
+#Fri Aug 22 00:43:11 BST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip

src/integTest/groovy/com/github/jrubygradle/JRubyPluginIntegrationSpec.groovy

@@ -1,6 +1,7 @@
 package com.github.jrubygradle
 
 import org.gradle.testfixtures.ProjectBuilder
+import org.junit.Ignore
 import spock.lang.*
 import static org.gradle.api.logging.LogLevel.LIFECYCLE
 
@@ -23,33 +24,39 @@ class JRubyPluginIntegrationSpec extends Specification {
         project.apply plugin: 'com.github.jruby-gradle.base'
     }
 
-    @IgnoreIf({TESTS_ARE_OFFLINE})
-    def "jrubyWar task needs to add jruby-complete jar"() {
-        given: "That we have a test version that is different that the compiled-in defaultVersion"
-            final String useVersion = '1.7.3'
-            assert useVersion != project.jruby.defaultVersion
-            new File(TESTROOT,'libs').mkdirs()
-            new File(TESTROOT,'classes/main').mkdirs()
-
-        when: "We change the default version and the rubyWar task is executed (via copy)"
-            project.jruby {
-                defaultVersion useVersion
-            }
-            def jrw = project.tasks.jrubyWar
-            project.evaluate()
-            jrw.copy()
-            def jar = project.configurations.jrubyWar.files.find { it.toString().find('jruby-complete') }
-            def jarMatch = (jar !=null) ? (jar =~ /.*(jruby-complete-.+.jar)/) : jar
-
-        then: "We expect the task to have completed succesfully"
-            jrw.outputs.files.singleFile.exists()
-
-        and: "We expect to have a jruby-complete-XXX.jar"
-            jar != null
-
-        and: "jruby-complete-XXX.jar must match ${useVersion}"
-            jarMatch != null
-            "jruby-complete-${useVersion}.jar".toString() == jarMatch[0][1]
+    @Ignore
+    def "dummy test - need to decide what to do with jrubywar test"() {
+        expect:
+            true
     }
+    //@IgnoreIf({TESTS_ARE_OFFLINE})
+//    @Ignore
+//    def "jrubyWar task needs to add jruby-complete jar"() {
+//        given: "That we have a test version that is different that the compiled-in defaultVersion"
+//            final String useVersion = '1.7.3'
+//            assert useVersion != project.jruby.defaultVersion
+//            new File(TESTROOT,'libs').mkdirs()
+//            new File(TESTROOT,'classes/main').mkdirs()
+//
+//        when: "We change the default version and the rubyWar task is executed (via copy)"
+//            project.jruby {
+//                defaultVersion useVersion
+//            }
+//            def jrw = project.tasks.jrubyWar
+//            project.evaluate()
+//            jrw.copy()
+//            def jar = project.configurations.jrubyWar.files.find { it.toString().find('jruby-complete') }
+//            def jarMatch = (jar !=null) ? (jar =~ /.*(jruby-complete-.+.jar)/) : jar
+//
+//        then: "We expect the task to have completed succesfully"
+//            jrw.outputs.files.singleFile.exists()
+//
+//        and: "We expect to have a jruby-complete-XXX.jar"
+//            jar != null
+//
+//        and: "jruby-complete-XXX.jar must match ${useVersion}"
+//            jarMatch != null
+//            "jruby-complete-${useVersion}.jar".toString() == jarMatch[0][1]
+//    }
 }
 

src/main/groovy/com/github/jrubygradle/JRubyJar.groovy

@@ -13,7 +13,8 @@ class JRubyPlugin implements Plugin<Project> {
     static final String RUBYGEMS_RELEASE_URL = 'http://rubygems-proxy.torquebox.org/releases'
 
     void apply(Project project) {
-        project.apply plugin: 'java'
+        // REMOVE: project.apply plugin: 'java'
+
         project.extensions.create('jruby', JRubyPluginExtension, project)
 
         if (!project.repositories.metaClass.respondsTo(project.repositories, 'rubygemsRelease')) {
@@ -29,8 +30,7 @@ class JRubyPlugin implements Plugin<Project> {
         }
 
         project.configurations.create(JRubyExec.JRUBYEXEC_CONFIG)
-        project.configurations.create(JRubyWar.JRUBYWAR_CONFIG)
-        project.configurations.create(JRubyJar.JRUBYJAR_CONFIG)
+// MOVE:       project.configurations.create(JRubyJar.JRUBYJAR_CONFIG)
         JRubyExecDelegate.addToProject(project)
 
         // In order for jrubyWar to work we'll need to pull in the warbler
@@ -46,21 +46,9 @@ class JRubyPlugin implements Plugin<Project> {
                 }
             }
 
-            project.dependencies {
-                jrubyEmbeds group: 'com.lookout', name: 'warbler-bootstrap', version: '1.+'
-            }
 
-            // In order to update the testing cycle we need to tell unit tests where to
-            // find GEMs. We are assuming that if someone includes this plugin, that they
-            // will be writing tests that includes jruby and that they might need some
-            // GEMs as part of the tests.
-            project.tasks.test {
-                environment GEM_HOME : project.extensions.getByName('jruby').gemInstallDir
-                dependsOn 'jrubyPrepareGems'
-            }
 
             JRubyExec.updateJRubyDependencies(project)
-            JRubyWar.updateJRubyDependencies(project)
         }
 
         project.task('jrubyClean', type: Delete) {
@@ -76,37 +64,6 @@ class JRubyPlugin implements Plugin<Project> {
             gems project.configurations.gems
             outputDir project.jruby.gemInstallDir
         }
-
-        project.task('jrubyCacheJars', type: Copy) {
-            group TASK_GROUP_NAME
-            description 'Cache .jar-based dependencies into .jarcache/'
-
-            from project.configurations.jrubyWar
-            into ".jarcache"
-            include '**/*.jar'
-        }
-
-        project.task('jrubyPrepare') {
-            group TASK_GROUP_NAME
-            description 'Pre-cache and prepare all dependencies (jars and gems)'
-            dependsOn project.tasks.jrubyCacheJars, project.tasks.jrubyPrepareGems
-        }
-
-        // Only jRubyWar will depend on jrubyPrepare. Other JRubyWar tasks created by
-        // build script authors will be under their own control
-        // jrubyWar task will use jrubyWar as configuration
-        project.task('jrubyWar', type: JRubyWar) {
-            group JRubyPlugin.TASK_GROUP_NAME
-            description 'Create a JRuby-based web archive'
-            dependsOn project.tasks.jrubyPrepare
-            classpath project.configurations.jrubyWar
-        }
-
-        project.task('jrubyJar', type: JRubyJar) {
-            group JRubyPlugin.TASK_GROUP_NAME
-            dependsOn project.tasks.jrubyPrepare
-            dependsOn project.tasks.classes
-        }
     }
 
 }

src/main/groovy/com/github/jrubygradle/JRubyPlugin.groovy

@@ -34,19 +34,6 @@ class JRubyPluginTest {
         assertTrue(project.tasks.jrubyPrepareGems instanceof JRubyPrepareGems)
     }
 
-    @Test
-    public void jrubyPluginAddsJarTasks() {
-        assertTrue(project.tasks.jrubyCacheJars instanceof AbstractCopyTask)
-    }
-
-    @Test
-    public void jrubyPluginAddsPrimaryTasks() {
-        assertTrue(project.tasks.jrubyPrepare instanceof Task)
-        assertTrue(project.tasks.jrubyWar instanceof War)
-        assertTrue(project.tasks.jrubyJar instanceof Jar)
-        assertTrue(project.tasks.jrubyClean instanceof Delete)
-    }
-
     @Test
     public void jrubyPluginSetsRepositoriesCorrectly() {
         project.evaluate()