ruby-changes:48554
From: hsbt <ko1@a...>
Date: Mon, 6 Nov 2017 11:02:09 +0900 (JST)
Subject: [ruby-changes:48554] hsbt:r60669 (trunk): Merge RubyGems 2.7.1.
hsbt 2017-11-06 11:02:04 +0900 (Mon, 06 Nov 2017) New Revision: 60669 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60669 Log: Merge RubyGems 2.7.1. * Fix `gem update --system` with RubyGems 2.7+. Modified files: trunk/lib/rubygems/commands/setup_command.rb trunk/lib/rubygems.rb Index: lib/rubygems.rb =================================================================== --- lib/rubygems.rb (revision 60668) +++ lib/rubygems.rb (revision 60669) @@ -10,7 +10,7 @@ require 'rbconfig' https://github.com/ruby/ruby/blob/trunk/lib/rubygems.rb#L10 require 'thread' module Gem - VERSION = "2.7.0" + VERSION = "2.7.1" end # Must be first since it unloads the prelude from 1.9.2 Index: lib/rubygems/commands/setup_command.rb =================================================================== --- lib/rubygems/commands/setup_command.rb (revision 60668) +++ lib/rubygems/commands/setup_command.rb (revision 60669) @@ -352,8 +352,10 @@ By default, this RubyGems will install g https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/setup_command.rb#L352 def install_default_bundler_gem return unless Gem::USE_BUNDLER_FOR_GEMDEPS + mkdir_p Gem::Specification.default_specifications_dir + bundler_spec = Gem::Specification.load("bundler/bundler.gemspec") - bundler_spec.files = Dir["bundler/{*.md,{lib,exe,man}/**/*}"] + bundler_spec.files = Dir.chdir("bundler") { 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-") }. @@ -370,6 +372,8 @@ By default, this RubyGems will install g https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/setup_command.rb#L372 mkdir_p bundler_spec.bin_dir bundler_spec.executables.each {|e| cp File.join("bundler", bundler_spec.bindir, e), File.join(bundler_spec.bin_dir, e) } + + say "Bundler #{bundler_spec.version} installed" end def make_destination_dirs(install_destdir) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/