rubygems-update 3.1.0.pre3 → 3.1.4

data/lib/rubygems/test_case.rb

@@ -96,6 +96,8 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
 
   TEST_PATH = ENV.fetch('RUBYGEMS_TEST_PATH', File.expand_path('../../../test/rubygems', __FILE__))
 
+  SPECIFICATIONS = File.expand_path(File.join(TEST_PATH, "specifications"), __FILE__)
+
   def assert_activate(expected, *specs)
     specs.each do |spec|
       case spec
@@ -164,6 +166,54 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     end
   end
 
+  ##
+  # Sets the bindir entry in RbConfig::CONFIG to +value+ and restores the
+  # original value when the block ends
+  #
+  def bindir(value)
+    with_clean_path_to_ruby do
+      bindir = RbConfig::CONFIG['bindir']
+
+      if value
+        RbConfig::CONFIG['bindir'] = value
+      else
+        RbConfig::CONFIG.delete 'bindir'
+      end
+
+      begin
+        yield
+      ensure
+        if bindir
+          RbConfig::CONFIG['bindir'] = bindir
+        else
+          RbConfig::CONFIG.delete 'bindir'
+        end
+      end
+    end
+  end
+
+  ##
+  # Sets the EXEEXT entry in RbConfig::CONFIG to +value+ and restores the
+  # original value when the block ends
+  #
+  def exeext(value)
+    exeext = RbConfig::CONFIG['EXEEXT']
+
+    if value
+      RbConfig::CONFIG['EXEEXT'] = value
+    else
+      RbConfig::CONFIG.delete 'EXEEXT'
+    end
+
+    yield
+  ensure
+    if exeext
+      RbConfig::CONFIG['EXEEXT'] = exeext
+    else
+      RbConfig::CONFIG.delete 'EXEEXT'
+    end
+  end
+
   # TODO: move to minitest
   def refute_path_exists(path, msg = nil)
     msg = message(msg) { "Expected path '#{path}' to not exist" }
@@ -1203,6 +1253,16 @@ Also, a list:
     end
   end
 
+  def with_clean_path_to_ruby
+    orig_ruby = Gem.ruby
+
+    Gem.instance_variable_set :@ruby, nil
+
+    yield
+  ensure
+    Gem.instance_variable_set :@ruby, orig_ruby
+  end
+
   class << self
 
     # :nodoc:

data/lib/rubygems/uri_formatter.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require 'cgi'
-require 'uri'
 
 ##
 # The UriFormatter handles URIs from user-input and escaping.

data/lib/rubygems/uri_parser.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+##
+# The UriParser handles parsing URIs.
+#
+
+class Gem::UriParser
+
+  ##
+  # Parses the #uri, raising if it's invalid
+
+  def parse!(uri)
+    raise URI::InvalidURIError unless uri
+
+    # Always escape URI's to deal with potential spaces and such
+    # It should also be considered that source_uri may already be
+    # a valid URI with escaped characters. e.g. "{DESede}" is encoded
+    # as "%7BDESede%7D". If this is escaped again the percentage
+    # symbols will be escaped.
+    begin
+      URI.parse(uri)
+    rescue URI::InvalidURIError
+      URI.parse(URI::DEFAULT_PARSER.escape(uri))
+    end
+  end
+
+  ##
+  # Parses the #uri, returning the original uri if it's invalid
+
+  def parse(uri)
+    parse!(uri)
+  rescue URI::InvalidURIError
+    uri
+  end
+
+end

data/lib/rubygems/uri_parsing.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "rubygems/uri_parser"
+
+module Gem::UriParsing
+
+  def parse_uri(source_uri)
+    return source_uri unless source_uri.is_a?(String)
+
+    uri_parser.parse(source_uri)
+  end
+
+  private :parse_uri
+
+  def uri_parser
+    require "uri"
+
+    Gem::UriParser.new
+  end
+
+  private :uri_parser
+
+end

data/lib/rubygems/util.rb

