rubygems-update 3.2.17 → 3.2.18

data/test/rubygems/test_gem_stream_ui.rb

@@ -90,7 +90,7 @@ class TestGemStreamUI < Gem::TestCase
     @in.tty = false
 
     Timeout.timeout(SHORT_TIMEOUT) do
-      assert_raises(Gem::OperationNotSupportedError) do
+      assert_raise(Gem::OperationNotSupportedError) do
         @sui.ask_yes_no("do coconuts migrate?")
       end
     end

data/test/rubygems/test_gem_stub_specification.rb

@@ -65,9 +65,9 @@ class TestStubSpecification < Gem::TestCase
   end
 
   def test_contains_requirable_file_eh_extension
-    skip "I guess making the stub match the running platform should work" if Gem.java_platform?
+    pend "I guess making the stub match the running platform should work" if Gem.java_platform?
     stub_with_extension do |stub|
-      _, err = capture_io do
+      _, err = capture_output do
         refute stub.contains_requirable_file? 'nonexistent'
       end
 
@@ -122,7 +122,7 @@ class TestStubSpecification < Gem::TestCase
   end
 
   def test_missing_extensions_eh
-    skip "I guess making the stub match the running platform should work" if Gem.java_platform?
+    pend "I guess making the stub match the running platform should work" if Gem.java_platform?
     stub = stub_with_extension do |s|
       extconf_rb = File.join s.gem_dir, s.extensions.first
       FileUtils.mkdir_p File.dirname extconf_rb
@@ -189,7 +189,7 @@ class TestStubSpecification < Gem::TestCase
   def test_to_spec_missing_extensions
     stub = stub_with_extension
 
-    capture_io do
+    capture_output do
       stub.contains_requirable_file? 'nonexistent'
     end
 

data/test/rubygems/test_gem_uninstaller.rb

@@ -54,7 +54,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
       uninstaller.remove_all [@spec]
     end
 
-    refute_path_exists @spec.gem_dir
+    assert_path_not_exist @spec.gem_dir
   end
 
   def test_remove_executables_force_keep
@@ -138,7 +138,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
     Dir.mkdir "#{@gemhome}2"
     uninstaller = Gem::Uninstaller.new nil, :install_dir => "#{@gemhome}2"
 
-    e = assert_raises Gem::GemNotInHomeException do
+    e = assert_raise Gem::GemNotInHomeException do
       use_ui ui do
         uninstaller.remove @spec
       end
@@ -149,11 +149,11 @@ class TestGemUninstaller < Gem::InstallerTestCase
 
     assert_equal expected, e.message
 
-    assert_path_exists @spec.gem_dir
+    assert_path_exist @spec.gem_dir
   end
 
   def test_remove_symlinked_gem_home
-    skip "Symlinks not supported or not enabled" unless symlink_supported?
+    pend "Symlinks not supported or not enabled" unless symlink_supported?
 
     Dir.mktmpdir("gem_home") do |dir|
       symlinked_gem_home = "#{dir}/#{File.basename(@gemhome)}"
@@ -166,7 +166,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
         uninstaller.remove @spec
       end
 
-      refute_path_exists @spec.gem_dir
+      assert_path_not_exist @spec.gem_dir
     end
   end
 
@@ -297,7 +297,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
 
     uninstaller.uninstall
 
-    refute_path_exists spec.gem_dir
+    assert_path_not_exist spec.gem_dir
   end
 
   def test_uninstall_extension
@@ -318,18 +318,18 @@ create_makefile '#{@spec.name}'
       installer.install
     end
 
-    assert_path_exists @spec.extension_dir, 'sanity check'
+    assert_path_exist @spec.extension_dir, 'sanity check'
 
     uninstaller = Gem::Uninstaller.new @spec.name, :executables => true
     uninstaller.uninstall
 
-    refute_path_exists @spec.extension_dir
+    assert_path_not_exist @spec.extension_dir
   end
 
   def test_uninstall_nonexistent
     uninstaller = Gem::Uninstaller.new 'bogus', :executables => true
 
-    e = assert_raises Gem::InstallError do
+    e = assert_raise Gem::InstallError do
       uninstaller.uninstall
     end
 
@@ -351,7 +351,7 @@ create_makefile '#{@spec.name}'
 
     ui = Gem::MockGemUi.new "n\n"
 
-    assert_raises Gem::DependencyRemovalException do
+    assert_raise Gem::DependencyRemovalException do
       use_ui ui do
         uninstaller.uninstall
       end
