rubygems-update 3.2.30 → 3.3.0

data/test/rubygems/test_require.rb

@@ -24,16 +24,6 @@ class TestGemRequire < Gem::TestCase
     end
   end
 
-  def setup
-    super
-
-    @old_loaded_features = $LOADED_FEATURES.dup
-    assert_raise LoadError do
-      require 'test_gem_require_a'
-    end
-    $LOADED_FEATURES.replace @old_loaded_features
-  end
-
   def assert_require(path)
     assert require(path), "'#{path}' was already required"
   end
@@ -88,8 +78,6 @@ class TestGemRequire < Gem::TestCase
     FileUtils.mkdir_p File.dirname c_rb
     File.open(c_rb, 'w') {|f| f.write "class Object; HELLO = 'world' end" }
 
-    lp = $LOAD_PATH.dup
-
     # Pretend to provide a commandline argument that overrides a file in gem b
     $LOAD_PATH.unshift dash_i_arg
 
@@ -98,7 +86,6 @@ class TestGemRequire < Gem::TestCase
     assert_equal "world", ::Object::HELLO
     assert_equal %w[a-1 b-1], loaded_spec_names
   ensure
-    $LOAD_PATH.replace lp
     Object.send :remove_const, :HELLO if Object.const_defined? :HELLO
   end
 
@@ -132,8 +119,6 @@ class TestGemRequire < Gem::TestCase
 
     assert_require 'test_gem_require_a'
 
-    lp = $LOAD_PATH.dup
-
     # Pretend to provide a commandline argument that overrides a file in gem b
     $LOAD_PATH.unshift dash_i_arg
 
@@ -142,7 +127,6 @@ class TestGemRequire < Gem::TestCase
     assert_equal "world", ::Object::HELLO
     assert_equal %w[a-1 b-1], loaded_spec_names
   ensure
-    $LOAD_PATH.replace lp
     Object.send :remove_const, :HELLO if Object.const_defined? :HELLO
   end
 
@@ -153,16 +137,10 @@ class TestGemRequire < Gem::TestCase
     dash_i_ext_arg = util_install_extension_file('a')
     dash_i_lib_arg = util_install_ruby_file('a')
 
-    lp = $LOAD_PATH.dup
-
-    begin
-      $LOAD_PATH.unshift dash_i_lib_arg
-      $LOAD_PATH.unshift dash_i_ext_arg
-      assert_require 'a'
-      assert_match(/a\.rb$/, $LOADED_FEATURES.last)
-    ensure
-      $LOAD_PATH.replace lp
-    end
+    $LOAD_PATH.unshift dash_i_lib_arg
+    $LOAD_PATH.unshift dash_i_ext_arg
+    assert_require 'a'
+    assert_match(/a\.rb$/, $LOADED_FEATURES.last)
   end
 
   def test_concurrent_require
@@ -466,8 +444,7 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_realworld_default_gem
-    testing_ruby_repo = !ENV["GEM_COMMAND"].nil?
-    pend "this test can't work under ruby-core setup" if testing_ruby_repo || java_platform?
+    omit "this test can't work under ruby-core setup" if testing_ruby_repo?
 
     cmd = <<-RUBY
       $stderr = $stdout
@@ -480,8 +457,7 @@ class TestGemRequire < Gem::TestCase
   end
 
   def test_realworld_upgraded_default_gem
-    testing_ruby_repo = !ENV["GEM_COMMAND"].nil?
-    pend "this test can't work under ruby-core setup" if testing_ruby_repo
+    omit "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
@@ -720,11 +696,8 @@ class TestGemRequire < Gem::TestCase
 
   private
 
-  def silence_warnings
-    old_verbose, $VERBOSE = $VERBOSE, false
-    yield
-  ensure
-    $VERBOSE = old_verbose
+  def testing_ruby_repo?
+    !ENV["GEM_COMMAND"].nil?
   end
 
   def util_install_extension_file(name)

data/test/rubygems/test_rubygems.rb

@@ -22,6 +22,29 @@ class GemTest < Gem::TestCase
     "the problem and ask for help."
   end
 
