rubygems-update 3.1.2 → 3.2.6

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
 
@@ -53,7 +52,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = @deplist.dependency_order
 
-    assert_equal %w[d-1 c-1 b-1 a-1], order.map { |s| s.full_name }
+    assert_equal %w[d-1 c-1 b-1 a-1], order.map {|s| s.full_name }
   end
 
   def test_dependency_order_circle
@@ -62,7 +61,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = @deplist.dependency_order
 
-    assert_equal %w[b-1 c-1 a-1], order.map { |s| s.full_name }
+    assert_equal %w[b-1 c-1 a-1], order.map {|s| s.full_name }
   end
 
   def test_dependency_order_development
@@ -80,7 +79,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = deplist.dependency_order
 
-    assert_equal %w[g-1 a-1 f-1 e-1], order.map { |s| s.full_name },
+    assert_equal %w[g-1 a-1 f-1 e-1], order.map {|s| s.full_name },
                  'development on'
 
     deplist2 = Gem::DependencyList.new
@@ -88,7 +87,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = deplist2.dependency_order
 
-    assert_equal %w[a-1 g-1 f-1 e-1], order.map { |s| s.full_name },
+    assert_equal %w[a-1 g-1 f-1 e-1], order.map {|s| s.full_name },
                  'development off'
   end
 
@@ -100,7 +99,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = @deplist.dependency_order
 
-    assert_equal %w[d-1 c-2 b-1 a-2 e-1], order.map { |s| s.full_name },
+    assert_equal %w[d-1 c-2 b-1 a-2 e-1], order.map {|s| s.full_name },
                  'deps of trimmed specs not included'
   end
 
@@ -109,7 +108,7 @@ class TestGemDependencyList < Gem::TestCase
 
     order = @deplist.dependency_order
 
-    assert_equal %w[c-2 a-1], order.map { |s| s.full_name }
+    assert_equal %w[c-2 a-1], order.map {|s| s.full_name }
   end
 
   def test_find_name
@@ -134,14 +133,14 @@ class TestGemDependencyList < Gem::TestCase
   end
 
   def test_why_not_ok_eh
-    assert_equal({},  @deplist.why_not_ok?)
+    assert_equal({}, @deplist.why_not_ok?)
 
     @deplist.add @b2
 
     exp = {
       "b" => [
-        Gem::Dependency.new("a", ">= 1")
-      ]
+        Gem::Dependency.new("a", ">= 1"),
+      ],
     }
 
     assert_equal exp, @deplist.why_not_ok?
@@ -162,7 +161,7 @@ class TestGemDependencyList < Gem::TestCase
 
     @deplist.add a, b0, b1
 
-    assert_equal({},  @deplist.why_not_ok?)
+    assert_equal({}, @deplist.why_not_ok?)
   end
 
   def test_ok_eh_mismatch
@@ -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
 
@@ -21,8 +20,7 @@ class TestGemDependencyResolutionError < Gem::TestCase
   end
 
   def test_message
-    assert_match %r%^conflicting dependencies a \(= 1\) and a \(= 2\)$%,
+    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]
@@ -153,6 +152,34 @@ This directory does not appear to be a RubyGems repository, skipping
     assert true # count
   end
 
+  def test_doctor_badly_named_plugins
+    gem 'a'
+
+    Gem.use_paths @gemhome.to_s
+
+    FileUtils.mkdir_p Gem.plugindir
+    bad_plugin = File.join(Gem.plugindir, "a_badly_named_file.rb")
+    write_file bad_plugin
+
+    doctor = Gem::Doctor.new @gemhome
+
+    capture_io do
+      use_ui @ui do
+        doctor.doctor
+      end
+    end
+
+    # refute_path_exists bad_plugin
+
+    expected = <<-OUTPUT
+Checking #{@gemhome}
+Removed file plugins/a_badly_named_file.rb
+
+    OUTPUT
+
+    assert_equal expected, @ui.output
+  end
+
   def test_gem_repository_eh
     doctor = Gem::Doctor.new @gemhome
 
@@ -164,5 +191,4 @@ This directory does not appear to be a RubyGems repository, skipping
 
     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
 
@@ -15,6 +14,7 @@ class TestGemExtBuilder < Gem::TestCase
     FileUtils.mkdir_p @dest_path
 
     @orig_DESTDIR = ENV['DESTDIR']
+    @orig_make = ENV['make']
 
     @spec = util_spec 'a'
 
@@ -23,6 +23,7 @@ class TestGemExtBuilder < Gem::TestCase
 
   def teardown
     ENV['DESTDIR'] = @orig_DESTDIR
+    ENV['make'] = @orig_make
 
     super
   end
