rubygems-update 3.4.17 → 3.4.19

data/lib/rubygems/specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
@@ -1047,7 +1048,7 @@ class Gem::Specification < Gem::BasicSpecification
       next if s.activated?
       s.contains_requirable_file? path
     end
-    stub && stub.to_spec
+    stub&.to_spec
   end
 
   def self.find_active_stub_by_path(path)
@@ -1299,6 +1300,8 @@ class Gem::Specification < Gem::BasicSpecification
   def self._load(str)
     Gem.load_yaml
 
+    yaml_set = false
+
     array = begin
       Marshal.load str
     rescue ArgumentError => e
@@ -1311,7 +1314,10 @@ class Gem::Specification < Gem::BasicSpecification
       message = e.message
       raise unless message.include?("YAML::")
 
-      Object.const_set "YAML", Psych unless Object.const_defined?(:YAML)
+      unless Object.const_defined?(:YAML)
+        Object.const_set "YAML", Psych
+        yaml_set = true
+      end
 
       if message.include?("YAML::Syck::")
         YAML.const_set "Syck", YAML unless YAML.const_defined?(:Syck)
@@ -1322,6 +1328,8 @@ class Gem::Specification < Gem::BasicSpecification
       end
 
       retry
+    ensure
+      Object.__send__(:remove_const, "YAML") if yaml_set
     end
 
     spec = Gem::Specification.new
@@ -1634,7 +1642,7 @@ class Gem::Specification < Gem::BasicSpecification
         builder.build_extensions
       end
     ensure
-      ui.close if ui
+      ui&.close
       Gem::Specification.unresolved_deps.replace unresolved_deps
     end
   end

data/lib/rubygems/specification_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "user_interaction"
 
 class Gem::SpecificationPolicy

data/lib/rubygems/stub_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # Gem::StubSpecification reads the stub: line from the gemspec.  This prevents
 # us having to eval the entire gemspec in order to find out certain

data/lib/rubygems/uninstaller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.

data/lib/rubygems/user_interaction.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -239,6 +240,7 @@ class Gem::StreamUI
     return nil, nil unless result
 
     result = result.strip.to_i - 1
+    return nil, nil unless (0...list.size) === result
     return list[result], result
   end
 
@@ -290,7 +292,7 @@ class Gem::StreamUI
     @outs.flush
 
     result = @ins.gets
-    result.chomp! if result
+    result&.chomp!
     result
   end
 
@@ -305,7 +307,7 @@ class Gem::StreamUI
 
     password = _gets_noecho
     @outs.puts
-    password.chomp! if password
+    password&.chomp!
     password
   end
 

data/lib/rubygems/util/licenses.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../text"
 
 class Gem::Licenses

data/lib/rubygems/util/list.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gem
   class List
     include Enumerable

data/lib/rubygems/util.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "deprecate"
 
 ##

data/lib/rubygems/validator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.

data/lib/rubygems/version_option.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.

data/lib/rubygems.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -8,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "3.4.17"
+  VERSION = "3.4.19"
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -855,8 +856,7 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
   # Returns the version of the latest release-version of gem +name+
 
   def self.latest_version_for(name)
-    spec = latest_spec_for name
-    spec && spec.version
+    latest_spec_for(name)&.version
   end
 
   ##

data/rubygems-update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.4.17"
+  s.version = "3.4.19"
   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"]
 
@@ -18,16 +18,17 @@ Gem::Specification.new do |s|
   s.licenses = ["Ruby", "MIT"]
 
   s.files = File.read("Manifest.txt").split
+  s.bindir = "exe"
   s.executables = ["update_rubygems"]
   s.require_paths = ["hide_lib_for_update"]
   s.rdoc_options = ["--main", "README.md", "--title=RubyGems Update Documentation"]
   s.extra_rdoc_files = [
-    "CHANGELOG.md", "LICENSE.txt", "MAINTAINERS.txt",
+    "LICENSE.txt", "MAINTAINERS.txt",
     "MIT.txt", "Manifest.txt", "README.md",
     "UPGRADING.md", "POLICIES.md", "CODE_OF_CONDUCT.md",
-    "CONTRIBUTING.md", "bundler/CHANGELOG.md",
+    "CONTRIBUTING.md",
     "bundler/LICENSE.md", "bundler/README.md",
-    "hide_lib_for_update/note.txt", *Dir["bundler/man/*.1"]
+    "hide_lib_for_update/note.txt", *Dir["bundler/lib/bundler/man/*.1"]
   ]
 
   s.required_ruby_version = Gem::Requirement.new(">= 2.6.0")

