rubygems-update 3.0.9 → 3.1.0.pre1

data/lib/rubygems/core_ext/kernel_warn.rb

@@ -12,9 +12,13 @@ if RUBY_VERSION >= "2.5"
 
     original_warn = method(:warn)
 
-    module_function define_method(:warn) {|*messages, uplevel: nil|
-      unless uplevel
-        return original_warn.call(*messages)
+    module_function define_method(:warn) {|*messages, **kw|
+      unless uplevel = kw[:uplevel]
+        if Gem.java_platform?
+          return original_warn.call(*messages)
+        else
+          return original_warn.call(*messages, **kw)
+        end
       end
 
       # Ensure `uplevel` fits a `long`
@@ -39,7 +43,9 @@ if RUBY_VERSION >= "2.5"
         end
         uplevel = start
       end
-      original_warn.call(*messages, uplevel: uplevel)
+
+      kw[:uplevel] = uplevel
+      original_warn.call(*messages, **kw)
     }
   end
 end

data/lib/rubygems/defaults.rb

@@ -2,8 +2,8 @@
 module Gem
   DEFAULT_HOST = "https://rubygems.org".freeze
 
-  @post_install_hooks   ||= []
-  @done_installing_hooks  ||= []
+  @post_install_hooks ||= []
+  @done_installing_hooks ||= []
   @post_uninstall_hooks ||= []
   @pre_uninstall_hooks  ||= []
   @pre_install_hooks    ||= []
@@ -34,16 +34,9 @@ module Gem
                'Gems',
                RbConfig::CONFIG['ruby_version']
              ]
-           elsif RbConfig::CONFIG['rubylibprefix']
-             [
-               RbConfig::CONFIG['rubylibprefix'],
-               'gems',
-               RbConfig::CONFIG['ruby_version']
-             ]
            else
              [
-               RbConfig::CONFIG['libdir'],
-               ruby_engine,
+               RbConfig::CONFIG['rubylibprefix'],
                'gems',
                RbConfig::CONFIG['ruby_version']
              ]
@@ -70,6 +63,13 @@ module Gem
     nil # default to standard layout
   end
 
+  ##
+  # Path to specification files of default gems.
+
+  def self.default_specifications_dir
+    File.join(Gem.default_dir, "specifications", "default")
+  end
+
   ##
   # Path for gems in the user's home directory
 
@@ -140,13 +140,6 @@ module Gem
     File.join Gem.user_home, ".gem", "gem-public_cert.pem"
   end
 
-  ##
-  # Whether to expect full paths in default gems - true for non-MRI
-  # ruby implementations
-  def self.default_gems_use_full_paths?
-    ruby_engine != 'ruby'
-  end
-
   ##
   # Install extensions into lib as well as into the extension directory.
 

data/lib/rubygems/dependency.rb

@@ -140,7 +140,7 @@ class Gem::Dependency
 
     if defined?(@version_requirement) && @version_requirement
       version = @version_requirement.instance_variable_get :@version
-      @version_requirement  = nil
+      @version_requirement = nil
       @version_requirements = Gem::Requirement.new version
     end
 
@@ -266,7 +266,7 @@ class Gem::Dependency
     end
 
     default = Gem::Requirement.default
-    self_req  = self.requirement
+    self_req = self.requirement
     other_req = other.requirement
 
     return self.class.new name, self_req  if other_req == default
@@ -277,16 +277,16 @@ class Gem::Dependency
 
   def matching_specs(platform_only = false)
     env_req = Gem.env_requirement(name)
-    matches = Gem::Specification.stubs_for(name).find_all { |spec|
+    matches = Gem::Specification.stubs_for(name).find_all do |spec|
       requirement.satisfied_by?(spec.version) && env_req.satisfied_by?(spec.version)
-    }.map(&:to_spec)
+    end.map(&:to_spec)
 
     Gem::BundlerVersionFinder.filter!(matches) if name == "bundler".freeze && !requirement.specific?
 
     if platform_only
-      matches.reject! { |spec|
+      matches.reject! do |spec|
         spec.nil? || !Gem::Platform.match(spec.platform)
-      }
+      end
     end
 
     matches
@@ -333,4 +333,19 @@ class Gem::Dependency
 
     matches.first
   end
+
+  def identity
+    if prerelease?
+      if specific?
+        :complete
+      else
+        :abs_latest
+      end
+    elsif latest_version?
+      :latest
+    else
+      :released
+    end
+  end
+
 end

data/lib/rubygems/dependency_installer.rb

@@ -29,7 +29,7 @@ class Gem::DependencyInstaller
     :wrappers            => true,
     :build_args          => nil,
     :build_docs_in_background => false,
-    :install_as_default  => false
+    :install_as_default => false
   }.freeze
 
   ##
@@ -88,14 +88,14 @@ class Gem::DependencyInstaller
     @wrappers            = options[:wrappers]
     @build_args          = options[:build_args]
     @build_docs_in_background = options[:build_docs_in_background]