@@ -14,7 +14,13 @@ module Gem::Util
     require 'stringio'
     data = StringIO.new(data, 'r')
 
-    unzipped = Zlib::GzipReader.new(data).read
+    gzip_reader = begin
+                    Zlib::GzipReader.new(data)
+                  rescue Zlib::GzipFile::Error => e
+                    raise e.class, e.inspect, e.backtrace
+                  end
+
+    unzipped = gzip_reader.read
     unzipped.force_encoding Encoding::BINARY
     unzipped
   end

data/lib/rubygems/version.rb

@@ -151,7 +151,7 @@
 
 class Gem::Version
 
-  autoload :Requirement, 'rubygems/requirement'
+  autoload :Requirement, File.expand_path('requirement', __dir__)
 
   include Comparable
 

data/rubygems-update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.1.0.pre3"
+  s.version = "3.1.4"
   s.authors = ["Jim Weirich", "Chad Fowler", "Eric Hodel", "Luis Lavena", "Aaron Patterson", "Samuel Giddins", "André Arko", "Evan Phoenix", "Hiroshi SHIBATA"]
   s.email = ["", "", "drbrain@segment7.net", "luislavena@gmail.com", "aaron@tenderlovemaking.com", "segiddins@segiddins.me", "andre@arko.net", "evan@phx.io", "hsbt@ruby-lang.org"]
 
@@ -33,11 +33,4 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0")
 
   s.specification_version = 4
-
-  s.add_development_dependency(%q<builder>, ["~> 3.0"])
-  s.add_development_dependency(%q<rdoc>, ["~> 6.0"])
-  s.add_development_dependency(%q<rake>, ["~> 12.0"])
-  s.add_development_dependency(%q<minitest>, ["~> 5.0"])
-  s.add_development_dependency(%q<simplecov>, ["~> 0"])
-  s.add_development_dependency(%q<rubocop>, ["~> 0.74.0"])
 end

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

@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name              = "rubyforge"
+  s.version           = "0.0.1"
+  s.platform          = "ruby"
+  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'
+end

data/test/rubygems/test_gem.rb

@@ -161,10 +161,8 @@ class TestGem < Gem::TestCase
 
   def test_self_install_permissions_with_format_executable_and_non_standard_ruby_install_name
     Gem::Installer.exec_format = nil
-    with_clean_path_to_ruby do
-      ruby_install_name 'ruby27' do
-        assert_self_install_permissions(format_executable: true)
-      end
+    ruby_install_name 'ruby27' do
+      assert_self_install_permissions(format_executable: true)
     end
   ensure
     Gem::Installer.exec_format = nil
@@ -226,7 +224,7 @@ class TestGem < Gem::TestCase
   def test_require_missing
     save_loaded_features do
       assert_raises ::LoadError do
-        require "q"
+        require "test_require_missing"
       end
     end
   end
@@ -310,6 +308,21 @@ class TestGem < Gem::TestCase
     assert_equal %w(a-1 b-2 c-1), loaded_spec_names
   end
 
+  def test_activate_bin_path_in_debug_mode
+    a1 = util_spec 'a', '1' do |s|
+      s.executables = ['exec']
+    end
+
+    install_specs a1
+
+    output, status = Open3.capture2e(
+      { "GEM_HOME" => Gem.paths.home, "DEBUG_RESOLVER" => "1" },
+      Gem.ruby, "-I", File.expand_path("../../lib", __dir__), "-e", "\"Gem.activate_bin_path('a', 'exec', '>= 0')\""
+    )
+
+    assert status.success?, output
+  end
+
   def test_activate_bin_path_gives_proper_error_for_bundler
     bundler = util_spec 'bundler', '2' do |s|
       s.executables = ['bundle']
@@ -1024,21 +1037,17 @@ class TestGem < Gem::TestCase
   end
 
   def test_self_ruby_escaping_spaces_in_path