@@ -31,9 +32,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,22 +42,21 @@ 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
-    assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
+    assert_match %r{DESTDIR\\=#{ENV['DESTDIR']} clean$},   results
+    assert_match %r{DESTDIR\\=#{ENV['DESTDIR']}$},         results
+    assert_match %r{DESTDIR\\=#{ENV['DESTDIR']} install$}, results
 
     if /nmake/ !~ results
-      assert_match %r%^clean: destination$%,   results
-      assert_match %r%^all: destination$%,     results
-      assert_match %r%^install: destination$%, results
+      assert_match %r{^clean: destination$},   results
+      assert_match %r{^all: destination$},     results
+      assert_match %r{^install: destination$}, results
     end
   end
 
@@ -65,25 +64,45 @@ 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
-    assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
+    assert_match %r{DESTDIR\\=#{ENV['DESTDIR']} clean$},   results
+    assert_match %r{DESTDIR\\=#{ENV['DESTDIR']}$},         results
+    assert_match %r{DESTDIR\\=#{ENV['DESTDIR']} install$}, results
+  end
+
+  def test_custom_make_with_options
+    ENV['make'] = 'make V=1'
+    results = []
+    File.open File.join(@ext, 'Makefile'), 'w' do |io|
+      io.puts <<-MAKEFILE
+all:
+\t@#{Gem.ruby} -e "puts 'all: OK'"
+
+clean:
+\t@#{Gem.ruby} -e "puts 'clean: OK'"
+
+install:
+\t@#{Gem.ruby} -e "puts 'install: OK'"
+      MAKEFILE
+    end
+    Gem::Ext::Builder.make @dest_path, results, @ext
+    results = results.join("\n").b
+    assert_match %r{clean: OK}, results
+    assert_match %r{all: OK}, results
+    assert_match %r{install: OK}, results
   end
 
   def test_build_extensions
@@ -134,7 +153,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 +160,6 @@ install:
       def Gem.install_extension_in_lib
         false
       end
-
     end
 
     @spec.extensions << 'ext/extconf.rb'
@@ -179,11 +196,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
 
@@ -227,26 +242,17 @@ install:
     end
 
     assert_match(/\AERROR: Failed to build gem native extension.$/, e.message)
-
-    assert_equal "Building native extensions. This could take a while...\n",
-                 @ui.output
+    assert_equal "Building native extensions. This could take a while...\n", @ui.output
     assert_equal '', @ui.error
 
     gem_make_out = File.join @spec.extension_dir, 'gem_make.out'
+    cmd_make_out = File.read(gem_make_out)
 
-    assert_match %r%#{Regexp.escape Gem.ruby}.* extconf\.rb%,
-                 File.read(gem_make_out)
-    assert_match %r%: No such file%,
-                 File.read(gem_make_out)
+    assert_match %r{#{Regexp.escape Gem.ruby} .* extconf\.rb}, cmd_make_out
+    assert_match %r{: No such file}, cmd_make_out
 
     refute_path_exists @spec.gem_build_complete_path
 
-    skip "Gem.ruby is not the name of the binary being run in the end" \
-      unless File.read(gem_make_out).include? "#{Gem.ruby}:"
-
-    assert_match %r%#{Regexp.escape Gem.ruby}: No such file%,
-                 File.read(gem_make_out)
-
     assert_equal cwd, Dir.pwd
   end
 
@@ -262,9 +268,7 @@ install:
     end
 
     assert_match(/^\s*No builder for extension ''$/, e.message)
-
-    assert_equal "Building native extensions. This could take a while...\n",
-                 @ui.output
+    assert_equal "Building native extensions. This could take a while...\n", @ui.output
     assert_equal '', @ui.error
 
     assert_equal "No builder for extension ''\n", File.read(gem_make_out)
@@ -328,5 +332,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,18 +3,18 @@ require 'rubygems/test_case'
 require 'rubygems/ext'
 
 class TestGemExtCmakeBuilder < Gem::TestCase
-
   def setup
     super
 
     # Details: https://github.com/rubygems/rubygems/issues/1270#issuecomment-177368340
     skip "CmakeBuilder doesn't work on Windows." if Gem.win_platform?
 
-    skip "CmakeBuilder doesn't work on JRuby." if Gem.java_platform? && ENV["CI"]
-
-    system('cmake', out: IO::NULL, err: [:child, :out])
-
-    skip 'cmake not present' unless $?.success?
+    begin
+      _, status = Open3.capture2e('cmake')
+      skip 'cmake not present' unless status.success?
+    rescue Errno::ENOENT
+      skip 'cmake not present'
+    end
 
     @ext = File.join @tempdir, 'ext'
     @dest_path = File.join @tempdir, 'prefix'
@@ -25,49 +25,43 @@ class TestGemExtCmakeBuilder < Gem::TestCase
 
   def test_self_build
     File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists|
-      cmakelists.write <<-eo_cmake
+      cmakelists.write <<-EO_CMAKE
 cmake_minimum_required(VERSION 2.6)
 project(self_build NONE)
 install (FILES test.txt DESTINATION bin)
-      eo_cmake
+      EO_CMAKE
     end
 
     FileUtils.touch File.join(@ext, 'test.txt')
 
     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_match \
-      %r%^cmake \. -DCMAKE_INSTALL_PREFIX=#{Regexp.escape @dest_path}%, output
-    assert_match %r%#{Regexp.escape @ext}%, output
+    assert_match %r{^cmake \. -DCMAKE_INSTALL_PREFIX\\=#{Regexp.escape @dest_path}}, output
+    assert_match %r{#{Regexp.escape @ext}}, output
     assert_contains_make_command '', output
     assert_contains_make_command 'install', output
-    assert_match %r%test\.txt%, output
+    assert_match %r{test\.txt}, output
   end
 
   def test_self_build_fail
     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"
 
     shell_error_msg = %r{(CMake Error: .*)}
-    sh_prefix_cmake = "cmake . -DCMAKE_INSTALL_PREFIX="
 
     assert_match 'cmake failed', error.message
 
-    assert_match %r%^#{sh_prefix_cmake}#{Regexp.escape @dest_path}%, output
-    assert_match %r%#{shell_error_msg}%, output
+    assert_match %r{^cmake . -DCMAKE_INSTALL_PREFIX\\=#{Regexp.escape @dest_path}}, output
+    assert_match %r{#{shell_error_msg}}, output
   end
 
   def test_self_build_has_makefile
@@ -77,14 +71,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