@@ -371,16 +371,16 @@ create_makefile '#{@spec.name}'
     gem_dir = File.join @user_spec.gem_dir
 
     Gem.pre_uninstall do
-      assert_path_exists gem_dir
+      assert_path_exist gem_dir
     end
 
     Gem.post_uninstall do
-      refute_path_exists gem_dir
+      assert_path_not_exist gem_dir
     end
 
     uninstaller.uninstall
 
-    refute_path_exists gem_dir
+    assert_path_not_exist gem_dir
 
     assert_same uninstaller, @pre_uninstall_hook_arg
     assert_same uninstaller, @post_uninstall_hook_arg
@@ -392,7 +392,7 @@ create_makefile '#{@spec.name}'
 
     uninstaller = Gem::Uninstaller.new @spec.name, :executables => true
 
-    e = assert_raises Gem::InstallError do
+    e = assert_raise Gem::InstallError do
       uninstaller.uninstall
     end
 
@@ -546,7 +546,7 @@ create_makefile '#{@spec.name}'
     un = Gem::Uninstaller.new('q', :abort_on_dependent => true)
     ui = Gem::MockGemUi.new("y\n")
 
-    assert_raises Gem::DependencyRemovalException do
+    assert_raise Gem::DependencyRemovalException do
       use_ui ui do
         un.uninstall
       end
@@ -619,7 +619,7 @@ create_makefile '#{@spec.name}'
     end
 
     FileUtils.stub :rm_r, stub_rm_r do
-      assert_raises Gem::UninstallError do
+      assert_raise Gem::UninstallError do
         uninstaller.uninstall
       end
     end

data/test/rubygems/test_gem_util.rb

@@ -4,20 +4,22 @@ require 'rubygems/util'
 
 class TestGemUtil < Gem::TestCase
   def test_class_popen
-    skip "popen with a block does not behave well on jruby" if Gem.java_platform?
+    pend "popen with a block does not behave well on jruby" if Gem.java_platform?
     assert_equal "0\n", Gem::Util.popen(*ruby_with_rubygems_in_load_path, '-e', 'p 0')
 
-    assert_raises Errno::ECHILD do
+    assert_raise Errno::ECHILD do
       Process.wait(-1)
     end
   end
 
   def test_silent_system
-    skip if Gem.java_platform?
+    pend if Gem.java_platform?
     Gem::Deprecate.skip_during do
-      assert_silent do
+      out, err = capture_output do
         Gem::Util.silent_system(*ruby_with_rubygems_in_load_path, '-e', 'puts "hello"; warn "hello"')
       end
+      assert_empty out
+      assert_empty err
     end
   end
 
@@ -33,14 +35,14 @@ class TestGemUtil < Gem::TestCase
   end
 
   def test_traverse_parents_does_not_crash_on_permissions_error
-    skip 'skipped on MS Windows (chmod has no effect)' if win_platform? || java_platform?
+    pend 'skipped on MS Windows (chmod has no effect)' if win_platform? || java_platform?
 
     FileUtils.mkdir_p 'd/e/f'
     # remove 'execute' permission from "e" directory and make it
     # impossible to cd into it and its children
     FileUtils.chmod(0666, 'd/e')
 
-    skip 'skipped in root privilege' if Process.uid.zero?
+    pend 'skipped in root privilege' if Process.uid.zero?
 
     paths = Gem::Util.traverse_parents('d/e/f').to_a
 

data/test/rubygems/test_gem_version.rb

@@ -2,8 +2,6 @@
 require 'rubygems/test_case'
 require "rubygems/version"
 
-require "minitest/benchmark"
-
 class TestGemVersion < Gem::TestCase
   class V < ::Gem::Version
   end
@@ -47,9 +45,11 @@ class TestGemVersion < Gem::TestCase
     assert_equal false, Gem::Version.correct?("an incorrect version")
 
     expected = "nil versions are discouraged and will be deprecated in Rubygems 4\n"
-    assert_output nil, expected do
+    actual_stdout, actual_stderr = capture_output do
       Gem::Version.correct?(nil)
     end
+    assert_empty actual_stdout
+    assert_equal(expected, actual_stderr)
   end
 
   def test_class_new_subclass
@@ -100,7 +100,7 @@ class TestGemVersion < Gem::TestCase
     invalid_versions << "2.3422222.222.222222222.22222.ads0as.dasd0.ddd2222.2.qd3e."
 
     invalid_versions.each do |invalid|
