rubygems-update 3.4.20 → 3.4.22

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:
@@ -231,7 +231,7 @@ command to remove old versions.
     highest_remote_tup = highest_remote_name_tuple(rubygems_update)
     target = highest_remote_tup ? highest_remote_tup.version : version
 
-    return target, requirement
+    [target, requirement]
   end
 
   def update_gem(name, version = Gem::Requirement.default)

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

@@ -202,7 +202,7 @@ class Gem::ConfigFile
       @hash = @hash.merge environment_config
     end
 
-    # HACK these override command-line args, which is bad
+    # HACK: these override command-line args, which is bad
     @backtrace                   = @hash[:backtrace]                   if @hash.key? :backtrace
     @bulk_threshold              = @hash[:bulk_threshold]              if @hash.key? :bulk_threshold
     @home                        = @hash[:gemhome]                     if @hash.key? :gemhome
@@ -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.is_a? 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
@@ -483,11 +479,11 @@ if you believe they were disclosed to a third party.
 
     @hash.each do |key, value|
       key = key.to_s
-      next if key =~ re
+      next if key&.match?(re)
       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)
@@ -534,7 +581,7 @@ if you believe they were disclosed to a third party.
         need_config_file_name = false
       elsif arg =~ /^--config-file=(.*)/
         @config_file_name = $1
-      elsif arg =~ /^--config-file$/
+      elsif /^--config-file$/.match?(arg)
         need_config_file_name = true
       end
     end

data/lib/rubygems/core_ext/kernel_gem.rb

@@ -39,7 +39,7 @@ module Kernel
 
     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
@@ -146,7 +146,7 @@ module Kernel
       end
 
       RUBYGEMS_ACTIVATION_MONITOR.exit
-      return gem_original_require(path)
+      gem_original_require(path)
     rescue LoadError => load_error
       if load_error.path == path
         RUBYGEMS_ACTIVATION_MONITOR.enter

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

@@ -19,12 +19,12 @@ class Gem::DependencyInstaller
   DEFAULT_OPTIONS = { # :nodoc:
     :env_shebang => false,
     :document => %w[ri],
-    :domain => :both, # HACK dup
+    :domain => :both, # HACK: dup
     :force => false,
-    :format_executable => false, # HACK dup
+    :format_executable => false, # HACK: dup
     :ignore_dependencies => false,
     :prerelease => false,
-    :security_policy => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low?
+    :security_policy => nil, # HACK: NoSecurity requires OpenSSL. AlmostNo? Low?
     :wrappers => true,
     :build_args => nil,
     :build_docs_in_background => false,
@@ -292,7 +292,7 @@ class Gem::DependencyInstaller
         src = Gem::Source::SpecificFile.new dep_or_name
         installer_set.add_local dep_or_name, src.spec, src
         version = src.spec.version if version == Gem::Requirement.default
-      elsif dep_or_name =~ /\.gem$/
+      elsif dep_or_name =~ /\.gem$/ # rubocop:disable Performance/RegexpMatch
         Dir[dep_or_name].each do |name|
           src = Gem::Source::SpecificFile.new name
           installer_set.add_local dep_or_name, src.spec, src

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

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?
 
   ##
@@ -111,7 +111,7 @@ class Gem::Doctor
 
       basename = File.basename(child, extension)
       next if installed_specs.include? basename
-      next if /^rubygems-\d/ =~ basename
+      next if /^rubygems-\d/.match?(basename)
       next if "specifications" == sub_directory && "default" == basename
       next if "plugins" == sub_directory && Gem.plugin_suffix_regexp =~ (basename)
 

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/ext/ext_conf_builder.rb

@@ -43,7 +43,7 @@ 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[. ..]

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

@@ -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

@@ -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
 

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

@@ -230,11 +230,11 @@ class Gem::Installer
         end
       end
 
-      next unless line =~ shebang
+      next unless line&.match?(shebang)
 
       io.gets # blankline
 
-      # TODO detect a specially formatted comment instead of trying
+      # 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")
 
@@ -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
@@ -348,11 +348,6 @@ class Gem::Installer
     run_post_install_hooks
 
     spec
-
-  # TODO This rescue is in the wrong place. What is raising this exception?
-  # move this rescue to around the code that actually might raise it.
-  rescue Zlib::GzipFile::Error
-    raise Gem::InstallError, "gzip error installing #{gem}"
   end
 
   def run_pre_install_hooks # :nodoc:
@@ -494,7 +489,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"
@@ -537,9 +532,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
@@ -709,12 +704,12 @@ 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
 
   def verify_spec
-    unless spec.name =~ Gem::Specification::VALID_NAME_PATTERN
+    unless Gem::Specification::VALID_NAME_PATTERN.match?(spec.name)
       raise Gem::InstallError, "#{spec} has an invalid name"
     end
 
@@ -726,11 +721,11 @@ class Gem::Installer
       raise Gem::InstallError, "#{spec} has an invalid extensions"
     end
 
-    if spec.platform.to_s =~ /\R/
+    if /\R/.match?(spec.platform.to_s)
       raise Gem::InstallError, "#{spec.platform} is an invalid platform"
     end
 
-    unless spec.specification_version.to_s =~ /\A\d+\z/
+    unless /\A\d+\z/.match?(spec.specification_version.to_s)
       raise Gem::InstallError, "#{spec} has an invalid specification_version"
     end
 
@@ -747,9 +742,9 @@ class Gem::Installer
   # Return the text for an application file.
 
   def app_script_text(bin_file_name)
-    # note that the `load` lines cannot be indented, as old RG versions match
+    # NOTE: that the `load` lines cannot be indented, as old RG versions match
     # against the beginning of the line
-    return <<-TEXT
+    <<-TEXT
 #{shebang bin_file_name}
 #
 # This file was generated by RubyGems.
@@ -806,7 +801,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)
@@ -931,7 +926,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"
 
