From e5e1f904d584bb8afd6f97f868c1fe896a572356 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 24 Sep 2017 07:52:25 +0000
Subject: 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
---
 LEGAL                     |  1 -
 lib/ubygems.rb            | 11 -----------
 test/rubygems/test_gem.rb |  6 ++++--
 tool/sync_default_gems.rb |  3 +--
 4 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 lib/ubygems.rb

diff --git a/LEGAL b/LEGAL
index dd2bb73fe1..4a9858f36e 100644
--- 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
deleted file mode 100644
index 51ee23e880..0000000000
--- a/lib/ubygems.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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'
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 62b36dfd41..c880abc3a6 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -1466,8 +1466,9 @@ class TestGem < Gem::TestCase
     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
     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
index 3ae9000655..49a1f8e237 100644
--- 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`
-- 
cgit v1.2.3