rubygems-update 3.3.18 → 3.6.2

data/lib/rubygems/platform.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "deprecate"
 
 ##
@@ -11,21 +12,30 @@ class Gem::Platform
 
   attr_accessor :cpu, :os, :version
 
-  def self.local
-    arch = RbConfig::CONFIG['arch']
-    arch = "#{arch}_60" if arch =~ /mswin(?:32|64)$/
-    @local ||= new(arch)
+  def self.local(refresh: false)
+    return @local if @local && !refresh
+    @local = begin
+      arch = Gem.target_rbconfig["arch"]
+      arch = "#{arch}_60" if /mswin(?:32|64)$/.match?(arch)
+      new(arch)
+    end
   end
 
   def self.match(platform)
     match_platforms?(platform, Gem.platforms)
   end
 
+  class << self
+    extend Gem::Deprecate
+    rubygems_deprecate :match, "Gem::Platform.match_spec? or match_gem?"
+  end
+
   def self.match_platforms?(platform, platforms)
+    platform = Gem::Platform.new(platform) unless platform.is_a?(Gem::Platform)
     platforms.any? do |local_platform|
-      platform.nil? or
-        local_platform == platform or
-        (local_platform != Gem::Platform::RUBY and local_platform =~ platform)
+      platform.nil? ||
+        local_platform == platform ||
+        (local_platform != Gem::Platform::RUBY && platform =~ local_platform)
     end
   end
   private_class_method :match_platforms?
@@ -34,10 +44,20 @@ class Gem::Platform
     match_gem?(spec.platform, spec.name)
   end
 
-  def self.match_gem?(platform, gem_name)
-    # Note: this method might be redefined by Ruby implementations to
-    # customize behavior per RUBY_ENGINE, gem_name or other criteria.
-    match_platforms?(platform, Gem.platforms)
+  if RUBY_ENGINE == "truffleruby"
+    def self.match_gem?(platform, gem_name)
+      raise "Not a string: #{gem_name.inspect}" unless String === gem_name
+
+      if REUSE_AS_BINARY_ON_TRUFFLERUBY.include?(gem_name)
+        match_platforms?(platform, [Gem::Platform::RUBY, Gem::Platform.local])
+      else
+        match_platforms?(platform, Gem.platforms)
+      end
+    end
+  else
+    def self.match_gem?(platform, gem_name)
+      match_platforms?(platform, Gem.platforms)
+    end
   end
 
   def self.sort_priority(platform)
@@ -56,7 +76,7 @@ class Gem::Platform
     case arch
     when Gem::Platform::CURRENT then
       Gem::Platform.local
-    when Gem::Platform::RUBY, nil, '' then
+    when Gem::Platform::RUBY, nil, "" then
       Gem::Platform::RUBY
     else
       super
@@ -68,9 +88,9 @@ class Gem::Platform
     when Array then
       @cpu, @os, @version = arch
     when String then
-      arch = arch.split '-'
+      arch = arch.split "-"
 
-      if arch.length > 2 and arch.last !~ /\d/ # reassemble x86-linux-gnu
+      if arch.length > 2 && !arch.last.match?(/\d+(\.\d+)?$/) # reassemble x86-linux-{libc}
         extra = arch.pop
         arch.last << "-#{extra}"
       end
@@ -78,44 +98,47 @@ class Gem::Platform
       cpu = arch.shift
 
       @cpu = case cpu
-      when /i\d86/ then 'x86'
-      else cpu
+             when /i\d86/ then "x86"
+             else cpu
       end
 
-      if arch.length == 2 and arch.last =~ /^\d+(\.\d+)?$/ # for command-line
+      if arch.length == 2 && arch.last.match?(/^\d+(\.\d+)?$/) # for command-line
         @os, @version = arch
         return
       end
 
       os, = arch
-      @cpu, os = nil, cpu if os.nil? # legacy jruby
+      if os.nil?
+        @cpu = nil
+        os = cpu
+      end # legacy jruby
 
       @os, @version = case os
