1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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
This commit is contained in:
hsbt 2017-09-24 07:52:25 +00:00
parent 6f968cab15
commit e5e1f904d5
4 changed files with 5 additions and 16 deletions

1
LEGAL
View file

@ -729,7 +729,6 @@ spec/ruby:
OTHER DEALINGS IN THE SOFTWARE.
lib/rubygems.rb:
lib/ubygems.rb:
lib/rubygems:
test/rubygems:

View file

@ -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'

View file

@ -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

View file

@ -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`