rubygems-update 3.4.20 → 3.4.21

data/bundler/lib/bundler/settings.rb

@@ -95,6 +95,8 @@ module Bundler
 
       @global_config   = load_config(global_config_file)
       @temporary       = {}
+
+      @key_cache = {}
     end
 
     def [](name)
@@ -310,7 +312,7 @@ module Bundler
     end
 
     def key_for(key)
-      self.class.key_for(key)
+      @key_cache[key] ||= self.class.key_for(key)
     end
 
     private
@@ -342,12 +344,12 @@ module Bundler
     end
 
     def is_bool(name)
-      name = name.to_s
+      name = self.class.key_to_s(name)
       BOOL_KEYS.include?(name) || BOOL_KEYS.include?(parent_setting_for(name))
     end
 
     def is_string(name)
-      name = name.to_s
+      name = self.class.key_to_s(name)
       STRING_KEYS.include?(name) || name.start_with?("local.") || name.start_with?("mirror.") || name.start_with?("build.")
     end
 
@@ -363,11 +365,11 @@ module Bundler
     end
 
     def is_num(key)
-      NUMBER_KEYS.include?(key.to_s)
+      NUMBER_KEYS.include?(self.class.key_to_s(key))
     end
 
     def is_array(key)
-      ARRAY_KEYS.include?(key.to_s)
+      ARRAY_KEYS.include?(self.class.key_to_s(key))
     end
 
     def is_credential(key)
@@ -390,7 +392,7 @@ module Bundler
     end
 
     def set_key(raw_key, value, hash, file)
-      raw_key = raw_key.to_s
+      raw_key = self.class.key_to_s(raw_key)
       value = array_to_s(value) if is_array(raw_key)
 
       key = key_for(raw_key)
@@ -405,13 +407,12 @@ module Bundler
       return unless file
       SharedHelpers.filesystem_access(file) do |p|
         FileUtils.mkdir_p(p.dirname)
-        require_relative "yaml_serializer"
-        p.open("w") {|f| f.write(YAMLSerializer.dump(hash)) }
+        p.open("w") {|f| f.write(serializer_class.dump(hash)) }
       end
     end
 
     def converted_value(value, key)
-      key = key.to_s
+      key = self.class.key_to_s(key)
 
       if is_array(key)
         to_array(value)
@@ -470,24 +471,31 @@ module Bundler
       SharedHelpers.filesystem_access(config_file, :read) do |file|
         valid_file = file.exist? && !file.size.zero?
         return {} unless valid_file
-        require_relative "yaml_serializer"
-        YAMLSerializer.load(file.read).inject({}) do |config, (k, v)|
-          new_k = k
-
+        serializer_class.load(file.read).inject({}) do |config, (k, v)|
           if k.include?("-")
             Bundler.ui.warn "Your #{file} config includes `#{k}`, which contains the dash character (`-`).\n" \
               "This is deprecated, because configuration through `ENV` should be possible, but `ENV` keys cannot include dashes.\n" \
               "Please edit #{file} and replace any dashes in configuration keys with a triple underscore (`___`)."
 
-            new_k = k.gsub("-", "___")
+            # string hash keys are frozen
+            k = k.gsub("-", "___")
           end
 
-          config[new_k] = v
+          config[k] = v
           config
         end
       end
     end
 
+    def serializer_class
+      require "rubygems/yaml_serializer"
+      Gem::YAMLSerializer
+    rescue LoadError
+      # TODO: Remove this when RubyGems 3.4 is EOL
+      require_relative "yaml_serializer"
+      YAMLSerializer
+    end
+
     PER_URI_OPTIONS = %w[
       fallback_timeout
     ].freeze
@@ -503,7 +511,7 @@ module Bundler
 
     def self.key_for(key)
       key = normalize_uri(key).to_s if key.is_a?(String) && key.start_with?("http", "mirror.http")
