rubygems-update 3.4.19 → 3.4.21

data/lib/rubygems/commands/unpack_command.rb

@@ -96,12 +96,10 @@ command help for an example.
 
         FileUtils.mkdir_p @options[:target] if @options[:target]
 
-        destination = begin
-          if @options[:target]
-            File.join @options[:target], spec_file
-          else
-            spec_file
-          end
+        destination = if @options[:target]
+          File.join @options[:target], spec_file
+        else
+          spec_file
         end
 
         File.open destination, "w" do |io|

data/lib/rubygems/commands/update_command.rb

@@ -128,10 +128,10 @@ command to remove old versions.
     if updated.empty?
       say "Nothing to update"
     else
-      say "Gems updated: #{updated_names.join(' ')}"
+      say "Gems updated: #{updated_names.join(" ")}"
     end
-    say "Gems already up-to-date: #{up_to_date_names.join(' ')}" unless up_to_date_names.empty?
-    say "Gems not currently installed: #{not_installed_names.join(' ')}" unless not_installed_names.empty?
+    say "Gems already up-to-date: #{up_to_date_names.join(" ")}" unless up_to_date_names.empty?
+    say "Gems not currently installed: #{not_installed_names.join(" ")}" unless not_installed_names.empty?
   end
 
   def fetch_remote_gems(spec) # :nodoc:

data/lib/rubygems/commands/yank_command.rb

@@ -89,7 +89,7 @@ data you will need to change them immediately and yank your gem.
 
   def get_version_from_requirements(requirements)
     requirements.requirements.first[1].version
-  rescue
+  rescue StandardError
     nil
   end
 

data/lib/rubygems/config_file.rb

@@ -241,9 +241,9 @@ class Gem::ConfigFile
     return if Gem.win_platform? # windows doesn't write 0600 as 0600
     return unless File.exist? credentials_path
 
-    existing_permissions = File.stat(credentials_path).mode & 0777
+    existing_permissions = File.stat(credentials_path).mode & 0o777
 
-    return if existing_permissions == 0600
+    return if existing_permissions == 0o600
 
     alert_error <<-ERROR
 Your gem push credentials file located at:
@@ -324,11 +324,9 @@ if you believe they were disclosed to a third party.
     require "fileutils"
     FileUtils.mkdir_p(dirname)
 
-    Gem.load_yaml
-
-    permissions = 0600 & (~File.umask)
+    permissions = 0o600 & (~File.umask)
     File.open(credentials_path, "w", permissions) do |f|
-      f.write config.to_yaml
+      f.write self.class.dump_with_rubygems_yaml(config)
     end
 
     load_api_keys # reload
@@ -344,20 +342,18 @@ if you believe they were disclosed to a third party.
   end
 
   def load_file(filename)
-    Gem.load_yaml
-
     yaml_errors = [ArgumentError]
-    yaml_errors << Psych::SyntaxError if defined?(Psych::SyntaxError)
 
     return {} unless filename && !filename.empty? && File.exist?(filename)
 
     begin
-      content = Gem::SafeYAML.load(File.read(filename))
-      unless content.kind_of? Hash
+      config = self.class.load_with_rubygems_config_hash(File.read(filename))
+      if config.keys.any? {|k| k.to_s.gsub(%r{https?:\/\/}, "").include?(": ") }
         warn "Failed to load #{filename} because it doesn't contain valid YAML hash"
         return {}
+      else
+        return config
       end
-      return content
     rescue *yaml_errors => e
       warn "Failed to load #{filename}, #{e}"
     rescue Errno::EACCES
@@ -487,7 +483,7 @@ if you believe they were disclosed to a third party.
       yaml_hash[key.to_s] = value
     end
 
-    yaml_hash.to_yaml
+    self.class.dump_with_rubygems_yaml(yaml_hash)
   end
 
   # Writes out this config file, replacing its source.
@@ -522,6 +518,57 @@ if you believe they were disclosed to a third party.
   attr_reader :hash
   protected :hash
 
