rubygems-update 3.2.17 → 3.2.21

data/test/rubygems/test_gem_ext_builder.rb

@@ -132,12 +132,12 @@ install:
       @builder.build_extensions
     end
 
-    assert_path_exists @spec.extension_dir
-    assert_path_exists @spec.gem_build_complete_path
-    assert_path_exists File.join @spec.extension_dir, 'gem_make.out'
-    assert_path_exists File.join @spec.extension_dir, 'a.rb'
-    assert_path_exists File.join @spec.gem_dir, 'lib', 'a.rb'
-    assert_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
+    assert_path_exist @spec.extension_dir
+    assert_path_exist @spec.gem_build_complete_path
+    assert_path_exist File.join @spec.extension_dir, 'gem_make.out'
+    assert_path_exist File.join @spec.extension_dir, 'a.rb'
+    assert_path_exist File.join @spec.gem_dir, 'lib', 'a.rb'
+    assert_path_exist File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
   end
 
   def test_build_extensions_with_gemhome_with_space
@@ -188,12 +188,12 @@ install:
       @builder.build_extensions
     end
 
-    assert_path_exists @spec.extension_dir
-    assert_path_exists @spec.gem_build_complete_path
-    assert_path_exists File.join @spec.extension_dir, 'gem_make.out'
-    assert_path_exists File.join @spec.extension_dir, 'a.rb'
-    refute_path_exists File.join @spec.gem_dir, 'lib', 'a.rb'
-    refute_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
+    assert_path_exist @spec.extension_dir
+    assert_path_exist @spec.gem_build_complete_path
+    assert_path_exist File.join @spec.extension_dir, 'gem_make.out'
+    assert_path_exist File.join @spec.extension_dir, 'a.rb'
+    assert_path_not_exist File.join @spec.gem_dir, 'lib', 'a.rb'
+    assert_path_not_exist File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
   ensure
     class << Gem
       remove_method :install_extension_in_lib
@@ -210,7 +210,7 @@ install:
     assert_equal '', @ui.output
     assert_equal '', @ui.error
 
-    refute_path_exists File.join @spec.extension_dir, 'gem_make.out'
+    assert_path_not_exist File.join @spec.extension_dir, 'gem_make.out'
   end
 
   def test_build_extensions_rebuild_failure
@@ -219,13 +219,13 @@ install:
 
     @spec.extensions << nil
 
-    assert_raises Gem::Ext::BuildError do
+    assert_raise Gem::Ext::BuildError do
       use_ui @ui do
         @builder.build_extensions
       end
     end
 
-    refute_path_exists @spec.gem_build_complete_path
+    assert_path_not_exist @spec.gem_build_complete_path
   end
 
   def test_build_extensions_extconf_bad
@@ -235,7 +235,7 @@ install:
 
     FileUtils.mkdir_p @spec.gem_dir
 
-    e = assert_raises Gem::Ext::BuildError do
+    e = assert_raise Gem::Ext::BuildError do
       use_ui @ui do
         @builder.build_extensions
       end
@@ -251,7 +251,7 @@ install:
     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
+    assert_path_not_exist @spec.gem_build_complete_path
 
     assert_equal cwd, Dir.pwd
   end
@@ -261,7 +261,7 @@ install:
     gem_make_out = File.join @spec.extension_dir, 'gem_make.out'
     @spec.extensions << nil
 
-    e = assert_raises Gem::Ext::BuildError do
+    e = assert_raise Gem::Ext::BuildError do
       use_ui @ui do
         @builder.build_extensions
       end
@@ -273,7 +273,7 @@ install:
 
     assert_equal "No builder for extension ''\n", File.read(gem_make_out)
 
-    refute_path_exists @spec.gem_build_complete_path
+    assert_path_not_exist @spec.gem_build_complete_path
   ensure
     FileUtils.rm_f gem_make_out
   end
@@ -308,7 +308,7 @@ install:
     path = File.join @spec.gem_dir, "extconf_args"
 
     assert_equal args.inspect, File.read(path).strip
