rubygems-update 3.2.0.rc.1 → 3.2.3

data/test/rubygems/test_gem_dependency_list.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/dependency_list'
 
 class TestGemDependencyList < Gem::TestCase
-
   def setup
     super
 
@@ -140,8 +139,8 @@ class TestGemDependencyList < Gem::TestCase
 
     exp = {
       "b" => [
-        Gem::Dependency.new("a", ">= 1")
-      ]
+        Gem::Dependency.new("a", ">= 1"),
+      ],
     }
 
     assert_equal exp, @deplist.why_not_ok?
@@ -262,5 +261,4 @@ class TestGemDependencyList < Gem::TestCase
 
     @deplist.add @a1, @a2, @b1, @c2, @d1
   end
-
 end

data/test/rubygems/test_gem_dependency_resolution_error.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemDependencyResolutionError < Gem::TestCase
-
   def setup
     super
 
@@ -24,5 +23,4 @@ class TestGemDependencyResolutionError < Gem::TestCase
     assert_match %r{^conflicting dependencies a \(= 1\) and a \(= 2\)$},
                  @error.message
   end
-
 end

data/test/rubygems/test_gem_doctor.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/doctor'
 
 class TestGemDoctor < Gem::TestCase
-
   def gem(name)
     spec = quick_gem name do |gem|
       gem.files = %W[lib/#{name}.rb Rakefile]
@@ -192,5 +191,4 @@ Removed file plugins/a_badly_named_file.rb
 
     assert doctor.gem_repository?, 'gems installed'
   end
-
 end

data/test/rubygems/test_gem_ext_builder.rb

@@ -4,7 +4,6 @@ require 'rubygems/ext'
 require 'rubygems/installer'
 
 class TestGemExtBuilder < Gem::TestCase
-
   def setup
     super
 
@@ -31,9 +30,8 @@ class TestGemExtBuilder < Gem::TestCase
     ENV['DESTDIR'] = 'destination'
     results = []
 
-    Dir.chdir @ext do
-      File.open 'Makefile', 'w' do |io|
-        io.puts <<-MAKEFILE
+    File.open File.join(@ext, 'Makefile'), 'w' do |io|
+      io.puts <<-MAKEFILE
 all:
 \t@#{Gem.ruby} -e "puts %Q{all: \#{ENV['DESTDIR']}}"
 
@@ -42,13 +40,12 @@ clean:
 
 install:
 \t@#{Gem.ruby} -e "puts %Q{install: \#{ENV['DESTDIR']}}"
-        MAKEFILE
-      end
-
-      Gem::Ext::Builder.make @dest_path, results
+      MAKEFILE
     end
 
-    results = results.join "\n"
+    Gem::Ext::Builder.make @dest_path, results, @ext
+
+    results = results.join("\n").b
 
     assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" clean$},   results
     assert_match %r{"DESTDIR=#{ENV['DESTDIR']}"$},         results
@@ -65,21 +62,19 @@ install:
     ENV['DESTDIR'] = 'destination'
     results = []
 
-    Dir.chdir @ext do
-      File.open 'Makefile', 'w' do |io|
-        io.puts <<-MAKEFILE
+    File.open File.join(@ext, 'Makefile'), 'w' do |io|
+      io.puts <<-MAKEFILE
 all:
 \t@#{Gem.ruby} -e "puts %Q{all: \#{ENV['DESTDIR']}}"
 
 install:
 \t@#{Gem.ruby} -e "puts %Q{install: \#{ENV['DESTDIR']}}"
-        MAKEFILE
-      end
-
-      Gem::Ext::Builder.make @dest_path, results
+      MAKEFILE
     end
 
-    results = results.join "\n"
+    Gem::Ext::Builder.make @dest_path, results, @ext
+
+    results = results.join("\n").b
 
     assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" clean$},   results
     assert_match %r{"DESTDIR=#{ENV['DESTDIR']}"$},         results
@@ -134,7 +129,6 @@ install:
 
   def test_build_extensions_install_ext_only
     class << Gem
-
       alias orig_install_extension_in_lib install_extension_in_lib
 
       remove_method :install_extension_in_lib
@@ -142,7 +136,6 @@ install:
       def Gem.install_extension_in_lib
         false
       end
-
     end
 
     @spec.extensions << 'ext/extconf.rb'
@@ -179,11 +172,9 @@ install:
     refute_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
   ensure
     class << Gem
-
       remove_method :install_extension_in_lib
 
       alias install_extension_in_lib orig_install_extension_in_lib
-
     end
   end
 
@@ -317,5 +308,4 @@ install:
 
     assert_equal %w[--with-foo-dir=/nonexistent], builder.build_args
   end
-
 end unless Gem.java_platform?

data/test/rubygems/test_gem_ext_cmake_builder.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/ext'
 
 class TestGemExtCmakeBuilder < Gem::TestCase
-
   def setup
     super
 
@@ -37,9 +36,7 @@ install (FILES test.txt DESTINATION bin)
 
     output = []
 
-    Dir.chdir @ext do
-      Gem::Ext::CmakeBuilder.build nil, @dest_path, output
-    end
+    Gem::Ext::CmakeBuilder.build nil, @dest_path, output, [], nil, @ext
 
     output = output.join "\n"
 
@@ -55,9 +52,7 @@ install (FILES test.txt DESTINATION bin)
     output = []
 
     error = assert_raises Gem::InstallError do
-      Dir.chdir @ext do
-        Gem::Ext::CmakeBuilder.build nil, @dest_path, output
-      end
+      Gem::Ext::CmakeBuilder.build nil, @dest_path, output, [], nil, @ext
     end
 
     output = output.join "\n"
@@ -78,14 +73,11 @@ install (FILES test.txt DESTINATION bin)
 
     output = []
 
-    Dir.chdir @ext do
-      Gem::Ext::CmakeBuilder.build nil, @dest_path, output
-    end
+    Gem::Ext::CmakeBuilder.build nil, @dest_path, output, [], nil, @ext
 
     output = output.join "\n"
 
     assert_contains_make_command '', output
     assert_contains_make_command 'install', output
   end
-
 end

data/test/rubygems/test_gem_ext_configure_builder.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/ext'
 
 class TestGemExtConfigureBuilder < Gem::TestCase
-
   def setup
     super
 
@@ -26,9 +25,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
 
     output = []
 
-    Dir.chdir @ext do
-      Gem::Ext::ConfigureBuilder.build nil, @dest_path, output
-    end
+    Gem::Ext::ConfigureBuilder.build nil, @dest_path, output, [], nil, @ext
 
     assert_match(/^current directory:/, output.shift)
     assert_equal "sh ./configure --prefix=#{@dest_path}", output.shift
@@ -49,9 +46,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
     output = []
 
     error = assert_raises Gem::InstallError do
-      Dir.chdir @ext do
-        Gem::Ext::ConfigureBuilder.build nil, @dest_path, output
-      end
+      Gem::Ext::ConfigureBuilder.build nil, @dest_path, output, [], nil, @ext
     end
 
     shell_error_msg = %r{(\./configure: .*)|((?:[Cc]an't|cannot) open '?\./configure'?(?:: No such file or directory)?)}
@@ -75,13 +70,10 @@ class TestGemExtConfigureBuilder < Gem::TestCase
     end
 
     output = []
-    Dir.chdir @ext do
-      Gem::Ext::ConfigureBuilder.build nil, @dest_path, output
-    end
+    Gem::Ext::ConfigureBuilder.build nil, @dest_path, output, [], nil, @ext
 
     assert_contains_make_command 'clean', output[1]
     assert_contains_make_command '', output[4]
     assert_contains_make_command 'install', output[7]
   end
-
 end

data/test/rubygems/test_gem_ext_ext_conf_builder.rb

@@ -4,7 +4,6 @@ require 'rubygems/test_case'
 require 'rubygems/ext'
 
 class TestGemExtExtConfBuilder < Gem::TestCase
-
   def setup
     super
 
@@ -30,12 +29,9 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     output = []
 
-    Dir.chdir @ext do
-      result =
-        Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
+    result = Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
 
-      assert_same result, output
-    end
+    assert_same result, output
 
     assert_match(/^current directory:/, output[0])
     assert_match(/^#{Gem.ruby}.* extconf.rb/, output[1])
@@ -60,9 +56,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
       output = []
 
-      Dir.chdir @ext do
-        Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
-      end
+      Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
 
       assert_equal "creating Makefile\n", output[2]
       assert_contains_make_command 'clean', output[4]
@@ -87,9 +81,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
       output = []
 
       assert_raises Gem::InstallError do
-        Dir.chdir @ext do
-          Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
-        end
+        Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
       end
 
       assert_equal "creating Makefile\n",   output[2]
@@ -113,9 +105,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     output = []
 
     error = assert_raises Gem::InstallError do
-      Dir.chdir @ext do
-        Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
-      end
+      Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
     end
 
     assert_equal 'extconf failed, exit code 1', error.message
@@ -140,9 +130,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     output = []
 
-    Dir.chdir @ext do
-      Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
-    end
+    Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
 
     refute_includes(output, "To see why this extension failed to compile, please check the mkmf.log which can be found here:\n")
 
@@ -182,9 +170,7 @@ end
 
     output = []
 
-    Dir.chdir @ext do
-      Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
-    end
+    Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
 
     assert_contains_make_command 'clean', output[4]
     assert_contains_make_command '', output[7]
@@ -208,9 +194,7 @@ end
       makefile.puts "install:"
     end
 
-    Dir.chdir @ext do
-      Gem::Ext::ExtConfBuilder.make @ext, output
-    end
+    Gem::Ext::ExtConfBuilder.make @ext, output, @ext
 
     assert_contains_make_command 'clean', output[1]
     assert_contains_make_command '', output[4]
@@ -219,9 +203,7 @@ end
 
   def test_class_make_no_Makefile
     error = assert_raises Gem::InstallError do
-      Dir.chdir @ext do
-        Gem::Ext::ExtConfBuilder.make @ext, ['output']
-      end
+      Gem::Ext::ExtConfBuilder.make @ext, ['output'], @ext
     end
 
     assert_equal 'Makefile not found', error.message
@@ -240,5 +222,4 @@ end
       RbConfig::CONFIG.delete 'configure_args'
     end
   end
-
 end

data/test/rubygems/test_gem_ext_rake_builder.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/ext'
 
 class TestGemExtRakeBuilder < Gem::TestCase
-
   def setup
     super
 
@@ -19,9 +18,7 @@ class TestGemExtRakeBuilder < Gem::TestCase
     output = []
 
     build_rake_in do |rake|
-      Dir.chdir @ext do
-        Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', @dest_path, output
-      end
+      Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', @dest_path, output, [], nil, @ext
 
       output = output.join "\n"
 
@@ -39,10 +36,8 @@ class TestGemExtRakeBuilder < Gem::TestCase
     output = []
 
     build_rake_in do |rake|
-      Dir.chdir @ext do
-        non_empty_args_list = ['']
-        Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', @dest_path, output, non_empty_args_list
-      end
+      non_empty_args_list = ['']
+      Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', @dest_path, output, non_empty_args_list, nil, @ext
 
       output = output.join "\n"
 
@@ -52,13 +47,36 @@ class TestGemExtRakeBuilder < Gem::TestCase
     end
   end
 
+  def test_class_no_openssl_override
+    create_temp_mkrf_file('task :default')
+
+    rake = util_spec 'rake' do |s|
+      s.executables = %w[rake]
+      s.files = %w[bin/rake]
+    end
+
+    output = []
+
+    write_file File.join(@tempdir, 'bin', 'rake') do |fp|
+      fp.puts "#!/usr/bin/ruby"
+      fp.puts "require 'openssl'; puts OpenSSL"
+    end
+
+    install_gem rake
+
+    Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', @dest_path, output, [''], nil, @ext
+
+    output = output.join "\n"
+
+    assert_match "OpenSSL", output
+    assert_match %r{^#{Regexp.escape Gem.ruby} mkrf_conf\.rb}, output
+  end
+
   def test_class_build_no_mkrf_passes_args
     output = []
 
     build_rake_in do |rake|
-      Dir.chdir @ext do
-        Gem::Ext::RakeBuilder.build "ext/Rakefile", @dest_path, output, ["test1", "test2"]
-      end
+      Gem::Ext::RakeBuilder.build "ext/Rakefile", @dest_path, output, ["test1", "test2"], nil, @ext
 
       output = output.join "\n"
 
@@ -73,9 +91,7 @@ class TestGemExtRakeBuilder < Gem::TestCase
 
     build_rake_in(false) do |rake|
       error = assert_raises Gem::InstallError do
-        Dir.chdir @ext do
-          Gem::Ext::RakeBuilder.build "mkrf_conf.rb", @dest_path, output
-        end
+        Gem::Ext::RakeBuilder.build "mkrf_conf.rb", @dest_path, output, [], nil, @ext
       end
 
       assert_match %r{^rake failed}, error.message
@@ -91,5 +107,4 @@ class TestGemExtRakeBuilder < Gem::TestCase
       EO_MKRF
     end
   end
-
 end

data/test/rubygems/test_gem_gem_runner.rb

@@ -2,13 +2,13 @@
 require 'rubygems/test_case'
 
 class TestGemGemRunner < Gem::TestCase
-
   def setup
     super
 
     require 'rubygems/command'
     @orig_args = Gem::Command.build_args
     @orig_specific_extra_args = Gem::Command.specific_extra_args_hash.dup
+    @orig_extra_args = Gem::Command.extra_args.dup
 
     require 'rubygems/gem_runner'
     @runner = Gem::GemRunner.new
@@ -19,6 +19,7 @@ class TestGemGemRunner < Gem::TestCase
 
     Gem::Command.build_args = @orig_args
     Gem::Command.specific_extra_args_hash = @orig_specific_extra_args
+    Gem::Command.extra_args = @orig_extra_args
   end
 
   def test_do_configuration
@@ -73,17 +74,18 @@ class TestGemGemRunner < Gem::TestCase
     args = %w[query]
 
     use_ui @ui do
-      assert_nil @runner.run(args)
+      @runner.run(args)
     end
 
     assert_match(/WARNING:  query command is deprecated. It will be removed in Rubygems [0-9]+/, @ui.error)
+    assert_match(/WARNING:  It is recommended that you use `gem search` or `gem list` instead/, @ui.error)
   end
 
   def test_info_succeeds
     args = %w[info]
 
     use_ui @ui do
-      assert_nil @runner.run(args)
+      @runner.run(args)
     end
 
     assert_empty @ui.error
@@ -93,7 +95,7 @@ class TestGemGemRunner < Gem::TestCase
     args = %w[list]
 
     use_ui @ui do
-      assert_nil @runner.run(args)
+      @runner.run(args)
     end
 
     assert_empty @ui.error
@@ -103,10 +105,9 @@ class TestGemGemRunner < Gem::TestCase
     args = %w[search]
 
     use_ui @ui do
-      assert_nil @runner.run(args)
+      @runner.run(args)
     end
 
     assert_empty @ui.error
   end
-
 end