-      when /aix(\d+)?/ then             [ 'aix',       $1  ]
-      when /cygwin/ then                [ 'cygwin',    nil ]
-      when /darwin(\d+)?/ then          [ 'darwin',    $1  ]
-      when /^macruby$/ then             [ 'macruby',   nil ]
-      when /freebsd(\d+)?/ then         [ 'freebsd',   $1  ]
-      when /hpux(\d+)?/ then            [ 'hpux',      $1  ]
-      when /^java$/, /^jruby$/ then     [ 'java',      nil ]
-      when /^java([\d.]*)/ then         [ 'java',      $1  ]
-      when /^dalvik(\d+)?$/ then        [ 'dalvik',    $1  ]
-      when /^dotnet$/ then              [ 'dotnet',    nil ]
-      when /^dotnet([\d.]*)/ then       [ 'dotnet',    $1  ]
-      when /linux-?((?!gnu)\w+)?/ then  [ 'linux',     $1  ]
-      when /mingw32/ then               [ 'mingw32',   nil ]
-      when /mingw-?(\w+)?/ then         [ 'mingw',     $1  ]
-      when /(mswin\d+)(\_(\d+))?/ then
-        os, version = $1, $3
-        @cpu = 'x86' if @cpu.nil? and os =~ /32$/
-        [os, version]
-      when /netbsdelf/ then             [ 'netbsdelf', nil ]
-      when /openbsd(\d+\.\d+)?/ then    [ 'openbsd',   $1  ]
-      when /bitrig(\d+\.\d+)?/ then     [ 'bitrig',    $1  ]
-      when /solaris(\d+\.\d+)?/ then    [ 'solaris',   $1  ]
-      # test
-      when /^(\w+_platform)(\d+)?/ then [ $1,          $2  ]
-      else                              [ 'unknown',   nil ]
+                      when /aix(\d+)?/ then             ["aix",       $1]
+                      when /cygwin/ then                ["cygwin",    nil]
+                      when /darwin(\d+)?/ then          ["darwin",    $1]
+                      when /^macruby$/ then             ["macruby",   nil]
+                      when /freebsd(\d+)?/ then         ["freebsd",   $1]
+                      when /^java$/, /^jruby$/ then     ["java",      nil]
+                      when /^java([\d.]*)/ then         ["java",      $1]
+                      when /^dalvik(\d+)?$/ then        ["dalvik",    $1]
+                      when /^dotnet$/ then              ["dotnet",    nil]
+                      when /^dotnet([\d.]*)/ then       ["dotnet",    $1]
+                      when /linux-?(\w+)?/ then         ["linux",     $1]
+                      when /mingw32/ then               ["mingw32",   nil]
+                      when /mingw-?(\w+)?/ then         ["mingw",     $1]
+                      when /(mswin\d+)(\_(\d+))?/ then
+                        os = $1
+                        version = $3
+                        @cpu = "x86" if @cpu.nil? && os =~ /32$/
+                        [os, version]
+                      when /netbsdelf/ then             ["netbsdelf", nil]
+                      when /openbsd(\d+\.\d+)?/ then    ["openbsd",   $1]
+                      when /solaris(\d+\.\d+)?/ then    ["solaris",   $1]
+                      when /wasi/ then                  ["wasi",      nil]
+                      # test
+                      when /^(\w+_platform)(\d+)?/ then [$1,          $2]
+                      else ["unknown", nil]
       end
     when Gem::Platform then
       @cpu = arch.cpu
@@ -131,7 +154,7 @@ class Gem::Platform
   end
 
   def to_s
-    to_a.compact.join '-'
+    to_a.compact.join "-"
   end
 
   ##
@@ -139,10 +162,10 @@ class Gem::Platform
   # the same CPU, OS and version.
 
   def ==(other)
-    self.class === other and to_a == other.to_a
+    self.class === other && to_a == other.to_a
   end
 
-  alias :eql? :==
+  alias_method :eql?, :==
 
   def hash # :nodoc:
     to_a.hash
