rubygems-update 3.4.21 → 3.5.0

data/lib/rubygems/doctor.rb

@@ -53,7 +53,7 @@ class Gem::Doctor
   # Specs installed in this gem repository
 
   def installed_specs # :nodoc:
-    @installed_specs ||= Gem::Specification.map {|s| s.full_name }
+    @installed_specs ||= Gem::Specification.map(&:full_name)
   end
 
   ##
@@ -75,7 +75,7 @@ class Gem::Doctor
     Gem.use_paths @gem_repository.to_s
 
     unless gem_repository?
-      say "This directory does not appear to be a RubyGems repository, " +
+      say "This directory does not appear to be a RubyGems repository, " \
           "skipping"
       say
       return
@@ -104,16 +104,16 @@ class Gem::Doctor
     directory = File.join(@gem_repository, sub_directory)
 
     Dir.entries(directory).sort.each do |ent|
-      next if ent == "." || ent == ".."
+      next if [".", ".."].include?(ent)
 
       child = File.join(directory, ent)
       next unless File.exist?(child)
 
       basename = File.basename(child, extension)
       next if installed_specs.include? basename
-      next if /^rubygems-\d/ =~ basename
-      next if "specifications" == sub_directory && "default" == basename
-      next if "plugins" == sub_directory && Gem.plugin_suffix_regexp =~ (basename)
+      next if /^rubygems-\d/.match?(basename)
+      next if sub_directory == "specifications" && basename == "default"
+      next if sub_directory == "plugins" && Gem.plugin_suffix_regexp =~ (basename)
 
       type = File.directory?(child) ? "directory" : "file"
 

data/lib/rubygems/errors.rb

@@ -134,11 +134,7 @@ module Gem
     ##
     # A wordy description of the error.
     def wordy
-      "Found %s (%s), but was for platform%s %s" %
-        [@name,
-         @version,
-         @platforms.size == 1 ? "" : "s",
-         @platforms.join(" ,")]
+      format("Found %s (%s), but was for platform%s %s", @name, @version, @platforms.size == 1 ? "" : "s", @platforms.join(" ,"))
     end
   end
 
@@ -175,6 +171,6 @@ module Gem
     ##
     # The "exception" alias allows you to call raise on a SourceFetchProblem.
 
-    alias exception error
+    alias_method :exception, :error
   end
 end

data/lib/rubygems/exceptions.rb

@@ -172,6 +172,7 @@ class Gem::ImpossibleDependenciesError < Gem::Exception
 end
 
 class Gem::InstallError < Gem::Exception; end
+
 class Gem::RuntimeRequirementNotMetError < Gem::InstallError
   attr_accessor :suggestion
   def message
@@ -231,7 +232,7 @@ class Gem::SystemExitException < SystemExit
   ##
   # The exit code for the process
 
-  alias exit_code status
+  alias_method :exit_code, :status
 
   ##
   # Creates a new SystemExitException with the given +exit_code+

data/lib/rubygems/ext/builder.rb

@@ -27,19 +27,17 @@ class Gem::Ext::Builder
     # try to find make program from Ruby configure arguments first
     RbConfig::CONFIG["configure_args"] =~ /with-make-prog\=(\w+)/
     make_program_name = ENV["MAKE"] || ENV["make"] || $1
-    unless make_program_name
-      make_program_name = (RUBY_PLATFORM.include?("mswin")) ? "nmake" : "make"
-    end
+    make_program_name ||= RUBY_PLATFORM.include?("mswin") ? "nmake" : "make"
     make_program = Shellwords.split(make_program_name)
 
     # The installation of the bundled gems is failed when DESTDIR is empty in mswin platform.
-    destdir = (/\bnmake/i !~ make_program_name || ENV["DESTDIR"] && ENV["DESTDIR"] != "") ? "DESTDIR=%s" % ENV["DESTDIR"] : ""
+    destdir = /\bnmake/i !~ make_program_name || ENV["DESTDIR"] && ENV["DESTDIR"] != "" ? format("DESTDIR=%s", ENV["DESTDIR"]) : ""
 
     env = [destdir]
 
     if sitedir
