rubygems-update 3.2.0.rc.2 → 3.2.0

data/test/rubygems/test_gem_security_policy.rb

@@ -2,7 +2,7 @@
 
 require 'rubygems/test_case'
 
-unless defined?(OpenSSL::SSL)
+unless Gem::HAVE_OPENSSL
   warn 'Skipping Gem::Security::Policy tests.  openssl not found.'
 end
 
@@ -532,4 +532,4 @@ class TestGemSecurityPolicy < Gem::TestCase
 
     return digests, signatures
   end
-end if defined?(OpenSSL::SSL)
+end if Gem::HAVE_OPENSSL

data/test/rubygems/test_gem_security_signer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'rubygems/test_case'
 
-unless defined?(OpenSSL::SSL)
+unless Gem::HAVE_OPENSSL
   warn 'Skipping Gem::Security::Signer tests.  openssl not found.'
 end
 
@@ -214,4 +214,4 @@ toqvglr0kdbknSRRjBVLK6tsgr07aLT9gNP7mTW2PA==
       signer.sign 'hello'
     end
   end
-end if defined?(OpenSSL::SSL)
+end if Gem::HAVE_OPENSSL

data/test/rubygems/test_gem_security_trust_dir.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'rubygems/test_case'
 
-unless defined?(OpenSSL::SSL)
+unless Gem::HAVE_OPENSSL
   warn 'Skipping Gem::Security::TrustDir tests.  openssl not found.'
 end
 
@@ -95,4 +95,4 @@ class TestGemSecurityTrustDir < Gem::TestCase
 
     assert_equal mask, File.stat(@dest_dir).mode unless win_platform?
   end
-end if defined?(OpenSSL::SSL)
+end if Gem::HAVE_OPENSSL

data/test/rubygems/test_gem_source.rb

@@ -240,6 +240,11 @@ class TestGemSource < Gem::TestCase
     refute rubygems_source.typo_squatting?("rubysertgems.org")
   end
 
+  def test_typo_squatting_false_positive
+    rubygems_source = Gem::Source.new("https://rubygems.org")
+    refute rubygems_source.typo_squatting?("rubygems.org")
+  end
+
   def test_typo_squatting_custom_distance_threshold
     rubygems_source = Gem::Source.new("https://rubgems.org")
     distance_threshold = 5

data/test/rubygems/test_gem_source_subpath_problem.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+require 'rubygems/test_case'
+require 'rubygems/source'
+
+class TestGemSourceSubpathProblem < Gem::TestCase
+  def tuple(*args)
+    Gem::NameTuple.new(*args)
+  end
+
+  def setup
+    super
+
+    @gem_repo = "http://gems.example.com/private"
+
+    spec_fetcher
+
+    @source = Gem::Source.new(@gem_repo)
+
+    util_make_gems
+  end
+
+  def test_dependency_resolver_set
+    response = Net::HTTPResponse.new '1.1', 200, 'OK'
+    response.uri = URI('http://example') if response.respond_to? :uri
+
+    @fetcher.data["#{@gem_repo}/api/v1/dependencies"] = response
+
+    set = @source.dependency_resolver_set
+
+    assert_kind_of Gem::Resolver::APISet, set
+  end
+
+  def test_fetch_spec
+    @fetcher.data["#{@gem_repo}/#{Gem::MARSHAL_SPEC_DIR}#{@a1.spec_name}.rz"] = Zlib::Deflate.deflate(Marshal.dump(@a1))
+
+    spec = @source.fetch_spec tuple('a', Gem::Version.new(1), 'ruby')
+    assert_equal @a1.full_name, spec.full_name
+  end
+
+  def test_load_specs
+    @fetcher.data["#{@gem_repo}/latest_specs.#{Gem.marshal_version}.gz"] = util_gzip(Marshal.dump([
+      Gem::NameTuple.new(@a1.name, @a1.version, 'ruby'),
+      Gem::NameTuple.new(@b2.name, @b2.version, 'ruby'),
+    ]))
+
+    released = @source.load_specs(:latest).map {|spec| spec.full_name }
+    assert_equal %W[a-1 b-2], released
+  end
+end

data/test/rubygems/test_gem_specification.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'benchmark'
 require 'rubygems/test_case'
