Merge 59918120- to master

Glyn Normington · Glyn Normington · commit 3cb88f0ba737 · 2013-11-14T09:32:31.000Z
[Completes #59918120]
diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ bundle install --gemfile Gemfile.rubymine-debug
 [Pull requests][] are welcome; see the [contributor guidelines][] for details.
 
 ## License
-The Tomcat Builder is released under version 2.0 of the [Apache License][].
+This buildpack is released under version 2.0 of the [Apache License][].
 
 [Apache License]: http://www.apache.org/licenses/LICENSE-2.0
 [Cloud Foundry]: http://www.cloudfoundry.com
diff --git a/lib/java_buildpack/repository/repository_index.rb b/lib/java_buildpack/repository/repository_index.rb
@@ -62,6 +62,7 @@ def canonical(raw)
       cooked = raw
       .gsub(/\{platform\}/, platform)
       .gsub(/\{architecture\}/, architecture)
+      .chomp('/')
       @logger.debug { "#{raw} expanded to #{cooked}" }
       cooked
     end
diff --git a/spec/java_buildpack/repository/repository_index_spec.rb b/spec/java_buildpack/repository/repository_index_spec.rb
@@ -35,6 +35,16 @@ module JavaBuildpack::Repository
       expect(repository_index.find_item('test-version')).to eq(%w(resolved-version resolved-uri))
     end
 
+    it 'should cope with trailing slash in repository URI' do
+      JavaBuildpack::Util::DownloadCache.stub(:new).and_return(application_cache)
+      application_cache.stub(:get).with(%r(/test-uri/index\.yml))
+      .and_yield(File.open('spec/fixtures/test-index.yml'))
+      VersionResolver.stub(:resolve).with('test-version', %w(resolved-version)).and_return('resolved-version')
+
+      repository_index = RepositoryIndex.new('{platform}/{architecture}/test-uri/')
+      expect(repository_index.find_item('test-version')).to eq(%w(resolved-version resolved-uri))
+    end
+
     it 'should use the read-only buildpack cache when index.yaml cannot be downloaded because the internet is not available' do
       stub_request(:get, 'http://foo.com/index.yml').to_raise(SocketError)
 