data/setup.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006, 2007 by Chad Fowler, Rich Kilmer, Jim Weirich, Eric Hodel
 # and others.

data/test/rubygems/bad_rake.rb

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
+
 exit 1

data/test/rubygems/bundler_test_gem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "helper"
 
 class TestBundlerGem < Gem::TestCase
@@ -376,7 +378,7 @@ You may need to `bundle install` to install missing gems
   private
 
   def add_bundler_full_name(names)
-    names << "bundler-#{Bundler::VERSION}".freeze
+    names << "bundler-#{Bundler::VERSION}"
     names.sort!
     names
   end

data/test/rubygems/fake_certlib/openssl.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.

data/test/rubygems/good_rake.rb

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
+
 exit 0

data/test/rubygems/helper.rb

@@ -1625,7 +1625,7 @@ class Object
       if val_or_callable.respond_to? :call
         val_or_callable.call(*args, &blk)
       else
-        blk.call(*block_args) if blk
+        blk&.call(*block_args)
         val_or_callable
       end
     end

data/test/rubygems/installer_test_case.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/installer"
 

data/test/rubygems/multifactor_auth_utilities.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+##
+# A MultifactorAuthFetcher is a FakeFetcher that adds paths to data for requests related to
+# multi-factor authentication.
+#
+
+require_relative "utilities"
+require "json"
+
+class Gem::MultifactorAuthFetcher < Gem::FakeFetcher
+  attr_reader :host, :webauthn_url
+
+  # GET /api/v1/webauthn_verification defaults to user does not have any security devices
+  def initialize(host: nil)
+    super()
+    @host = host || Gem.host
+    @path_token = "odow34b93t6aPCdY"
+    @webauthn_url = "#{@host}/webauthn_verification/#{@path_token}"
+    @data["#{@host}/api/v1/webauthn_verification"] = Gem::HTTPResponseFactory.create(
+      body: "You don't have any security devices",
+      code: 422,
+      msg: "Unprocessable Entity"
+    )
+  end
+
+  # given a url, return a response that requires multifactor authentication
+  def respond_with_require_otp(url, success_body)
+    response_fail = "You have enabled multifactor authentication"
+
+    @data[url] = proc do
+      @call_count ||= 0
+      if (@call_count += 1).odd?
+        Gem::HTTPResponseFactory.create(body: response_fail, code: 401, msg: "Unauthorized")
+      else
+        Gem::HTTPResponseFactory.create(body: success_body, code: 200, msg: "OK")
+      end
+    end
+  end
+
+  # GET /api/v1/webauthn_verification returns a webauthn url
+  # GET /api/v1/webauthn_verification/:token/status.json (polling url) returns pending status
+  def respond_with_webauthn_url
+    @data["#{@host}/api/v1/webauthn_verification"] = Gem::HTTPResponseFactory.create(body: @webauthn_url, code: 200, msg: "OK")
+    @data["#{@host}/api/v1/webauthn_verification/#{@path_token}/status.json"] = Gem::HTTPResponseFactory.create(
+      body: { status: "pending", message: "Security device authentication is still pending." }.to_json,
+      code: 200,
+      msg: "OK"
+    )
+  end
+
+  # GET /api/v1/webauthn_verification/:token/status.json returns success status with OTP code
+  def respond_with_webauthn_polling(code)
+    @data["#{@host}/api/v1/webauthn_verification/#{@path_token}/status.json"] = Gem::HTTPResponseFactory.create(
+      body: { status: "success", code: code }.to_json,
+      code: 200,
+      msg: "OK"
+    )
+  end
+
+  # GET /api/v1/webauthn_verification/:token/status.json returns expired status
+  def respond_with_webauthn_polling_failure
+    @data["#{@host}/api/v1/webauthn_verification/#{@path_token}/status.json"] = Gem::HTTPResponseFactory.create(
+      body: {
+        status: "expired",
+        message: "The token in the link you used has either expired or been used already.",
+      }.to_json,
+      code: 200,
+      msg: "OK"
+    )
+  end
+
+  def webauthn_url_with_port(port)
+    "#{@webauthn_url}?port=#{port}"
+  end
+end
+
+##
+# The MockTCPServer for use in tests or to avoid real TCPServer instances to be created
+# when testing code related to the WebAuthn listener.
+#
+# Example:
+#
+#   server = Gem::MockTCPServer
+#   port = server.addr[1].to_s
+#
+#   # this mocks waiting for a request by calling sleep
+#   server.accept
+#
+#   # this mocks the server closing
+#   server.close
+
+class Gem::MockTCPServer
+  attr_reader :port
+
+  def initialize(port = 5678)
+    @port = port
+  end
+
+  def close
+    true
+  end
+
+  def addr
+    ["AF_INET6", @port, "::", "::"]
+  end
+
+  def accept
+    sleep
+  end
+end