-      env << "sitearchdir=%s" % sitedir
-      env << "sitelibdir=%s" % sitedir
+      env << format("sitearchdir=%s", sitedir)
+      env << format("sitelibdir=%s", sitedir)
     end
 
     targets.each do |target|
@@ -90,13 +88,20 @@ class Gem::Ext::Builder
       # Set $SOURCE_DATE_EPOCH for the subprocess.
       build_env = { "SOURCE_DATE_EPOCH" => Gem.source_date_epoch_string }.merge(env)
       output, status = begin
-                         Open3.capture2e(build_env, *command, :chdir => dir)
+                         Open3.popen2e(build_env, *command, chdir: dir) do |_stdin, stdouterr, wait_thread|
+                           output = String.new
+                           while line = stdouterr.gets
+                             output << line
+                             if verbose
+                               print line
+                             end
+                           end
+                           [output, wait_thread.value]
+                         end
                        rescue StandardError => error
                          raise Gem::InstallError, "#{command_name || class_name} failed#{error.message}"
                        end
-      if verbose
-        puts output
-      else
+      unless verbose
         results << output
       end
     ensure

data/lib/rubygems/ext/cargo_builder.rb

@@ -198,7 +198,7 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
 
     output, status =
       begin
-        Open3.capture2e(cargo, "metadata", "--no-deps", "--format-version", "1", :chdir => cargo_dir)
+        Open3.capture2e(cargo, "metadata", "--no-deps", "--format-version", "1", chdir: cargo_dir)
       rescue StandardError => error
         raise Gem::InstallError, "cargo metadata failed #{error.message}"
       end
@@ -246,10 +246,10 @@ EOF
   end
 
   def rustc_dynamic_linker_flags(dest_dir, crate_name)
-    split_flags("DLDFLAGS")
-      .map {|arg| maybe_resolve_ldflag_variable(arg, dest_dir, crate_name) }
-      .compact
-      .flat_map {|arg| ldflag_to_link_modifier(arg) }
+    split_flags("DLDFLAGS").
+      map {|arg| maybe_resolve_ldflag_variable(arg, dest_dir, crate_name) }.
+      compact.
+      flat_map {|arg| ldflag_to_link_modifier(arg) }
   end
 
   def rustc_lib_flags(dest_dir)

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -43,12 +43,12 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 
       full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
 
-      # TODO remove in RubyGems 4
+      # TODO: remove in RubyGems 4
       if Gem.install_extension_in_lib && lib_dir
         FileUtils.mkdir_p lib_dir
         entries = Dir.entries(full_tmp_dest) - %w[. ..]
         entries = entries.map {|entry| File.join full_tmp_dest, entry }
-        FileUtils.cp_r entries, lib_dir, :remove_destination => true
+        FileUtils.cp_r entries, lib_dir, remove_destination: true
       end
 
       FileUtils::Entry_.new(full_tmp_dest).traverse do |ent|
@@ -66,8 +66,6 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
     FileUtils.rm_rf tmp_dest if tmp_dest
   end
 
-  private
-
   def self.get_relative_path(path, base)
     path[0..base.length - 1] = "." if path.start_with?(base)
     path

data/lib/rubygems/ext/rake_builder.rb

@@ -10,7 +10,7 @@ require_relative "../shellwords"
 
 class Gem::Ext::RakeBuilder < Gem::Ext::Builder
   def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd)
-    if File.basename(extension) =~ /mkrf_conf/i
+    if /mkrf_conf/i.match?(File.basename(extension))
       run([Gem.ruby, File.basename(extension), *args], results, class_name, extension_dir)
     end
 

data/lib/rubygems/gem_runner.rb

@@ -45,10 +45,10 @@ class Gem::GemRunner
     cmd.command_names.each do |command_name|
       config_args = Gem.configuration[command_name]
       config_args = case config_args
-      when String
-        config_args.split " "
-      else
-        Array(config_args)
+                    when String
+                      config_args.split " "
+                    else
+                      Array(config_args)
       end
       Gem::Command.add_specific_extra_args command_name, config_args
     end