-    with_clean_path_to_ruby do
-      with_bindir_and_exeext("C:/Ruby 1.8/bin", ".exe") do
-        ruby_install_name "ruby" do
-          assert_equal "\"C:/Ruby 1.8/bin/ruby.exe\"", Gem.ruby
-        end
+    with_bindir_and_exeext("C:/Ruby 1.8/bin", ".exe") do
+      ruby_install_name "ruby" do
+        assert_equal "\"C:/Ruby 1.8/bin/ruby.exe\"", Gem.ruby
       end
     end
   end
 
   def test_self_ruby_path_without_spaces
-    with_clean_path_to_ruby do
-      with_bindir_and_exeext("C:/Ruby18/bin", ".exe") do
-        ruby_install_name "ruby" do
-          assert_equal "C:/Ruby18/bin/ruby.exe", Gem.ruby
-        end
+    with_bindir_and_exeext("C:/Ruby18/bin", ".exe") do
+      ruby_install_name "ruby" do
+        assert_equal "C:/Ruby18/bin/ruby.exe", Gem.ruby
       end
     end
   end
@@ -1090,7 +1099,7 @@ class TestGem < Gem::TestCase
     util_restore_RUBY_VERSION
   end
 
-  def test_self_ruby_version_with_prerelease
+  def test_self_ruby_version_with_svn_prerelease
     util_set_RUBY_VERSION '2.6.0', -1, 63539, 'ruby 2.6.0preview2 (2018-05-31 trunk 63539) [x86_64-linux]'
 
     assert_equal Gem::Version.new('2.6.0.preview2'), Gem.ruby_version
@@ -1098,6 +1107,14 @@ class TestGem < Gem::TestCase
     util_restore_RUBY_VERSION
   end
 
+  def test_self_ruby_version_with_git_prerelease
+    util_set_RUBY_VERSION '2.7.0', -1, 'b563439274a402e33541f5695b1bfd4ac1085638', 'ruby 2.7.0preview3 (2019-11-23 master b563439274) [x86_64-linux]'
+
+    assert_equal Gem::Version.new('2.7.0.preview3'), Gem.ruby_version
+  ensure
+    util_restore_RUBY_VERSION
+  end
+
   def test_self_ruby_version_with_non_mri_implementations_with_mri_prerelase_compatibility
     util_set_RUBY_VERSION '2.6.0', -1, 63539, 'weirdjruby 9.2.0.0 (2.6.0preview2) 2018-05-24 81156a8 OpenJDK 64-Bit Server VM 25.171-b11 on 1.8.0_171-8u171-b11-0ubuntu0.16.04.1-b11 [linux-x86_64]', 'weirdjruby', '9.2.0.0'
 
@@ -1106,7 +1123,7 @@ class TestGem < Gem::TestCase
     util_restore_RUBY_VERSION
   end
 
-  def test_self_ruby_version_with_trunk
+  def test_self_ruby_version_with_svn_trunk
     util_set_RUBY_VERSION '1.9.2', -1, 23493, 'ruby 1.9.2dev (2009-05-20 trunk 23493) [x86_64-linux]'
 
     assert_equal Gem::Version.new('1.9.2.dev'), Gem.ruby_version
@@ -1114,6 +1131,14 @@ class TestGem < Gem::TestCase
     util_restore_RUBY_VERSION
   end
 
+  def test_self_ruby_version_with_git_master
+    util_set_RUBY_VERSION '2.7.0', -1, '5de284ec78220e75643f89b454ce999da0c1c195', 'ruby 2.7.0dev (2019-12-23T01:37:30Z master 5de284ec78) [x86_64-linux]'
+
+    assert_equal Gem::Version.new('2.7.0.dev'), Gem.ruby_version
+  ensure
+    util_restore_RUBY_VERSION
+  end
+
   def test_self_rubygems_version
     assert_equal Gem::Version.new(Gem::VERSION), Gem.rubygems_version
   end
@@ -1388,7 +1413,7 @@ class TestGem < Gem::TestCase
       a = util_spec "a", "1"
       b = util_spec "b", "1", "c" => nil
       c = util_spec "c", "2"
