archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 01:54:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge revision(s) 39606,39609: [Backport #8019]

Browse source 
* lib/rubygems/commands/query_command.rb:  Only fetch remote specs when
	  showing details.  [ruby-trunk - Bug #8019]  RubyGems bug #487

	* lib/rubygems/remote_fetcher.rb:  ditto.

	* lib/rubygems/security/policy.rb:  ditto.

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

	* lib/rubygems/security.rb:  Make OpenSSL optional for RubyGems.

	* lib/rubygems/commands/cert_command.rb:  ditto.

	* lib/rubygems/config_file.rb:  Display file with YAML error, not
	  ~/.gemrc

	* lib/rubygems/remote_fetcher.rb:  Only create gem subdirectories when
	  installing gems.

	* lib/rubygems/dependency_resolver.rb:  ditto.

	* lib/rubygems/test_utilities.rb:  ditto.

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

	* lib/rubygems/spec_fetcher.rb:  Only try to upgrade
	  http://rubygems.org to HTTPS

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

	* lib/rubygems.rb:  Update win_platform? check for JRuby compatibility.

	* test/rubygems/test_gem_installer.rb:  Update for Ruby 1.9.2
	  compatibility

	* test/rubygems/test_gem_spec_fetcher.rb:  Removed unused variable.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-03-17 15:01:47 +00:00
parent d1ce1051b9
commit 3e3f03461b
16 changed files with 133 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/rubygems/commands/cert_command.rb
View file

@ -1,5 +1,6 @@
require 'rubygems/command'
require 'rubygems/security'
require 'openssl'
class Gem::Commands::CertCommand < Gem::Command

14
lib/rubygems/commands/query_command.rb
View file

@ -192,9 +192,13 @@ class Gem::Commands::QueryCommand < Gem::Command
end
end
def entry_details entry, spec, specs, platforms
def entry_details entry, detail_tuple, specs, platforms
return unless options[:details]
name_tuple, spec = detail_tuple
spec = spec.fetch_spec name_tuple unless Gem::Specification === spec
entry << "\n"
spec_platforms entry, platforms
@ -228,19 +232,15 @@ class Gem::Commands::QueryCommand < Gem::Command
def make_entry entry_tuples, platforms
detail_tuple = entry_tuples.first
name_tuple, latest_spec = detail_tuple
latest_spec = latest_spec.fetch_spec name_tuple unless
Gem::Specification === latest_spec
name_tuples, specs = entry_tuples.flatten.partition do |item|
Gem::NameTuple === item
end
entry = [latest_spec.name]
entry = [name_tuples.first.name]
entry_versions entry, name_tuples, platforms
entry_details entry, latest_spec, specs, platforms
entry_details entry, detail_tuple, specs, platforms
entry.join
end