data/lib/rubygems/gemcutter_utilities/webauthn_listener/response.rb

@@ -2,9 +2,9 @@
 
 ##
 # The WebauthnListener Response class is used by the WebauthnListener to create
-# responses to be sent to the Gem host. It creates a Net::HTTPResponse instance
+# responses to be sent to the Gem host. It creates a Gem::Net::HTTPResponse instance
 # when initialized and can be converted to the appropriate format to be sent by a socket using `to_s`.
-# Net::HTTPResponse instances cannot be directly sent over a socket.
+# Gem::Net::HTTPResponse instances cannot be directly sent over a socket.
 #
 # Types of response classes:
 #   - OkResponse
@@ -60,7 +60,7 @@ module Gem::GemcutterUtilities
       def body; end
 
       def build_http_response
-        response_class = Net::HTTPResponse::CODE_TO_OBJ[code.to_s]
+        response_class = Gem::Net::HTTPResponse::CODE_TO_OBJ[code.to_s]
         @http_response = response_class.new("1.1", code, reason_phrase)
         @http_response.instance_variable_set(:@read, true)
 

data/lib/rubygems/gemcutter_utilities/webauthn_poller.rb

@@ -37,16 +37,16 @@ module Gem::GemcutterUtilities
         thread.abort_on_exception = true
         thread.report_on_exception = false
         thread[:otp] = new(options, host).poll_for_otp(webauthn_url, credentials)
-      rescue Gem::WebauthnVerificationError, Timeout::Error => e
+      rescue Gem::WebauthnVerificationError, Gem::Timeout::Error => e
         thread[:error] = e
       end
     end
 
     def poll_for_otp(webauthn_url, credentials)
-      Timeout.timeout(TIMEOUT_IN_SECONDS) do
+      Gem::Timeout.timeout(TIMEOUT_IN_SECONDS) do
         loop do
           response = webauthn_verification_poll_response(webauthn_url, credentials)
-          raise Gem::WebauthnVerificationError, response.message unless response.is_a?(Net::HTTPSuccess)
+          raise Gem::WebauthnVerificationError, response.message unless response.is_a?(Gem::Net::HTTPSuccess)
 
           require "json"
           parsed_response = JSON.parse(response.body)

data/lib/rubygems/gemcutter_utilities.rb

@@ -9,9 +9,8 @@ require_relative "gemcutter_utilities/webauthn_poller"
 # Utility methods for using the RubyGems API.
 
 module Gem::GemcutterUtilities
-
   ERROR_CODE = 1
-  API_SCOPES = %i[index_rubygems push_rubygem yank_rubygem add_owner remove_owner access_webhooks show_dashboard].freeze
+  API_SCOPES = [:index_rubygems, :push_rubygem, :yank_rubygem, :add_owner, :remove_owner, :access_webhooks, :show_dashboard].freeze
 
   include Gem::Text
 
@@ -85,7 +84,7 @@ module Gem::GemcutterUtilities
   # If +allowed_push_host+ metadata is present, then it will only allow that host.
 
   def rubygems_api_request(method, path, host = nil, allowed_push_host = nil, scope: nil, credentials: {}, &block)
-    require "net/http"
+    require_relative "net/http"
 
     self.host = host if host
     unless self.host
@@ -120,11 +119,11 @@ module Gem::GemcutterUtilities
   end
 
   def mfa_unauthorized?(response)
-    response.is_a?(Net::HTTPUnauthorized) && response.body.start_with?("You have enabled multifactor authentication")
+    response.is_a?(Gem::Net::HTTPUnauthorized) && response.body.start_with?("You have enabled multifactor authentication")
   end
 
   def update_scope(scope)
-    sign_in_host        = self.host
+    sign_in_host        = host
     pretty_host         = pretty_host(sign_in_host)
     update_scope_params = { scope => true }
 
@@ -137,10 +136,10 @@ module Gem::GemcutterUtilities
                                     sign_in_host, scope: scope) do |request|
       request.basic_auth email, password
       request["OTP"] = otp if otp
