rubygems-update 3.0.6 → 3.2.14

data/lib/rubygems/test_utilities.rb

@@ -13,6 +13,13 @@ require 'rubygems/remote_fetcher'
 #   @fetcher.data['http://gems.example.com/yaml'] = source_index.to_yaml
 #   Gem::RemoteFetcher.fetcher = @fetcher
 #
+#   use nested array if multiple response is needed
+#
+#   @fetcher.data['http://gems.example.com/sequence'] = [['Success', 200, 'OK'], ['Failed', 401, 'Unauthorized']]
+#
+#   @fetcher.fetch_path('http://gems.example.com/sequence') # => ['Success', 200, 'OK']
+#   @fetcher.fetch_path('http://gems.example.com/sequence') # => ['Failed', 401, 'Unauthorized']
+#
 #   # invoke RubyGems code
 #
 #   paths = @fetcher.paths
@@ -22,7 +29,6 @@ require 'rubygems/remote_fetcher'
 # See RubyGems' tests for more examples of FakeFetcher.
 
 class Gem::FakeFetcher
-
   attr_reader :data
   attr_reader :last_request
   attr_accessor :paths
@@ -33,7 +39,7 @@ class Gem::FakeFetcher
   end
 
   def find_data(path)
-    return File.read path.path if URI === path and 'file' == path.scheme
+    return Gem.read_binary path.path if URI === path and 'file' == path.scheme
 
     if URI === path and "URI::#{path.scheme.upcase}" != path.class.name
       raise ArgumentError,
@@ -42,13 +48,17 @@ class Gem::FakeFetcher
 
     path = path.to_s
     @paths << path
-    raise ArgumentError, 'need full URI' unless path =~ %r'^https?://'
+    raise ArgumentError, 'need full URI' unless path.start_with?("https://", "http://")
 
     unless @data.key? path
       raise Gem::RemoteFetcher::FetchError.new("no data for #{path}", path)
     end
 
-    @data[path]
+    if @data[path].kind_of?(Array) && @data[path].first.kind_of?(Array)
+      @data[path].shift
+    else
+      @data[path]
+    end
   end
 
   def fetch_path(path, mtime = nil, head = false)
@@ -57,17 +67,16 @@ class Gem::FakeFetcher
     if data.respond_to?(:call)
       data.call
     else
-      if path.to_s =~ /gz$/ and not data.nil? and not data.empty?
+      if path.to_s.end_with?(".gz") and not data.nil? and not data.empty?
         data = Gem::Util.gunzip data
       end
-
       data
     end
   end
 
   def cache_update_path(uri, path = nil, update = true)
     if data = fetch_path(uri)
-      open(path, 'wb') { |io| io.write data } if path and update
+      open(path, 'wb') {|io| io.write data } if path and update
       data
     else
       Gem.read_binary(path) if path
@@ -112,7 +121,7 @@ class Gem::FakeFetcher
     path = path.to_s
     @paths << path
 