-    @install_as_default  = options[:install_as_default]
-    @dir_mode            = options[:dir_mode]
-    @data_mode           = options[:data_mode]
-    @prog_mode           = options[:prog_mode]
+    @install_as_default = options[:install_as_default]
+    @dir_mode = options[:dir_mode]
+    @data_mode = options[:data_mode]
+    @prog_mode = options[:prog_mode]
 
     # Indicates that we should not try to update any deps unless
     # we absolutely must.
-    @minimal_deps        = options[:minimal_deps]
+    @minimal_deps = options[:minimal_deps]
 
     @available      = nil
     @installed_gems = []
@@ -106,75 +106,26 @@ class Gem::DependencyInstaller
     @errors = []
   end
 
-  ##
-  #--
-  # TODO remove at RubyGems 4, no longer used
-
-  def add_found_dependencies(to_do, dependency_list) # :nodoc:
-    seen = {}
-    dependencies = Hash.new { |h, name| h[name] = Gem::Dependency.new name }
-
-    until to_do.empty? do
-      spec = to_do.shift
-
-      # HACK why is spec nil?
-      next if spec.nil? or seen[spec.name]
-      seen[spec.name] = true
-
-      deps = spec.runtime_dependencies
-
-      if @development
-        if @dev_shallow
-          if @toplevel_specs.include? spec.full_name
-            deps |= spec.development_dependencies
-          end
-        else
-          deps |= spec.development_dependencies
-        end
-      end
-
-      deps.each do |dep|
-        dependencies[dep.name] = dependencies[dep.name].merge dep
-
-        if @minimal_deps
-          next if Gem::Specification.any? do |installed_spec|
-                    dep.name == installed_spec.name and
-                      dep.requirement.satisfied_by? installed_spec.version
-                  end
-        end
-
-        results = find_gems_with_sources(dep)
-
-        results.sorted.each do |t|
-          to_do.push t.spec
-        end
-
-        results.remove_installed! dep
-
-        @available << results
-        results.inject_into_list dependency_list
-      end
-    end
-
-    dependency_list.remove_specs_unsatisfied_by dependencies
-  end
-  deprecate :add_found_dependencies, :none, 2018, 12
-
   ##
   # Creates an AvailableSet to install from based on +dep_or_name+ and
   # +version+
 
   def available_set_for(dep_or_name, version) # :nodoc:
     if String === dep_or_name
-      find_spec_by_name_and_version dep_or_name, version, @prerelease
+      Gem::Deprecate.skip_during do
+        find_spec_by_name_and_version dep_or_name, version, @prerelease
+      end
     else
       dep = dep_or_name.dup
       dep.prerelease = @prerelease
-      @available = find_gems_with_sources dep
+      @available = Gem::Deprecate.skip_during do
+        find_gems_with_sources dep
+      end
     end
 
     @available.pick_best!
   end
+  deprecate :available_set_for, :none, 2019, 12
 
   ##
   # Indicated, based on the requested domain, if local
@@ -265,6 +216,7 @@ class Gem::DependencyInstaller
 
     set
   end
+  deprecate :find_gems_with_sources, :none, 2019, 12
 
   ##
   # Finds a spec and the source_uri it came from for gem +gem_name+ and
@@ -301,7 +253,10 @@ class Gem::DependencyInstaller
       dep = Gem::Dependency.new gem_name, version
       dep.prerelease = true if prerelease
 
-      set = find_gems_with_sources(dep, true)
+      set = Gem::Deprecate.skip_during do
+        find_gems_with_sources(dep, true)
+      end
+
       set.match_platform!
     end
 
@@ -311,45 +266,7 @@ class Gem::DependencyInstaller
 
     @available = set
   end
-
-  ##
-  # Gathers all dependencies necessary for the installation from local and
-  # remote sources unless the ignore_dependencies was given.
-  #--
-  # TODO remove at RubyGems 4
-
-  def gather_dependencies # :nodoc:
-    specs = @available.all_specs
-
-    # these gems were listed by the user, always install them
-    keep_names = specs.map { |spec| spec.full_name }
-
-    if @dev_shallow
-      @toplevel_specs = keep_names
-    end
-
-    dependency_list = Gem::DependencyList.new @development
-    dependency_list.add(*specs)
-    to_do = specs.dup
-    add_found_dependencies to_do, dependency_list unless @ignore_dependencies
-
-    # REFACTOR maybe abstract away using Gem::Specification.include? so
-    # that this isn't dependent only on the currently installed gems
-    dependency_list.specs.reject! { |spec|
-      not keep_names.include?(spec.full_name) and
-      Gem::Specification.include?(spec)
-    }
-
-    unless dependency_list.ok? or @ignore_dependencies or @force
-      reason = dependency_list.why_not_ok?.map { |k,v|
-        "#{k} requires #{v.join(", ")}"
-      }.join("; ")
-      raise Gem::DependencyError, "Unable to resolve dependencies: #{reason}"
-    end
-
-    @gems_to_install = dependency_list.dependency_order.reverse
-  end
-  deprecate :gather_dependencies, :none, 2018, 12
+  deprecate :find_spec_by_name_and_version, :none, 2019, 12
 
   def in_background(what) # :nodoc:
     fork_happened = false

data/lib/rubygems/dependency_list.rb

