From b6139464f544ec511f741f5bbae2fb13adc51c21 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 28 Sep 2016 01:16:43 +0000
Subject: 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
---
 lib/rubygems/commands/owner_command.rb |   4 +-
 lib/rubygems/commands/push_command.rb  |   3 +-
 lib/rubygems/commands/query_command.rb |  27 +++---
 lib/rubygems/commands/setup_command.rb | 159 ++++++++++++++-------------------
 lib/rubygems/commands/yank_command.rb  |   3 +-
 5 files changed, 82 insertions(+), 114 deletions(-)

(limited to 'lib/rubygems/commands')

diff --git a/lib/rubygems/commands/owner_command.rb b/lib/rubygems/commands/owner_command.rb
index 8e2271657a..4b99434e87 100644
--- a/lib/rubygems/commands/owner_command.rb
+++ b/lib/rubygems/commands/owner_command.rb
@@ -40,9 +40,7 @@ permission to.
       options[:remove] << value
     end
 
-    add_option '-h', '--host HOST',
-               'Use another gemcutter-compatible host',
-               '  (e.g. https://rubygems.org)' do |value, options|
+    add_option '-h', '--host HOST', 'Use another gemcutter-compatible host' do |value, options|
       options[:host] = value
     end
   end
diff --git a/lib/rubygems/commands/push_command.rb b/lib/rubygems/commands/push_command.rb
index d294cbc8df..6adeff6b30 100644
--- a/lib/rubygems/commands/push_command.rb
+++ b/lib/rubygems/commands/push_command.rb
@@ -33,8 +33,7 @@ command.  For further discussion see the help for the yank command.
     add_key_option
 
     add_option('--host HOST',
-               'Push to another gemcutter-compatible host',
-               '  (e.g. https://rubygems.org)') do |value, options|
+               'Push to another gemcutter-compatible host') do |value, options|
       options[:host] = value
     end
 
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
 
diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb
index 1fff2a7dcb..ebb08d24d7 100644
--- a/lib/rubygems/commands/setup_command.rb
+++ b/lib/rubygems/commands/setup_command.rb
@@ -142,8 +142,6 @@ By default, this RubyGems will install gem as:
 
     remove_old_lib_files lib_dir
 
-    install_default_gemspec
-
     say "RubyGems #{Gem::VERSION} installed"
 
     uninstall_old_gemcutter
@@ -204,65 +202,59 @@ By default, this RubyGems will install gem as:
     end
   end
 
-
   def install_executables(bin_dir)
+    say "Installing gem executable" if @verbose
+
     @bin_file_names = []
 
-    {
-      'gem' => 'bin',
-      'bundler' => 'bundler/exe',
-    }.each do |tool, path|
-      say "Installing #{tool} executable" if @verbose
+    Dir.chdir 'bin' do
+      bin_files = Dir['*']
+
+      bin_files.delete 'update_rubygems'
+
+      bin_files.each do |bin_file|
+        bin_file_formatted = if options[:format_executable] then
+                               Gem.default_exec_format % bin_file
+                             else
+                               bin_file
+                             end
 
-      Dir.chdir path do
-        bin_files = Dir['*']
+        dest_file = File.join bin_dir, bin_file_formatted
+        bin_tmp_file = File.join Dir.tmpdir, "#{bin_file}.#{$$}"
 
-        bin_files -= %w[update_rubygems bundler bundle_ruby]
+        begin
+          bin = File.readlines bin_file
+          bin[0] = "#!#{Gem.ruby}\n"
 
-        bin_files.each do |bin_file|
-          bin_file_formatted = if options[:format_executable] then
-                                 Gem.default_exec_format % bin_file
-                               else
-                                 bin_file
-                               end
+          File.open bin_tmp_file, 'w' do |fp|
+            fp.puts bin.join
+          end
 
-          dest_file = File.join bin_dir, bin_file_formatted
-          bin_tmp_file = File.join Dir.tmpdir, "#{bin_file}.#{$$}"
+          install bin_tmp_file, dest_file, :mode => 0755
+          @bin_file_names << dest_file
+        ensure
+          rm bin_tmp_file
+        end
 
-          begin
-            bin = File.readlines bin_file
-            bin[0] = "#!#{Gem.ruby}\n"
+        next unless Gem.win_platform?
 
-            File.open bin_tmp_file, 'w' do |fp|
-              fp.puts bin.join
-            end
+        begin
+          bin_cmd_file = File.join Dir.tmpdir, "#{bin_file}.bat"
 
-            install bin_tmp_file, dest_file, :mode => 0755
-            @bin_file_names << dest_file
-          ensure
-            rm bin_tmp_file
+          File.open bin_cmd_file, 'w' do |file|
+            file.puts <<-TEXT
+@ECHO OFF
+IF NOT "%~f0" == "~f0" GOTO :WinNT
+@"#{File.basename(Gem.ruby).chomp('"')}" "#{dest_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9
+GOTO :EOF
+:WinNT
+@"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %*
+TEXT
           end
 
