diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-28 01:16:43 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-28 01:16:43 +0000 |
commit | b6139464f544ec511f741f5bbae2fb13adc51c21 (patch) | |
tree | 00e91ff57caed712ae08e8b657e8e0a52a030d7c /lib/rubygems/commands/query_command.rb | |
parent | 69934aeb8d7948c4ca590b7092504c41d8bce6ac (diff) | |
download | ruby-b6139464f544ec511f741f5bbae2fb13adc51c21.tar.gz |
rubygems 2.6.7
* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update
rubygems to 2.6.7, not the master, with r56225.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/commands/query_command.rb')
-rw-r--r-- | lib/rubygems/commands/query_command.rb | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb index 813154fa23..f25d120b88 100644 --- a/lib/rubygems/commands/query_command.rb +++ b/lib/rubygems/commands/query_command.rb @@ -255,21 +255,22 @@ is too hard to use. name_tuples.map { |n| n.version }.uniq else platforms.sort.reverse.map do |version, pls| - out = version.to_s - - if options[:domain] == :local - default = specs.any? do |s| - !s.is_a?(Gem::Source) && s.version == version && s.default_gem? + if pls == [Gem::Platform::RUBY] then + if options[:domain] == :remote || specs.all? { |spec| spec.is_a? Gem::Source } + version + else + spec = specs.select { |s| s.version == version } + if spec.first.default_gem? + "default: #{version}" + else + version + end end - out = "default: #{out}" if default - end - - if pls != [Gem::Platform::RUBY] then - platform_list = [pls.delete(Gem::Platform::RUBY), *pls.sort].compact - out = platform_list.unshift(out).join(' ') + else + ruby = pls.delete Gem::Platform::RUBY + platform_list = [ruby, *pls.sort].compact + "#{version} #{platform_list.join ' '}" end - - out end end |