Permalink
Browse files

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
  • Loading branch information...
hsbt committed Sep 24, 2017
1 parent 6f968ca commit e5e1f904d584bb8afd6f97f868c1fe896a572356
Showing with 5 additions and 16 deletions.
  1. +0 −1 LEGAL
  2. +0 −11 lib/ubygems.rb
  3. +4 −2 test/rubygems/test_gem.rb
  4. +1 −2 tool/sync_default_gems.rb
View
1 LEGAL
@@ -729,7 +729,6 @@ spec/ruby:
OTHER DEALINGS IN THE SOFTWARE.
lib/rubygems.rb:
lib/ubygems.rb:
lib/rubygems:
test/rubygems:
View

This file was deleted.

Oops, something went wrong.
@@ -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
@@ -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`

5 comments on commit e5e1f90

@simi

This comment has been minimized.

Show comment
Hide comment
@simi

simi Oct 5, 2017

Bye ubygems! I'll never forget.

simi replied Oct 5, 2017

Bye ubygems! I'll never forget.

@pynixwang

This comment has been minimized.

Show comment
Hide comment
@pynixwang

pynixwang Oct 5, 2017

add add add, clean clean clean

pynixwang replied Oct 5, 2017

add add add, clean clean clean

@attilagyorffy

This comment has been minimized.

Show comment
Hide comment
@attilagyorffy

attilagyorffy Oct 5, 2017

A tiny piece of my heart is now broken. Bless you irb -rubygems.

attilagyorffy replied Oct 5, 2017

A tiny piece of my heart is now broken. Bless you irb -rubygems.

@wilsonsilva

This comment has been minimized.

Show comment
Hide comment
@wilsonsilva

wilsonsilva Oct 5, 2017

The best code is no code at all. Byyyyyye.

wilsonsilva replied Oct 5, 2017

The best code is no code at all. Byyyyyye.

@marcandre

This comment has been minimized.

Show comment
Hide comment
@marcandre

marcandre Oct 21, 2017

Member

We should deprecate in 2.5 and remove in later version.

Member

marcandre replied Oct 21, 2017

We should deprecate in 2.5 and remove in later version.

Please sign in to comment.