Merge pull request #268 from michaelwoodson/fix-nonint-version-ranges

Fix range check for string versions

Author: R. Tyler Croy

.travis.yml

@@ -1,5 +1,9 @@
 language: groovy
 sudo: false
+addons:
+  apt:
+    packages:
+      - oracle-java8-installer
 
 install:
  - ./gradlew clean

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

@@ -169,27 +169,13 @@ class GemVersion {
             return 1
         }
 
-        int aaObject
-        int bbObject
-
         if (aDigits[index].isInteger() && bDigits[index].isInteger()) {
             // compare them as number
-            aaObject = aDigits[index] as int
-            bbObject = bDigits[index] as int
+            aDigits[index] as int <=> bDigits[index] as int
         }
         else {
             // compare them as string
-            aaObject = aDigits[index]
-            bbObject = bDigits[index]
-        }
-        if (aaObject < bbObject) {
-            -1
-        }
-        else if (aaObject > bbObject) {
-            1
-        }
-        else {
-            0
+            aDigits[index] <=> bDigits[index]
         }
     }
 

jruby-gradle-base-plugin/src/test/groovy/com/github/jrubygradle/internal/GemVersionSpec.groovy

@@ -178,4 +178,28 @@ class GemVersionSpec extends Specification {
         expect:
         subject.intersect('[1.2.4, 1.2.4]').conflict() == true
     }
+
+    def "finds no conflicts in non-integer version ranges"() {
+        given:
+        GemVersion subject = new GemVersion('[1.2.bar, 1.2.foo]')
+
+        expect:
+        !subject.conflict()
+    }
+
+    def "finds conflicts in non-integer version ranges"() {
+        given:
+        GemVersion subject = new GemVersion('[1.2.foo, 1.2.bar]')
+
+        expect:
+        subject.conflict()
+    }
+
+    def "does not throw an exception for a '+' version"() {
+        when:
+        new GemVersion('+').conflict()
+
+        then:
+        notThrown(Exception)
+    }
 }