Merge 51720657-move-version-resolver-to-repository to master

Glyn Normington · Glyn Normington · commit d22a90c07b81 · 2013-06-18T11:32:55.000+01:00
[Completes #51720657]
diff --git a/lib/java_buildpack/repository/repository_index.rb b/lib/java_buildpack/repository/repository_index.rb
@@ -15,7 +15,7 @@
 
 require 'java_buildpack/repository'
 require 'java_buildpack/util/download_cache'
-require 'java_buildpack/util/version_resolver'
+require 'java_buildpack/repository/version_resolver'
 
 module JavaBuildpack::Repository
 
@@ -38,7 +38,7 @@ def initialize(repository_root)
     # @return [TokenizedVersion] the version of the file found
     # @return [String] the URI of the file found
     def find_item(version)
-      version = JavaBuildpack::Util::VersionResolver.resolve(version, @index.keys)
+      version = VersionResolver.resolve(version, @index.keys)
       uri = @index[version.to_s]
       return version, uri
     end
diff --git a/lib/java_buildpack/repository/version_resolver.rb b/lib/java_buildpack/repository/version_resolver.rb
@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'java_buildpack/util'
+require 'java_buildpack/repository'
 require 'java_buildpack/util/tokenized_version'
 
-module JavaBuildpack::Util
+module JavaBuildpack::Repository
 
   # A resolver that selects values from a collection based on a set of rules governing wildcards
   class VersionResolver
@@ -33,7 +33,7 @@ class VersionResolver
     # @raise if no version can be resolved
     def self.resolve(candidate_version, versions)
       tokenized_candidate_version = safe_candidate_version candidate_version
-      tokenized_versions = versions.map { |version| TokenizedVersion.new(version, false) }
+      tokenized_versions = versions.map { |version| JavaBuildpack::Util::TokenizedVersion.new(version, false) }
 
       version = tokenized_versions
       .find_all { |tokenized_version| matches? tokenized_candidate_version, tokenized_version }
@@ -45,21 +45,21 @@ def self.resolve(candidate_version, versions)
 
     private
 
-    TOKENIZED_WILDCARD = TokenizedVersion.new('+')
+    TOKENIZED_WILDCARD = JavaBuildpack::Util::TokenizedVersion.new('+')
 
     def self.safe_candidate_version(candidate_version)
       if candidate_version.nil? then
         TOKENIZED_WILDCARD
       else
-        raise "Invalid TokenizedVersion '#{candidate_version}'" unless candidate_version.is_a?(TokenizedVersion)
+        raise "Invalid TokenizedVersion '#{candidate_version}'" unless candidate_version.is_a?(JavaBuildpack::Util::TokenizedVersion)
         candidate_version
       end
     end
 
     def self.matches?(tokenized_candidate_version, tokenized_version)
       (0..3).all? do |i|
         tokenized_candidate_version[i].nil? ||
-            tokenized_candidate_version[i] == TokenizedVersion::WILDCARD ||
+            tokenized_candidate_version[i] == JavaBuildpack::Util::TokenizedVersion::WILDCARD ||
             tokenized_candidate_version[i] == tokenized_version[i]
       end
     end
diff --git a/spec/java_buildpack/repository/repository_index_spec.rb b/spec/java_buildpack/repository/repository_index_spec.rb
@@ -27,7 +27,7 @@ module JavaBuildpack::Repository
       JavaBuildpack::Util::DownloadCache.stub(:new).and_return(application_cache)
       application_cache.stub(:get).with('test-uri/index.yml')
         .and_yield(File.open('spec/fixtures/test-index.yml'))
-      JavaBuildpack::Util::VersionResolver.stub(:resolve).with('test-version', ["resolved-version"]).and_return('resolved-version')
+      VersionResolver.stub(:resolve).with('test-version', ["resolved-version"]).and_return('resolved-version')
 
       repository_index = RepositoryIndex.new('test-uri')
       expect(repository_index.find_item('test-version')).to eq(['resolved-version', 'resolved-uri'])
diff --git a/spec/java_buildpack/repository/version_resolver_spec.rb b/spec/java_buildpack/repository/version_resolver_spec.rb
@@ -14,9 +14,9 @@
 # limitations under the License.
 
 require 'spec_helper'
-require 'java_buildpack/util/version_resolver'
+require 'java_buildpack/repository/version_resolver'
 
-module JavaBuildpack::Util
+module JavaBuildpack::Repository
 
   describe VersionResolver do
 
@@ -37,37 +37,37 @@ module JavaBuildpack::Util
 
 
     it 'resolves a wildcard major version' do
-      expect(VersionResolver.resolve(TokenizedVersion.new('+'), VERSIONS).to_s).to eq('2.0.0')
+      expect(VersionResolver.resolve(JavaBuildpack::Util::TokenizedVersion.new('+'), VERSIONS).to_s).to eq('2.0.0')
     end
 
     it 'resolves a wildcard minor version' do
-      expect(VersionResolver.resolve(TokenizedVersion.new('1.+'), VERSIONS).to_s).to eq('1.8.0_05')
+      expect(VersionResolver.resolve(JavaBuildpack::Util::TokenizedVersion.new('1.+'), VERSIONS).to_s).to eq('1.8.0_05')
     end
 
     it 'resolves a wildcard micro version' do
-      expect(VersionResolver.resolve(TokenizedVersion.new('1.6.+'), VERSIONS).to_s).to eq('1.6.1_14')
+      expect(VersionResolver.resolve(JavaBuildpack::Util::TokenizedVersion.new('1.6.+'), VERSIONS).to_s).to eq('1.6.1_14')
     end
 
     it 'resolves a wildcard qualifier' do
-      expect(VersionResolver.resolve(TokenizedVersion.new('1.6.0_+'), VERSIONS).to_s).to eq('1.6.0_27')
-      expect(VersionResolver.resolve(TokenizedVersion.new('1.8.0_+'), VERSIONS).to_s).to eq('1.8.0_05')
+      expect(VersionResolver.resolve(JavaBuildpack::Util::TokenizedVersion.new('1.6.0_+'), VERSIONS).to_s).to eq('1.6.0_27')
+      expect(VersionResolver.resolve(JavaBuildpack::Util::TokenizedVersion.new('1.8.0_+'), VERSIONS).to_s).to eq('1.8.0_05')
     end
 
     it 'resolves a non-wildcard version' do
-      expect(VersionResolver.resolve(TokenizedVersion.new('1.6.0_26'), VERSIONS).to_s).to eq('1.6.0_26')
-      expect(VersionResolver.resolve(TokenizedVersion.new('2.0.0'), VERSIONS).to_s).to eq('2.0.0')
+      expect(VersionResolver.resolve(JavaBuildpack::Util::TokenizedVersion.new('1.6.0_26'), VERSIONS).to_s).to eq('1.6.0_26')
+      expect(VersionResolver.resolve(JavaBuildpack::Util::TokenizedVersion.new('2.0.0'), VERSIONS).to_s).to eq('2.0.0')
     end
 
     it 'resolves a non-digit qualifier' do
-      expect(VersionResolver.resolve(TokenizedVersion.new('1.8.0_M-7'), VERSIONS).to_s).to eq('1.8.0_M-7')
+      expect(VersionResolver.resolve(JavaBuildpack::Util::TokenizedVersion.new('1.8.0_M-7'), VERSIONS).to_s).to eq('1.8.0_M-7')
     end
 
     it 'should raise an exception if no version can be resolved' do
-      expect { VersionResolver.resolve(TokenizedVersion.new('2.1.0'), VERSIONS).to_s }.to raise_error
+      expect { VersionResolver.resolve(JavaBuildpack::Util::TokenizedVersion.new('2.1.0'), VERSIONS).to_s }.to raise_error
     end
 
     it 'should raise an exception when a wildcard is specified in the [] collection' do
-      expect { VersionResolver.resolve(TokenizedVersion.new('1.6.0_25'), ['+']) }.to raise_error(/Invalid/)
+      expect { VersionResolver.resolve(JavaBuildpack::Util::TokenizedVersion.new('1.6.0_25'), ['+']) }.to raise_error(/Invalid/)
     end
 
   end