-      e = assert_raises ArgumentError, invalid do
+      e = assert_raise ArgumentError, invalid do
         Gem::Version.new invalid
       end
 
@@ -108,15 +108,6 @@ class TestGemVersion < Gem::TestCase
     end
   end
 
-  def bench_anchored_version_pattern
-    assert_performance_linear 0.5 do |count|
-      version_string = count.times.map {|i| "0" * i.succ }.join(".") << "."
-      version_string =~ Gem::Version::ANCHORED_VERSION_PATTERN
-    end
-  rescue RegexpError
-    skip "It fails to allocate the memory for regex pattern of Gem::Version::ANCHORED_VERSION_PATTERN"
-  end
-
   def test_empty_version
     ["", "   ", " "].each do |empty|
       assert_equal "0", Gem::Version.new(empty).version

data/test/rubygems/test_kernel.rb

@@ -38,7 +38,7 @@ class TestKernel < Gem::TestCase
   def test_gem_re_gem_mismatch
     assert gem('a', '=1')
 
-    assert_raises Gem::LoadError do
+    assert_raise Gem::LoadError do
       gem('a', '= 2')
     end
 
@@ -65,7 +65,7 @@ class TestKernel < Gem::TestCase
 
   def test_gem_env_req
     ENV["GEM_REQUIREMENT_A"] = '~> 2.0'
-    assert_raises(Gem::MissingSpecVersionError) { gem('a', '= 1') }
+    assert_raise(Gem::MissingSpecVersionError) { gem('a', '= 1') }
     assert gem('a', '> 1')
     assert_equal @a2, Gem.loaded_specs['a']
   end
@@ -73,7 +73,7 @@ class TestKernel < Gem::TestCase
   def test_gem_conflicting
     assert gem('a', '= 1'), "Should load"
 
-    ex = assert_raises Gem::LoadError do
+    ex = assert_raise Gem::LoadError do
       gem 'a', '= 2'
     end
 
@@ -120,7 +120,7 @@ class TestKernel < Gem::TestCase
       quick_gem 'bundler', '1'
       quick_gem 'bundler', '2.a'
 
-      e = assert_raises Gem::MissingSpecVersionError do
+      e = assert_raise Gem::MissingSpecVersionError do
         gem('bundler')
       end
       assert_match "Could not find 'bundler' (55) required by reason.", e.message

data/test/rubygems/test_project_sanity.rb

@@ -5,7 +5,7 @@ require "open3"
 
 class TestProjectSanity < Gem::TestCase
   def test_manifest_is_up_to_date
-    skip unless File.exist?(File.expand_path("../../../Rakefile", __FILE__))
+    pend unless File.exist?(File.expand_path("../../../Rakefile", __FILE__))
 
     _, status = Open3.capture2e("rake check_manifest")
 

data/test/rubygems/test_remote_fetch_error.rb

@@ -4,7 +4,7 @@ require 'rubygems/test_case'
 class TestRemoteFetchError < Gem::TestCase
   def test_password_redacted
     error = Gem::RemoteFetcher::FetchError.new('There was an error fetching', 'https://user:secret@gemsource.org')
-    refute_match 'secret', error.to_s
+    refute_match %r{secret}, error.to_s
   end
 
   def test_invalid_url

data/test/rubygems/test_require.rb

@@ -28,7 +28,7 @@ class TestGemRequire < Gem::TestCase
     super
 
     @old_loaded_features = $LOADED_FEATURES.dup
-    assert_raises LoadError do
+    assert_raise LoadError do
       require 'test_gem_require_a'
     end
     $LOADED_FEATURES.replace @old_loaded_features
@@ -147,8 +147,8 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_dash_i_respects_default_library_extension_priority
-    skip "extensions don't quite work on jruby" if Gem.java_platform?
-    skip "not installed yet" unless RbConfig::TOPDIR
+    pend "extensions don't quite work on jruby" if Gem.java_platform?
+    pend "not installed yet" unless RbConfig::TOPDIR
 
     dash_i_ext_arg = util_install_extension_file('a')
     dash_i_lib_arg = util_install_ruby_file('a')
@@ -245,12 +245,12 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_activate_via_require_respects_loaded_files
-    skip "Not sure what's going on. If another spec creates a 'a' gem before
+    pend "Not sure what's going on. If another spec creates a 'a' gem before
       this test, somehow require will load the benchmark in b, and ignore that the
       stdlib one is already in $LOADED_FEATURES?. Reproducible by running the
       spaceship_specific_file test before this one" if java_platform?
 
