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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Sep 24, 2017 · e5e1f90 · e5e1f90 · simi · Oct 5, 2017
1 parent 6f968ca
commit e5e1f90
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/LEGAL b/LEGAL
@@ -729,7 +729,6 @@ spec/ruby:
     OTHER DEALINGS IN THE SOFTWARE.
 
 lib/rubygems.rb:
-lib/ubygems.rb:
 lib/rubygems:
 test/rubygems:
 

diff --git a/lib/ubygems.rb b/lib/ubygems.rb
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
@@ -1466,8 +1466,9 @@ def test_looks_for_gemdeps_files_automatically_on_start
     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 @@ def test_looks_for_gemdeps_files_automatically_on_start_in_parent_dir
     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

diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
@@ -60,9 +60,8 @@ def sync_default_gems(gem)
 
   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`