From 7a88ad0a42dffdbbcaf0192635ab64c636294cf6 Mon Sep 17 00:00:00 2001 From: drbrain Date: Tue, 5 Mar 2013 22:40:53 +0000 Subject: * 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/commands/query_command.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/rubygems/commands/query_command.rb') diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb index 0ae7924564..7bda7383e2 100644 --- a/lib/rubygems/commands/query_command.rb +++ b/lib/rubygems/commands/query_command.rb @@ -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 -- cgit v1.2.3