rubygems-update 3.1.6 → 3.3.22

data/{lib → test}/rubygems/installer_test_case.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/installer'
+require_relative "helper"
+require "rubygems/installer"
 
 class Gem::Installer
-
   ##
   # Available through requiring rubygems/installer_test_case
 
@@ -58,14 +57,12 @@ class Gem::Installer
   # Available through requiring rubygems/installer_test_case
 
   attr_writer :wrappers
-
 end
 
 ##
 # A test case for Gem::Installer.
 
 class Gem::InstallerTestCase < Gem::TestCase
-
   def setup
     super
 
@@ -111,9 +108,9 @@ class Gem::InstallerTestCase < Gem::TestCase
   #
   # And returns a Gem::Installer for the @spec that installs into @gemhome
 
-  def setup_base_installer
+  def setup_base_installer(force = true)
     @gem = setup_base_gem
-    util_installer @spec, @gemhome
+    util_installer @spec, @gemhome, false, force
   end
 
   ##
@@ -136,7 +133,7 @@ class Gem::InstallerTestCase < Gem::TestCase
   # And returns it
 
   def setup_base_spec
-    quick_gem 'a' do |spec|
+    quick_gem "a" do |spec|
       util_make_exec spec
     end
   end
@@ -157,7 +154,7 @@ class Gem::InstallerTestCase < Gem::TestCase
   # And returns a Gem::Installer for the @user_spec that installs into Gem.user_dir
 
   def setup_base_user_installer
-    @user_spec = quick_gem 'b' do |spec|
+    @user_spec = quick_gem "b" do |spec|
       util_make_exec spec
     end
 
@@ -171,10 +168,10 @@ class Gem::InstallerTestCase < Gem::TestCase
   ##
   # Sets up the base @gem, builds it and returns an installer for it.
   #
-  def util_setup_installer
+  def util_setup_installer(&block)
     @gem = setup_base_gem
 
-    util_setup_gem
+    util_setup_gem(&block)
   end
 
   ##
@@ -185,24 +182,24 @@ class Gem::InstallerTestCase < Gem::TestCase
   #   lib/code.rb
   #   ext/a/mkrf_conf.rb
 
-  def util_setup_gem(ui = @ui)
-    @spec.files << File.join('lib', 'code.rb')
-    @spec.extensions << File.join('ext', 'a', 'mkrf_conf.rb')
+  def util_setup_gem(ui = @ui, force = true)
+    @spec.files << File.join("lib", "code.rb")
+    @spec.extensions << File.join("ext", "a", "mkrf_conf.rb")
 
     Dir.chdir @tempdir do
-      FileUtils.mkdir_p 'bin'
-      FileUtils.mkdir_p 'lib'
-      FileUtils.mkdir_p File.join('ext', 'a')
+      FileUtils.mkdir_p "bin"
+      FileUtils.mkdir_p "lib"
+      FileUtils.mkdir_p File.join("ext", "a")
 
-      File.open File.join('bin', 'executable'), 'w' do |f|
+      File.open File.join("bin", "executable"), "w" do |f|
         f.puts "raise 'ran executable'"
       end
 
-      File.open File.join('lib', 'code.rb'), 'w' do |f|
-        f.puts '1'
+      File.open File.join("lib", "code.rb"), "w" do |f|
+        f.puts "1"
       end
 
-      File.open File.join('ext', 'a', 'mkrf_conf.rb'), 'w' do |f|
+      File.open File.join("ext", "a", "mkrf_conf.rb"), "w" do |f|
         f << <<-EOF
           File.open 'Rakefile', 'w' do |rf| rf.puts "task :default" end
         EOF
@@ -217,17 +214,34 @@ class Gem::InstallerTestCase < Gem::TestCase
       end
     end
 
-    Gem::Installer.at @gem
+    Gem::Installer.at @gem, :force => force
   end
 
   ##
   # Creates an installer for +spec+ that will install into +gem_home+.  If
   # +user+ is true a user-install will be performed.
 
-  def util_installer(spec, gem_home, user=false)
+  def util_installer(spec, gem_home, user=false, force=true)
     Gem::Installer.at(spec.cache_file,
                        :install_dir => gem_home,
-                       :user_install => user)
+                       :user_install => user,
+                       :force => force)
   end
 
+  @@symlink_supported = nil
+
+  # This is needed for Windows environment without symlink support enabled (the default
+  # for non admin) to be able to skip test for features using symlinks.
+  def symlink_supported?
+    if @@symlink_supported.nil?
+      begin
+        File.symlink("", "")
+      rescue Errno::ENOENT, Errno::EEXIST
+        @@symlink_supported = true
+      rescue NotImplementedError, SystemCallError
+        @@symlink_supported = false
+      end
+    end
+    @@symlink_supported
+  end
 end