data/test/rubygems/package/tar_test_case.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../helper"
 require "rubygems/package"
 

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

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

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

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

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

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

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

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

data/test/rubygems/rubygems_plugin.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rubygems/command_manager"
 
 ##

data/test/rubygems/simple_gem.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 SIMPLE_GEM = <<-GEMDATA
         MD5SUM = "989bf34a1cbecd52e0ea66b662b3a405"
         if $0 == __FILE__

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.name          = "bar"
   s.version       = "0.0.2"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.name              = "rubyforge"
   s.version           = "0.0.1"

data/test/rubygems/test_bundled_ca.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "net/http"
 require "rubygems/openssl"

data/test/rubygems/test_config.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems"
 require "shellwords"

data/test/rubygems/test_deprecate.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/deprecate"
 

data/test/rubygems/test_gem.rb

@@ -1,4 +1,5 @@
 # coding: US-ASCII
+
 require_relative "helper"
 require "rubygems"
 require "rubygems/command"

data/test/rubygems/test_gem_available_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/available_set"
 require "rubygems/security"

data/test/rubygems/test_gem_bundler_version_finder.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/bundler_version_finder"
 

data/test/rubygems/test_gem_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/command"
 

data/test/rubygems/test_gem_command_manager.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/command_manager"
 

data/test/rubygems/test_gem_commands_build_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/build_command"
 require "rubygems/package"

data/test/rubygems/test_gem_commands_cert_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/cert_command"
 

data/test/rubygems/test_gem_commands_check_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/check_command"
 

data/test/rubygems/test_gem_commands_cleanup_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/cleanup_command"
 require "rubygems/installer"

data/test/rubygems/test_gem_commands_contents_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/contents_command"
 

data/test/rubygems/test_gem_commands_dependency_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/dependency_command"
 

data/test/rubygems/test_gem_commands_environment_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/environment_command"
 

data/test/rubygems/test_gem_commands_exec_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/exec_command"
 
@@ -215,6 +216,7 @@ class TestGemCommandsExecCommand < Gem::TestCase
 
   def test_gem_with_platform_and_platform_dependencies
     pend "extensions don't quite work on jruby" if Gem.java_platform?
+    pend "terminates on mswin" if vc_windows? && ruby_repo?
 
     spec_fetcher do |fetcher|
       fetcher.download "a", 2 do |s|

data/test/rubygems/test_gem_commands_fetch_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/package"
 require "rubygems/security"

data/test/rubygems/test_gem_commands_generate_index_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/indexer"
 require "rubygems/commands/generate_index_command"

data/test/rubygems/test_gem_commands_help_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rubygems"
 require_relative "helper"
 require "rubygems/commands/help_command"

data/test/rubygems/test_gem_commands_info_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/info_command"
 

data/test/rubygems/test_gem_commands_install_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require_relative "test_gem_update_suggestion"
 require "rubygems/commands/install_command"

data/test/rubygems/test_gem_commands_list_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/list_command"
 

data/test/rubygems/test_gem_commands_lock_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/lock_command"
 

data/test/rubygems/test_gem_commands_mirror.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/mirror_command"
 

data/test/rubygems/test_gem_commands_open_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/open_command"
 

data/test/rubygems/test_gem_commands_outdated_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/commands/outdated_command"