+  def self.dump_with_rubygems_yaml(content)
+    content.transform_keys! do |k|
+      k.is_a?(Symbol) ? ":#{k}" : k
+    end
+
+    require_relative "yaml_serializer"
+    Gem::YAMLSerializer.dump(content)
+  end
+
+  def self.load_with_rubygems_config_hash(yaml)
+    require_relative "yaml_serializer"
+
+    content = Gem::YAMLSerializer.load(yaml)
+
+    content.transform_keys! do |k|
+      if k.match?(/\A:(.*)\Z/)
+        k[1..-1].to_sym
+      elsif k.include?("__") || k.match?(%r{/\Z})
+        if k.is_a?(Symbol)
+          k.to_s.gsub(/__/,".").gsub(%r{/\Z}, "").to_sym
+        else
+          k.dup.gsub(/__/,".").gsub(%r{/\Z}, "")
+        end
+      else
+        k
+      end
+    end
+
+    content.transform_values! do |v|
+      if v.is_a?(String)
+        if v.match?(/\A:(.*)\Z/)
+          v[1..-1].to_sym
+        elsif v.match?(/\A[+-]?\d+\Z/)
+          v.to_i
+        elsif v.match?(/\Atrue|false\Z/)
+          v == "true"
+        elsif v.empty?
+          nil
+        else
+          v
+        end
+      elsif v.is_a?(Hash) && v.empty?
+        nil
+      else
+        v
+      end
+    end
+
+    content
+  end
+
   private
 
   def set_config_file_name(args)

data/lib/rubygems/core_ext/kernel_gem.rb

@@ -37,9 +37,9 @@ module Kernel
     skip_list = (ENV["GEM_SKIP"] || "").split(/:/)
     raise Gem::LoadError, "skipping #{gem_name}" if skip_list.include? gem_name
 
-    if gem_name.kind_of? Gem::Dependency
+    if gem_name.is_a? Gem::Dependency
       unless Gem::Deprecate.skip
-        warn "#{Gem.location_of_caller.join ':'}:Warning: Kernel.gem no longer "\
+        warn "#{Gem.location_of_caller.join ":"}:Warning: Kernel.gem no longer "\
           "accepts a Gem::Dependency object, please pass the name "\
           "and requirements directly"
       end

data/lib/rubygems/core_ext/kernel_require.rb

@@ -128,7 +128,7 @@ module Kernel
 
         if names.size > 1
           RUBYGEMS_ACTIVATION_MONITOR.exit
-          raise Gem::LoadError, "#{path} found in multiple gems: #{names.join ', '}"
+          raise Gem::LoadError, "#{path} found in multiple gems: #{names.join ", "}"
         end
 
         # Ok, now find a gem that has no conflicts, starting

data/lib/rubygems/core_ext/kernel_warn.rb

@@ -35,11 +35,10 @@ module Kernel
 
         start += 1
 
-        if path = loc.path
-          unless path.start_with?(rubygems_path) || path.start_with?("<internal:")
-            # Non-rubygems frames
-            uplevel -= 1
-          end
+        next unless path = loc.path
+        unless path.start_with?(rubygems_path) || path.start_with?("<internal:")
+          # Non-rubygems frames
+          uplevel -= 1
         end
       end
       kw[:uplevel] = start

data/lib/rubygems/defaults.rb

@@ -80,7 +80,7 @@ module Gem
 
   def self.find_home
     Dir.home.dup
-  rescue
+  rescue StandardError
     if Gem.win_platform?
       File.expand_path File.join(ENV["HOMEDRIVE"] || ENV["SystemDrive"], "/")
     else
@@ -184,7 +184,11 @@ module Gem
   # Deduce Ruby's --program-prefix and --program-suffix from its install name
 
   def self.default_exec_format
-    exec_format = RbConfig::CONFIG["ruby_install_name"].sub("ruby", "%s") rescue "%s"
+    exec_format = begin
+                    RbConfig::CONFIG["ruby_install_name"].sub("ruby", "%s")
+                  rescue StandardError
+                    "%s"
+                  end
 
     unless exec_format.include?("%s")
       raise Gem::Exception,

data/lib/rubygems/dependency_installer.rb

@@ -163,13 +163,11 @@ class Gem::DependencyInstaller
 
         specs = []
         tuples.each do |tup, source|