-      key = key.to_s.gsub(".", "__")
+      key = key_to_s(key).gsub(".", "__")
       key.gsub!("-", "___")
       key.upcase!
 
@@ -527,5 +535,34 @@ module Bundler
       end
       "#{prefix}#{uri}#{suffix}"
     end
+
+    # This is a hot method, so avoid respond_to? checks on every invocation
+    if :read.respond_to?(:name)
+      def self.key_to_s(key)
+        case key
+        when String
+          key
+        when Symbol
+          key.name
+        when Bundler::URI::HTTP
+          key.to_s
+        else
+          raise ArgumentError, "Invalid key: #{key.inspect}"
+        end
+      end
+    else
+      def self.key_to_s(key)
+        case key
+        when String
+          key
+        when Symbol
+          key.to_s
+        when Bundler::URI::HTTP
+          key.to_s
+        else
+          raise ArgumentError, "Invalid key: #{key.inspect}"
+        end
+      end
+    end
   end
 end

data/bundler/lib/bundler/shared_helpers.rb

@@ -197,6 +197,21 @@ module Bundler
       filesystem_access(gemfile_path) {|g| File.open(g, "w") {|file| file.puts contents } }
     end
 
+    def relative_gemfile_path
+      relative_path_to(Bundler.default_gemfile)
+    end
+
+    def relative_lockfile_path
+      relative_path_to(Bundler.default_lockfile)
+    end
+
+    def relative_path_to(destination, from: pwd)
+      Pathname.new(destination).relative_path_from(from).to_s
+    rescue ArgumentError
+      # on Windows, if source and destination are on different drivers, there's no relative path from one to the other
+      destination
+    end
+
     private
 
     def validate_bundle_path
@@ -297,7 +312,7 @@ module Bundler
     def set_rubyopt
       rubyopt = [ENV["RUBYOPT"]].compact
       setup_require = "-r#{File.expand_path("setup", __dir__)}"
-      return if !rubyopt.empty? && rubyopt.first =~ /#{setup_require}/
+      return if !rubyopt.empty? && rubyopt.first =~ /#{Regexp.escape(setup_require)}/
       rubyopt.unshift setup_require
       Bundler::SharedHelpers.set_env "RUBYOPT", rubyopt.join(" ")
     end

data/bundler/lib/bundler/source/git/git_proxy.rb

@@ -130,7 +130,8 @@ module Bundler
             end
           end
 
-          git "fetch", "--force", "--quiet", *extra_fetch_args, :dir => destination if @commit_ref
+          ref = @commit_ref || (locked_to_full_sha? && @revision)
+          git "fetch", "--force", "--quiet", *extra_fetch_args(ref), :dir => destination if ref
 
           git "reset", "--hard", @revision, :dir => destination
 
@@ -247,7 +248,15 @@ module Bundler
         end
 
         def pinned_to_full_sha?
-          ref =~ /\A\h{40}\z/
+          full_sha_revision?(ref)
+        end
+
+        def locked_to_full_sha?
+          full_sha_revision?(@revision)
+        end
+
+        def full_sha_revision?(ref)
+          ref&.match?(/\A\h{40}\z/)
         end
 
         def git_null(*command, dir: nil)
@@ -411,9 +420,9 @@ module Bundler
           ["--depth", depth.to_s]
         end
 
-        def extra_fetch_args
+        def extra_fetch_args(ref)
           extra_args = [path.to_s, *depth_args]
-          extra_args.push(@commit_ref)
+          extra_args.push(ref)
           extra_args
         end
 

data/bundler/lib/bundler/spec_set.rb

@@ -100,12 +100,12 @@ module Bundler
       end
     end
 
-    def incomplete_ruby_specs?(deps)
+    def incomplete_for_platform?(deps, platform)
       return false if @specs.empty?
 
       @incomplete_specs = []
 
-      self.for(deps, true, [Gem::Platform::RUBY])
+      self.for(deps, true, [platform])
 
       @incomplete_specs.any?
     end

data/bundler/lib/bundler/stub_specification.rb

