Merge pull request #46 from rtyler/issues/44-package-restructure

R. Tyler Croy · R. Tyler Croy · commit de88a31769ea · 2014-08-26T09:30:09.000-07:00
Restructure the base plugin/package namespace
diff --git a/build.gradle b/build.gradle
@@ -9,8 +9,8 @@ buildscript {
     dependencies { classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:0.5' }
 }
 
-group = 'com.lookout'
-version = '2.2.0'
+group = 'com.github.jruby-gradle'
+version = '0.1.0'
 
 if (System.env.RELEASE != '1') {
     version = "${version}-SNAPSHOT"
@@ -112,15 +112,16 @@ bintray {
     configurations = ['archives']
 
     pkg {
-        repo = 'jruby'
+        userOrg = 'jruby-gradle'
+        repo = 'plugins'
         name = 'jruby-gradle-plugin'
         labels = ['jruby']
 
         version {
             name = project.version
             vcsTag = "v${project.version}"
-            attributes = ['gradle-plugin' : 'com.lookout.jruby:com.lookout:jruby-gradle-plugin']
-            desc = "The purpose of plugin is to encapsulate useful Gradle functionality for JRuby projects. Use of this plugin replaces the need for both Bundler and Warbler in JRuby projects."
+            attributes = ['gradle-plugin' : 'com.github.jruby-gradle.base:com.github.jruby-gradle:jruby-gradle-plugin']
+            desc = 'The purpose of plugin is to encapsulate useful Gradle functionality for JRuby projects.'
 
         }
     }
diff --git a/src/integTest/groovy/com/github/jrubygradle/JRubyExecExtensionIntegrationSpec.groovy b/src/integTest/groovy/com/github/jrubygradle/JRubyExecExtensionIntegrationSpec.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.*
@@ -25,7 +25,7 @@ class JRubyExecExtensionIntegrationSpec extends Specification {
         project.with {
             buildDir = TESTROOT
             logging.level = LIFECYCLE
-            apply plugin: 'com.lookout.jruby'
+            apply plugin: 'com.github.jruby-gradle.base'
             evaluate()
         }
     }
@@ -92,4 +92,4 @@ class JRubyExecExtensionIntegrationSpec extends Specification {
             output.toString() == "Not valid\n"
     }
 
-}
+}
diff --git a/src/integTest/groovy/com/github/jrubygradle/JRubyExecIntegrationSpec.groovy b/src/integTest/groovy/com/github/jrubygradle/JRubyExecIntegrationSpec.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.*
@@ -26,7 +26,7 @@ class JRubyExecIntegrationSpec extends Specification {
         project = ProjectBuilder.builder().build()
         project.buildDir = TESTROOT
         project.logging.level = LIFECYCLE
-        project.apply plugin: 'com.lookout.jruby'
+        project.apply plugin: 'com.github.jruby-gradle.base'
         execTask = project.task(TASK_NAME,type: JRubyExec)
     }
 
@@ -106,4 +106,4 @@ class JRubyExecIntegrationSpec extends Specification {
             output.toString() == "Not valid\n"
     }
 
-}
+}
diff --git a/src/integTest/groovy/com/github/jrubygradle/JRubyPluginIntegrationSpec.groovy b/src/integTest/groovy/com/github/jrubygradle/JRubyPluginIntegrationSpec.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.*
@@ -20,7 +20,7 @@ class JRubyPluginIntegrationSpec extends Specification {
         project = ProjectBuilder.builder().build()
         project.buildDir = TESTROOT
         project.logging.level = LIFECYCLE
-        project.apply plugin: 'com.lookout.jruby'
+        project.apply plugin: 'com.github.jruby-gradle.base'
     }
 
     @IgnoreIf({TESTS_ARE_OFFLINE})
diff --git a/src/integTest/groovy/com/github/jrubygradle/JRubyPrepareGemsIntegrationSpec.groovy b/src/integTest/groovy/com/github/jrubygradle/JRubyPrepareGemsIntegrationSpec.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.api.file.FileCollection
 import org.gradle.testfixtures.ProjectBuilder
