From 54e58c947b119ff02fde57413ae104c98432c48d Mon Sep 17 00:00:00 2001 From: hsbt Date: Mon, 6 Nov 2017 02:02:04 +0000 Subject: [PATCH] Merge RubyGems 2.7.1. * Fix `gem update --system` with RubyGems 2.7+. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60669 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems.rb | 2 +- lib/rubygems/commands/setup_command.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/rubygems.rb b/lib/rubygems.rb index d32df84be1..c4c279e964 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -10,7 +10,7 @@ require 'rbconfig' 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 diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb index f322ca9df5..5f39b4c93c 100644 --- a/lib/rubygems/commands/setup_command.rb +++ b/lib/rubygems/commands/setup_command.rb @@ -352,8 +352,10 @@ By default, this RubyGems will install gem as: 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 gem as: 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)