-      request.body = URI.encode_www_form({ :api_key => api_key }.merge(update_scope_params))
+      request.body = URI.encode_www_form({ api_key: api_key }.merge(update_scope_params))
     end
 
-    with_response response do |resp|
+    with_response response do |_resp|
       say "Added #{scope} scope to the existing API key"
     end
   end
@@ -150,13 +149,13 @@ module Gem::GemcutterUtilities
   # key.
 
   def sign_in(sign_in_host = nil, scope: nil)
-    sign_in_host ||= self.host
+    sign_in_host ||= host
     return if api_key
 
     pretty_host = pretty_host(sign_in_host)
 
     say "Enter your #{pretty_host} credentials."
-    say "Don't have an account yet? " +
+    say "Don't have an account yet? " \
         "Create one at #{sign_in_host}/sign_up"
 
     email = ask "   Email: "
@@ -209,13 +208,13 @@ module Gem::GemcutterUtilities
 
   def with_response(response, error_prefix = nil)
     case response
-    when Net::HTTPSuccess then
+    when Gem::Net::HTTPSuccess then
       if block_given?
         yield response
       else
         say clean_text(response.body)
       end
-    when Net::HTTPPermanentRedirect, Net::HTTPRedirection then
+    when Gem::Net::HTTPPermanentRedirect, Gem::Net::HTTPRedirection then
       message = "The request has redirected permanently to #{response["location"]}. Please check your defined push host URL."
       message = "#{error_prefix}: #{message}" if error_prefix
 
@@ -245,7 +244,7 @@ module Gem::GemcutterUtilities
   private
 
   def request_with_otp(method, uri, &block)
-    request_method = Net::HTTP.const_get method.to_s.capitalize
+    request_method = Gem::Net::HTTP.const_get method.to_s.capitalize
 
     Gem::RemoteFetcher.fetcher.request(uri, request_method) do |req|
       req["OTP"] = otp if otp
@@ -298,7 +297,7 @@ module Gem::GemcutterUtilities
         request.basic_auth credentials[:email], credentials[:password]
       end
     end
-    response.is_a?(Net::HTTPSuccess) ? response.body : nil
+    response.is_a?(Gem::Net::HTTPSuccess) ? response.body : nil
   end
 
   def pretty_host(host)
@@ -316,9 +315,9 @@ module Gem::GemcutterUtilities
       scope_params = { scope => true }
     else
       say "Please select scopes you want to enable for the API key (y/n)"
-      API_SCOPES.each do |scope|
-        selected = ask_yes_no("#{scope}", false)
-        scope_params[scope] = true if selected
+      API_SCOPES.each do |s|
+        selected = ask_yes_no(s.to_s, false)
+        scope_params[s] = true if selected
       end
       say "\n"
     end
@@ -327,7 +326,7 @@ module Gem::GemcutterUtilities
   end
 
   def default_host?
-    self.host == Gem::DEFAULT_HOST
+    host == Gem::DEFAULT_HOST
   end
 
   def get_user_profile(email, password)
@@ -345,7 +344,7 @@ module Gem::GemcutterUtilities
   def get_mfa_params(profile)
     mfa_level = profile["mfa"]
     params = {}
-    if mfa_level == "ui_only" || mfa_level == "ui_and_gem_signin"
+    if ["ui_only", "ui_and_gem_signin"].include?(mfa_level)
       selected = ask_yes_no("Would you like to enable MFA for this key? (strongly recommended)")
       params["mfa"] = true if selected
     end
@@ -367,6 +366,6 @@ module Gem::GemcutterUtilities
   end
 
   def api_key_forbidden?(response)
-    response.is_a?(Net::HTTPForbidden) && response.body.start_with?("The API key doesn't have access")
+    response.is_a?(Gem::Net::HTTPForbidden) && response.body.start_with?("The API key doesn't have access")
   end
 end

data/lib/rubygems/install_update_options.rb

@@ -36,9 +36,9 @@ module Gem::InstallUpdateOptions
                "List the documentation types you wish to",
                "generate.  For example: rdoc,ri") do |value, options|
       options[:document] = case value