data/{lib → test}/rubygems/package/tar_test_case.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/package'
+require_relative "../helper"
+require "rubygems/package"
 
 ##
 # A test case for Gem::Package::Tar* classes
 
 class Gem::Package::TarTestCase < Gem::TestCase
-
   def ASCIIZ(str, length)
     str + "\0" * (length - str.length)
   end
@@ -68,7 +67,7 @@ class Gem::Package::TarTestCase < Gem::TestCase
   end
 
   def calc_checksum(header)
-    sum = header.unpack("C*").inject{|s,a| s + a}
+    sum = header.unpack("C*").inject {|s,a| s + a }
     SP(Z(to_oct(sum, 6)))
   end
 
@@ -91,7 +90,7 @@ class Gem::Package::TarTestCase < Gem::TestCase
       ASCIIZ("wheel", 32),   # char gname[32];     ASCIIZ
       Z(to_oct(0, 7)),       # char devmajor[8];   0 padded, octal, null
       Z(to_oct(0, 7)),       # char devminor[8];   0 padded, octal, null
-      ASCIIZ(dname, 155)     # char prefix[155];   ASCII + (Z unless filled)
+      ASCIIZ(dname, 155), # char prefix[155];   ASCII + (Z unless filled)
     ]
 
     h = arr.join
@@ -137,5 +136,4 @@ class Gem::Package::TarTestCase < Gem::TestCase
   def util_symlink_entry
     util_entry tar_symlink_header("foo", "bar", 0, Time.now, "link")
   end
-
 end

data/test/rubygems/plugin/exception/rubygems_plugin.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 TestGem::TEST_PLUGIN_EXCEPTION = :loaded
-raise Exception.new('boom')
+raise Exception.new("boom")

data/test/rubygems/plugin/load/rubygems_plugin.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 class TestGem
-
   TEST_PLUGIN_LOAD = :loaded
-
 end

data/test/rubygems/plugin/standarderror/rubygems_plugin.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 TestGem::TEST_PLUGIN_STANDARDERROR = :loaded
-raise StandardError.new('boom')
+raise StandardError.new("boom")

data/test/rubygems/private_ec_key.pem

@@ -0,0 +1,9 @@
+-----BEGIN EC PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-256-CBC,4107F98A374CB8EC18F1AA4EA4B6A0DB
+
+BRklFxJGcz7gqQYxek8TZkt8qbPhB0FSR6nyw3SYuio/2tlT9ohs74mlK3EbG9Lt
+Y4OquJbksBFmoB7fIoM4vnuIZ0Eoz2ooxn9tjhBtqJ3mVscYXwZmA3UDUWDMlviQ
+Fu37OpikQv4TFA1jlmUK0LM8xmUCfUeLl0kHD17lFsz2gkO2kwg8mn/YUMOIaDOu
+EnnmxbAwnZBpemQkQfpTt2mYL9gu3CcMt5gokBuGDxY=
+-----END EC PRIVATE KEY-----

data/test/rubygems/rubygems/commands/crash_command.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 class Gem::Commands::CrashCommand < Gem::Command
-
   raise "crash"
-
 end

data/test/rubygems/rubygems_plugin.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'rubygems/command_manager'
+require "rubygems/command_manager"
 
 ##
 # This is an example of exactly what NOT to do.
@@ -11,15 +11,13 @@ module Gem::Commands
 end
 
 class Gem::Commands::InterruptCommand < Gem::Command
-
   def initialize
-    super('interrupt', 'Raises an Interrupt Exception', {})
+    super("interrupt", "Raises an Interrupt Exception", {})
   end
 
   def execute
     raise Interrupt, "Interrupt exception"
   end
-
 end
 
 Gem::CommandManager.instance.register_command :interrupt

data/test/rubygems/specifications/bar-0.0.2.gemspec

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name          = "bar"
   s.version       = "0.0.2"

data/test/rubygems/specifications/rubyforge-0.0.1.gemspec

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name              = "rubyforge"
   s.version           = "0.0.1"
@@ -7,8 +5,8 @@ Gem::Specification.new do |s|
   s.require_paths     = ["lib"]
   s.summary           = "A very bar gem"
   s.authors           = ["unknown"]
-  s.license           = 'MIT'
-  s.homepage          = 'http://example.com'
-  s.files             = ['README.md']
-  s.rubyforge_project = 'abc'
+  s.license           = "MIT"
+  s.homepage          = "http://example.com"
+  s.files             = ["README.md"]
+  s.rubyforge_project = "abc"
 end