-    raise ArgumentError, 'need full URI' unless path =~ %r'^http://'
+    raise ArgumentError, 'need full URI' unless path =~ %r{^http://}
 
     unless @data.key? path
       raise Gem::RemoteFetcher::FetchError.new("no data for #{path}", path)
@@ -125,7 +134,7 @@ class Gem::FakeFetcher
 
   def download(spec, source_uri, install_dir = Gem.dir)
     name = File.basename spec.cache_file
-    path = if Dir.pwd == install_dir  # see fetch_command
+    path = if Dir.pwd == install_dir # see fetch_command
              install_dir
            else
              File.join install_dir, "cache"
@@ -153,16 +162,13 @@ class Gem::FakeFetcher
 
     download spec, source.uri.to_s
   end
-
 end
 
 # :stopdoc:
 class Gem::RemoteFetcher
-
   def self.fetcher=(fetcher)
     @fetcher = fetcher
   end
-
 end
 # :startdoc:
 
@@ -182,7 +188,6 @@ end
 # After the gems are created they are removed from Gem.dir.
 
 class Gem::TestCase::SpecFetcherSetup
-
   ##
   # Executes a SpecFetcher setup block.  Yields an instance then creates the
   # gems and specifications defined in the instance.
@@ -232,21 +237,22 @@ class Gem::TestCase::SpecFetcherSetup
 
   def execute_operations # :nodoc:
     @operations.each do |operation, *arguments|
+      block = arguments.pop
       case operation
       when :gem then
-        spec, gem = @test.util_gem(*arguments, &arguments.pop)
+        spec, gem = @test.util_gem(*arguments, &block)
 
         write_spec spec
 
         @gems[spec] = gem
         @installed << spec
       when :download then
-        spec, gem = @test.util_gem(*arguments, &arguments.pop)
+        spec, gem = @test.util_gem(*arguments, &block)
 
         @gems[spec] = gem
         @downloaded << spec
       when :spec then
-        spec = @test.util_spec(*arguments, &arguments.pop)
+        spec = @test.util_spec(*arguments, &block)
 
         write_spec spec
 
@@ -336,7 +342,6 @@ class Gem::TestCase::SpecFetcherSetup
       io.write spec.to_ruby_for_cache
     end
   end
-
 end
 
 ##
@@ -348,7 +353,6 @@ end
 # This class was added to flush out problems in Rubinius' IO implementation.
 
 class TempIO < Tempfile
-
   ##
   # Creates a new TempIO that will be initialized to contain +string+.
 

data/lib/rubygems/text.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'rubygems'
 
 ##
 # A collection of text-wrangling methods
@@ -65,12 +64,12 @@ module Gem::Text
     x = nil
 
     str1.each_char.each_with_index do |char1,i|
-      e = i+1
+      e = i + 1
 
       str2.each_char.each_with_index do |char2,j|
         cost = (char1 == char2) ? 0 : 1
         x = min3(
-             d[j+1] + 1, # insertion
+             d[j + 1] + 1, # insertion
              e + 1,      # deletion
              d[j] + cost # substitution
            )

data/lib/rubygems/uninstaller.rb

@@ -7,6 +7,7 @@
 
 require 'fileutils'
 require 'rubygems'
+require 'rubygems/installer_uninstaller_utils'
 require 'rubygems/dependency_list'
 require 'rubygems/rdoc'
 require 'rubygems/user_interaction'
@@ -20,9 +21,10 @@ require 'rubygems/user_interaction'
 # file.  See Gem.pre_uninstall and Gem.post_uninstall for details.
 
 class Gem::Uninstaller
-
   include Gem::UserInteraction
 
+  include Gem::InstallerUninstallerUtils
+
   ##
   # The directory a gem's executables will be installed into
 
@@ -47,6 +49,7 @@ class Gem::Uninstaller
     @gem                = gem
     @version            = options[:version] || Gem::Requirement.default
     @gem_home           = File.realpath(options[:install_dir] || Gem.dir)
+    @plugins_dir        = Gem.plugindir(@gem_home)
     @force_executables  = options[:executables]
     @force_all          = options[:all]
     @force_ignore       = options[:ignore]
@@ -57,7 +60,7 @@ class Gem::Uninstaller
     # Indicate if development dependencies should be checked when
     # uninstalling. (default: false)
     #
-    @check_dev         = options[:check_dev]
+    @check_dev = options[:check_dev]
 
     if options[:force]
       @force_all = true
@@ -80,7 +83,7 @@ class Gem::Uninstaller
 
     dirs =
       Gem::Specification.dirs +
-      [Gem::Specification.default_specifications_dir]
+      [Gem.default_specifications_dir]
 
     Gem::Specification.each_spec dirs do |spec|
       next unless dependency.matches_spec? spec
@@ -88,10 +91,18 @@ class Gem::Uninstaller
       list << spec
     end
 
+    if list.empty?
+      raise Gem::InstallError, "gem #{@gem.inspect} is not installed"
+    end
+
     default_specs, list = list.partition do |spec|
       spec.default_gem?
     end
 
+    default_specs.each do |default_spec|
+      say "Gem #{default_spec.full_name} cannot be uninstalled because it is a default gem"
+    end
+
     list, other_repo_specs = list.partition do |spec|
       @gem_home == spec.base_dir or
         (@user_install and spec.base_dir == Gem.user_dir)
@@ -100,21 +111,12 @@ class Gem::Uninstaller
     list.sort!
 
     if list.empty?
-      if other_repo_specs.empty?
-        if default_specs.empty?
-          raise Gem::InstallError, "gem #{@gem.inspect} is not installed"
-        else
-          message =
-            "gem #{@gem.inspect} cannot be uninstalled " +
-            "because it is a default gem"
-          raise Gem::InstallError, message
-        end
-      end
+      return unless other_repo_specs.any?
 
-      other_repos = other_repo_specs.map { |spec| spec.base_dir }.uniq
+      other_repos = other_repo_specs.map {|spec| spec.base_dir }.uniq
 
       message = ["#{@gem} is not installed in GEM_HOME, try:"]
-      message.concat other_repos.map { |repo|
+      message.concat other_repos.map {|repo|
         "\tgem uninstall -i #{repo} #{@gem}"
       }
 
@@ -123,7 +125,7 @@ class Gem::Uninstaller
       remove_all list
 
     elsif list.size > 1
-      gem_names = list.map { |gem| gem.full_name }
+      gem_names = list.map {|gem| gem.full_name }
       gem_names << "All versions"
 
       say
@@ -134,7 +136,7 @@ class Gem::Uninstaller
       elsif index >= 0 && index < list.size
         uninstall_gem list[index]
       else
-        say "Error: must enter a number [1-#{list.size+1}]"
+        say "Error: must enter a number [1-#{list.size + 1}]"
       end
     else
       uninstall_gem list.first
@@ -159,8 +161,11 @@ class Gem::Uninstaller
     end
 
     remove_executables @spec
+    remove_plugins @spec
     remove @spec
 
+    regenerate_plugins
+
     Gem.post_uninstall_hooks.each do |hook|
       hook.call self
     end
@@ -169,20 +174,19 @@ class Gem::Uninstaller
   end
 
   ##
-  # Removes installed executables and batch files (windows only) for
-  # +gemspec+.
+  # Removes installed executables and batch files (windows only) for +spec+.
 
   def remove_executables(spec)
-    return if spec.nil? or spec.executables.empty?
+    return if spec.executables.empty?
 
     executables = spec.executables.clone
 
     # Leave any executables created by other installed versions
     # of this gem installed.
 
-    list = Gem::Specification.find_all { |s|
+    list = Gem::Specification.find_all do |s|
       s.name == spec.name && s.version != spec.version
-    }
+    end
 
     list.each do |s|
       s.executables.each do |exe_name|
@@ -192,7 +196,7 @@ class Gem::Uninstaller
 
     return if executables.empty?
 
-    executables = executables.map { |exec| formatted_program_filename exec }
+    executables = executables.map {|exec| formatted_program_filename exec }
 
     remove = if @force_executables.nil?
                ask_yes_no("Remove executables:\n" +
@@ -227,15 +231,11 @@ class Gem::Uninstaller
   # NOTE: removes uninstalled gems from +list+.
 
   def remove_all(list)
-    list.each { |spec| uninstall_gem spec }
+    list.each {|spec| uninstall_gem spec }
   end
 
   ##
   # spec:: the spec of the gem to be uninstalled
-  # list:: the list of all such gems
-  #
-  # Warning: this method modifies the +list+ parameter.  Once it has
-  # uninstalled a gem, it is removed from that list.
 
   def remove(spec)
     unless path_ok?(@gem_home, spec) or
@@ -275,6 +275,25 @@ class Gem::Uninstaller
     Gem::Specification.reset
   end
 
+  ##
+  # Remove any plugin wrappers for +spec+.
+
+  def remove_plugins(spec) # :nodoc:
+    return if spec.plugins.empty?
+
+    remove_plugins_for(spec, @plugins_dir)
+  end
+
+  ##
+  # Regenerates plugin wrappers after removal.
+
+  def regenerate_plugins
+    latest = Gem::Specification.latest_spec_for(@spec.name)
+    return if latest.nil?
+
+    regenerate_plugins_for(latest, @plugins_dir)
+  end
+
   ##
   # Is +spec+ in +gem_dir+?
 
@@ -318,8 +337,8 @@ class Gem::Uninstaller
       s.name == spec.name && s.full_name != spec.full_name
     end
 
-    spec.dependent_gems.each do |dep_spec, dep, satlist|
-      unless siblings.any? { |s| s.satisfies_requirement? dep }
+    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
     end

data/lib/rubygems/uri_formatter.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'cgi'
-require 'uri'
 
 ##
 # The UriFormatter handles URIs from user-input and escaping.
@@ -10,7 +8,6 @@ require 'uri'
 #   p uf.normalize #=> 'http://example.com'
 
 class Gem::UriFormatter
-
   ##
   # The URI to be formatted.
 
@@ -20,6 +17,8 @@ class Gem::UriFormatter
   # Creates a new URI formatter for +uri+.
 
   def initialize(uri)
+    require 'cgi'
+
     @uri = uri
   end
 
@@ -45,5 +44,4 @@ class Gem::UriFormatter
     return unless @uri
     CGI.unescape @uri
   end
-
 end

data/lib/rubygems/uri_parser.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+##
+# The UriParser handles parsing URIs.
+#
+
+class Gem::UriParser
+  ##
+  # Parses the #uri, raising if it's invalid
+
+  def parse!(uri)
+    raise URI::InvalidURIError unless uri
+
+    # Always escape URI's to deal with potential spaces and such
+    # It should also be considered that source_uri may already be
+    # a valid URI with escaped characters. e.g. "{DESede}" is encoded
+    # 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))
+    end
+  end
+
+  ##
+  # Parses the #uri, returning the original uri if it's invalid
+
+  def parse(uri)
+    parse!(uri)
+  rescue URI::InvalidURIError
+    uri
+  end
+end

data/lib/rubygems/uri_parsing.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "rubygems/uri_parser"
+
+module Gem::UriParsing
+
+  def parse_uri(source_uri)
+    return source_uri unless source_uri.is_a?(String)
+
+    uri_parser.parse(source_uri)
+  end
+
+  private :parse_uri
+
+  def uri_parser
+    require "uri"
+
+    Gem::UriParser.new
+  end
+
+  private :uri_parser
+
+end