Merge 51814411-version-resolution to master

nebhale · nebhale · commit f6899016d20d · 2013-06-17T16:09:23.000+01:00
[Completes #51814411]
diff --git a/lib/java_buildpack/util/tokenized_version.rb b/lib/java_buildpack/util/tokenized_version.rb
@@ -43,9 +43,9 @@ def initialize(version, allow_wildcards = true)
     #
     # @return [Integer] A numerical representation of the comparisong between two instances
     def <=>(another)
-      comparison = self[0] <=> another[0]
-      comparison = self[1] <=> another[1] if comparison == 0
-      comparison = self[2] <=> another[2] if comparison == 0
+      comparison = self[0].to_i <=> another[0].to_i
+      comparison = self[1].to_i <=> another[1].to_i if comparison == 0
+      comparison = self[2].to_i <=> another[2].to_i if comparison == 0
       comparison = qualifier_compare(self[3].nil? ? '' : self[3], another[3].nil? ? '' : another[3]) if comparison == 0
 
       comparison
diff --git a/spec/java_buildpack/util/version_resolver_spec.rb b/spec/java_buildpack/util/version_resolver_spec.rb
@@ -21,14 +21,14 @@ module JavaBuildpack::Util
   describe VersionResolver do
 
     VERSIONS = [
-        '1.6.0_26',
-        '1.6.0_27',
-        '1.6.1_14',
-        '1.7.0_19',
-        '1.7.0_21',
-        '1.8.0_M-7',
-        '1.8.0_05',
-        '2.0.0'
+      '1.6.0_26',
+      '1.6.0_27',
+      '1.6.1_14',
+      '1.7.0_19',
+      '1.7.0_21',
+      '1.8.0_M-7',
+      '1.8.0_05',
+      '2.0.0'
     ]
 
     it 'resolves the default version if no candidate is supplied' do
@@ -66,6 +66,10 @@ module JavaBuildpack::Util
       expect(VersionResolver.resolve('1.7.0_+', ['1.7.0_28', '1.7.0_28a']).to_s).to eq('1.7.0_28a')
     end
 
+    it 'should resolve versions numerically' do
+      expect(VersionResolver.resolve('7.0.+', ['7.0.8', '7.0.40']).to_s).to eq('7.0.40')
+    end
+
     it 'should raise an exception when the major version is not numeric' do
       expect { VersionResolver.resolve('A', []) }.to raise_error(/Invalid/)
     end