@@ -151,27 +174,53 @@ class Gem::Platform
   ##
   # Does +other+ match this platform?  Two platforms match if they have the
   # same CPU, or either has a CPU of 'universal', they have the same OS, and
-  # they have the same version, or either has no version.
+  # they have the same version, or either one has no version
   #
   # Additionally, the platform will match if the local CPU is 'arm' and the
-  # other CPU starts with "arm" (for generic ARM family support).
+  # other CPU starts with "armv" (for generic 32-bit ARM family support).
+  #
+  # Of note, this method is not commutative. Indeed the OS 'linux' has a
+  # special case: the version is the libc name, yet while "no version" stands
+  # as a wildcard for a binary gem platform (as for other OSes), for the
+  # runtime platform "no version" stands for 'gnu'. To be able to distinguish
+  # these, the method receiver is the gem platform, while the argument is
+  # the runtime platform.
+  #
+  #--
+  # NOTE: Until it can be removed, changes to this method must also be reflected in `bundler/lib/bundler/rubygems_ext.rb`
 
   def ===(other)
     return nil unless Gem::Platform === other
 
     # universal-mingw32 matches x64-mingw-ucrt
-    return true if (@cpu == 'universal' or other.cpu == 'universal') and
-                   @os.start_with?('mingw') and other.os.start_with?('mingw')
+    return true if (@cpu == "universal" || other.cpu == "universal") &&
+                   @os.start_with?("mingw") && other.os.start_with?("mingw")
 
     # cpu
-    ([nil,'universal'].include?(@cpu) or [nil, 'universal'].include?(other.cpu) or @cpu == other.cpu or
-    (@cpu == 'arm' and other.cpu.start_with?("arm"))) and
+    ([nil,"universal"].include?(@cpu) || [nil, "universal"].include?(other.cpu) || @cpu == other.cpu ||
+    (@cpu == "arm" && other.cpu.start_with?("armv"))) &&
+
+      # os
+      @os == other.os &&
+
+      # version
+      (
+        (@os != "linux" && (@version.nil? || other.version.nil?)) ||
+        (@os == "linux" && (normalized_linux_version == other.normalized_linux_version || ["musl#{@version}", "musleabi#{@version}", "musleabihf#{@version}"].include?(other.version))) ||
+        @version == other.version
+      )
+  end
+
+  #--
+  # NOTE: Until it can be removed, changes to this method must also be reflected in `bundler/lib/bundler/rubygems_ext.rb`
+
+  def normalized_linux_version
+    return nil unless @version
 
-    # os
-    @os == other.os and
+    without_gnu_nor_abi_modifiers = @version.sub(/\Agnu/, "").sub(/eabi(hf)?\Z/, "")
+    return nil if without_gnu_nor_abi_modifiers.empty?
 
-    # version
-    (@version.nil? or other.version.nil? or @version == other.version)
+    without_gnu_nor_abi_modifiers
   end
 
   ##
@@ -184,18 +233,18 @@ class Gem::Platform
     when String then
       # This data is from http://gems.rubyforge.org/gems/yaml on 19 Aug 2007
       other = case other