-          begin
-            spec = source.fetch_spec(tup)
-          rescue Gem::RemoteFetcher::FetchError => e
-            errors << Gem::SourceFetchProblem.new(source, e)
-          else
-            specs << [spec, source]
-          end
+          spec = source.fetch_spec(tup)
+        rescue Gem::RemoteFetcher::FetchError => e
+          errors << Gem::SourceFetchProblem.new(source, e)
+        else
+          specs << [spec, source]
         end
 
         if @errors
@@ -296,11 +294,9 @@ class Gem::DependencyInstaller
         version = src.spec.version if version == Gem::Requirement.default
       elsif dep_or_name =~ /\.gem$/
         Dir[dep_or_name].each do |name|
-          begin
-            src = Gem::Source::SpecificFile.new name
-            installer_set.add_local dep_or_name, src.spec, src
-          rescue Gem::Package::FormatError
-          end
+          src = Gem::Source::SpecificFile.new name
+          installer_set.add_local dep_or_name, src.spec, src
+        rescue Gem::Package::FormatError
         end
         # else This is a dependency. InstallerSet handles this case
       end

data/lib/rubygems/deprecate.rb

@@ -83,7 +83,8 @@ module Gem::Deprecate
   # Temporarily turn off warnings. Intended for tests only.
 
   def skip_during
-    Gem::Deprecate.skip, original = true, Gem::Deprecate.skip
+    original = Gem::Deprecate.skip
+    Gem::Deprecate.skip = true
     yield
   ensure
     Gem::Deprecate.skip = original
@@ -104,7 +105,7 @@ module Gem::Deprecate
       old = "_deprecated_#{name}"
       alias_method old, name
       define_method name do |*args, &block|
