rubygems-update 3.4.22 → 3.5.1

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

@@ -48,7 +48,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
         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/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

data/lib/rubygems/installer.rb

@@ -189,10 +189,12 @@ class Gem::Installer
     @package.prog_mode = options[:prog_mode]
     @package.data_mode = options[:data_mode]
 
-    if options[:user_install]
-      @gem_home = Gem.user_dir
-      @bin_dir = Gem.bindir gem_home unless options[:bin_dir]
-      @plugins_dir = Gem.plugindir(gem_home)
+    if @gem_home == Gem.user_dir
+      # If we get here, then one of the following likely happened:
+      # - `--user-install` was specified
+      # - `Gem::PathSupport#home` fell back to `Gem.user_dir`
+      # - GEM_HOME was manually set to `Gem.user_dir`
+
       check_that_user_bin_dir_is_in_path
     end
   end
@@ -222,10 +224,11 @@ class Gem::Installer
 
     File.open generated_bin, "rb" do |io|
       line = io.gets
-      shebang = /^#!.*ruby/
+      shebang = /^#!.*ruby/o
 
-      if load_relative_enabled?
-        until line.nil? || line =~ shebang do
+      # TruffleRuby uses a bash prelude in default launchers
+      if load_relative_enabled? || RUBY_ENGINE == "truffleruby"
+        until line.nil? || shebang.match?(line) do
           line = io.gets
         end
       end
@@ -236,17 +239,17 @@ class Gem::Installer
 
       # TODO: detect a specially formatted comment instead of trying
       # to find a string inside Ruby code.
-      next unless io.gets.to_s.include?("This file was generated by RubyGems")
+      next unless io.gets&.include?("This file was generated by RubyGems")
 
       ruby_executable = true