-      when nil   then %w[ri]
-      when false then []
-      else            value
+                           when nil   then %w[ri]
+                           when false then []
+                           else value
       end
     end
 
@@ -50,7 +50,7 @@ module Gem::InstallUpdateOptions
 
     add_option(:"Install/Update", "--vendor",
                "Install gem into the vendor directory.",
-               "Only for use by gem repackagers.") do |value, options|
+               "Only for use by gem repackagers.") do |_value, options|
       unless Gem.vendor_dir
         raise Gem::OptionParser::InvalidOption.new "your platform is not supported"
       end
@@ -60,7 +60,7 @@ module Gem::InstallUpdateOptions
     end
 
     add_option(:"Install/Update", "-N", "--no-document",
-               "Disable documentation generation") do |value, options|
+               "Disable documentation generation") do |_value, options|
       options[:document] = []
     end
 
@@ -104,21 +104,21 @@ module Gem::InstallUpdateOptions
 
     add_option(:"Install/Update", "--development",
                 "Install additional development",
-                "dependencies") do |value, options|
+                "dependencies") do |_value, options|
       options[:development] = true
       options[:dev_shallow] = true
     end
 
     add_option(:"Install/Update", "--development-all",
                 "Install development dependencies for all",
-                "gems (including dev deps themselves)") do |value, options|
+                "gems (including dev deps themselves)") do |_value, options|
       options[:development] = true
       options[:dev_shallow] = false
     end
 
     add_option(:"Install/Update", "--conservative",
                 "Don't attempt to upgrade gems already",
-                "meeting version requirement") do |value, options|
+                "meeting version requirement") do |_value, options|
       options[:conservative] = true
       options[:minimal_deps] = true
     end
@@ -136,10 +136,10 @@ module Gem::InstallUpdateOptions
 
     add_option(:"Install/Update", "-g", "--file [FILE]",
                "Read from a gem dependencies API file and",
-               "install the listed gems") do |v,o|
-      v = Gem::GEM_DEP_FILES.find do |file|
+               "install the listed gems") do |v,_o|
+      v ||= Gem::GEM_DEP_FILES.find do |file|
         File.exist? file
-      end unless v
+      end
 
       unless v
         message = v ? v : "(tried #{Gem::GEM_DEP_FILES.join ", "})"
@@ -154,29 +154,29 @@ module Gem::InstallUpdateOptions
     add_option(:"Install/Update", "--without GROUPS", Array,
                "Omit the named groups (comma separated)",
                "when installing from a gem dependencies",
-               "file") do |v,o|
-      options[:without_groups].concat v.map {|without| without.intern }
+               "file") do |v,_o|
+      options[:without_groups].concat v.map(&:intern)
     end
 
     add_option(:"Install/Update", "--default",
                "Add the gem's full specification to",
-               "specifications/default and extract only its bin") do |v,o|
+               "specifications/default and extract only its bin") do |v,_o|
       options[:install_as_default] = v
     end
 
     add_option(:"Install/Update", "--explain",
                "Rather than install the gems, indicate which would",
-               "be installed") do |v,o|
+               "be installed") do |v,_o|
       options[:explain] = v
     end
 
     add_option(:"Install/Update", "--[no-]lock",
-               "Create a lock file (when used with -g/--file)") do |v,o|
+               "Create a lock file (when used with -g/--file)") do |v,_o|
       options[:lock] = v
     end
 
     add_option(:"Install/Update", "--[no-]suggestions",
-               "Suggest alternates when gems are not found") do |v,o|
+               "Suggest alternates when gems are not found") do |v,_o|
       options[:suggest_alternate] = v
     end
   end
@@ -186,7 +186,7 @@ module Gem::InstallUpdateOptions
 
   def install_update_options
     {
-      :document => %w[ri],
+      document: %w[ri],
     }
   end
 
@@ -196,5 +196,4 @@ module Gem::InstallUpdateOptions
   def install_update_defaults_str
     "--document=ri"
   end
-
 end