+require 'date'
 require 'pathname'
 require 'stringio'
 require 'rubygems/ext'
@@ -1999,7 +2000,7 @@ dependencies: []
     test_cases = {
       'i386-mswin32'      => 'a-1-x86-mswin32-60',
       'i386-mswin32_80'   => 'a-1-x86-mswin32-80',
-      'i386-mingw32'      => 'a-1-x86-mingw32'
+      'i386-mingw32'      => 'a-1-x86-mingw32',
     }
 
     test_cases.each do |arch, expected|
@@ -3035,7 +3036,7 @@ Please report a bug if this causes problems.
     specification.define_singleton_method(:find_all_by_name) do |dep_name|
       [
         specification.new {|s| s.name = "z", s.version = Gem::Version.new("1") },
-        specification.new {|s| s.name = "z", s.version = Gem::Version.new("2") }
+        specification.new {|s| s.name = "z", s.version = Gem::Version.new("2") },
       ]
     end
 
@@ -3578,7 +3579,7 @@ Did you mean 'Ruby'?
           "one"          => "two",
           "home"         => "three",
           "homepage_uri" => "https://example.com/user/repo",
-          "funding_uri"  => "https://example.com/donate"
+          "funding_uri"  => "https://example.com/donate",
         }
       end
 
@@ -3838,7 +3839,7 @@ end
 
     default_gem_spec = new_default_spec("default", "2.0.0.0",
                                         nil, "default/gem.rb")
-    spec_path = File.join(@default_spec_dir, default_gem_spec.spec_name)
+    spec_path = File.join(@gemhome, "specifications", "default", default_gem_spec.spec_name)
     write_file(spec_path) do |file|
       file.print(default_gem_spec.to_ruby)
     end

data/test/rubygems/test_gem_uninstaller.rb

@@ -177,7 +177,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
 
     @spec.files += %w[lib/rubygems_plugin.rb]
 
-    Gem::Installer.at(Gem::Package.build(@spec)).install
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
 
     plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
     assert File.exist?(plugin_path), 'plugin not written'
@@ -194,7 +194,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
 
     @spec.files += %w[lib/rubygems_plugin.rb]
 
-    Gem::Installer.at(Gem::Package.build(@spec)).install
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
 
     plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
     assert File.exist?(plugin_path), 'plugin not written'
@@ -212,7 +212,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
 
     @spec.files += %w[lib/rubygems_plugin.rb]
 
-    Gem::Installer.at(Gem::Package.build(@spec)).install
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
 
     plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
     assert File.exist?(plugin_path), 'plugin not written'
@@ -314,7 +314,7 @@ create_makefile '#{@spec.name}'
     use_ui @ui do
       path = Gem::Package.build @spec
 
-      installer = Gem::Installer.at path
+      installer = Gem::Installer.at path, :force => true
       installer.install
     end
 
@@ -633,19 +633,19 @@ create_makefile '#{@spec.name}'
     plugin_path = File.join Gem.plugindir, 'a_plugin.rb'
 
     @spec.version = '1'
-    Gem::Installer.at(Gem::Package.build(@spec)).install
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
 
     refute File.exist?(plugin_path), 'version without plugin installed, but plugin written'
 
     @spec.files += %w[lib/rubygems_plugin.rb]
     @spec.version = '2'
-    Gem::Installer.at(Gem::Package.build(@spec)).install
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
 
     assert File.exist?(plugin_path), 'version with plugin installed, but plugin not written'
     assert_match %r{\Arequire.*a-2/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'written plugin has incorrect content'
 
     @spec.version = '3'
-    Gem::Installer.at(Gem::Package.build(@spec)).install
+    Gem::Installer.at(Gem::Package.build(@spec), :force => true).install
 
     assert File.exist?(plugin_path), 'version with plugin installed, but plugin removed'
     assert_match %r{\Arequire.*a-3/lib/rubygems_plugin\.rb}, File.read(plugin_path), 'old version installed, but plugin updated'

data/test/rubygems/test_gem_validator.rb

@@ -26,7 +26,7 @@ class TestGemValidator < Gem::TestCase
       @spec.file_name => [
         Gem::Validator::ErrorData.new('lib/b.rb', 'Missing file'),
         Gem::Validator::ErrorData.new('lib/c.rb', 'Extra file'),
-      ]
+      ],
     }
 
     assert_equal expected, alien