@@ -16,7 +16,8 @@ module Bundler
       # Stub has no concept of source, which means that extension_dir may be wrong
       # This is the case for git-based gems. So, instead manually assign the extension dir
       return unless source.respond_to?(:extension_dir_name)
-      path = File.join(stub.extensions_dir, source.extension_dir_name)
+      unique_extension_dir = [source.extension_dir_name, File.basename(full_gem_path)].uniq.join("-")
+      path = File.join(stub.extensions_dir, unique_extension_dir)
       stub.extension_dir = File.expand_path(path)
     end
 
@@ -56,7 +57,7 @@ module Bundler
     end
 
     def gem_build_complete_path
-      File.join(extension_dir, "gem.build_complete")
+      stub.gem_build_complete_path
     end
 
     def default_gem?
@@ -108,6 +109,7 @@ module Bundler
         end
 
         rs.source = source
+        rs.base_dir = stub.base_dir
 
         rs
       end

data/bundler/lib/bundler/templates/newgem/Rakefile.tt

@@ -46,7 +46,9 @@ require "rb_sys/extensiontask"
 
 task build: :compile
 
-RbSys::ExtensionTask.new(<%= config[:name].inspect %>) do |ext|
+GEMSPEC = Gem::Specification.load("<%= config[:underscored_name] %>.gemspec")
+
+RbSys::ExtensionTask.new(<%= config[:name].inspect %>, GEMSPEC) do |ext|
   ext.lib_dir = "lib/<%= config[:namespaced_path] %>"
 end
 <% else -%>
@@ -54,7 +56,9 @@ require "rake/extensiontask"
 
 task build: :compile
 
-Rake::ExtensionTask.new("<%= config[:underscored_name] %>") do |ext|
+GEMSPEC = Gem::Specification.load("<%= config[:underscored_name] %>.gemspec")
+
+Rake::ExtensionTask.new("<%= config[:underscored_name] %>", GEMSPEC) do |ext|
   ext.lib_dir = "lib/<%= config[:namespaced_path] %>"
 end
 <% end -%>

data/bundler/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.4.20".freeze
+  VERSION = "2.4.21".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

data/bundler/lib/bundler/yaml_serializer.rb

@@ -54,8 +54,8 @@ module Bundler
       str.split(/\r?\n/).each do |line|
         if match = HASH_REGEX.match(line)
           indent, key, quote, val = match.captures
-          key = convert_to_backward_compatible_key(key)
-          depth = indent.scan(/  /).length
+          convert_to_backward_compatible_key!(key)
+          depth = indent.size / 2
           if quote.empty? && val.empty?
             new_hash = {}
             stack[depth][key] = new_hash
@@ -76,14 +76,13 @@ module Bundler
     end
 
     # for settings' keys
-    def convert_to_backward_compatible_key(key)
-      key = "#{key}/" if key =~ /https?:/i && key !~ %r{/\Z}
-      key = key.gsub(".", "__") if key.include?(".")
-      key
+    def convert_to_backward_compatible_key!(key)
+      key << "/" if /https?:/i.match?(key) && !%r{/\Z}.match?(key)
+      key.gsub!(".", "__")
     end
 
     class << self
-      private :dump_hash, :convert_to_backward_compatible_key
+      private :dump_hash, :convert_to_backward_compatible_key!
     end
   end
 end

data/lib/rubygems/basic_specification.rb

@@ -291,7 +291,7 @@ class Gem::BasicSpecification
   def lib_dirs_glob
     dirs = if self.raw_require_paths
       if self.raw_require_paths.size > 1
-        "{#{self.raw_require_paths.join(',')}}"
+        "{#{self.raw_require_paths.join(",")}}"
       else
         self.raw_require_paths.first
       end

data/lib/rubygems/command.rb

@@ -228,7 +228,7 @@ class Gem::Command
 
     if args.size > 1
       raise Gem::CommandLineError,