-    assert_path_exists @spec.extension_dir
+    assert_path_exist @spec.extension_dir
   end
 
   def test_initialize

data/test/rubygems/test_gem_ext_cmake_builder.rb

@@ -7,13 +7,13 @@ class TestGemExtCmakeBuilder < Gem::TestCase
     super
 
     # Details: https://github.com/rubygems/rubygems/issues/1270#issuecomment-177368340
-    skip "CmakeBuilder doesn't work on Windows." if Gem.win_platform?
+    pend "CmakeBuilder doesn't work on Windows." if Gem.win_platform?
 
     begin
       _, status = Open3.capture2e('cmake')
-      skip 'cmake not present' unless status.success?
+      pend 'cmake not present' unless status.success?
     rescue Errno::ENOENT
-      skip 'cmake not present'
+      pend 'cmake not present'
     end
 
     @ext = File.join @tempdir, 'ext'
@@ -50,7 +50,7 @@ install (FILES test.txt DESTINATION bin)
   def test_self_build_fail
     output = []
 
-    error = assert_raises Gem::InstallError do
+    error = assert_raise Gem::InstallError do
       Gem::Ext::CmakeBuilder.build nil, @dest_path, output, [], nil, @ext
     end
 

data/test/rubygems/test_gem_ext_configure_builder.rb

@@ -17,7 +17,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
   end
 
   def test_self_build
-    skip("test_self_build skipped on MS Windows (VC++)") if vc_windows?
+    pend("test_self_build skipped on MS Windows (VC++)") if vc_windows?
 
     File.open File.join(@ext, './configure'), 'w' do |configure|
       configure.puts "#!/bin/sh\necho \"#{@makefile_body}\" > Makefile"
@@ -42,10 +42,10 @@ class TestGemExtConfigureBuilder < Gem::TestCase
   end
 
   def test_self_build_fail
-    skip("test_self_build_fail skipped on MS Windows (VC++)") if vc_windows?
+    pend("test_self_build_fail skipped on MS Windows (VC++)") if vc_windows?
     output = []
 
-    error = assert_raises Gem::InstallError do
+    error = assert_raise Gem::InstallError do
       Gem::Ext::ConfigureBuilder.build nil, @dest_path, output, [], nil, @ext
     end
 
@@ -62,7 +62,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
 
   def test_self_build_has_makefile
     if vc_windows? && !nmake_found?
-      skip("test_self_build_has_makefile skipped - nmake not found")
+      pend("test_self_build_has_makefile skipped - nmake not found")
     end
 
     File.open File.join(@ext, 'Makefile'), 'w' do |makefile|

data/test/rubygems/test_gem_ext_ext_conf_builder.rb

@@ -16,11 +16,11 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
   def test_class_build
     if java_platform?
-      skip("failing on jruby")
+      pend("failing on jruby")
     end
 
     if vc_windows? && !nmake_found?
-      skip("test_class_build skipped - nmake not found")
+      pend("test_class_build skipped - nmake not found")
     end
 
     File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -41,11 +41,12 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     assert_contains_make_command '', output[7]
     assert_contains_make_command 'install', output[10]
     assert_empty Dir.glob(File.join(@ext, 'siteconf*.rb'))
+    assert_empty Dir.glob(File.join(@ext, '.gem.*'))
   end
 
   def test_class_build_rbconfig_make_prog
     if java_platform?
-      skip("failing on jruby")
+      pend("failing on jruby")
     end
 
     configure_args do
@@ -70,7 +71,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     ENV['MAKE'] = 'anothermake'
 
     if java_platform?
-      skip("failing on jruby")
+      pend("failing on jruby")
     end
 
     configure_args '' do
@@ -80,7 +81,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
       output = []
 
-      assert_raises Gem::InstallError do
+      assert_raise Gem::InstallError do
         Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
       end
 
@@ -93,7 +94,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
   def test_class_build_extconf_fail
     if vc_windows? && !nmake_found?
-      skip("test_class_build_extconf_fail skipped - nmake not found")
+      pend("test_class_build_extconf_fail skipped - nmake not found")
     end
 
     File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -104,7 +105,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     output = []
 
