diff options
author | André Arko <andre@arko.net> | 2014-03-04 23:30:56 -0800 |
---|---|---|
committer | André Arko <andre@arko.net> | 2014-03-04 23:30:56 -0800 |
commit | 4df9b7e7c2ee3c2e98fb3887d30e31824b5805f7 (patch) | |
tree | 0b98e90276aac10fb25175cc499aa262d8a46a21 | |
parent | dcf278f6c611846557112def175983f0cb0f6902 (diff) | |
parent | a0b4d3864c786f2e4b085b212984144680ae6fb0 (diff) | |
download | bundler-4df9b7e7c2ee3c2e98fb3887d30e31824b5805f7.tar.gz |
Merge pull request #2918 from bundler/redirect_to_bundler
Redirect to bundler.rubygems.org if the host is rubygems.org
-rw-r--r-- | lib/bundler/fetcher.rb | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb index 6511e3bbb7..be11e3680e 100644 --- a/lib/bundler/fetcher.rb +++ b/lib/bundler/fetcher.rb @@ -292,7 +292,7 @@ module Bundler end def dependency_api_uri(gem_names = []) - url = "#{@remote_uri}api/v1/dependencies" + url = "#{redirected_uri}api/v1/dependencies" url << "?gems=#{URI.encode(gem_names.join(","))}" if gem_names.any? URI.parse(url) end @@ -378,5 +378,19 @@ module Bundler yield end + private + def redirected_uri + return bundler_uri if rubygems? + return @remote_uri + end + + def rubygems? + @remote_uri.host == "rubygems.org" + end + + def bundler_uri + URI.parse("#{@remote_uri.scheme}://bundler.#{@remote_uri.host}/") + end + end end |