-            "Too many gem names (#{args.join(', ')}); please specify only one"
+            "Too many gem names (#{args.join(", ")}); please specify only one"
     end
 
     args.first
@@ -431,7 +431,7 @@ class Gem::Command
   def handles?(args)
     parser.parse!(args.dup)
     return true
-  rescue
+  rescue StandardError
     return false
   end
 

data/lib/rubygems/command_manager.rb

@@ -201,7 +201,7 @@ class Gem::CommandManager
 
     if possibilities.size > 1
       raise Gem::CommandLineError,
-            "Ambiguous command #{cmd_name} matches [#{possibilities.join(', ')}]"
+            "Ambiguous command #{cmd_name} matches [#{possibilities.join(", ")}]"
     elsif possibilities.empty?
       raise Gem::UnknownCommandError.new(cmd_name)
     end

data/lib/rubygems/commands/cert_command.rb

@@ -178,7 +178,7 @@ class Gem::Commands::CertCommand < Gem::Command
 
     algorithm = options[:key_algorithm] || Gem::Security::DEFAULT_KEY_ALGORITHM
     key = Gem::Security.create_key(algorithm)
-    key_path = Gem::Security.write key, "gem-private_key.pem", 0600, passphrase
+    key_path = Gem::Security.write key, "gem-private_key.pem", 0o600, passphrase
 
     return key, key_path
   end
@@ -292,7 +292,7 @@ For further reading on signing gems see `ri Gem::Security`.
     cert = File.read cert_file
     cert = OpenSSL::X509::Certificate.new cert
 
-    permissions = File.stat(cert_file).mode & 0777
+    permissions = File.stat(cert_file).mode & 0o777
 
     issuer_cert = options[:issuer_cert]
     issuer_key = options[:key]

data/lib/rubygems/commands/check_command.rb

@@ -41,7 +41,11 @@ class Gem::Commands::CheckCommand < Gem::Command
   def check_gems
     say "Checking gems..."
     say
-    gems = get_all_gem_names rescue []
+    gems = begin
+             get_all_gem_names
+           rescue StandardError
+             []
+           end
 
     Gem::Validator.new.alien(gems).sort.each do |key, val|
       unless val.empty?

data/lib/rubygems/commands/cleanup_command.rb

@@ -90,7 +90,7 @@ If no gems are named all gems in GEM_HOME are cleaned.
     verbose do
       skipped = @default_gems.map {|spec| spec.full_name }
 
-      "Skipped default gems: #{skipped.join ', '}"
+      "Skipped default gems: #{skipped.join ", "}"
     end
   end
 

data/lib/rubygems/commands/contents_command.rb

@@ -92,7 +92,7 @@ prefix or only the files that are requireable.
 
   def files_in_gem(spec)
     gem_path  = spec.full_gem_path
-    extra     = "/{#{spec.require_paths.join ','}}" if options[:lib_only]
+    extra     = "/{#{spec.require_paths.join ","}}" if options[:lib_only]
     glob      = "#{gem_path}#{extra}/**/*"
     prefix_re = /#{Regexp.escape(gem_path)}\//
 

data/lib/rubygems/commands/help_command.rb

@@ -328,7 +328,7 @@ platform.
 
     summary_width = 80 - margin_width - desc_width
     wrap_indent = " " * (margin_width + desc_width)
-    format = "#{' ' * margin_width}%-#{desc_width}s%s"
+    format = "#{" " * margin_width}%-#{desc_width}s%s"
 
     @command_manager.command_names.each do |cmd_name|
       command = @command_manager[cmd_name]
@@ -367,7 +367,7 @@ platform.
       command = @command_manager[possibilities.first]
       command.invoke("--help")
     elsif possibilities.size > 1
-      alert_warning "Ambiguous command #{command_name} (#{possibilities.join(', ')})"
+      alert_warning "Ambiguous command #{command_name} (#{possibilities.join(", ")})"
     else
       alert_warning "Unknown command #{command_name}. Try: gem help commands"
     end

