Partially deal with != in ranges, by ignoring the version (#290)

Author: ysb33r

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

@@ -65,6 +65,7 @@ class GenerateGradleRb extends DefaultTask implements JRubyAwareTask {
 
     @TaskAction
     @CompileDynamic
+    @SuppressWarnings('DuplicateStringLiteral')
     void generate() {
         Object source = getSourceFromResource()
         File destination = destinationFile().parentFile

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

@@ -30,7 +30,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
      * system Ruby environment.
      */
     @Input
-    boolean InheritRubyEnv = false
+    boolean inheritRubyEnv = false
 
     JRubyExec() {
         super()
@@ -155,7 +155,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
      */
     @Deprecated
     String getJrubyVersion() {
-        deprecated("Use jruby.getJrubyVersion rather getJrubyVersion()")
+        deprecated('Use jruby.getJrubyVersion rather getJrubyVersion()')
         jruby.jrubyVersion
     }
 
@@ -172,7 +172,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
      */
     @Deprecated
     void jrubyVersion(final String ver) {
-        deprecated("Use jruby.jrubyVersion rather jrubyVersion")
+        deprecated('Use jruby.jrubyVersion rather jrubyVersion')
         jruby.jrubyVersion(ver)
     }
 
@@ -184,7 +184,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
      */
     @Deprecated
     void configuration(Configuration newConfiguration) {
-        deprecated("Use jruby.setGemConfiguration() rather than configuration()")
+        deprecated('Use jruby.setGemConfiguration() rather than configuration()')
         jruby.gemConfiguration(newConfiguration)
     }
 
@@ -196,7 +196,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
      */
     @Deprecated
     void configuration(String newConfiguration) {
-        deprecated("Use jruby.setGemConfiguration() rather than configuration()")
+        deprecated('Use jruby.setGemConfiguration(newConfiguration) rather than configuration(newConfiguration)')
         jruby.gemConfiguration(newConfiguration)
     }
 
@@ -211,15 +211,15 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
      */
     @Deprecated
     void setJrubyVersion(final String version) {
-        deprecated("Use jruby.setJrubyVersion rather setJrubyVersion")
+        deprecated('Use jruby.setJrubyVersion rather setJrubyVersion')
         jruby.jrubyVersion(version)
     }
 
     @Override
     @SuppressWarnings('UnnecessaryGetter')
     void exec() {
         File gemDir = getGemWorkDir().get()
-        setEnvironment prepareJRubyEnvironment(this.environment, inheritRubyEnv, gemDir)
+        setEnvironment prepareJRubyEnvironment(this.environment, this.inheritRubyEnv, gemDir)
         super.classpath jruby.jrubyConfiguration
         super.setArgs(getArgs())
         super.exec()

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

@@ -316,7 +316,7 @@ class JRubyPluginExtension extends AbstractCombinedProjectTaskExtension {
             if (taskResolutionStrategiesOnly) {
                 this.resolutionsStrategies
             } else {
-                getExtFromProject().allResolutionStrategyActions + this.resolutionsStrategies
+                extFromProject.allResolutionStrategyActions + this.resolutionsStrategies
             }
         } else {
             this.resolutionsStrategies

base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy

@@ -96,6 +96,7 @@ class JRubyExecDelegate {
             notSupported(USE_ARGS_ALTERNATIVES)
         }
 
+        @SuppressWarnings('UnusedMethodParameter')
         JavaExecSpec setArgs(Object... a) {
             notSupported(USE_ARGS_ALTERNATIVES)
         }
@@ -157,27 +158,8 @@ class JRubyExecDelegate {
             this.jrubyArgs
         }
 
-//        JavaExecSpec copyTo(JavaExecSpec execSpec) {
-//            delegate.copyTo(execSpec)
-//
-//            execSpec.workingDir = delegate.workingDir
-//            execSpec.args = delegate.getArgs()
-//            execSpec.classpath = delegate.jruby.jrubyConfiguration
-//            execSpec.main = delegate.main
-//
-//            execSpec.errorOutput = delegate.errorOutput
-//            execSpec.standardOutput = delegate.standardOutput
-//            execSpec.standardInput = delegate.standardInput
-//            execSpec.ignoreExitValue = delegate.ignoreExitValue
-//
-//            execSpec.environment = prepareJRubyEnvironment(
-//                delegate.environment, delegate.inheritRubyEnv, delegate.gemWorkDir.get()
-//            )
-//        }
-
-
         private void notSupported(final String msg) {
-            throw new UnsupportedOperationException()
+            throw new UnsupportedOperationException(msg)
         }
 
         private static final String USE_ARGS_ALTERNATIVES = 'Use jrubyArgs/scriptArgs instead of `args`'

core-plugin/src/integTest/groovy/com/github/jrubygradle/api/core/IvyXmlProxyServerIntegrationSpec.groovy

@@ -4,11 +4,13 @@ import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder
+import spock.lang.IgnoreIf
+import spock.lang.Issue
 import spock.lang.Specification
 
 import java.util.regex.Pattern
 
-
+@IgnoreIf({ System.getProperty('TESTS_ARE_OFFLINE') })
 class IvyXmlProxyServerIntegrationSpec extends Specification {
 
     @Rule
@@ -52,7 +54,7 @@ class IvyXmlProxyServerIntegrationSpec extends Specification {
             .withProjectDir(projectDir)
             .withPluginClasspath()
             .withTestKitDir(testKitDir)
-            .withArguments(['dependencies', '--configuration=something',  '-i', '-s'])
+            .withArguments(['dependencies', '--configuration=something', '-i', '-s'])
             .forwardOutput()
             .withDebug(true)
             .build()
@@ -74,8 +76,8 @@ class IvyXmlProxyServerIntegrationSpec extends Specification {
         build()
 
         then:
-        new File(projectDir,'build/something/credit_card_validator-1.3.2.gem').exists()
-        new File(projectDir,'build/something/base_app-1.0.6.gem').exists()
+        new File(projectDir, 'build/something/credit_card_validator-1.3.2.gem').exists()
+        new File(projectDir, 'build/something/base_app-1.0.6.gem').exists()
     }
 
 
@@ -110,8 +112,24 @@ class IvyXmlProxyServerIntegrationSpec extends Specification {
         findFiles ~/^rake-.*gem$/
     }
 
+    @Issue('https://github.com/jruby-gradle/jruby-gradle-plugin/issues/290')
+    void 'Resolve ranges with =, != and non-dotted versions'() {
+        setup:
+        withBuildFile '''
+        dependencies {
+            something 'rubygems:github-pages:106'    
+        }
+        '''
+
+        when:
+        build()
+
+        then:
+        findFiles ~/^github-pages-106.gem$/
+    }
+
     private List<File> findFiles(Pattern pat) {
-        new File(projectDir,'build/something').listFiles( new FilenameFilter() {
+        new File(projectDir, 'build/something').listFiles(new FilenameFilter() {
             @Override
             boolean accept(File dir, String name) {
                 name =~ pat

core-plugin/src/main/groovy/com/github/jrubygradle/api/core/AbstractJRubyPrepare.groovy

@@ -95,5 +95,3 @@ abstract class AbstractJRubyPrepare extends DefaultTask implements JRubyAwareTas
     private Object outputDir = { -> "${project.buildDir}/.gems" }
 }
 
-
-