data/test/rubygems/test_bundled_ca.rb

@@ -1,67 +1,60 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'net/https'
-require 'rubygems/request'
+require_relative "helper"
+require "net/http"
+require "rubygems/openssl"
+
+unless Gem::HAVE_OPENSSL
+  warn "Skipping bundled certificates tests.  openssl not found."
+end
+
+require "rubygems/request"
 
 # = Testing Bundled CA
 #
 # The tested hosts are explained in detail here: https://github.com/rubygems/rubygems/commit/5e16a5428f973667cabfa07e94ff939e7a83ebd9
 #
 
-if ENV["CI"] || ENV["TEST_SSL"]
-  class TestBundledCA < Gem::TestCase
-
-    THIS_FILE = File.expand_path __FILE__
-
-    def bundled_certificate_store
-      store = OpenSSL::X509::Store.new
+class TestBundledCA < Gem::TestCase
+  def bundled_certificate_store
+    store = OpenSSL::X509::Store.new
 
-      ssl_cert_glob =
-        File.expand_path '../../../lib/rubygems/ssl_certs/*/*.pem', THIS_FILE
-
-      Dir[ssl_cert_glob].each do |ssl_cert|
-        store.add_file ssl_cert
-      end
-
-      store
+    Gem::Request.get_cert_files.each do |ssl_cert|
+      store.add_file ssl_cert
     end
 
-    def assert_https(host)
-      if self.respond_to? :_assertions # minitest <= 4
-        self._assertions += 1
-      else # minitest >= 5
-        self.assertions += 1
-      end
-      http = Net::HTTP.new(host, 443)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      http.cert_store = bundled_certificate_store
-      http.get('/')
-    rescue Errno::ENOENT, Errno::ETIMEDOUT, SocketError
-      skip "#{host} seems offline, I can't tell whether ssl would work."
-    rescue OpenSSL::SSL::SSLError => e
-      # Only fail for certificate verification errors
-      if e.message =~ /certificate verify failed/
-        flunk "#{host} is not verifiable using the included certificates. Error was: #{e.message}"
-      end
-      raise
-    end
+    store
+  end
 
-    def test_accessing_rubygems
-      assert_https('rubygems.org')
+  def assert_https(host)
+    assert true
+    http = Net::HTTP.new(host, 443)
+    http.use_ssl = true
+    http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    http.cert_store = bundled_certificate_store
+    http.get("/")
+  rescue Errno::ENOENT, Errno::ETIMEDOUT, SocketError
+    pend "#{host} seems offline, I can't tell whether ssl would work."
+  rescue OpenSSL::SSL::SSLError => e
+    # Only fail for certificate verification errors
+    if e.message =~ /certificate verify failed/
+      flunk "#{host} is not verifiable using the included certificates. Error was: #{e.message}"
     end
+    raise
+  end
 
-    def test_accessing_www_rubygems
-      assert_https('www.rubygems.org')
-    end
+  def test_accessing_rubygems
+    assert_https("rubygems.org")
+  end
 
-    def test_accessing_staging
-      assert_https('staging.rubygems.org')
-    end
+  def test_accessing_www_rubygems
+    assert_https("www.rubygems.org")
+  end
 
-    def test_accessing_new_index
-      assert_https('index.rubygems.org')
-    end
+  def test_accessing_staging
+    assert_https("staging.rubygems.org")
+  end
 
+  def test_accessing_new_index
+    assert_https("index.rubygems.org")
   end
-end
+end if Gem::HAVE_OPENSSL

data/test/rubygems/test_config.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems'
-require 'shellwords'
+require_relative "helper"
+require "rubygems"
+require "shellwords"
 
 class TestConfig < Gem::TestCase
-
   def test_datadir
     util_make_gems
     spec = Gem::Specification.find_by_name("a")
@@ -13,17 +12,16 @@ class TestConfig < Gem::TestCase
   end
 
   def test_good_rake_path_is_escaped
-    path = Gem::TestCase.class_eval('@@good_rake')
+    path = Gem::TestCase.class_variable_get(:@@good_rake)
     ruby, rake = path.shellsplit
     assert_equal(Gem.ruby, ruby)
     assert_match(/\/good_rake.rb\z/, rake)
   end
 
   def test_bad_rake_path_is_escaped
-    path = Gem::TestCase.class_eval('@@bad_rake')
+    path = Gem::TestCase.class_variable_get(:@@bad_rake)
     ruby, rake = path.shellsplit
     assert_equal(Gem.ruby, ruby)
     assert_match(/\/bad_rake.rb\z/, rake)
   end
-
 end

data/test/rubygems/test_deprecate.rb

