rubygems-update 3.4.10 → 3.5.22

data/lib/rubygems/stub_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 ##
 # Gem::StubSpecification reads the stub: line from the gemspec.  This prevents
 # us having to eval the entire gemspec in order to find out certain
@@ -34,7 +35,7 @@ class Gem::StubSpecification < Gem::BasicSpecification
 
     def initialize(data, extensions)
       parts          = data[PREFIX.length..-1].split(" ", 4)
-      @name          = parts[0].freeze
+      @name          = -parts[0]
       @version       = if Gem::Version.correct?(parts[1])
         Gem::Version.new(parts[1])
       else
@@ -68,7 +69,6 @@ class Gem::StubSpecification < Gem::BasicSpecification
 
   def initialize(filename, base_dir, gems_dir, default_gem)
     super()
-    filename.tap(&Gem::UNTAINT)
 
     self.loaded_from = filename
     @data            = nil
@@ -83,11 +83,7 @@ class Gem::StubSpecification < Gem::BasicSpecification
   # True when this gem has been activated
 
   def activated?
-    @activated ||=
-    begin
-      loaded = Gem.loaded_specs[name]
-      loaded && loaded.version == version
-    end
+    @activated ||= !loaded_spec.nil?
   end
 
   def default_gem?
@@ -111,20 +107,23 @@ class Gem::StubSpecification < Gem::BasicSpecification
         saved_lineno = $.
 
         Gem.open_file loaded_from, OPEN_MODE do |file|
-          begin
-            file.readline # discard encoding line
-            stubline = file.readline.chomp
-            if stubline.start_with?(PREFIX)
-              extensions = if /\A#{PREFIX}/ =~ file.readline.chomp
-                $'.split "\0"
+          file.readline # discard encoding line
+          stubline = file.readline
+          if stubline.start_with?(PREFIX)
+            extline = file.readline
+
+            extensions =
+              if extline.delete_prefix!(PREFIX)
+                extline.chomp!
+                extline.split "\0"
               else
                 StubLine::NO_EXTENSIONS
               end
 
-              @data = StubLine.new stubline, extensions
-            end
-          rescue EOFError
+            stubline.chomp! # readline(chomp: true) allocates 3x as much as .readline.chomp!
+            @data = StubLine.new stubline, extensions
           end
+        rescue EOFError
         end
       ensure
         $. = saved_lineno
@@ -183,14 +182,11 @@ class Gem::StubSpecification < Gem::BasicSpecification
   ##
   # The full Gem::Specification for this gem, loaded from evalling its gemspec
 
-  def to_spec
-    @spec ||= if @data
-      loaded = Gem.loaded_specs[name]
-      loaded if loaded && loaded.version == version
-    end
-
+  def spec
+    @spec ||= loaded_spec if @data
     @spec ||= Gem::Specification.load(loaded_from)
   end
+  alias_method :to_spec, :spec
 
   ##
   # Is this StubSpecification valid? i.e. have we found a stub line, OR does
@@ -206,4 +202,34 @@ class Gem::StubSpecification < Gem::BasicSpecification
   def stubbed?
     data.is_a? StubLine
   end
+
+  def ==(other) # :nodoc:
+    self.class === other &&
+      name == other.name &&
+      version == other.version &&
+      platform == other.platform
+  end
+
+  alias_method :eql?, :== # :nodoc:
+
+  def hash # :nodoc:
+    name.hash ^ version.hash ^ platform.hash
+  end
+
+  def <=>(other) # :nodoc:
+    sort_obj <=> other.sort_obj
+  end
+
+  def sort_obj # :nodoc:
+    [name, version, Gem::Platform.sort_priority(platform)]
+  end
+
+  private
+
+  def loaded_spec
+    spec = Gem.loaded_specs[name]
+    return unless spec && spec.version == version && spec.default_gem? == default_gem?
+
+    spec
+  end
 end

data/lib/rubygems/text.rb

@@ -4,7 +4,6 @@
 # A collection of text-wrangling methods
 
 module Gem::Text
-
   ##
   # Remove any non-printable characters and make the text suitable for
   # printing.
@@ -67,7 +66,7 @@ module Gem::Text
     str1.each_codepoint.with_index(1) do |char1, i|
       j = 0
       while j < m
