Auto merge of #2029 - hsbt:no-more-ubygems-2, r=hsbt

More rename ubygems.rb.

Follow up 4cb0e5b

Author: bundlerbot

test/rubygems/test_gem.rb

@@ -1552,7 +1552,7 @@ def test_looks_for_gemdeps_files_automatically_on_start_in_parent_dir
 
     path = File.join @tempdir, "gem.deps.rb"
     cmd = [Gem.ruby.dup.untaint, "-Csub1", "-I#{LIB_PATH.untaint}",
-           "-I#{BUNDLER_LIB_PATH.untaint}", "-rubygems"]
+           "-I#{BUNDLER_LIB_PATH.untaint}", "-rrubygems"]
     if RUBY_VERSION < '1.9'
       cmd << "-e 'puts Gem.loaded_specs.values.map(&:full_name).sort'"
       cmd = cmd.join(' ')