-      when /^i686-darwin(\d)/     then ['x86',       'darwin',  $1    ]
-      when /^i\d86-linux/         then ['x86',       'linux',   nil   ]
-      when 'java', 'jruby'        then [nil,         'java',    nil   ]
-      when /^dalvik(\d+)?$/       then [nil,         'dalvik',  $1    ]
-      when /dotnet(\-(\d+\.\d+))?/ then ['universal','dotnet',  $2    ]
-      when /mswin32(\_(\d+))?/    then ['x86',       'mswin32', $2    ]
-      when /mswin64(\_(\d+))?/    then ['x64',       'mswin64', $2    ]
-      when 'powerpc-darwin'       then ['powerpc',   'darwin',  nil   ]
-      when /powerpc-darwin(\d)/   then ['powerpc',   'darwin',  $1    ]
-      when /sparc-solaris2.8/     then ['sparc',     'solaris', '2.8' ]
-      when /universal-darwin(\d)/ then ['universal', 'darwin',  $1    ]
-      else                             other
+              when /^i686-darwin(\d)/     then ["x86",       "darwin",  $1]
+              when /^i\d86-linux/         then ["x86",       "linux",   nil]
+              when "java", "jruby"        then [nil,         "java",    nil]
+              when /^dalvik(\d+)?$/       then [nil,         "dalvik",  $1]
+              when /dotnet(\-(\d+\.\d+))?/ then ["universal","dotnet",  $2]
+              when /mswin32(\_(\d+))?/    then ["x86",       "mswin32", $2]
+              when /mswin64(\_(\d+))?/    then ["x64",       "mswin64", $2]
+              when "powerpc-darwin"       then ["powerpc",   "darwin",  nil]
+              when /powerpc-darwin(\d)/   then ["powerpc",   "darwin",  $1]
+              when /sparc-solaris2.8/     then ["sparc",     "solaris", "2.8"]
+              when /universal-darwin(\d)/ then ["universal", "darwin",  $1]
+              else other
       end
 
       other = Gem::Platform.new other
@@ -210,11 +259,11 @@ class Gem::Platform
   # A pure-Ruby gem that may use Gem::Specification#extensions to build
   # binary files.
 
-  RUBY = 'ruby'.freeze
+  RUBY = "ruby"
 
   ##
   # A platform-specific gem that is built for the packaging Ruby's platform.
   # This will be replaced with Gem::Platform::local.
 
-  CURRENT = 'current'.freeze
+  CURRENT = "current"
 end

data/lib/rubygems/psych_tree.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gem
   if defined? ::Psych::Visitors
     class NoAliasYAMLTree < Psych::Visitors::YAMLTree
@@ -7,12 +8,16 @@ module Gem
       end unless respond_to? :create
 
       def visit_String(str)
-        return super unless str == '=' # or whatever you want
+        return super unless str == "=" # or whatever you want
 
         quote = Psych::Nodes::Scalar::SINGLE_QUOTED
         @emitter.scalar str, nil, nil, false, true, quote
       end
 
+      def visit_Hash(o)
+        super(o.compact)
+      end
+
       # Noop this out so there are no anchors
       def register(target, obj)
       end

data/lib/rubygems/query_utils.rb

@@ -1,52 +1,51 @@
 # frozen_string_literal: true
 
-require_relative 'local_remote_options'
-require_relative 'spec_fetcher'
-require_relative 'version_option'
-require_relative 'text'
+require_relative "local_remote_options"
+require_relative "spec_fetcher"
+require_relative "version_option"
+require_relative "text"
 
 module Gem::QueryUtils
-
   include Gem::Text
   include Gem::LocalRemoteOptions
   include Gem::VersionOption
 
   def add_query_options
-    add_option('-i', '--[no-]installed',
-               'Check for installed gem') do |value, options|
+    add_option("-i", "--[no-]installed",
+               "Check for installed gem") do |value, options|
       options[:installed] = value
     end
 
-    add_option('-I', 'Equivalent to --no-installed') do |value, options|
+    add_option("-I", "Equivalent to --no-installed") do |_value, options|
       options[:installed] = false
     end
 
     add_version_option command, "for use with --installed"
 
-    add_option('-d', '--[no-]details',
-               'Display detailed information of gem(s)') do |value, options|
+    add_option("-d", "--[no-]details",
+               "Display detailed information of gem(s)") do |value, options|
       options[:details] = value
     end
 
-    add_option('--[no-]versions',
-               'Display only gem names') do |value, options|
+    add_option("--[no-]versions",
+               "Display only gem names") do |value, options|
       options[:versions] = value
       options[:details] = false unless value
     end
 
-    add_option('-a', '--all',
-               'Display all gem versions') do |value, options|
+    add_option("-a", "--all",
+               "Display all gem versions") do |value, options|
       options[:all] = value
     end
 