@@ -954,7 +949,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/local_remote_options.rb

@@ -105,7 +105,7 @@ module Gem::LocalRemoteOptions
 
     add_option(:"Local/Remote", "-s", "--source URL", URI::HTTP,
                "Append URL to list of remote gem sources") do |source, options|
-      source << "/" if source !~ /\/\z/
+      source << "/" unless source.end_with?("/")
 
       if options.delete :sources_cleared
         Gem.sources = [source]

data/lib/rubygems/package/digest_io.rb

@@ -36,7 +36,7 @@ class Gem::Package::DigestIO
 
     yield digest_io
 
-    return digests
+    digests
   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_header.rb

@@ -125,7 +125,7 @@ class Gem::Package::TarHeader
   end
 
   def self.strict_oct(str)
-    return str.strip.oct if str.strip =~ /\A[0-7]*\z/
+    return str.strip.oct if /\A[0-7]*\z/.match?(str.strip)
 
     raise ArgumentError, "#{str.inspect} is not an octal string"
   end
@@ -135,7 +135,7 @@ class Gem::Package::TarHeader
     # \ff flags a negative 256-based number
     # In case we have a match, parse it as a signed binary value
     # in big-endian order, except that the high-order bit is ignored.
-    return str.unpack("N2").last if str =~ /\A[\x80\xff]/n
+    return str.unpack("N2").last if /\A[\x80\xff]/n.match?(str)
     strict_oct(str)
   end
 

data/lib/rubygems/package/tar_reader.rb

@@ -50,7 +50,14 @@ class Gem::Package::TarReader
     return enum_for __method__ unless block_given?
 
     until @io.eof? do
-      header = Gem::Package::TarHeader.from @io
+      begin
+        header = Gem::Package::TarHeader.from @io
+      rescue ArgumentError => e
+        # Specialize only exceptions from Gem::Package::TarHeader.strict_oct
+        raise e unless e.message.match?(/ is not an octal string$/)
+        raise Gem::Package::TarInvalidError, e.message
+      end
+
       return if header.empty?
       entry = Gem::Package::TarReader::Entry.new header, @io
       yield entry
@@ -83,7 +90,7 @@ class Gem::Package::TarReader
 
     return unless found
 
-    return yield found
+    yield found
   ensure
     rewind
   end

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
@@ -324,6 +324,6 @@ class Gem::Package::TarWriter
       end
     end
 
-    return name, prefix
+    [name, prefix]
   end
 end