@@ -32,7 +32,7 @@ class JRubyPrepareGemsIntegrationSpec extends Specification {
         project.with {
             buildDir = TESTROOT
             logging.level = LIFECYCLE
-            apply plugin: 'com.lookout.jruby'
+            apply plugin: 'com.github.jruby-gradle.base'
         }
 
         prepTask = project.task(TASK_NAME, type: JRubyPrepareGems)
@@ -95,4 +95,4 @@ class JRubyPrepareGemsIntegrationSpec extends Specification {
             new File(jrpg.outputDir,'gems/temple-0.6.8').exists()
             new File(jrpg.outputDir,'gems/tilt-2.0.1').exists()
     }
-}
+}
diff --git a/src/main/groovy/com/github/jrubygradle/GemUtils.groovy b/src/main/groovy/com/github/jrubygradle/GemUtils.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
diff --git a/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy b/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy
@@ -1,6 +1,6 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
-import com.lookout.jruby.internal.JRubyExecUtils
+import com.github.jrubygradle.internal.JRubyExecUtils
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.FileCollection
diff --git a/src/main/groovy/com/github/jrubygradle/JRubyJar.groovy b/src/main/groovy/com/github/jrubygradle/JRubyJar.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.api.Project
 import org.gradle.api.tasks.bundling.Jar
diff --git a/src/main/groovy/com/github/jrubygradle/JRubyPlugin.groovy b/src/main/groovy/com/github/jrubygradle/JRubyPlugin.groovy
@@ -1,6 +1,6 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
-import com.lookout.jruby.internal.JRubyExecDelegate
+import com.github.jrubygradle.internal.JRubyExecDelegate
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.Copy
diff --git a/src/main/groovy/com/github/jrubygradle/JRubyPluginExtension.groovy b/src/main/groovy/com/github/jrubygradle/JRubyPluginExtension.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.api.Incubating
 import org.gradle.api.Project
diff --git a/src/main/groovy/com/github/jrubygradle/JRubyPrepareGems.groovy b/src/main/groovy/com/github/jrubygradle/JRubyPrepareGems.groovy
@@ -1,6 +1,6 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
-import com.lookout.jruby.internal.JRubyExecUtils
+import com.github.jrubygradle.internal.JRubyExecUtils
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.file.FileCollection
diff --git a/src/main/groovy/com/github/jrubygradle/JRubyWar.groovy b/src/main/groovy/com/github/jrubygradle/JRubyWar.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.api.Project
 import org.gradle.api.tasks.Input
diff --git a/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy b/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy
@@ -1,7 +1,7 @@
-package com.lookout.jruby.internal
+package com.github.jrubygradle.internal
 
-import com.lookout.jruby.GemUtils
-import com.lookout.jruby.JRubyExec
+import com.github.jrubygradle.GemUtils
+import com.github.jrubygradle.JRubyExec
 import groovy.transform.PackageScope
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
diff --git a/src/main/groovy/com/github/jrubygradle/internal/JRubyExecUtils.groovy b/src/main/groovy/com/github/jrubygradle/internal/JRubyExecUtils.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby.internal
+package com.github.jrubygradle.internal
 
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.FileCollection
diff --git a/src/main/resources/META-INF/gradle-plugins/com.github.jruby-gradle.base.properties b/src/main/resources/META-INF/gradle-plugins/com.github.jruby-gradle.base.properties
@@ -0,0 +1 @@
+implementation-class=com.github.jrubygradle.JRubyPlugin
diff --git a/src/main/resources/META-INF/gradle-plugins/com.lookout.jruby.properties b/src/main/resources/META-INF/gradle-plugins/com.lookout.jruby.properties
diff --git a/src/test/groovy/com/github/jrubygradle/JRubyExecSpec.groovy b/src/test/groovy/com/github/jrubygradle/JRubyExecSpec.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.api.tasks.TaskInstantiationException
 import org.gradle.testfixtures.ProjectBuilder
@@ -27,7 +27,7 @@ class JRubyExecSpec extends Specification {
         project = ProjectBuilder.builder().build()
         project.buildDir = TESTROOT
         project.logging.level = LIFECYCLE
-        project.apply plugin: 'com.lookout.jruby'
+        project.apply plugin: 'com.github.jruby-gradle.base'
         execTask = project.task(TASK_NAME, type: JRubyExec)
     }
 
diff --git a/src/test/groovy/com/github/jrubygradle/JRubyJarSpec.groovy b/src/test/groovy/com/github/jrubygradle/JRubyJarSpec.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.*
@@ -20,7 +20,7 @@ class JRubyJarSpec extends Specification {
         project = ProjectBuilder.builder().build()
         project.buildDir = TESTROOT
         project.logging.level = LIFECYCLE
-        project.apply plugin: 'com.lookout.jruby'
+        project.apply plugin: 'com.github.jruby-gradle.base'
         jarTask = project.task(TASK_NAME, type: JRubyJar)
 
     }