data/test/rubygems/test_gem_version_option.rb

@@ -56,7 +56,7 @@ class TestGemVersionOption < Gem::TestCase
     @cmd.handle_options %w[--platform ruby]
 
     expected = [
-      Gem::Platform::RUBY
+      Gem::Platform::RUBY,
     ]
 
     assert_equal expected, Gem.platforms

data/test/rubygems/test_require.rb

@@ -120,7 +120,7 @@ class TestGemRequire < Gem::TestCase
     c1 = new_default_spec "c", "1", nil, "c/c.rb"
     c2 = new_default_spec "c", "2", nil, "c/c.rb"
 
-    install_default_specs c1, c2, b1, a1
+    install_default_gems c1, c2, b1, a1
 
     dir = Dir.mktmpdir("test_require", @tempdir)
     dash_i_arg = File.join dir, 'lib'
@@ -405,8 +405,8 @@ class TestGemRequire < Gem::TestCase
 
     # Remove an old default gem version directly from disk as if someone ran
     # gem cleanup.
-    FileUtils.rm_rf(File.join @default_dir, "#{b1.full_name}")
-    FileUtils.rm_rf(File.join @default_spec_dir, "#{b1.full_name}.gemspec")
+    FileUtils.rm_rf(File.join @gemhome, "#{b1.full_name}")
+    FileUtils.rm_rf(File.join @gemhome, "specifications", "default", "#{b1.full_name}.gemspec")
 
     # Require gems that have not been removed.
     assert_require 'a/b'
@@ -433,7 +433,7 @@ class TestGemRequire < Gem::TestCase
   def test_default_gem_only
     default_gem_spec = new_default_spec("default", "2.0.0.0",
                                         nil, "default/gem.rb")
-    install_default_specs(default_gem_spec)
+    install_default_gems(default_gem_spec)
     assert_require "default/gem"
     assert_equal %w[default-2.0.0.0], loaded_spec_names
   end
@@ -441,7 +441,7 @@ class TestGemRequire < Gem::TestCase
   def test_default_gem_require_activates_just_once
     default_gem_spec = new_default_spec("default", "2.0.0.0",
                                         nil, "default/gem.rb")
-    install_default_specs(default_gem_spec)
+    install_default_gems(default_gem_spec)
 
     assert_require "default/gem"
 
@@ -506,7 +506,7 @@ class TestGemRequire < Gem::TestCase
   def test_default_gem_and_normal_gem
     default_gem_spec = new_default_spec("default", "2.0.0.0",
                                         nil, "default/gem.rb")
-    install_default_specs(default_gem_spec)
+    install_default_gems(default_gem_spec)
     normal_gem_spec = util_spec("default", "3.0", nil,
                                "lib/default/gem.rb")
     install_specs(normal_gem_spec)
@@ -544,11 +544,11 @@ class TestGemRequire < Gem::TestCase
   def test_default_gem_prerelease
     default_gem_spec = new_default_spec("default", "2.0.0",
                                         nil, "default/gem.rb")
-    install_default_specs(default_gem_spec)
+    install_default_gems(default_gem_spec)
 
     normal_gem_higher_prerelease_spec = util_spec("default", "3.0.0.rc2", nil,
                                                   "lib/default/gem.rb")
-    install_default_specs(normal_gem_higher_prerelease_spec)
+    install_default_gems(normal_gem_higher_prerelease_spec)
 
     assert_require "default/gem"
     assert_equal %w[default-3.0.0.rc2], loaded_spec_names
@@ -586,7 +586,7 @@ class TestGemRequire < Gem::TestCase
   def test_require_when_gem_defined
     default_gem_spec = new_default_spec("default", "2.0.0.0",
                                         nil, "default/gem.rb")
-    install_default_specs(default_gem_spec)
+    install_default_gems(default_gem_spec)
     c = Class.new do
       def self.gem(*args)
         raise "received #gem with #{args.inspect}"