-    error = assert_raises Gem::InstallError do
+    error = assert_raise Gem::InstallError do
       Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output, [], nil, @ext
     end
 
@@ -114,12 +115,12 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     assert_match(File.join(@dest_path, 'mkmf.log'), output[4])
     assert_includes(output, "To see why this extension failed to compile, please check the mkmf.log which can be found here:\n")
 
-    assert_path_exists File.join @dest_path, 'mkmf.log'
+    assert_path_exist File.join @dest_path, 'mkmf.log'
   end
 
   def test_class_build_extconf_success_without_warning
     if vc_windows? && !nmake_found?
-      skip("test_class_build_extconf_fail skipped - nmake not found")
+      pend("test_class_build_extconf_fail skipped - nmake not found")
     end
 
     File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -134,12 +135,12 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     refute_includes(output, "To see why this extension failed to compile, please check the mkmf.log which can be found here:\n")
 
-    assert_path_exists File.join @dest_path, 'mkmf.log'
+    assert_path_exist File.join @dest_path, 'mkmf.log'
   end
 
   def test_class_build_unconventional
     if vc_windows? && !nmake_found?
-      skip("test_class_build skipped - nmake not found")
+      pend("test_class_build skipped - nmake not found")
     end
 
     File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
@@ -180,7 +181,7 @@ end
 
   def test_class_make
     if vc_windows? && !nmake_found?
-      skip("test_class_make skipped - nmake not found")
+      pend("test_class_make skipped - nmake not found")
     end
 
     output = []
@@ -202,7 +203,7 @@ end
   end
 
   def test_class_make_no_Makefile
-    error = assert_raises Gem::InstallError do
+    error = assert_raise Gem::InstallError do
       Gem::Ext::ExtConfBuilder.make @ext, ['output'], @ext
     end
 

data/test/rubygems/test_gem_ext_rake_builder.rb

@@ -90,7 +90,7 @@ class TestGemExtRakeBuilder < Gem::TestCase
     output = []
 
     build_rake_in(false) do |rake|
-      error = assert_raises Gem::InstallError do
+      error = assert_raise Gem::InstallError do
         Gem::Ext::RakeBuilder.build "mkrf_conf.rb", @dest_path, output, [], nil, @ext
       end
 

data/test/rubygems/test_gem_gemcutter_utilities.rb

@@ -35,8 +35,6 @@ class TestGemGemcutterUtilities < Gem::TestCase
       "http://rubygems.engineyard.com" => "EYKEY",
     }
 
-    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
-
     File.open Gem.configuration.credentials_path, 'w' do |f|
       f.write keys.to_yaml
     end
@@ -50,7 +48,6 @@ class TestGemGemcutterUtilities < Gem::TestCase
 
   def test_api_key
     keys = { :rubygems_api_key => 'KEY' }
-    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
 
     File.open Gem.configuration.credentials_path, 'w' do |f|
       f.write keys.to_yaml
@@ -63,7 +60,6 @@ class TestGemGemcutterUtilities < Gem::TestCase
 
   def test_api_key_override
     keys = { :rubygems_api_key => 'KEY', :other => 'OTHER' }
-    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
 
     File.open Gem.configuration.credentials_path, 'w' do |f|
       f.write keys.to_yaml
@@ -101,7 +97,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert @fetcher.last_request["authorization"]
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials[:rubygems_api_key]
   end
 
@@ -115,7 +111,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert @fetcher.last_request["authorization"]
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials['http://example.com']
   end
 
@@ -129,7 +125,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert @fetcher.last_request["authorization"]
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials[:rubygems_api_key]
   end
 
@@ -142,7 +138,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert @fetcher.last_request["authorization"]
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials['http://example.com']
   end
 
@@ -168,7 +164,6 @@ class TestGemGemcutterUtilities < Gem::TestCase
     api_key       = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
     other_api_key = 'f46dbb18bb6a9c97cdc61b5b85c186a17403cdcbf'
 