-          next unless Gem.win_platform?
-
-          begin
-            bin_cmd_file = File.join Dir.tmpdir, "#{bin_file}.bat"
-
-            File.open bin_cmd_file, 'w' do |file|
-              file.puts <<-TEXT
-  @ECHO OFF
-  IF NOT "%~f0" == "~f0" GOTO :WinNT
-  @"#{File.basename(Gem.ruby).chomp('"')}" "#{dest_file}" %1 %2 %3 %4 %5 %6 %7 %8 %9
-  GOTO :EOF
-  :WinNT
-  @"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %*
-  TEXT
-            end
-
-            install bin_cmd_file, "#{dest_file}.bat", :mode => 0755
-          ensure
-            rm bin_cmd_file
-          end
+          install bin_cmd_file, "#{dest_file}.bat", :mode => 0755
+        ensure
+          rm bin_cmd_file
         end
       end
     end
@@ -277,23 +269,18 @@ By default, this RubyGems will install gem as:
   end
 
   def install_lib(lib_dir)
-    {
-      'RubyGems' => 'lib',
-      'Bundler' => 'bundler/lib'
-    }.each do |tool, path|
-      say "Installing #{tool}" if @verbose
-
-      lib_files = rb_files_in path
-      pem_files = pem_files_in path
-
-      Dir.chdir path do
-        lib_files.each do |lib_file|
-          install_file lib_file, lib_dir
-        end
+    say "Installing RubyGems" if @verbose
 
-        pem_files.each do |pem_file|
-          install_file pem_file, lib_dir
-        end
+    lib_files = rb_files_in 'lib'
+    pem_files = pem_files_in 'lib'
+
+    Dir.chdir 'lib' do
+      lib_files.each do |lib_file|
+        install_file lib_file, lib_dir
+      end
+
+      pem_files.each do |pem_file|
+        install_file pem_file, lib_dir
       end
     end
   end
@@ -339,19 +326,6 @@ By default, this RubyGems will install gem as:
     return false
   end
 
-  def install_default_gemspec
-    Dir.chdir("bundler") do
-      bundler_spec = Gem::Specification.load("bundler.gemspec")
-      bundler_spec.files = Dir["{*.md,{lib,exe,man}/**/*}"]
-      bundler_spec.executables -= %w[bundler bundle_ruby]
-      Dir.entries(Gem::Specification.default_specifications_dir).
-        select {|gs| gs.start_with?("bundler-") }.
-        each {|gs| File.delete(File.join(Gem::Specification.default_specifications_dir, gs)) }
-      default_spec_path = File.join(Gem::Specification.default_specifications_dir, "#{bundler_spec.full_name}.gemspec")
-      Gem.write_binary(default_spec_path, bundler_spec.to_ruby)
-    end
-  end
-
   def make_destination_dirs(install_destdir)
     lib_dir, bin_dir = Gem.default_rubygems_dirs
 
@@ -442,27 +416,23 @@ abort "#{deprecation_message}"
   end
 
   def remove_old_lib_files lib_dir
-    {
-      File.join(lib_dir, 'rubygems') => 'lib/rubygems',
-      File.join(lib_dir, 'bundler') => 'bundler/lib/bundler',
-    }.each do |old_lib_dir, new_lib_dir|
-      lib_files = rb_files_in(new_lib_dir)
+    rubygems_dir = File.join lib_dir, 'rubygems'
+    lib_files = rb_files_in 'lib/rubygems'
 
-      old_lib_files = rb_files_in(old_lib_dir)
+    old_lib_files = rb_files_in rubygems_dir
 
-      to_remove = old_lib_files - lib_files
+    to_remove = old_lib_files - lib_files
 
-      to_remove.delete_if do |file|
-        file.start_with? 'defaults'
-      end
+    to_remove.delete_if do |file|
+      file.start_with? 'defaults'
+    end
 
-      Dir.chdir old_lib_dir do
-        to_remove.each do |file|
-          FileUtils.rm_f file
+    Dir.chdir rubygems_dir do
+      to_remove.each do |file|
+        FileUtils.rm_f file
 
-          warn "unable to remove old file #{file} please remove it by hand" if
-            File.exist? file
-        end
+        warn "unable to remove old file #{file} please remove it by hand" if
+          File.exist? file
       end
     end
   end
@@ -511,3 +481,4 @@ abort "#{deprecation_message}"
   end
 
 end
+
diff --git a/lib/rubygems/commands/yank_command.rb b/lib/rubygems/commands/yank_command.rb
index 36809cbd57..0d6575b272 100644
--- a/lib/rubygems/commands/yank_command.rb
+++ b/lib/rubygems/commands/yank_command.rb
@@ -42,8 +42,7 @@ as the reason for the removal request.
     add_platform_option("remove")
 
     add_option('--host HOST',
-               'Yank from another gemcutter-compatible host',
-               '  (e.g. https://rubygems.org)') do |value, options|
+               'Yank from another gemcutter-compatible host') do |value, options|
       options[:host] = value
     end
 
-- 
cgit v1.2.3