data/lib/rubygems/commands/open_command.rb

@@ -70,9 +70,7 @@ class Gem::Commands::OpenCommand < Gem::Command
   end
 
   def open_editor(path)
-    Dir.chdir(path) do
-      system(*@editor.split(/\s+/) + [path])
-    end
+    system(*@editor.split(/\s+/) + [path], { :chdir => path })
   end
 
   def spec_for(name)

data/lib/rubygems/commands/owner_command.rb

@@ -79,7 +79,7 @@ permission to.
 
       say "Owners for gem: #{name}"
       owners.each do |owner|
-        say "- #{owner['email'] || owner['handle'] || owner['id']}"
+        say "- #{owner["email"] || owner["handle"] || owner["id"]}"
       end
     end
   end

data/lib/rubygems/commands/setup_command.rb

@@ -134,7 +134,7 @@ prefix and suffix.  If ruby was installed as `ruby18`, gem will be
 installed as `gem18`.
 
 By default, this RubyGems will install gem as:
-  #{Gem.default_exec_format % 'gem'}
+  #{Gem.default_exec_format % "gem"}
     EOF
   end
 
@@ -243,7 +243,7 @@ By default, this RubyGems will install gem as:
   end
 
   def install_executables(bin_dir)
-    prog_mode = options[:prog_mode] || 0755
+    prog_mode = options[:prog_mode] || 0o755
 
     executables = { "gem" => "exe" }
     executables.each do |tool, path|
@@ -369,7 +369,7 @@ By default, this RubyGems will install gem as:
       File.dirname(loaded_from)
     else
       target_specs_dir = File.join(default_dir, "specifications", "default")
-      mkdir_p target_specs_dir, :mode => 0755
+      mkdir_p target_specs_dir, :mode => 0o755
       target_specs_dir
     end
 
@@ -393,7 +393,7 @@ By default, this RubyGems will install gem as:
     end
 
     bundler_bin_dir = bundler_spec.bin_dir
-    mkdir_p bundler_bin_dir, :mode => 0755
+    mkdir_p bundler_bin_dir, :mode => 0o755
     bundler_spec.executables.each do |e|
       cp File.join("bundler", bundler_spec.bindir, e), File.join(bundler_bin_dir, e)
     end
@@ -430,8 +430,8 @@ By default, this RubyGems will install gem as:
       lib_dir, bin_dir = generate_default_dirs
     end
 
-    mkdir_p lib_dir, :mode => 0755
-    mkdir_p bin_dir, :mode => 0755
+    mkdir_p lib_dir, :mode => 0o755
+    mkdir_p bin_dir, :mode => 0o755
 
     return lib_dir, bin_dir
   end
@@ -639,10 +639,10 @@ abort "#{deprecation_message}"
     dest_file = File.join dest_dir, file
     dest_dir = File.dirname dest_file
     unless File.directory? dest_dir
-      mkdir_p dest_dir, :mode => 0755
+      mkdir_p dest_dir, :mode => 0o755
     end
 
-    install file, dest_file, :mode => options[:data_mode] || 0644
+    install file, dest_file, :mode => options[:data_mode] || 0o644
   end
 
   def remove_file_list(files, dir)

data/lib/rubygems/commands/specification_command.rb

@@ -107,7 +107,11 @@ Specific fields in the specification can be extracted in YAML format:
 
     if local?
       if File.exist? gem
-        specs << Gem::Package.new(gem).spec rescue nil
+        begin
+          specs << Gem::Package.new(gem).spec
+        rescue StandardError
+          nil
+        end
       end
 
       if specs.empty?

data/lib/rubygems/commands/stale_command.rb

@@ -34,7 +34,7 @@ longer using.
     end
 
     gem_to_atime.sort_by {|_, atime| atime }.each do |name, atime|
-      say "#{name} at #{atime.strftime '%c'}"
+      say "#{name} at #{atime.strftime "%c"}"
     end
   end
 end

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