-    FileUtils.mkdir_p File.dirname(Gem.configuration.credentials_path)
     File.open Gem.configuration.credentials_path, 'w' do |f|
       f.write Hash[:other_api_key, other_api_key].to_yaml
     end
@@ -177,13 +172,13 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert_match %r{Enter your RubyGems.org credentials.}, @sign_in_ui.output
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials[:rubygems_api_key]
     assert_equal other_api_key, credentials[:other_api_key]
   end
 
   def test_sign_in_with_bad_credentials
-    assert_raises Gem::MockGemUi::TermError do
+    assert_raise Gem::MockGemUi::TermError do
       util_sign_in ['Access Denied.', 403, 'Forbidden']
     end
 
@@ -209,7 +204,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
   def test_sign_in_with_incorrect_otp_code
     response = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
 
-    assert_raises Gem::MockGemUi::TermError do
+    assert_raise Gem::MockGemUi::TermError do
       util_sign_in [response, 401, 'Unauthorized'], nil, [], "111111\n"
     end
 
@@ -246,7 +241,6 @@ class TestGemGemcutterUtilities < Gem::TestCase
 
   def test_verify_api_key
     keys = {:other => 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'}
-    FileUtils.mkdir_p File.dirname(Gem.configuration.credentials_path)
     File.open Gem.configuration.credentials_path, 'w' do |f|
       f.write keys.to_yaml
     end
@@ -257,7 +251,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
   end
 
   def test_verify_missing_api_key
-    assert_raises Gem::MockGemUi::TermError do
+    assert_raise Gem::MockGemUi::TermError do
       @cmd.verify_api_key :missing
     end
   end

data/test/rubygems/test_gem_install_update_options.rb

@@ -92,7 +92,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_security_policy
-    skip 'openssl is missing' unless Gem::HAVE_OPENSSL
+    pend 'openssl is missing' unless Gem::HAVE_OPENSSL
 
     @cmd.handle_options %w[-P HighSecurity]
 
@@ -100,11 +100,11 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_security_policy_unknown
-    skip 'openssl is missing' unless Gem::HAVE_OPENSSL
+    pend 'openssl is missing' unless Gem::HAVE_OPENSSL
 
     @cmd.add_install_update_options
 
-    e = assert_raises OptionParser::InvalidArgument do
+    e = assert_raise OptionParser::InvalidArgument do
       @cmd.handle_options %w[-P UnknownSecurity]
     end
     assert_includes e.message, "UnknownSecurity"
@@ -124,8 +124,8 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
     @installer = Gem::Installer.at @gem, @cmd.options
     @installer.install
-    assert_path_exists File.join(Gem.user_dir, 'gems')
-    assert_path_exists File.join(Gem.user_dir, 'gems', @spec.full_name)
+    assert_path_exist File.join(Gem.user_dir, 'gems')
+    assert_path_exist File.join(Gem.user_dir, 'gems', @spec.full_name)
   end
 
   def test_user_install_disabled_read_only
@@ -137,9 +137,9 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
     @gem = @spec.cache_file
 
     if win_platform?
-      skip('test_user_install_disabled_read_only test skipped on MS Windows')
+      pend('test_user_install_disabled_read_only test skipped on MS Windows')
     elsif Process.uid.zero?
-      skip('test_user_install_disabled_read_only test skipped in root privilege')
+      pend('test_user_install_disabled_read_only test skipped in root privilege')
     else
       @cmd.handle_options %w[--no-user-install]
 
@@ -150,7 +150,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
       Gem.use_paths @gemhome, @userhome
 
-      assert_raises(Gem::FilePermissionError) do
+      assert_raise(Gem::FilePermissionError) do
         Gem::Installer.at(@gem, @cmd.options).install
       end
     end
@@ -169,7 +169,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
 
   def test_vendor_missing
     vendordir(nil) do
-      e = assert_raises OptionParser::InvalidOption do
+      e = assert_raise OptionParser::InvalidOption do
         @cmd.handle_options %w[--vendor]
       end