-      d = util_spec "d", "1", {'e' => '= 1'}, "lib/d.rb"
+      d = util_spec "d", "1", {'e' => '= 1'}, "lib/d#{$$}.rb"
       e = util_spec "e", "1"
 
       install_specs a, c, b, e, d
@@ -1397,7 +1422,7 @@ class TestGem < Gem::TestCase
         r.gem "a"
         r.gem "b", "= 1"
 
-        require 'd'
+        require "d#{$$}"
       end
 
       assert_equal %w!a-1 b-1 c-2 d-1 e-1!, loaded_spec_names
@@ -1731,6 +1756,18 @@ class TestGem < Gem::TestCase
     assert_nil              Gem.find_unresolved_default_spec("README")
   end
 
+  def test_register_default_spec_old_style_with_folder_starting_with_lib
+    Gem.clear_default_specs
+
+    old_style = Gem::Specification.new do |spec|
+      spec.files = ["libexec/bundle", "foo.rb", "bar.rb"]
+    end
+
+    Gem.register_default_spec old_style
+
+    assert_equal old_style, Gem.find_unresolved_default_spec("foo.rb")
+  end
+
   def test_use_gemdeps
     gem_deps_file = 'gem.deps.rb'.tap(&Gem::UNTAINT)
     spec = util_spec 'a', 1
@@ -1903,40 +1940,47 @@ You may need to `gem install -g` to install missing gems
     assert platform_defaults.is_a? Hash
   end
 
-  def ruby_install_name(name)
-    orig_RUBY_INSTALL_NAME = RbConfig::CONFIG['ruby_install_name']
-    RbConfig::CONFIG['ruby_install_name'] = name
+  # Ensure that `Gem.source_date_epoch` is consistent even if
+  # $SOURCE_DATE_EPOCH has not been set.
+  def test_default_source_date_epoch_doesnt_change
+    old_epoch = ENV['SOURCE_DATE_EPOCH']
+    ENV['SOURCE_DATE_EPOCH'] = nil
 
-    yield
+    # Unfortunately, there is no real way to test this aside from waiting
+    # enough for `Time.now.to_i` to change -- which is a whole second.
+    #
+    # Fortunately, we only need to do this once.
+    a = Gem.source_date_epoch
+    sleep 1
+    b = Gem.source_date_epoch
+    assert_equal a, b
   ensure
-    if orig_RUBY_INSTALL_NAME
-      RbConfig::CONFIG['ruby_install_name'] = orig_RUBY_INSTALL_NAME
-    else
-      RbConfig::CONFIG.delete 'ruby_install_name'
-    end
+    ENV['SOURCE_DATE_EPOCH'] = old_epoch
   end
 
-  def with_bindir_and_exeext(bindir, exeext)
-    orig_bindir = RbConfig::CONFIG['bindir']
-    orig_exe_ext = RbConfig::CONFIG['EXEEXT']
-
-    RbConfig::CONFIG['bindir'] = bindir
-    RbConfig::CONFIG['EXEEXT'] = exeext
+  def ruby_install_name(name)
+    with_clean_path_to_ruby do
+      orig_RUBY_INSTALL_NAME = RbConfig::CONFIG['ruby_install_name']
+      RbConfig::CONFIG['ruby_install_name'] = name
 
-    yield
-  ensure
-    RbConfig::CONFIG['bindir'] = orig_bindir
-    RbConfig::CONFIG['EXEEXT'] = orig_exe_ext
+      begin
+        yield
+      ensure
+        if orig_RUBY_INSTALL_NAME
+          RbConfig::CONFIG['ruby_install_name'] = orig_RUBY_INSTALL_NAME
+        else
+          RbConfig::CONFIG.delete 'ruby_install_name'
+        end
+      end
+    end
   end
 
-  def with_clean_path_to_ruby
-    orig_ruby = Gem.ruby
-
-    Gem.instance_variable_set :@ruby, nil
-
-    yield
-  ensure
-    Gem.instance_variable_set :@ruby, orig_ruby
+  def with_bindir_and_exeext(bindir, exeext)
+    bindir(bindir) do
+      exeext(exeext) do
+        yield
+      end
+    end
   end
 
   def with_plugin(path)