-      existing = io.read.slice(%r{
+      existing = io.read.slice(/
           ^\s*(
             gem \s |
             load \s Gem\.bin_path\( |
             load \s Gem\.activate_bin_path\(
           )
           (['"])(.*?)(\2),
-        }x, 3)
+        /x, 3)
     end
 
     return if spec.name == existing
@@ -316,7 +319,7 @@ class Gem::Installer
     FileUtils.rm_rf spec.extension_dir
 
     dir_mode = options[:dir_mode]
-    FileUtils.mkdir_p gem_dir, :mode => dir_mode && 0o755
+    FileUtils.mkdir_p gem_dir, mode: dir_mode && 0o755
 
     if @options[:install_as_default]
       extract_bin
@@ -348,6 +351,9 @@ class Gem::Installer
     run_post_install_hooks
 
     spec
+  rescue Errno::EACCES => e
+    # Permission denied - /path/to/foo
+    raise Gem::FilePermissionError, e.message.split(" - ").last
   end
 
   def run_pre_install_hooks # :nodoc:
@@ -388,7 +394,7 @@ class Gem::Installer
       specs = []
 
       Gem::Util.glob_files_in_dir("*.gemspec", File.join(gem_home, "specifications")).each do |path|
-        spec = Gem::Specification.load path.tap(&Gem::UNTAINT)
+        spec = Gem::Specification.load path
         specs << spec if spec
       end
 
@@ -458,6 +464,9 @@ class Gem::Installer
   ##
   # Writes the full .gemspec specification (in Ruby) to the gem home's
   # specifications/default directory.
+  #
+  # In contrast to #write_spec, this keeps file lists, so the `gem contents`
+  # command works.
 
   def write_default_spec
     Gem.write_binary(default_spec_file, spec.to_ruby)
@@ -484,7 +493,6 @@ class Gem::Installer
     ensure_writable_dir @bin_dir
 
     spec.executables.each do |filename|
-      filename.tap(&Gem::UNTAINT)
       bin_path = File.join gem_dir, spec.bindir, filename
       next unless File.exist? bin_path
 
@@ -517,6 +525,8 @@ class Gem::Installer
     else
       regenerate_plugins_for(spec, @plugins_dir)
     end
+  rescue ArgumentError => e
+    raise e, "#{latest.name} #{latest.version} #{spec.name} #{spec.version}: #{e.message}"
   end
 
   ##
@@ -524,7 +534,7 @@ class Gem::Installer
   #--
   # The Windows script is generated in addition to the regular one due to a
   # bug or misfeature in the Windows shell's pipe.  See
-  # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/193379
+  # https://blade.ruby-lang.org/ruby-talk/193379
 
   def generate_bin_script(filename, bindir)
     bin_script_path = File.join bindir, formatted_program_filename(filename)
@@ -559,7 +569,7 @@ class Gem::Installer
       File.unlink dst
     end
 
-    FileUtils.symlink src, dst, :verbose => Gem.configuration.really_verbose
+    FileUtils.symlink src, dst, verbose: Gem.configuration.really_verbose
   rescue NotImplementedError, SystemCallError
     alert_warning "Unable to use symlinks, installing wrapper"
     generate_bin_script filename, bindir
@@ -582,7 +592,7 @@ class Gem::Installer
 
   def shebang(bin_file_name)
     path = File.join gem_dir, spec.bindir, bin_file_name
-    first_line = File.open(path, "rb") {|file| file.gets } || ""
+    first_line = File.open(path, "rb", &:gets) || ""
 
     if first_line.start_with?("#!")
       # Preserve extra words on shebang line, like "-w".  Thanks RPA.
@@ -624,7 +634,6 @@ class Gem::Installer
 
   def ensure_loadable_spec
     ruby = spec.to_ruby_for_cache
-    ruby.tap(&Gem::UNTAINT)
 
     begin
       eval ruby
@@ -645,32 +654,37 @@ class Gem::Installer
 
   def process_options # :nodoc:
     @options = {
-      :bin_dir => nil,
-      :env_shebang => false,
-      :force => false,
-      :only_install_dir => false,
-      :post_install_message => true,
+      bin_dir: nil,
+      env_shebang: false,
+      force: false,
+      only_install_dir: false,
+      post_install_message: true,
     }.merge options
 
     @env_shebang         = options[:env_shebang]
     @force               = options[:force]
     @install_dir         = options[:install_dir]
-    @gem_home            = options[:install_dir] || Gem.dir
-    @plugins_dir         = Gem.plugindir(@gem_home)
+    @user_install        = options[:user_install]
     @ignore_dependencies = options[:ignore_dependencies]
     @format_executable   = options[:format_executable]
     @wrappers            = options[:wrappers]
     @only_install_dir    = options[:only_install_dir]
 
-    # If the user has asked for the gem to be installed in a directory that is
-    # the system gem directory, then use the system bin directory, else create
-    # (or use) a new bin dir under the gem_home.
-    @bin_dir             = options[:bin_dir] || Gem.bindir(gem_home)
+    @bin_dir             = options[:bin_dir]
     @development         = options[:development]
     @build_root          = options[:build_root]
 
     @build_args = options[:build_args]
 
+    @gem_home = @install_dir || user_install_dir || Gem.dir
+
+    # If the user has asked for the gem to be installed in a directory that is
+    # the system gem directory, then use the system bin directory, else create
+    # (or use) a new bin dir under the gem_home.
+    @bin_dir ||= Gem.bindir(@gem_home)
+
+    @plugins_dir = Gem.plugindir(@gem_home)
+
     unless @build_root.nil?
       @bin_dir = File.join(@build_root, @bin_dir.gsub(/^[a-zA-Z]:/, ""))
       @gem_home = File.join(@build_root, @gem_home.gsub(/^[a-zA-Z]:/, ""))
@@ -704,8 +718,7 @@ class Gem::Installer
   end
 
   def verify_gem_home # :nodoc:
-    FileUtils.mkdir_p gem_home, :mode => options[:dir_mode] && 0o755
-    raise Gem::FilePermissionError, gem_home unless File.writable?(gem_home)
+    FileUtils.mkdir_p gem_home, mode: options[:dir_mode] && 0o755
   end
 
   def verify_spec
@@ -804,7 +817,7 @@ TEXT
     ruby_exe = "#{rb_config["RUBY_INSTALL_NAME"]}#{rb_config["EXEEXT"]}"
     ruby_exe = "ruby.exe" if ruby_exe.empty?
 
-    if File.exist?(File.join bindir, ruby_exe)
+    if File.exist?(File.join(bindir, ruby_exe))
       # stub & ruby.exe within same folder.  Portable
       <<-TEXT
 @ECHO OFF
@@ -926,7 +939,7 @@ TEXT
     build_info_dir = File.join gem_home, "build_info"
 
     dir_mode = options[:dir_mode]
-    FileUtils.mkdir_p build_info_dir, :mode => dir_mode && 0o755
+    FileUtils.mkdir_p build_info_dir, mode: dir_mode && 0o755
 
     build_info_file = File.join build_info_dir, "#{spec.full_name}.info"
 
@@ -959,6 +972,19 @@ TEXT
 
   private
 
+  def user_install_dir
+    # never install to user home in --build-root mode
+    return unless @build_root.nil?
+
+    # Please note that @user_install might have three states:
+    # * `true`: `--user-install`
+    # * `false`: `--no-user-install` and
+    # * `nil`: option was not specified
+    if @user_install || (@user_install.nil? && Gem.default_user_install)
+      Gem.user_dir
+    end
+  end
+
   def build_args
     @build_args ||= begin
                       require_relative "command"
@@ -984,7 +1010,7 @@ TEXT
         bindir="${0%/*}"
       EOS
 
-      script << %Q(exec "$bindir/#{ruby_install_name}" "-x" "$0" "$@"\n)
+      script << %(exec "$bindir/#{ruby_install_name}" "-x" "$0" "$@"\n)
 
       <<~EOS
         #!/bin/sh

data/lib/rubygems/installer_uninstaller_utils.rb

@@ -4,7 +4,6 @@
 # Helper methods for both Gem::Installer and Gem::Uninstaller
 
 module Gem::InstallerUninstallerUtils
-
   def regenerate_plugins_for(spec, plugins_dir)
     plugins = spec.plugins
     return if plugins.empty?
@@ -25,5 +24,4 @@ module Gem::InstallerUninstallerUtils
   def remove_plugins_for(spec, plugins_dir)
     FileUtils.rm_f Gem::Util.glob_files_in_dir("#{spec.name}#{Gem.plugin_suffix_pattern}", plugins_dir)
   end
-
 end