-    add_option('-e', '--exact',
-               'Name of gem(s) to query on matches the',
-               'provided STRING') do |value, options|
+    add_option("-e", "--exact",
+               "Name of gem(s) to query on matches the",
+               "provided STRING") do |value, options|
       options[:exact] = value
     end
 
-    add_option('--[no-]prerelease',
-               'Display prerelease versions') do |value, options|
+    add_option("--[no-]prerelease",
+               "Display prerelease versions") do |value, options|
       options[:prerelease] = value
     end
 
@@ -85,7 +84,7 @@ module Gem::QueryUtils
       installed = !installed unless options[:installed]
 
       say(installed)
-      exit_code = 1 if !installed
+      exit_code = 1 unless installed
     end
 
     exit_code
@@ -112,14 +111,14 @@ module Gem::QueryUtils
   end
 
   def display_header(type)
-    if (ui.outs.tty? and Gem.configuration.verbose) or both?
+    if (ui.outs.tty? && Gem.configuration.verbose) || both?
       say
       say "*** #{type} GEMS ***"
       say
     end
   end
 
-  #Guts of original execute
+  # Guts of original execute
   def show_gems(name)
     show_local_gems(name)  if local?
     show_remote_gems(name) if remote?
@@ -132,8 +131,8 @@ module Gem::QueryUtils
       name_matches = name ? s.name =~ name : true
       version_matches = show_prereleases? || !s.version.prerelease?
 
-      name_matches and version_matches
-    end
+      name_matches && version_matches
+    end.uniq(&:full_name)
 
     spec_tuples = specs.map do |spec|
       [spec.name_tuple, spec]
@@ -151,7 +150,7 @@ module Gem::QueryUtils
       fetcher.detect(specs_type) { true }
     else
       fetcher.detect(specs_type) do |name_tuple|
-        name === name_tuple.name
+        name === name_tuple.name && options[:version].satisfied_by?(name_tuple.version)
       end
     end
 
@@ -159,7 +158,7 @@ module Gem::QueryUtils
   end
 
   def specs_type
-    if options[:all]
+    if options[:all] || options[:version].specific?
       if options[:prerelease]
         :complete
       else
@@ -176,7 +175,7 @@ module Gem::QueryUtils
   # Check if gem +name+ version +version+ is installed.
 
   def installed?(name, req = Gem::Requirement.default)
-    Gem::Specification.any? {|s| s.name =~ name and req =~ s.version }
+    Gem::Specification.any? {|s| s.name =~ name && req =~ s.version }
   end
 
   def output_query_results(spec_tuples)
@@ -197,7 +196,7 @@ module Gem::QueryUtils
   end
 
   def output_versions(output, versions)
-    versions.each do |gem_name, matching_tuples|
+    versions.each do |_gem_name, matching_tuples|
       matching_tuples = matching_tuples.sort_by {|n,_| n.version }.reverse
 
       platforms = Hash.new {|h,version| h[version] = [] }
@@ -242,8 +241,8 @@ module Gem::QueryUtils
     return unless options[:versions]
 
     list =
-      if platforms.empty? or options[:details]
-        name_tuples.map {|n| n.version }.uniq
+      if platforms.empty? || options[:details]
+        name_tuples.map(&:version).uniq
       else
         platforms.sort.reverse.map do |version, pls|
           out = version.to_s
@@ -257,14 +256,14 @@ module Gem::QueryUtils
 
           if pls != [Gem::Platform::RUBY]
             platform_list = [pls.delete(Gem::Platform::RUBY), *pls.sort].compact
-            out = platform_list.unshift(out).join(' ')
+            out = platform_list.unshift(out).join(" ")
           end
 
           out
         end
       end
 
-    entry << " (#{list.join ', '})"
+    entry << " (#{list.join ", "})"
   end
 
   def make_entry(entry_tuples, platforms)
@@ -283,22 +282,22 @@ module Gem::QueryUtils
   end
 
   def spec_authors(entry, spec)