-    skip "not installed yet" unless RbConfig::TOPDIR
+    pend "not installed yet" unless RbConfig::TOPDIR
 
     lib_dir = File.expand_path("../../lib", File.dirname(__FILE__))
     rubylibdir = File.realdirpath(RbConfig::CONFIG["rubylibdir"])
@@ -359,7 +359,7 @@ class TestGemRequire < Gem::TestCase
     assert_equal %w[a-1 c-1], loaded_spec_names
     assert_equal ["b (> 0)", "x (> 0)"], unresolved_names
 
-    e = assert_raises(Gem::LoadError) do
+    e = assert_raise(Gem::LoadError) do
       require("ib")
     end
 
@@ -382,7 +382,7 @@ class TestGemRequire < Gem::TestCase
     assert_equal %w[a-1 c-1], loaded_spec_names
     assert_equal ["b (> 0)"], unresolved_names
 
-    e = assert_raises(Gem::LoadError) do
+    e = assert_raise(Gem::LoadError) do
       require("ib")
     end
 
@@ -467,7 +467,7 @@ class TestGemRequire < Gem::TestCase
 
   def test_realworld_default_gem
     testing_ruby_repo = !ENV["GEM_COMMAND"].nil?
-    skip "this test can't work under ruby-core setup" if testing_ruby_repo || java_platform?
+    pend "this test can't work under ruby-core setup" if testing_ruby_repo || java_platform?
 
     cmd = <<-RUBY
       $stderr = $stdout
@@ -481,7 +481,7 @@ class TestGemRequire < Gem::TestCase
 
   def test_realworld_upgraded_default_gem
     testing_ruby_repo = !ENV["GEM_COMMAND"].nil?
-    skip "this test can't work under ruby-core setup" if testing_ruby_repo
+    pend "this test can't work under ruby-core setup" if testing_ruby_repo
 
     newer_json = util_spec("json", "999.99.9", nil, ["lib/json.rb"])
     install_gem newer_json
@@ -626,7 +626,7 @@ class TestGemRequire < Gem::TestCase
       b2a = util_spec('bundler', '2.a', nil, "lib/bundler/setup.rb")
       install_specs b1, b2a
 
-      e = assert_raises Gem::MissingSpecVersionError do
+      e = assert_raise Gem::MissingSpecVersionError do
         gem('bundler')
       end
       assert_match "Could not find 'bundler' (55) required by reason.", e.message
@@ -679,7 +679,7 @@ class TestGemRequire < Gem::TestCase
     end
 
     def test_no_crash_when_overriding_warn_with_warning_module
-      skip "https://github.com/oracle/truffleruby/issues/2109" if RUBY_ENGINE == "truffleruby"
+      pend "https://github.com/oracle/truffleruby/issues/2109" if RUBY_ENGINE == "truffleruby"
 
       Dir.mktmpdir("warn_test") do |dir|
         File.write(dir + "/main.rb", "module Warning; def warn(str); super; end; end; warn 'Foo Bar'")
@@ -753,12 +753,12 @@ class TestGemRequire < Gem::TestCase
     spec.files += ["extconf.rb", "depend", "#{name}.c"]
 
     so = File.join(spec.gem_dir, "#{name}.#{RbConfig::CONFIG["DLEXT"]}")
-    refute_path_exists so
+    assert_path_not_exist so
 
     path = Gem::Package.build spec
     installer = Gem::Installer.at path
     installer.install
-    assert_path_exists so
+    assert_path_exist so
 
     spec.gem_dir
   end

data/test/test_changelog_generator.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require "minitest/autorun"
 require_relative "../util/changelog"
 require "rubygems/commands/setup_command"
 
-class ChangelogTest < Minitest::Test
+class ChangelogTest < Test::Unit::TestCase
   def setup
     @changelog = Changelog.for_rubygems(Gem::VERSION)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.2.17
+  version: 3.2.18
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
@@ -236,7 +236,9 @@ files:
 - bundler/lib/bundler/source/path/installer.rb
 - bundler/lib/bundler/source/rubygems.rb
 - bundler/lib/bundler/source/rubygems/remote.rb
+- bundler/lib/bundler/source/rubygems_aggregate.rb
 - bundler/lib/bundler/source_list.rb
+- bundler/lib/bundler/source_map.rb
 - bundler/lib/bundler/spec_set.rb
 - bundler/lib/bundler/stub_specification.rb
 - bundler/lib/bundler/templates/.document
@@ -769,7 +771,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.18
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby.