merge revision(s) 39621,39622: [Backport #7991]

* lib/rubygems/commands/setup_command.rb:  Install .pem files.

	* test/rubygems/test_gem_commands_setup_command.rb:  Test for the
	  above.

	* lib/rubygems/spec_fetcher.rb:  Test HTTPS upgrade with URI::HTTPS,
	  not URI::HTTP.  Fixes bug in automatic HTTPS upgrade.

	* test/rubygems/test_gem_spec_fetcher.rb:  Test for the above.

	* lib/rubygems.rb:  Version 2.0.2

	* lib/rubygems/test_utilities.rb:  Ensure scheme and uri class match.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-03-17 15:07:00 +00:00
parent c071b47a22
commit cae2f1eb8b
8 changed files with 92 additions and 8 deletions

View file

@ -241,7 +241,13 @@ class Gem::SpecFetcher
https_uri.scheme = 'https'
https_uri += '/'
Gem::RemoteFetcher.fetcher.fetch_path https_uri, nil, true
https_uri = URI https_uri.to_s # cast to URI::HTTPS
begin
Gem::RemoteFetcher.fetcher.fetch_path https_uri, nil, true
rescue Gem::RemoteFetcher::FetchError => e
raise unless e.message =~ / Not Allowed 405 /
end
say "Upgraded #{uri} to HTTPS"