nobu	2017-10-06 09:15:08 +0900 (Fri, 06 Oct 2017)

  New Revision: 60125

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60125

  Log:
    No more ubygems in trunk
    
    [Fix GH-1711]
    Author:    MSP-Greg <MSP-Greg@u...>

  Modified files:
    trunk/lib/rubygems/ext/rake_builder.rb
    trunk/spec/bundler/support/helpers.rb
Index: spec/bundler/support/helpers.rb
===================================================================
--- spec/bundler/support/helpers.rb	(revision 60124)
+++ spec/bundler/support/helpers.rb	(revision 60125)
@@ -157,7 +157,7 @@ module Spec https://github.com/ruby/ruby/blob/trunk/spec/bundler/support/helpers.rb#L157
         args = args.gsub(/(?=")/, "\\")
         args = %("#{args}")
       end
-      gem = ENV['BUNDLE_GEM'] || "#{Gem.ruby} -rubygems -S gem --backtrace"
+      gem = ENV['BUNDLE_GEM'] || "#{Gem.ruby} -rrubygems -S gem --backtrace"
       sys_exec("#{gem} #{command} #{args}")
     end
     bang :gem_command
Index: lib/rubygems/ext/rake_builder.rb
===================================================================
--- lib/rubygems/ext/rake_builder.rb	(revision 60124)
+++ lib/rubygems/ext/rake_builder.rb	(revision 60125)
@@ -20,7 +20,7 @@ class Gem::Ext::RakeBuilder < Gem::Ext:: https://github.com/ruby/ruby/blob/trunk/lib/rubygems/ext/rake_builder.rb#L20
     rake = ENV['rake']
 
     rake ||= begin
-               "#{Gem.ruby} -rubygems #{Gem.bin_path('rake', 'rake')}"
+               "#{Gem.ruby} -rrubygems #{Gem.bin_path('rake', 'rake')}"
              rescue Gem::Exception
              end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/