+  def test_operating_system_customizing_default_dir
+    pend "does not apply to truffleruby" if RUBY_ENGINE == 'truffleruby'
+    pend "loads a custom defaults/jruby file that gets in the middle" if RUBY_ENGINE == 'jruby'
+
+    # On a non existing default dir, there should be no gems
+
+    path = util_install_operating_system_rb <<-RUBY
+      module Gem
+        def self.default_dir
+          File.expand_path("foo")
+        end
+      end
+    RUBY
+
+    output = Gem::Util.popen(
+      *ruby_with_rubygems_and_fake_operating_system_in_load_path(path),
+      '-e',
+      "require \"rubygems\"; puts Gem::Specification.stubs.map(&:full_name)",
+      {:err => [:child, :out]}
+    ).strip
+    assert_empty output
+  end
+
   private
 
   def util_install_operating_system_rb(content)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.2.30
+  version: 3.3.0
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
@@ -134,7 +134,6 @@ files:
 - bundler/lib/bundler/gem_helpers.rb
 - bundler/lib/bundler/gem_tasks.rb
 - bundler/lib/bundler/gem_version_promoter.rb
-- bundler/lib/bundler/gemdeps.rb
 - bundler/lib/bundler/graph.rb
 - bundler/lib/bundler/index.rb
 - bundler/lib/bundler/injector.rb
@@ -222,6 +221,7 @@ files:
 - bundler/lib/bundler/rubygems_gem_installer.rb
 - bundler/lib/bundler/rubygems_integration.rb
 - bundler/lib/bundler/runtime.rb
+- bundler/lib/bundler/self_manager.rb
 - bundler/lib/bundler/settings.rb
 - bundler/lib/bundler/settings/validator.rb
 - bundler/lib/bundler/setup.rb
@@ -268,10 +268,12 @@ files:
 - bundler/lib/bundler/templates/newgem/newgem.gemspec.tt
 - bundler/lib/bundler/templates/newgem/rspec.tt
 - bundler/lib/bundler/templates/newgem/rubocop.yml.tt
+- bundler/lib/bundler/templates/newgem/sig/newgem.rbs.tt
 - bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
 - bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt
-- bundler/lib/bundler/templates/newgem/test/minitest/newgem_test.rb.tt
+- bundler/lib/bundler/templates/newgem/standard.yml.tt
 - bundler/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt
+- bundler/lib/bundler/templates/newgem/test/minitest/test_newgem.rb.tt
 - bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt
 - bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt
 - bundler/lib/bundler/templates/newgem/travis.yml.tt
@@ -280,6 +282,7 @@ files:
 - bundler/lib/bundler/ui/shell.rb
 - bundler/lib/bundler/ui/silent.rb
 - bundler/lib/bundler/uri_credentials_filter.rb
+- bundler/lib/bundler/vendor/.document
 - bundler/lib/bundler/vendor/connection_pool/LICENSE
 - bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb
 - bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
@@ -346,6 +349,8 @@ files:
 - bundler/lib/bundler/vendor/thor/lib/thor/util.rb
 - bundler/lib/bundler/vendor/thor/lib/thor/version.rb
 - bundler/lib/bundler/vendor/tmpdir/lib/tmpdir.rb
+- bundler/lib/bundler/vendor/tsort/LICENSE.txt
+- bundler/lib/bundler/vendor/tsort/lib/tsort.rb
 - bundler/lib/bundler/vendor/uri/LICENSE.txt
 - bundler/lib/bundler/vendor/uri/lib/uri.rb
 - bundler/lib/bundler/vendor/uri/lib/uri/common.rb
@@ -360,11 +365,14 @@ files:
 - bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb
 - bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb
 - bundler/lib/bundler/vendor/uri/lib/uri/version.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/ws.rb
+- bundler/lib/bundler/vendor/uri/lib/uri/wss.rb
 - bundler/lib/bundler/vendored_fileutils.rb
 - bundler/lib/bundler/vendored_molinillo.rb
 - bundler/lib/bundler/vendored_persistent.rb
 - bundler/lib/bundler/vendored_thor.rb
 - bundler/lib/bundler/vendored_tmpdir.rb