-    authors = "Author#{spec.authors.length > 1 ? 's' : ''}: ".dup
-    authors << spec.authors.join(', ')
+    authors = "Author#{spec.authors.length > 1 ? "s" : ""}: ".dup
+    authors << spec.authors.join(", ")
     entry << format_text(authors, 68, 4)
   end
 
   def spec_homepage(entry, spec)
-    return if spec.homepage.nil? or spec.homepage.empty?
+    return if spec.homepage.nil? || spec.homepage.empty?
 
     entry << "\n" << format_text("Homepage: #{spec.homepage}", 68, 4)
   end
 
   def spec_license(entry, spec)
-    return if spec.license.nil? or spec.license.empty?
+    return if spec.license.nil? || spec.license.empty?
 
-    licenses = "License#{spec.licenses.length > 1 ? 's' : ''}: ".dup
-    licenses << spec.licenses.join(', ')
+    licenses = "License#{spec.licenses.length > 1 ? "s" : ""}: ".dup
+    licenses << spec.licenses.join(", ")
     entry << "\n" << format_text(licenses, 68, 4)
   end
 
@@ -306,15 +305,15 @@ module Gem::QueryUtils
     return unless spec.loaded_from
 
     if specs.length == 1
-      default = spec.default_gem? ? ' (default)' : nil
+      default = spec.default_gem? ? " (default)" : nil
       entry << "\n" << "    Installed at#{default}: #{spec.base_dir}"
     else
-      label = 'Installed at'
+      label = "Installed at"
       specs.each do |s|
         version = s.version.to_s
-        version << ', default' if s.default_gem?
-        entry << "\n" << "    #{label} (#{version}): #{s.base_dir}"
-        label = ' ' * label.length
+        default = s.default_gem? ? ", default" : ""
+        entry << "\n" << "    #{label} (#{version}#{default}): #{s.base_dir}"
+        label = " " * label.length
       end
     end
   end
@@ -327,16 +326,16 @@ module Gem::QueryUtils
     return unless non_ruby
 
     if platforms.length == 1
-      title = platforms.values.length == 1 ? 'Platform' : 'Platforms'
-      entry << "    #{title}: #{platforms.values.sort.join(', ')}\n"
+      title = platforms.values.length == 1 ? "Platform" : "Platforms"
+      entry << "    #{title}: #{platforms.values.sort.join(", ")}\n"
     else
       entry << "    Platforms:\n"
 
-      sorted_platforms = platforms.sort_by {|version,| version }
+      sorted_platforms = platforms.sort
 
       sorted_platforms.each do |version, pls|
         label = "        #{version}: "
-        data = format_text pls.sort.join(', '), 68, label.length
+        data = format_text pls.sort.join(", "), 68, label.length
         data[0, label.length] = label
         entry << data << "\n"
       end
@@ -347,5 +346,4 @@ module Gem::QueryUtils
     summary = truncate_text(spec.summary, "the summary for #{spec.full_name}")
     entry << "\n\n" << format_text(summary, 68, 4)
   end
-
 end

data/lib/rubygems/rdoc.rb

@@ -1,12 +1,22 @@
 # frozen_string_literal: true
-require_relative '../rubygems'
+
+require_relative "../rubygems"
 
 begin
-  require 'rdoc/rubygems_hook'
+  require "rdoc/rubygems_hook"
   module Gem
     RDoc = ::RDoc::RubygemsHook
+
+    ##
+    # Returns whether RDoc defines its own install hooks through a RubyGems
+    # plugin. This and whatever is guarded by it can be removed once no
+    # supported Ruby ships with RDoc older than 6.9.0.
+
+    def self.rdoc_hooks_defined_via_plugin?
+      Gem::Version.new(::RDoc::VERSION) >= Gem::Version.new("6.9.0")
+    end
   end
 
-  Gem.done_installing(&Gem::RDoc.method(:generation_hook))
+  Gem.done_installing(&Gem::RDoc.method(:generation_hook)) unless Gem.rdoc_hooks_defined_via_plugin?
 rescue LoadError
 end