-        cost = (char1 == str2_codepoints[j]) ? 0 : 1
+        cost = char1 == str2_codepoints[j] ? 0 : 1
         x = min3(
           d[j + 1] + 1, # insertion
           i + 1,      # deletion

data/lib/rubygems/uninstaller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -31,7 +32,7 @@ class Gem::Uninstaller
   attr_reader :bin_dir
 
   ##
-  # The gem repository the gem will be installed into
+  # The gem repository the gem will be uninstalled from
 
   attr_reader :gem_home
 
@@ -45,11 +46,12 @@ class Gem::Uninstaller
   # Constructs an uninstaller that will uninstall +gem+
 
   def initialize(gem, options = {})
-    # TODO document the valid options
+    # TODO: document the valid options
     @gem                = gem
     @version            = options[:version] || Gem::Requirement.default
-    @gem_home           = File.realpath(options[:install_dir] || Gem.dir)
-    @plugins_dir        = Gem.plugindir(@gem_home)
+    @install_dir        = options[:install_dir]
+    @gem_home           = File.realpath(@install_dir || Gem.dir)
+    @user_dir           = File.exist?(Gem.user_dir) ? File.realpath(Gem.user_dir) : Gem.user_dir
     @force_executables  = options[:executables]
     @force_all          = options[:all]
     @force_ignore       = options[:ignore]
@@ -69,7 +71,7 @@ class Gem::Uninstaller
 
     # only add user directory if install_dir is not set
     @user_install = false
-    @user_install = options[:user_install] unless options[:install_dir]
+    @user_install = options[:user_install] unless @install_dir
 
     # Optimization: populated during #uninstall
     @default_specs_matching_uninstall_params = []
@@ -84,11 +86,7 @@ class Gem::Uninstaller
 
     list = []
 
-    dirs =
-      Gem::Specification.dirs +
-      [Gem.default_specifications_dir]
-
-    Gem::Specification.each_spec dirs do |spec|
+    specification_record.stubs.each do |spec|
       next unless dependency.matches_spec? spec
 
       list << spec
@@ -98,15 +96,13 @@ class Gem::Uninstaller
       raise Gem::InstallError, "gem #{@gem.inspect} is not installed"
     end
 
-    default_specs, list = list.partition do |spec|
-      spec.default_gem?
-    end
+    default_specs, list = list.partition(&:default_gem?)
     warn_cannot_uninstall_default_gems(default_specs - list)
-    @default_specs_matching_uninstall_params = default_specs
+    @default_specs_matching_uninstall_params = default_specs.map(&:to_spec)
 
     list, other_repo_specs = list.partition do |spec|
       @gem_home == spec.base_dir ||
-        (@user_install && spec.base_dir == Gem.user_dir)
+        (@user_install && spec.base_dir == @user_dir)
     end
 
     list.sort!
@@ -114,7 +110,7 @@ class Gem::Uninstaller
     if list.empty?
       return unless other_repo_specs.any?
 
-      other_repos = other_repo_specs.map {|spec| spec.base_dir }.uniq
+      other_repos = other_repo_specs.map(&:base_dir).uniq
 
       message = ["#{@gem} is not installed in GEM_HOME, try:"]
       message.concat other_repos.map {|repo|
@@ -126,7 +122,7 @@ class Gem::Uninstaller
       remove_all list
 
     elsif list.size > 1
-      gem_names = list.map {|gem| gem.full_name }
+      gem_names = list.map(&:full_name_with_location)
       gem_names << "All versions"
 
       say
@@ -134,7 +130,7 @@ class Gem::Uninstaller
 
       if index == list.size
         remove_all list
-      elsif index >= 0 && index < list.size
+      elsif index && index >= 0 && index < list.size
         uninstall_gem list[index]
       else
         say "Error: must enter a number [1-#{list.size + 1}]"
@@ -147,7 +143,9 @@ class Gem::Uninstaller
   ##
   # Uninstalls gem +spec+
 
-  def uninstall_gem(spec)
+  def uninstall_gem(stub)
+    spec = stub.to_spec
+
     @spec = spec
 
     unless dependencies_ok? spec
@@ -165,6 +163,8 @@ class Gem::Uninstaller
     remove_plugins @spec
     remove @spec
 
+    specification_record.remove_spec(stub)
+
     regenerate_plugins
 
     Gem.post_uninstall_hooks.each do |hook|
@@ -178,7 +178,7 @@ class Gem::Uninstaller
   # Removes installed executables and batch files (windows only) for +spec+.
 
   def remove_executables(spec)
-    return if spec.executables.empty?
+    return if spec.executables.empty? || default_spec_matches?(spec)
 
     executables = spec.executables.clone
 
@@ -200,8 +200,8 @@ class Gem::Uninstaller
     executables = executables.map {|exec| formatted_program_filename exec }
 
     remove = if @force_executables.nil?
-      ask_yes_no("Remove executables:\n" +
-                 "\t#{executables.join ', '}\n\n" +
+      ask_yes_no("Remove executables:\n" \
+                 "\t#{executables.join ", "}\n\n" \
                  "in addition to the gem?",
                  true)
     else
@@ -240,9 +240,9 @@ class Gem::Uninstaller
 
   def remove(spec)
     unless path_ok?(@gem_home, spec) ||
-           (@user_install && path_ok?(Gem.user_dir, spec))
+           (@user_install && path_ok?(@user_dir, spec))
       e = Gem::GemNotInHomeException.new \
-            "Gem '#{spec.full_name}' is not installed in directory #{@gem_home}"
+        "Gem '#{spec.full_name}' is not installed in directory #{@gem_home}"
       e.spec = spec
 
       raise e
@@ -251,7 +251,15 @@ class Gem::Uninstaller
     raise Gem::FilePermissionError, spec.base_dir unless
       File.writable?(spec.base_dir)
 
-    safe_delete { FileUtils.rm_r spec.full_gem_path }
+    full_gem_path = spec.full_gem_path
+    exclusions = []
+
+    if default_spec_matches?(spec) && spec.executables.any?
+      exclusions = spec.executables.map {|exe| File.join(spec.bin_dir, exe) }
+      exclusions << File.dirname(exclusions.last) until exclusions.last == full_gem_path
+    end
+
+    safe_delete { rm_r full_gem_path, exclusions: exclusions }
     safe_delete { FileUtils.rm_r spec.extension_dir }
 
     old_platform_name = spec.original_name
@@ -275,8 +283,6 @@ class Gem::Uninstaller
 
     safe_delete { FileUtils.rm_r gemspec }
     announce_deletion_of(spec)
-
-    Gem::Specification.reset
   end
 
   ##
@@ -285,17 +291,17 @@ class Gem::Uninstaller
   def remove_plugins(spec) # :nodoc:
     return if spec.plugins.empty?
 
-    remove_plugins_for(spec, @plugins_dir)
+    remove_plugins_for(spec, plugin_dir_for(spec))
   end
 
   ##
   # Regenerates plugin wrappers after removal.
 
   def regenerate_plugins
-    latest = Gem::Specification.latest_spec_for(@spec.name)
+    latest = specification_record.latest_spec_for(@spec.name)
     return if latest.nil?
 
-    regenerate_plugins_for(latest, @plugins_dir)
+    regenerate_plugins_for(latest, plugin_dir_for(@spec))
   end
 
   ##
@@ -341,7 +347,7 @@ class Gem::Uninstaller
       s.name == spec.name && s.full_name != spec.full_name
     end
 
-    spec.dependent_gems(@check_dev).each do |dep_spec, dep, satlist|
+    spec.dependent_gems(@check_dev).each do |dep_spec, dep, _satlist|
       unless siblings.any? {|s| s.satisfies_requirement? dep }
         msg << "#{dep_spec.name}-#{dep_spec.version} depends on #{dep}"
       end
@@ -349,7 +355,7 @@ class Gem::Uninstaller
 
     msg << "If you remove this gem, these dependencies will not be met."
     msg << "Continue with Uninstall?"
-    return ask_yes_no(msg.join("\n"), false)
+    ask_yes_no(msg.join("\n"), false)
   end
 
   ##
@@ -380,6 +386,16 @@ class Gem::Uninstaller
 
   private
 
+  def rm_r(path, exclusions:)
+    FileUtils::Entry_.new(path).postorder_traverse do |ent|
+      ent.remove unless exclusions.include?(ent.path)
+    end
+  end
+
+  def specification_record
+    @specification_record ||= @install_dir ? Gem::SpecificationRecord.from_path(@install_dir) : Gem::Specification.specification_record
+  end
+
   def announce_deletion_of(spec)
     name = spec.full_name
     say "Successfully uninstalled #{name}"
@@ -407,4 +423,8 @@ class Gem::Uninstaller
       say "Gem #{spec.full_name} cannot be uninstalled because it is a default gem"
     end
   end
+
+  def plugin_dir_for(spec)
+    Gem.plugindir(spec.base_dir)
+  end
 end

data/lib/rubygems/update_suggestion.rb

@@ -4,15 +4,6 @@
 # Mixin methods for Gem::Command to promote available RubyGems update
 
 module Gem::UpdateSuggestion
-  # list taken from https://github.com/watson/ci-info/blob/7a3c30d/index.js#L56-L66
-  CI_ENV_VARS = [
-    "CI", # Travis CI, CircleCI, Cirrus CI, Gitlab CI, Appveyor, CodeShip, dsari
-    "CONTINUOUS_INTEGRATION", # Travis CI, Cirrus CI
-    "BUILD_NUMBER", # Jenkins, TeamCity
-    "CI_APP_ID", "CI_BUILD_ID", "CI_BUILD_NUMBER", # Applfow
-    "RUN_ID" # TaskCluster, dsari
-  ].freeze
-
   ONE_WEEK = 7 * 24 * 60 * 60
 
   ##
@@ -28,9 +19,9 @@ Run `gem update --system #{Gem.latest_rubygems_version}` to update your installa
   end
 
   ##
-  # Determines if current environment is eglible for update suggestion.
+  # Determines if current environment is eligible for update suggestion.
 
-  def eglible_for_update?
+  def eligible_for_update?
     # explicit opt-out
     return false if Gem.configuration[:prevent_update_suggestion]
     return false if ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"]
@@ -39,7 +30,7 @@ Run `gem update --system #{Gem.latest_rubygems_version}` to update your installa
     return false unless Gem.ui.tty?
     return false if Gem.rubygems_version.prerelease?
     return false if Gem.disable_system_update_message
-    return false if ci?
+    return false if Gem::CIDetector.ci?
 
     # check makes sense only when we can store timestamp of last try
     # otherwise we will not be able to prevent "annoying" update message
@@ -53,17 +44,13 @@ Run `gem update --system #{Gem.latest_rubygems_version}` to update your installa
 
     # compare current and latest version, this is the part where
     # latest rubygems spec is fetched from remote
-    (Gem.rubygems_version < Gem.latest_rubygems_version).tap do |eglible|
+    (Gem.rubygems_version < Gem.latest_rubygems_version).tap do |eligible|
       # store the time of last successful check into state file
       Gem.configuration.last_update_check = check_time
 
-      return eglible
+      return eligible
     end
-  rescue # don't block install command on any problem
+  rescue StandardError # don't block install command on any problem
     false
   end
-
-  def ci?
-    CI_ENV_VARS.any? {|var| ENV.include?(var) }
-  end
 end

data/lib/rubygems/uri.rb

@@ -16,9 +16,9 @@ class Gem::Uri
   # Parses uri, raising if it's invalid
 
   def self.parse!(uri)
-    require "uri"
+    require_relative "vendor/uri/lib/uri"
 
-    raise URI::InvalidURIError unless uri
+    raise Gem::URI::InvalidURIError unless uri
 
     return uri unless uri.is_a?(String)
 
@@ -28,9 +28,9 @@ class Gem::Uri
     # as "%7BDESede%7D". If this is escaped again the percentage
     # symbols will be escaped.
     begin
-      URI.parse(uri)
-    rescue URI::InvalidURIError
-      URI.parse(URI::DEFAULT_PARSER.escape(uri))
+      Gem::URI.parse(uri)
+    rescue Gem::URI::InvalidURIError
+      Gem::URI.parse(Gem::URI::DEFAULT_PARSER.escape(uri))
     end
   end
 
@@ -39,7 +39,7 @@ class Gem::Uri
 
   def self.parse(uri)
     parse!(uri)
-  rescue URI::InvalidURIError
+  rescue Gem::URI::InvalidURIError
     uri
   end
 

data/lib/rubygems/uri_formatter.rb

@@ -34,7 +34,7 @@ class Gem::UriFormatter
   # Normalize the URI by adding "http://" if it is missing.
 
   def normalize
-    (@uri =~ /^(https?|ftp|file):/i) ? @uri : "http://#{@uri}"
+    /^(https?|ftp|file):/i.match?(@uri) ? @uri : "http://#{@uri}"
   end
 
   ##

data/lib/rubygems/user_interaction.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -13,7 +14,6 @@ require_relative "text"
 # module will have access to the +ui+ method that returns the default UI.
 
 module Gem::DefaultUserInteraction
-
   include Gem::Text
 
   ##
@@ -68,7 +68,6 @@ module Gem::DefaultUserInteraction
   def use_ui(new_ui, &block)
     Gem::DefaultUserInteraction.use_ui(new_ui, &block)
   end
-
 end
 
 ##
@@ -91,7 +90,6 @@ end
 #   end
 
 module Gem::UserInteraction
-
   include Gem::DefaultUserInteraction
 
   ##
@@ -195,7 +193,7 @@ class Gem::StreamUI
   # then special operations (like asking for passwords) will use the TTY
   # commands to disable character echo.
 
-  def initialize(in_stream, out_stream, err_stream=STDERR, usetty=true)
+  def initialize(in_stream, out_stream, err_stream=$stderr, usetty=true)
     @ins = in_stream
     @outs = out_stream
     @errs = err_stream
@@ -239,7 +237,8 @@ class Gem::StreamUI
     return nil, nil unless result
 
     result = result.strip.to_i - 1
-    return list[result], result
+    return nil, nil unless (0...list.size) === result
+    [list[result], result]
   end
 
   ##
@@ -258,39 +257,38 @@ class Gem::StreamUI
     end
 
     default_answer = case default
-    when nil
-      "yn"
-    when true
-      "Yn"
-    else
-      "yN"
+                     when nil
+                       "yn"
+                     when true
+                       "Yn"
+                     else
+                       "yN"
     end
 
     result = nil
 
     while result.nil? do
       result = case ask "#{question} [#{default_answer}]"
-      when /^y/i then true
-      when /^n/i then false
-      when /^$/  then default
-      else            nil
+               when /^y/i then true
+               when /^n/i then false
+               when /^$/  then default
       end
     end
 
-    return result
+    result
   end
 
   ##
   # Ask a question.  Returns an answer if connected to a tty, nil otherwise.
 
   def ask(question)
-    return nil if !tty?
+    return nil unless tty?
 
     @outs.print(question + "  ")
     @outs.flush
 
     result = @ins.gets
-    result.chomp! if result
+    result&.chomp!
     result
   end
 
@@ -298,14 +296,14 @@ class Gem::StreamUI
   # Ask for a password. Does not echo response to terminal.
 
   def ask_for_password(question)
-    return nil if !tty?
+    return nil unless tty?
 
     @outs.print(question, "  ")
     @outs.flush
 
     password = _gets_noecho
     @outs.puts
-    password.chomp! if password
+    password&.chomp!
     password
   end
 
@@ -428,8 +426,7 @@ class Gem::StreamUI
     # +size+ items.  Shows the given +initial_message+ when progress starts
     # and the +terminal_message+ when it is complete.
 
-    def initialize(out_stream, size, initial_message,
-                   terminal_message = "complete")
+    def initialize(out_stream, size, initial_message, terminal_message = "complete")
       @out = out_stream
       @total = size
       @count = 0
@@ -471,8 +468,7 @@ class Gem::StreamUI
     # +size+ items.  Shows the given +initial_message+ when progress starts
     # and the +terminal_message+ when it is complete.
 
-    def initialize(out_stream, size, initial_message,
-                   terminal_message = "complete")
+    def initialize(out_stream, size, initial_message, terminal_message = "complete")
       @out = out_stream
       @total = size
       @count = 0
@@ -595,8 +591,8 @@ class Gem::StreamUI
 end
 
 ##
-# Subclass of StreamUI that instantiates the user interaction using STDIN,
-# STDOUT, and STDERR.
+# Subclass of StreamUI that instantiates the user interaction using $stdin,
+# $stdout, and $stderr.
 
 class Gem::ConsoleUI < Gem::StreamUI
   ##
@@ -604,7 +600,7 @@ class Gem::ConsoleUI < Gem::StreamUI
   # stdin, output to stdout and warnings or errors to stderr.
 
   def initialize
-    super STDIN, STDOUT, STDERR, true
+    super $stdin, $stdout, $stderr, true
   end
 end