@@ -17,6 +17,7 @@ require 'rubygems/deprecate'
 # this class necessary anymore?  Especially #ok?, #why_not_ok?
 
 class Gem::DependencyList
+
   attr_reader :specs
 
   include Enumerable
@@ -118,10 +119,10 @@ class Gem::DependencyList
     unsatisfied = Hash.new { |h,k| h[k] = [] }
     each do |spec|
       spec.runtime_dependencies.each do |dep|
-        inst = Gem::Specification.any? { |installed_spec|
+        inst = Gem::Specification.any? do |installed_spec|
           dep.name == installed_spec.name and
             dep.requirement.satisfied_by? installed_spec.version
-        }
+        end
 
         unless inst or @specs.find { |s| s.satisfies_requirement? dep }
           unsatisfied[spec.name] << dep
@@ -145,10 +146,10 @@ class Gem::DependencyList
     # If the state is inconsistent, at least don't crash
     return true unless gem_to_remove
 
-    siblings = @specs.find_all { |s|
+    siblings = @specs.find_all do |s|
       s.name == gem_to_remove.name &&
         s.full_name != gem_to_remove.full_name
-    }
+    end
 
     deps = []
 
@@ -160,11 +161,11 @@ class Gem::DependencyList
       end
     end
 
-    deps.all? { |dep|
-      siblings.any? { |s|
+    deps.all? do |dep|
+      siblings.any? do |s|
         s.satisfies_requirement? dep
-      }
-    }
+      end
+    end
   end
 
   ##
@@ -173,10 +174,10 @@ class Gem::DependencyList
   # dependencies).
 
   def remove_specs_unsatisfied_by(dependencies)
-    specs.reject! { |spec|
+    specs.reject! do |spec|
       dep = dependencies[spec.name]
       dep and not dep.requirement.satisfied_by? spec.version
-    }
+    end
   end
 
   ##

data/lib/rubygems/deprecate.rb

@@ -48,21 +48,21 @@ module Gem::Deprecate
   # year/month that it is planned to go away.
 
   def deprecate(name, repl, year, month)
-    class_eval {
+    class_eval do
       old = "_deprecated_#{name}"
       alias_method old, name
       define_method name do |*args, &block|
         klass = self.kind_of? Module
         target = klass ? "#{self}." : "#{self.class}#"
         msg = [ "NOTE: #{target}#{name} is deprecated",
-          repl == :none ? " with no replacement" : "; use #{repl} instead",
-          ". It will be removed on or after %4d-%02d-01." % [year, month],
-          "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
+                repl == :none ? " with no replacement" : "; use #{repl} instead",
+                ". It will be removed on or after %4d-%02d-01." % [year, month],
+                "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
         ]
         warn "#{msg.join}." unless Gem::Deprecate.skip
         send old, *args, &block
       end
-    }
+    end
   end
 
   module_function :deprecate, :skip_during

data/lib/rubygems/errors.rb

@@ -13,11 +13,13 @@ module Gem
   # already activated gems or that RubyGems is otherwise unable to activate.
 
   class LoadError < ::LoadError
+
     # Name of gem
     attr_accessor :name
 
     # Version requirement of gem
     attr_accessor :requirement
+
   end
 
   ##
@@ -25,6 +27,7 @@ module Gem
   # system.  Instead of rescuing from this class, make sure to rescue from the
   # superclass Gem::LoadError to catch all types of load errors.
   class MissingSpecError < Gem::LoadError
+
     def initialize(name, requirement)
       @name        = name
       @requirement = requirement
@@ -41,6 +44,7 @@ module Gem
       total = Gem::Specification.stubs.size
       "Could not find '#{name}' (#{requirement}) among #{total} total gem(s)\n"
     end
+
   end
 
   ##
@@ -48,6 +52,7 @@ module Gem
   # not the requested version. Instead of rescuing from this class, make sure to
   # rescue from the superclass Gem::LoadError to catch all types of load errors.
   class MissingSpecVersionError < MissingSpecError
+
     attr_reader :specs
 
     def initialize(name, requirement, specs)
@@ -64,6 +69,7 @@ module Gem
       names = specs.map(&:full_name)
       "Could not find '#{name}' (#{requirement}) - did find: [#{names.join ','}]\n"
     end
+
   end
 
   # Raised when there are conflicting gem specs loaded
@@ -86,14 +92,15 @@ module Gem
       @conflicts = conflicts
       @name      = target.name
 
-      reason = conflicts.map { |act, dependencies|
+      reason = conflicts.map do |act, dependencies|
         "#{act.full_name} conflicts with #{dependencies.join(", ")}"
-      }.join ", "
+      end.join ", "
 
       # TODO: improve message by saying who activated `con`
 
       super("Unable to activate #{target.full_name}, because #{reason}")
     end
+
   end
 
   class ErrorReason; end
@@ -143,6 +150,7 @@ module Gem
          @platforms.size == 1 ? '' : 's',
          @platforms.join(' ,')]
     end
+
   end
 
   ##
@@ -181,5 +189,6 @@ module Gem
     # The "exception" alias allows you to call raise on a SourceFetchProblem.
 
     alias exception error
+
   end
 end