@@ -1,15 +1,11 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-# require 'rubygems/builder'
-# require 'rubygems/package'
-require 'rubygems/deprecate'
+require_relative "helper"
+require "rubygems/deprecate"
 
 class TestDeprecate < Gem::TestCase
-
   def setup
     super
 
-    # Gem::Deprecate.saved_warnings.clear
     @original_skip = Gem::Deprecate.skip
     Gem::Deprecate.skip = false
   end
@@ -17,7 +13,6 @@ class TestDeprecate < Gem::TestCase
   def teardown
     super
 
-    # Gem::Deprecate.saved_warnings.clear
     Gem::Deprecate.skip = @original_skip
   end
 
@@ -45,7 +40,34 @@ class TestDeprecate < Gem::TestCase
   end
 
   class Thing
+    extend Gem::Deprecate
+    attr_accessor :message
+    def foo
+      @message = "foo"
+    end
+    def bar
+      @message = "bar"
+    end
+    rubygems_deprecate :foo, :bar
+
+    def foo_arg(msg)
+      @message = "foo" + msg
+    end
+    def bar_arg(msg)
+      @message = "bar" + msg
+    end
+    rubygems_deprecate :foo_arg, :bar_arg
+
+    def foo_kwarg(message:)
+      @message = "foo" + message
+    end
+    def bar_kwarg(message:)
+      @message = "bar" + message
+    end
+    rubygems_deprecate :foo_kwarg, :bar_kwarg
+  end
 
+  class OtherThing
     extend Gem::Deprecate
     attr_accessor :message
     def foo
@@ -56,25 +78,80 @@ class TestDeprecate < Gem::TestCase
     end
     deprecate :foo, :bar, 2099, 3
 
+    def foo_arg(msg)
+      @message = "foo" + msg
+    end
+    def bar_arg(msg)
+      @message = "bar" + msg
+    end
+    deprecate :foo_arg, :bar_arg, 2099, 3
+
+    def foo_kwarg(message:)
+      @message = "foo" + message
+    end
+    def bar_kwarg(message:)
+      @message = "bar" + message
+    end
+    deprecate :foo_kwarg, :bar_kwarg, 2099, 3
   end
 
   def test_deprecated_method_calls_the_old_method
-    capture_io do
+    capture_output do
       thing = Thing.new
       thing.foo
       assert_equal "foo", thing.message
+      thing.foo_arg("msg")
+      assert_equal "foomsg", thing.message
+      thing.foo_kwarg(message: "msg")
+      assert_equal "foomsg", thing.message
     end
   end
 
   def test_deprecated_method_outputs_a_warning
-    out, err = capture_io do
+    out, err = capture_output do
       thing = Thing.new
       thing.foo
+      thing.foo_arg("msg")
+      thing.foo_kwarg(message: "msg")
     end
 
     assert_equal "", out
     assert_match(/Thing#foo is deprecated; use bar instead\./, err)
-    assert_match(/on or after 2099-03-01/, err)
+    assert_match(/Thing#foo_arg is deprecated; use bar_arg instead\./, err)
+    assert_match(/Thing#foo_kwarg is deprecated; use bar_kwarg instead\./, err)
+    assert_match(/in Rubygems [0-9]+/, err)
+  end
+
+  def test_rubygems_deprecate_command
+    require "rubygems/command"
+    foo_command = Class.new(Gem::Command) do
+      extend Gem::Deprecate
+
+      rubygems_deprecate_command
+
+      def execute
+        puts "pew pew!"
+      end
+    end
+
+    Gem::Commands.send(:const_set, :FooCommand, foo_command)
+    assert Gem::Commands::FooCommand.new("foo").deprecated?
+  ensure
+    Gem::Commands.send(:remove_const, :FooCommand)
   end
 
+  def test_deprecated_method_outputs_a_warning_old_way
+    out, err = capture_output do
+      thing = OtherThing.new
+      thing.foo
+      thing.foo_arg("msg")
+      thing.foo_kwarg(message: "msg")
+    end
+
+    assert_equal "", out
+    assert_match(/OtherThing#foo is deprecated; use bar instead\./, err)
+    assert_match(/OtherThing#foo_arg is deprecated; use bar_arg instead\./, err)
+    assert_match(/OtherThing#foo_kwarg is deprecated; use bar_kwarg instead\./, err)
+    assert_match(/on or after 2099-03/, err)
+  end
 end

data/test/rubygems/test_exit.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative "helper"
+require "rubygems"
+
+class TestExit < Gem::TestCase
+  def test_exit
+    system(*ruby_with_rubygems_in_load_path, "-e", "raise Gem::SystemExitException.new(2)")
+    assert_equal 2, $?.exitstatus
+  end
+end