hsbt	2017-09-24 16:52:25 +0900 (Sun, 24 Sep 2017)

  New Revision: 60008

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

  Log:
    Removed ubygems.rb. rubygems.rb is always loaded now.
    
      * tool/sync_default_gems.rb: removed ubygems.rb from sync target.
      * test/rubygems/test_gem.rb: only enable "-rubygems" option when
        running under the Ruby 1.9.

  Removed files:
    trunk/lib/ubygems.rb
  Modified files:
    trunk/LEGAL
    trunk/test/rubygems/test_gem.rb
    trunk/tool/sync_default_gems.rb
Index: lib/ubygems.rb
===================================================================
--- lib/ubygems.rb	(revision 60007)
+++ lib/ubygems.rb	(nonexistent)
@@ -1,11 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/lib/ubygems.rb#L0
-# frozen_string_literal: true
-# This file allows for the running of rubygems with a nice
-# command line look-and-feel: ruby -rubygems foo.rb
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-
-require 'rubygems'

Property changes on: lib/ubygems.rb
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-LF
\ No newline at end of property
Index: tool/sync_default_gems.rb
===================================================================
--- tool/sync_default_gems.rb	(revision 60007)
+++ tool/sync_default_gems.rb	(revision 60008)
@@ -60,9 +60,8 @@ def sync_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L60
 
   case gem
   when "rubygems"
-    `rm -rf lib/rubygems* lib/ubygems.rb test/rubygems`
+    `rm -rf lib/rubygems* test/rubygems`
     `cp -r ../../rubygems/rubygems/lib/rubygems* ./lib`
-    `cp -r ../../rubygems/rubygems/lib/ubygems.rb ./lib`
     `cp -r ../../rubygems/rubygems/test/rubygems ./test`
   when "bundler"
     `rm -rf lib/bundler* bin/bundler bin/bundle bin/bundle_ruby spec/bundler`
Index: test/rubygems/test_gem.rb
===================================================================
--- test/rubygems/test_gem.rb	(revision 60007)
+++ test/rubygems/test_gem.rb	(revision 60008)
@@ -1466,8 +1466,9 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1466
     ENV['RUBYGEMS_GEMDEPS'] = "-"
 
     path = File.join @tempdir, "gem.deps.rb"
-    cmd = [Gem.ruby.dup.untaint, "-I#{LIB_PATH.untaint}", "-rubygems"]
+    cmd = [Gem.ruby.dup.untaint, "-I#{LIB_PATH.untaint}"]
     if RUBY_VERSION < '1.9'
+      cmd << "-rubygems"
       cmd << "-e 'puts Gem.loaded_specs.values.map(&:full_name).sort'"
       cmd = cmd.join(' ')
     else
@@ -1508,8 +1509,9 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1509
     Dir.mkdir "sub1"
 
     path = File.join @tempdir, "gem.deps.rb"
-    cmd = [Gem.ruby.dup.untaint, "-Csub1", "-I#{LIB_PATH.untaint}", "-rubygems"]
+    cmd = [Gem.ruby.dup.untaint, "-Csub1", "-I#{LIB_PATH.untaint}"]
     if RUBY_VERSION < '1.9'
+      cmd << "-rubygems"
       cmd << "-e 'puts Gem.loaded_specs.values.map(&:full_name).sort'"
       cmd = cmd.join(' ')
     else
Index: LEGAL
===================================================================
--- LEGAL	(revision 60007)
+++ LEGAL	(revision 60008)
@@ -729,7 +729,6 @@ spec/ruby: https://github.com/ruby/ruby/blob/trunk/LEGAL#L729
     OTHER DEALINGS IN THE SOFTWARE.
 
 lib/rubygems.rb:
-lib/ubygems.rb:
 lib/rubygems:
 test/rubygems:
 

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