-        klass = self.kind_of? Module
+        klass = self.is_a? Module
         target = klass ? "#{self}." : "#{self.class}#"
         msg = [ "NOTE: #{target}#{name} is deprecated",
                 repl == :none ? " with no replacement" : "; use #{repl} instead",
@@ -129,7 +130,7 @@ module Gem::Deprecate
       old = "_deprecated_#{name}"
       alias_method old, name
       define_method name do |*args, &block|
-        klass = self.kind_of? Module
+        klass = self.is_a? Module
         target = klass ? "#{self}." : "#{self.class}#"
         msg = [ "NOTE: #{target}#{name} is deprecated",
                 replacement == :none ? " with no replacement" : "; use #{replacement} instead",

data/lib/rubygems/doctor.rb

@@ -33,7 +33,7 @@ class Gem::Doctor
     Gem::REPOSITORY_SUBDIRECTORIES.sort -
     REPOSITORY_EXTENSION_MAP.map {|(k,_)| k }.sort
 
-  raise "Update REPOSITORY_EXTENSION_MAP, missing: #{missing.join ', '}" unless
+  raise "Update REPOSITORY_EXTENSION_MAP, missing: #{missing.join ", "}" unless
     missing.empty?
 
   ##

data/lib/rubygems/errors.rb

@@ -61,7 +61,7 @@ module Gem
 
     def build_message
       names = specs.map(&:full_name)
-      "Could not find '#{name}' (#{requirement}) - did find: [#{names.join ','}]\n"
+      "Could not find '#{name}' (#{requirement}) - did find: [#{names.join ","}]\n"
     end
   end
 

data/lib/rubygems/exceptions.rb

@@ -264,7 +264,7 @@ class Gem::UnsatisfiableDependencyError < Gem::DependencyError
   def initialize(dep, platform_mismatch=nil)
     if platform_mismatch && !platform_mismatch.empty?
       plats = platform_mismatch.map {|x| x.platform.to_s }.sort.uniq
-      super "Unable to resolve dependency: No match for '#{dep}' on this platform. Found: #{plats.join(', ')}"
+      super "Unable to resolve dependency: No match for '#{dep}' on this platform. Found: #{plats.join(", ")}"
     else
       if dep.explicit?
         super "Unable to resolve dependency: user requested '#{dep}'"

data/lib/rubygems/ext/builder.rb

@@ -77,7 +77,8 @@ class Gem::Ext::Builder
     verbose = Gem.configuration.really_verbose
 
     begin
-      rubygems_gemdeps, ENV["RUBYGEMS_GEMDEPS"] = ENV["RUBYGEMS_GEMDEPS"], nil
+      rubygems_gemdeps = ENV["RUBYGEMS_GEMDEPS"]
+      ENV["RUBYGEMS_GEMDEPS"] = nil
       if verbose
         puts("current directory: #{dir}")
         p(command)
@@ -90,7 +91,7 @@ class Gem::Ext::Builder
       build_env = { "SOURCE_DATE_EPOCH" => Gem.source_date_epoch_string }.merge(env)
       output, status = begin
                          Open3.capture2e(build_env, *command, :chdir => dir)
-                       rescue => error
+                       rescue StandardError => error
                          raise Gem::InstallError, "#{command_name || class_name} failed#{error.message}"
                        end
       if verbose
@@ -190,7 +191,7 @@ EOF
       verbose { results.join("\n") }
 
       write_gem_make_out results.join "\n"
-    rescue => e
+    rescue StandardError => e
       results << e.message
       build_error(results.join("\n"), $@)
     end
@@ -206,7 +207,7 @@ EOF
     if @build_args.empty?
       say "Building native extensions. This could take a while..."
     else
-      say "Building native extensions with: '#{@build_args.join ' '}'"
+      say "Building native extensions with: '#{@build_args.join " "}'"
       say "This could take a while..."
     end
 

data/lib/rubygems/ext/cargo_builder.rb

@@ -199,7 +199,7 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
     output, status =
       begin
         Open3.capture2e(cargo, "metadata", "--no-deps", "--format-version", "1", :chdir => cargo_dir)
-      rescue => error
+      rescue StandardError => error
         raise Gem::InstallError, "cargo metadata failed #{error.message}"
       end
 
@@ -313,7 +313,7 @@ EOF
     deffile_path
   end
 
-  # We have to basically reimplement RbConfig::CONFIG['SOEXT'] here to support
+  # We have to basically reimplement <code>RbConfig::CONFIG['SOEXT']</code> here to support
   # Ruby < 2.5
   #
   # @see https://github.com/ruby/ruby/blob/c87c027f18c005460746a74c07cd80ee355b16e4/configure.ac#L3185

data/lib/rubygems/gem_runner.rb

@@ -33,7 +33,11 @@ class Gem::GemRunner
 
     do_configuration args
 
-    Gem.load_env_plugins rescue nil
+    begin
+      Gem.load_env_plugins
+    rescue StandardError
+      nil
+    end
     Gem.load_plugins
 
     cmd = @command_manager_class.instance

data/lib/rubygems/gemcutter_utilities.rb

@@ -120,7 +120,7 @@ module Gem::GemcutterUtilities
   end
 
   def mfa_unauthorized?(response)
-    response.kind_of?(Net::HTTPUnauthorized) && response.body.start_with?("You have enabled multifactor authentication")
+    response.is_a?(Net::HTTPUnauthorized) && response.body.start_with?("You have enabled multifactor authentication")
   end
 
   def update_scope(scope)
@@ -216,7 +216,7 @@ module Gem::GemcutterUtilities
         say clean_text(response.body)
       end
     when Net::HTTPPermanentRedirect, Net::HTTPRedirection then
-      message = "The request has redirected permanently to #{response['location']}. Please check your defined push host URL."
+      message = "The request has redirected permanently to #{response["location"]}. Please check your defined push host URL."
       message = "#{error_prefix}: #{message}" if error_prefix
 
       say clean_text(message)
@@ -338,7 +338,7 @@ module Gem::GemcutterUtilities
     end
 
     with_response response do |resp|
-      Gem::SafeYAML.load clean_text(resp.body)
+      Gem::ConfigFile.load_with_rubygems_config_hash(clean_text(resp.body))
     end
   end
 
@@ -367,6 +367,6 @@ module Gem::GemcutterUtilities
   end
 
   def api_key_forbidden?(response)
-    response.kind_of?(Net::HTTPForbidden) && response.body.start_with?("The API key doesn't have access")
+    response.is_a?(Net::HTTPForbidden) && response.body.start_with?("The API key doesn't have access")
   end
 end

data/lib/rubygems/indexer.rb

@@ -327,7 +327,7 @@ class Gem::Indexer
 
   def make_temp_directories
     FileUtils.rm_rf @directory
-    FileUtils.mkdir_p @directory, :mode => 0700
+    FileUtils.mkdir_p @directory, :mode => 0o700
     FileUtils.mkdir_p @quick_marshal_dir
   end
 

data/lib/rubygems/install_update_options.rb

@@ -142,7 +142,7 @@ module Gem::InstallUpdateOptions
       end unless v
 
       unless v
-        message = v ? v : "(tried #{Gem::GEM_DEP_FILES.join ', '})"
+        message = v ? v : "(tried #{Gem::GEM_DEP_FILES.join ", "})"
 
         raise Gem::OptionParser::InvalidArgument,
                 "cannot find gem dependencies file #{message}"

data/lib/rubygems/installer.rb

@@ -316,7 +316,7 @@ class Gem::Installer
     FileUtils.rm_rf spec.extension_dir
 
     dir_mode = options[:dir_mode]
-    FileUtils.mkdir_p gem_dir, :mode => dir_mode && 0755
+    FileUtils.mkdir_p gem_dir, :mode => dir_mode && 0o755
 
     if @options[:install_as_default]
       extract_bin
@@ -357,25 +357,23 @@ class Gem::Installer
 
   def run_pre_install_hooks # :nodoc:
     Gem.pre_install_hooks.each do |hook|
-      if hook.call(self) == false
-        location = " at #{$1}" if hook.inspect =~ /[ @](.*:\d+)/
+      next unless hook.call(self) == false
+      location = " at #{$1}" if hook.inspect =~ /[ @](.*:\d+)/
 
-        message = "pre-install hook#{location} failed for #{spec.full_name}"
-        raise Gem::InstallError, message
-      end
+      message = "pre-install hook#{location} failed for #{spec.full_name}"
+      raise Gem::InstallError, message
     end
   end
 
   def run_post_build_hooks # :nodoc:
     Gem.post_build_hooks.each do |hook|
-      if hook.call(self) == false
-        FileUtils.rm_rf gem_dir
+      next unless hook.call(self) == false
+      FileUtils.rm_rf gem_dir
 
-        location = " at #{$1}" if hook.inspect =~ /[ @](.*:\d+)/
+      location = " at #{$1}" if hook.inspect =~ /[ @](.*:\d+)/
 
-        message = "post-build hook#{location} failed for #{spec.full_name}"
-        raise Gem::InstallError, message
-      end
+      message = "post-build hook#{location} failed for #{spec.full_name}"
+      raise Gem::InstallError, message
     end
   end
 
@@ -496,7 +494,7 @@ class Gem::Installer
       next unless File.exist? bin_path
 
       mode = File.stat(bin_path).mode
-      dir_mode = options[:prog_mode] || (mode | 0111)
+      dir_mode = options[:prog_mode] || (mode | 0o111)
 
       unless dir_mode == mode
         require "fileutils"
@@ -539,9 +537,9 @@ class Gem::Installer
     require "fileutils"
     FileUtils.rm_f bin_script_path # prior install may have been --no-wrappers
 
-    File.open bin_script_path, "wb", 0755 do |file|
+    File.open bin_script_path, "wb", 0o755 do |file|
       file.print app_script_text(filename)
-      file.chmod(options[:prog_mode] || 0755)
+      file.chmod(options[:prog_mode] || 0o755)
     end
 
     verbose bin_script_path
@@ -711,7 +709,7 @@ class Gem::Installer
   end
 
   def verify_gem_home # :nodoc:
-    FileUtils.mkdir_p gem_home, :mode => options[:dir_mode] && 0755
+    FileUtils.mkdir_p gem_home, :mode => options[:dir_mode] && 0o755
     raise Gem::FilePermissionError, gem_home unless File.writable?(gem_home)
   end
 
@@ -808,7 +806,7 @@ TEXT
     rb_topdir = RbConfig::TOPDIR || File.dirname(rb_config["bindir"])
 
     # get ruby executable file name from RbConfig
-    ruby_exe = "#{rb_config['RUBY_INSTALL_NAME']}#{rb_config['EXEEXT']}"
+    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)
@@ -933,7 +931,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 && 0755
+    FileUtils.mkdir_p build_info_dir, :mode => dir_mode && 0o755
 
     build_info_file = File.join build_info_dir, "#{spec.full_name}.info"
 
@@ -956,7 +954,7 @@ TEXT
 
   def ensure_writable_dir(dir) # :nodoc:
     begin
-      Dir.mkdir dir, *[options[:dir_mode] && 0755].compact
+      Dir.mkdir dir, *[options[:dir_mode] && 0o755].compact
     rescue SystemCallError
       raise unless File.directory? dir
     end

data/lib/rubygems/name_tuple.rb

@@ -10,7 +10,7 @@ class Gem::NameTuple
     @name = name
     @version = version
 
-    unless platform.kind_of? Gem::Platform
+    unless platform.is_a? Gem::Platform
       platform = "ruby" if !platform || platform.empty?
     end
 

data/lib/rubygems/package/old.rb

@@ -78,7 +78,7 @@ class Gem::Package::Old < Gem::Package
 
         FileUtils.rm_rf destination
 
-        FileUtils.mkdir_p File.dirname(destination), :mode => dir_mode && 0755
+        FileUtils.mkdir_p File.dirname(destination), :mode => dir_mode && 0o755
 
         File.open destination, "wb", file_mode(entry["mode"]) do |out|
           out.write file_data

data/lib/rubygems/package/tar_reader/entry.rb

@@ -100,9 +100,7 @@ class Gem::Package::TarReader::Entry
   # Read one byte from the tar entry
 
   def getc
-    check_closed
-
-    return nil if @read >= @header.size
+    return nil if eof?
 
     ret = @io.getc
     @read += 1 if ret
@@ -155,30 +153,28 @@ class Gem::Package::TarReader::Entry
   alias length size
 
   ##
-  # Reads +len+ bytes from the tar file entry, or the rest of the entry if
-  # nil
-
-  def read(len = nil)
-    check_closed
-
-    len ||= @header.size - @read
+  # Reads +maxlen+ bytes from the tar file entry, or the rest of the entry if nil
 
-    return nil if len > 0 && @read >= @header.size
+  def read(maxlen = nil)
+    if eof?
+      return maxlen.to_i.zero? ? "" : nil
+    end
 
-    max_read = [len, @header.size - @read].min
+    max_read = [maxlen, @header.size - @read].compact.min
 
     ret = @io.read max_read
+    if ret.nil?
+      return maxlen ? nil : "" # IO.read returns nil on EOF with len argument
+    end
     @read += ret.size
 
     ret
   end
 
-  def readpartial(maxlen = nil, outbuf = "".b)
-    check_closed
-
-    maxlen ||= @header.size - @read
-
-    raise EOFError if maxlen > 0 && @read >= @header.size
+  def readpartial(maxlen, outbuf = "".b)
+    if eof? && maxlen > 0
+      raise EOFError, "end of file reached"
+    end
 
     max_read = [maxlen, @header.size - @read].min
 
@@ -212,6 +208,8 @@ class Gem::Package::TarReader::Entry
 
     pending = new_pos - @io.pos
 
+    return 0 if pending == 0
+
     if @io.respond_to?(:seek)
       begin
         # avoid reading if the @io supports seeking
@@ -229,8 +227,8 @@ class Gem::Package::TarReader::Entry
     end
 
     while pending > 0 do
-      size_read = @io.read([pending, 4096].min).size
-      raise UnexpectedEOF if @io.eof?
+      size_read = @io.read([pending, 4096].min)&.size
+      raise(EOFError, "end of file reached") if size_read.nil?
       pending -= size_read
     end
 

data/lib/rubygems/package/tar_reader.rb

@@ -11,11 +11,6 @@
 class Gem::Package::TarReader
   include Enumerable
 
-  ##
-  # Raised if the tar IO is not seekable
-
-  class UnexpectedEOF < StandardError; end
-
   ##
   # Creates a new TarReader on +io+ and yields it to the block, if given.
 

data/lib/rubygems/package/tar_writer.rb

@@ -190,7 +190,7 @@ class Gem::Package::TarWriter
     if signer.key
       signature = signer.sign signature_digest.digest
 
-      add_file_simple "#{name}.sig", 0444, signature.length do |io|
+      add_file_simple "#{name}.sig", 0o444, signature.length do |io|
         io.write signature
       end
     end