@@ -677,6 +677,47 @@ class TestGemRequire < Gem::TestCase
         end
       end
     end
+
+    def test_no_crash_when_overriding_warn_with_warning_module
+      skip "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'")
+        _, err = capture_subprocess_io do
+          system(*ruby_with_rubygems_in_load_path, "-w", "--disable=gems", "-C", dir, "main.rb")
+        end
+        assert_match(/Foo Bar\n$/, err)
+        _, err = capture_subprocess_io do
+          system(*ruby_with_rubygems_in_load_path, "-w", "--enable=gems", "-C", dir, "main.rb")
+        end
+        assert_match(/Foo Bar\n$/, err)
+      end
+    end
+
+    def test_expected_backtrace_location_when_inheriting_from_basic_object_and_including_kernel
+      Dir.mktmpdir("warn_test") do |dir|
+        File.write(dir + "/main.rb", "\nrequire 'sub'\n")
+        File.write(dir + "/sub.rb", <<-'RUBY')
+          require 'rubygems'
+          class C < BasicObject
+            include ::Kernel
+            def deprecated
+              warn "This is a deprecated method", uplevel: 2
+            end
+          end
+          C.new.deprecated
+        RUBY
+
+        _, err = capture_subprocess_io do
+          system(*ruby_with_rubygems_in_load_path, "-w", "--disable=gems", "-C", dir, "-I", dir, "main.rb")
+        end
+        assert_match(/main\.rb:2: warning: This is a deprecated method$/, err)
+        _, err = capture_subprocess_io do
+          system(*ruby_with_rubygems_in_load_path, "-w", "--enable=gems", "-C", dir, "-I", dir, "main.rb")
+        end
+        assert_match(/main\.rb:2: warning: This is a deprecated method$/, err)
+      end
+    end
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
@@ -169,6 +169,32 @@ files:
 - bundler/lib/bundler/lazy_specification.rb
 - bundler/lib/bundler/lockfile_generator.rb
 - bundler/lib/bundler/lockfile_parser.rb
+- bundler/lib/bundler/man/.document
+- bundler/lib/bundler/man/bundle-add.1.ronn
+- bundler/lib/bundler/man/bundle-binstubs.1.ronn
+- bundler/lib/bundler/man/bundle-cache.1.ronn
+- bundler/lib/bundler/man/bundle-check.1.ronn
+- bundler/lib/bundler/man/bundle-clean.1.ronn
+- bundler/lib/bundler/man/bundle-config.1.ronn
+- bundler/lib/bundler/man/bundle-doctor.1.ronn
+- bundler/lib/bundler/man/bundle-exec.1.ronn
+- bundler/lib/bundler/man/bundle-gem.1.ronn
+- bundler/lib/bundler/man/bundle-info.1.ronn
+- bundler/lib/bundler/man/bundle-init.1.ronn
+- bundler/lib/bundler/man/bundle-inject.1.ronn
+- bundler/lib/bundler/man/bundle-install.1.ronn
+- bundler/lib/bundler/man/bundle-list.1.ronn
+- bundler/lib/bundler/man/bundle-lock.1.ronn
+- bundler/lib/bundler/man/bundle-open.1.ronn
+- bundler/lib/bundler/man/bundle-outdated.1.ronn
+- bundler/lib/bundler/man/bundle-platform.1.ronn
+- bundler/lib/bundler/man/bundle-pristine.1.ronn
+- bundler/lib/bundler/man/bundle-remove.1.ronn
+- bundler/lib/bundler/man/bundle-show.1.ronn
+- bundler/lib/bundler/man/bundle-update.1.ronn
+- bundler/lib/bundler/man/bundle-viz.1.ronn
+- bundler/lib/bundler/man/bundle.1.ronn
+- bundler/lib/bundler/man/gemfile.5.ronn
 - bundler/lib/bundler/match_platform.rb
 - bundler/lib/bundler/mirror.rb
 - bundler/lib/bundler/plugin.rb
@@ -254,7 +280,6 @@ files:
 - bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb
 - bundler/lib/bundler/vendor/fileutils/lib/fileutils.rb
 - bundler/lib/bundler/vendor/molinillo/lib/molinillo.rb