+- bundler/lib/bundler/vendored_tsort.rb
 - bundler/lib/bundler/vendored_uri.rb
 - bundler/lib/bundler/version.rb
 - bundler/lib/bundler/version_ranges.rb
@@ -446,6 +454,18 @@ files:
 - lib/rubygems/mock_gem_ui.rb
 - lib/rubygems/name_tuple.rb
 - lib/rubygems/openssl.rb
+- lib/rubygems/optparse.rb
+- lib/rubygems/optparse/.document
+- lib/rubygems/optparse/COPYING
+- lib/rubygems/optparse/lib/optionparser.rb
+- lib/rubygems/optparse/lib/optparse.rb
+- lib/rubygems/optparse/lib/optparse/ac.rb
+- lib/rubygems/optparse/lib/optparse/date.rb
+- lib/rubygems/optparse/lib/optparse/kwargs.rb
+- lib/rubygems/optparse/lib/optparse/shellwords.rb
+- lib/rubygems/optparse/lib/optparse/time.rb
+- lib/rubygems/optparse/lib/optparse/uri.rb
+- lib/rubygems/optparse/lib/optparse/version.rb
 - lib/rubygems/package.rb
 - lib/rubygems/package/digest_io.rb
 - lib/rubygems/package/file_source.rb
@@ -531,7 +551,6 @@ files:
 - lib/rubygems/security/signer.rb
 - lib/rubygems/security/trust_dir.rb
 - lib/rubygems/security_option.rb
-- lib/rubygems/server.rb
 - lib/rubygems/source.rb
 - lib/rubygems/source/git.rb
 - lib/rubygems/source/installed.rb
@@ -548,7 +567,12 @@ files:
 - lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
 - lib/rubygems/stub_specification.rb
 - lib/rubygems/text.rb
+- lib/rubygems/tsort.rb
+- lib/rubygems/tsort/.document
+- lib/rubygems/tsort/LICENSE.txt
+- lib/rubygems/tsort/lib/tsort.rb
 - lib/rubygems/uninstaller.rb
+- lib/rubygems/unknown_command_spell_checker.rb
 - lib/rubygems/uri.rb
 - lib/rubygems/uri_formatter.rb
 - lib/rubygems/user_interaction.rb
@@ -564,7 +588,6 @@ files:
 - test/rubygems/alternate_cert_32.pem
 - test/rubygems/alternate_key.pem
 - test/rubygems/bad_rake.rb
-- test/rubygems/bogussources.rb
 - test/rubygems/ca_cert.pem
 - test/rubygems/child_cert.pem
 - test/rubygems/child_cert_32.pem
@@ -621,6 +644,7 @@ files:
 - test/rubygems/test_bundled_ca.rb
 - test/rubygems/test_config.rb
 - test/rubygems/test_deprecate.rb
+- test/rubygems/test_exit.rb
 - test/rubygems/test_gem.rb
 - test/rubygems/test_gem_available_set.rb
 - test/rubygems/test_gem_bundler_version_finder.rb
@@ -723,7 +747,6 @@ files:
 - test/rubygems/test_gem_security_policy.rb
 - test/rubygems/test_gem_security_signer.rb
 - test/rubygems/test_gem_security_trust_dir.rb
-- test/rubygems/test_gem_server.rb
 - test/rubygems/test_gem_silent_ui.rb
 - test/rubygems/test_gem_source.rb
 - test/rubygems/test_gem_source_fetch_problem.rb
@@ -780,7 +803,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.30
+rubygems_version: 3.3.0
 signing_key:
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby.

data/bundler/lib/bundler/gemdeps.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Bundler
-  class Gemdeps
-    def initialize(runtime)
-      @runtime = runtime
-    end
-
-    def requested_specs
-      @runtime.requested_specs
-    end
-
-    def specs
-      @runtime.specs
-    end
-
-    def dependencies
-      @runtime.dependencies
-    end
-
-    def current_dependencies
-      @runtime.current_dependencies
-    end
-
-    def requires
-      @runtime.requires
-    end
-  end
-end