data/test/rubygems/test_gem_command.rb

@@ -197,9 +197,9 @@ class TestGemCommand < Gem::TestCase
     assert_equal ['-h', 'command'], args
   end
 
-  def test_deprecate_option_long_name
+  def test_deprecate_option
     deprecate_msg = <<-EXPECTED
-WARNING:  The \"--test\" option has been deprecated and will be removed in Rubygems 3.1, its use is discouraged.
+WARNING:  The \"--test\" option has been deprecated and will be removed in Rubygems 3.1.
     EXPECTED
 
     testCommand = Class.new(Gem::Command) do
@@ -210,7 +210,7 @@ WARNING:  The \"--test\" option has been deprecated and will be removed in Rubyg
           options[:test] = true
         end
 
-        deprecate_option(long_name: '--test', version: '3.1')
+        deprecate_option('--test', version: '3.1')
       end
 
       def execute
@@ -228,7 +228,7 @@ WARNING:  The \"--test\" option has been deprecated and will be removed in Rubyg
 
   def test_deprecate_option_no_version
     deprecate_msg = <<-EXPECTED
-WARNING:  The \"--test\" option has been deprecated and will be removed in future versions of Rubygems, its use is discouraged.
+WARNING:  The \"--test\" option has been deprecated and will be removed in future versions of Rubygems.
     EXPECTED
 
     testCommand = Class.new(Gem::Command) do
@@ -239,7 +239,7 @@ WARNING:  The \"--test\" option has been deprecated and will be removed in futur
           options[:test] = true
         end
 
-        deprecate_option(long_name: '--test')
+        deprecate_option('--test')
       end
 
       def execute
@@ -255,9 +255,9 @@ WARNING:  The \"--test\" option has been deprecated and will be removed in futur
     end
   end
 
-  def test_deprecate_option_short_name
+  def test_deprecate_option_extra_message
     deprecate_msg = <<-EXPECTED
-WARNING:  The \"-t\" option has been deprecated and will be removed in Rubygems 3.5, its use is discouraged.
+WARNING:  The \"--test\" option has been deprecated and will be removed in Rubygems 3.1. Whether you set `--test` mode or not, this dummy app always runs in test mode.
     EXPECTED
 
     testCommand = Class.new(Gem::Command) do
@@ -268,7 +268,7 @@ WARNING:  The \"-t\" option has been deprecated and will be removed in Rubygems
           options[:test] = true
         end
 
-        deprecate_option(short_name: '-t', version: '3.5')
+        deprecate_option('--test', version: '3.1', extra_msg: 'Whether you set `--test` mode or not, this dummy app always runs in test mode.')
       end
 
       def execute
@@ -279,7 +279,36 @@ WARNING:  The \"-t\" option has been deprecated and will be removed in Rubygems
     cmd = testCommand.new
 
     use_ui @ui do
-      cmd.invoke("-t")
+      cmd.invoke("--test")
+      assert_equal deprecate_msg, @ui.error
+    end
+  end
+
+  def test_deprecate_option_extra_message_and_no_version
+    deprecate_msg = <<-EXPECTED
+WARNING:  The \"--test\" option has been deprecated and will be removed in future versions of Rubygems. Whether you set `--test` mode or not, this dummy app always runs in test mode.
+    EXPECTED
+
+    testCommand = Class.new(Gem::Command) do
+      def initialize
+        super('test', 'Gem::Command instance for testing')
+
+        add_option('-t', '--test', 'Test command') do |value, options|
+          options[:test] = true
+        end
+
+        deprecate_option('--test', extra_msg: 'Whether you set `--test` mode or not, this dummy app always runs in test mode.')
+      end
+
+      def execute
+        true
+      end
+    end
+
+    cmd = testCommand.new
+
+    use_ui @ui do
+      cmd.invoke("--test")
       assert_equal deprecate_msg, @ui.error
     end
   end