-- bundler/lib/bundler/vendor/molinillo/lib/molinillo/compatibility.rb
 - bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
 - bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
 - bundler/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb
@@ -309,6 +334,7 @@ files:
 - bundler/lib/bundler/vendor/thor/lib/thor/shell/html.rb
 - 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/uri/lib/uri.rb
 - bundler/lib/bundler/vendor/uri/lib/uri/common.rb
 - bundler/lib/bundler/vendor/uri/lib/uri/file.rb
@@ -326,6 +352,7 @@ files:
 - 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_uri.rb
 - bundler/lib/bundler/version.rb
 - bundler/lib/bundler/version_ranges.rb
@@ -333,55 +360,31 @@ files:
 - bundler/lib/bundler/worker.rb
 - bundler/lib/bundler/yaml_serializer.rb
 - bundler/man/bundle-add.1
-- bundler/man/bundle-add.1.ronn
 - bundler/man/bundle-binstubs.1
-- bundler/man/bundle-binstubs.1.ronn
 - bundler/man/bundle-cache.1
-- bundler/man/bundle-cache.1.ronn
 - bundler/man/bundle-check.1
-- bundler/man/bundle-check.1.ronn
 - bundler/man/bundle-clean.1
-- bundler/man/bundle-clean.1.ronn
 - bundler/man/bundle-config.1
-- bundler/man/bundle-config.1.ronn
 - bundler/man/bundle-doctor.1
-- bundler/man/bundle-doctor.1.ronn
 - bundler/man/bundle-exec.1
-- bundler/man/bundle-exec.1.ronn
 - bundler/man/bundle-gem.1
-- bundler/man/bundle-gem.1.ronn
 - bundler/man/bundle-info.1
-- bundler/man/bundle-info.1.ronn
 - bundler/man/bundle-init.1
-- bundler/man/bundle-init.1.ronn
 - bundler/man/bundle-inject.1
-- bundler/man/bundle-inject.1.ronn
 - bundler/man/bundle-install.1
-- bundler/man/bundle-install.1.ronn
 - bundler/man/bundle-list.1
-- bundler/man/bundle-list.1.ronn
 - bundler/man/bundle-lock.1
-- bundler/man/bundle-lock.1.ronn
 - bundler/man/bundle-open.1
-- bundler/man/bundle-open.1.ronn
 - bundler/man/bundle-outdated.1
-- bundler/man/bundle-outdated.1.ronn
 - bundler/man/bundle-platform.1
-- bundler/man/bundle-platform.1.ronn
 - bundler/man/bundle-pristine.1
-- bundler/man/bundle-pristine.1.ronn
 - bundler/man/bundle-remove.1
-- bundler/man/bundle-remove.1.ronn
 - bundler/man/bundle-show.1
-- bundler/man/bundle-show.1.ronn
 - bundler/man/bundle-update.1
-- bundler/man/bundle-update.1.ronn
 - bundler/man/bundle-viz.1
-- bundler/man/bundle-viz.1.ronn
 - bundler/man/bundle.1
-- bundler/man/bundle.1.ronn
 - bundler/man/gemfile.5
-- bundler/man/gemfile.5.ronn
+- bundler/man/index.txt
 - hide_lib_for_update/note.txt
 - lib/rubygems.rb
 - lib/rubygems/available_set.rb
@@ -554,9 +557,8 @@ files:
 - lib/rubygems/specification.rb
 - lib/rubygems/specification_policy.rb
 - lib/rubygems/ssl_certs/.document
-- lib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem
-- lib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem
-- lib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem
+- lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA.pem
+- lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
 - lib/rubygems/stub_specification.rb
 - lib/rubygems/syck_hack.rb
 - lib/rubygems/test_case.rb
@@ -740,6 +742,7 @@ files:
 - test/rubygems/test_gem_source_local.rb
 - test/rubygems/test_gem_source_lock.rb
 - test/rubygems/test_gem_source_specific_file.rb
+- test/rubygems/test_gem_source_subpath_problem.rb
 - test/rubygems/test_gem_source_vendor.rb
 - test/rubygems/test_gem_spec_fetcher.rb
 - test/rubygems/test_gem_specification.rb
@@ -782,7 +785,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.2.0
 signing_key:
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby.