Prioritize Leading Digits in Qualifier

Anackreon · nebhale · commit 9de12219f4fb · 2017-03-17T10:45:31.000-07:00
Previously, when wildcarded qualifiers were compared, they were compared purely lexically. This disadvantaged versions that exclusively used numbers in the qualifier (e.g. Java versions). The result of this was that no matter what _121 would always fall before _91 which in turn led to some poor work arounds using the wildcards. This change now handles leading digits numerically rather than lexically, after which the rest of the qualifier is compared lexically. [cloudfoundry#397][cloudfoundry#402]
diff --git a/lib/java_buildpack/util/tokenized_version.rb b/lib/java_buildpack/util/tokenized_version.rb
@@ -121,7 +121,7 @@ def minimum_qualifier_length(a, b)
       end
 
       def qualifier_compare(a, b)
-        comparison = 0
+        comparison = a[/^\d+/].to_i <=> b[/^\d+/].to_i
 
         i = 0
         until comparison.nonzero? || i == minimum_qualifier_length(a, b)
diff --git a/spec/java_buildpack/repository/version_resolver_spec.rb b/spec/java_buildpack/repository/version_resolver_spec.rb
@@ -22,7 +22,9 @@
 describe JavaBuildpack::Repository::VersionResolver do
   include_context 'logging_helper'
 
-  let(:versions) { %w(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 2.0.0a) }
+  let(:versions) do
+    %w(1.6.0_26 1.6.0_27 1.6.0_112 1.6.0_102 1.6.0_45RELEASE 1.6.1_14 1.7.0_19 1.7.0_21 1.8.0_M-7 1.8.0_05 2.0.0 2.0.0a)
+  end
 
   it 'resolves the default version if no candidate is supplied' do
     expect(described_class.resolve(nil, versions)).to eq(tokenized_version('2.0.0'))
@@ -41,7 +43,7 @@
   end
 
   it 'resolves a wildcard qualifier' do
-    expect(described_class.resolve(tokenized_version('1.6.0_+'), versions)).to eq(tokenized_version('1.6.0_27'))
+    expect(described_class.resolve(tokenized_version('1.6.0_+'), versions)).to eq(tokenized_version('1.6.0_112'))
     expect(described_class.resolve(tokenized_version('1.8.0_+'), versions)).to eq(tokenized_version('1.8.0_05'))
   end
 