diff --git a/src/test/groovy/com/github/jrubygradle/JRubyPluginExtensionSpec.groovy b/src/test/groovy/com/github/jrubygradle/JRubyPluginExtensionSpec.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.Specification
@@ -22,4 +22,4 @@ class JRubyPluginExtensionSpec extends Specification {
             jrpe.gemInstallDir == new File(project.buildDir,'vendor').absolutePath
 
     }
-}
+}
diff --git a/src/test/groovy/com/github/jrubygradle/JRubyPluginTest.groovy b/src/test/groovy/com/github/jrubygradle/JRubyPluginTest.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.api.*
 import org.gradle.api.tasks.*
@@ -26,7 +26,7 @@ class JRubyPluginTest {
         TESTROOT.mkdirs()
         project = ProjectBuilder.builder().build()
         project.logging.level = LIFECYCLE
-        project.apply plugin: 'com.lookout.jruby'
+        project.apply plugin: 'com.github.jruby-gradle.base'
     }
 
     @Test
diff --git a/src/test/groovy/com/github/jrubygradle/JRubyPrepareGemsSpec.groovy b/src/test/groovy/com/github/jrubygradle/JRubyPrepareGemsSpec.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.api.file.FileCollection
 import org.gradle.testfixtures.ProjectBuilder
@@ -33,7 +33,7 @@ class JRubyPrepareGemsSpec extends Specification {
         project.with {
             buildDir = TESTROOT
             logging.level = LIFECYCLE
-            apply plugin: 'com.lookout.jruby'
+            apply plugin: 'com.github.jruby-gradle.base'
             jruby.defaultRepositories = false
 
             repositories {
@@ -101,4 +101,4 @@ class JRubyPrepareGemsSpec extends Specification {
         expect:
             new File(prepTask.outputDir,'gems/erubis-2.7.0').exists()
     }
-}
+}
diff --git a/src/test/groovy/com/github/jrubygradle/JRubyWarSpec.groovy b/src/test/groovy/com/github/jrubygradle/JRubyWarSpec.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby
+package com.github.jrubygradle
 
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.*
@@ -20,7 +20,7 @@ class JRubyWarSpec extends Specification {
         project = ProjectBuilder.builder().build()
         project.buildDir = TESTROOT
         project.logging.level = LIFECYCLE
-        project.apply plugin: 'com.lookout.jruby'
+        project.apply plugin: 'com.github.jruby-gradle.base'
         warTask = project.task(TASK_NAME, type: JRubyWar)
 
     }
diff --git a/src/test/groovy/com/github/jrubygradle/internal/JRubyExecDelegateSpec.groovy b/src/test/groovy/com/github/jrubygradle/internal/JRubyExecDelegateSpec.groovy
@@ -1,4 +1,4 @@
-package com.lookout.jruby.internal
+package com.github.jrubygradle.internal
 
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.Ignore
@@ -27,7 +27,7 @@ class JRubyExecDelegateSpec extends Specification {
         project = ProjectBuilder.builder().build()
         project.buildDir = TESTROOT
         project.logging.level = LIFECYCLE
-        project.apply plugin: 'com.lookout.jruby'
+        project.apply plugin: 'com.github.jruby-gradle.base'
     }
 
     def "When just passing script, scriptArgs, jrubyArgs, expect local properties to be updated"() {
@@ -128,4 +128,4 @@ class JRubyExecDelegateSpec extends Specification {
             thrown(UnsupportedOperationException)
     }
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.lookout.jruby`
	`1`	`+package com.github.jrubygradle`
`2`	`2`
`3`	`3`	`import org.gradle.testfixtures.ProjectBuilder`
`4`	`4`	`import spock.lang.*`
`@@ -25,7 +25,7 @@ class JRubyExecExtensionIntegrationSpec extends Specification {`
`25`	`25`	`project.with {`
`26`	`26`	`buildDir = TESTROOT`
`27`	`27`	`logging.level = LIFECYCLE`
`28`		`- apply plugin: 'com.lookout.jruby'`
	`28`	`+ apply plugin: 'com.github.jruby-gradle.base'`
`29`	`29`	`evaluate()`
`30`	`30`	`}`
`31`	`31`	`}`
`@@ -92,4 +92,4 @@ class JRubyExecExtensionIntegrationSpec extends Specification {`
`92`	`92`	`output.toString() == "Not valid\n"`
`93`	`93`	`}`
`94`	`94`
`95`		`-}`
	`95`	`+}`