rubygems-update 2.5.1 → 2.5.2

data/lib/rubygems/request/connection_pools.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'thread'
 
 class Gem::Request::ConnectionPools # :nodoc:

data/lib/rubygems/request/http_pool.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A connection "pool" that only manages one connection for now.  Provides
 # thread safe `checkout` and `checkin` methods.  The pool consists of one

data/lib/rubygems/request/https_pool.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Gem::Request::HTTPSPool < Gem::Request::HTTPPool # :nodoc:
   private
 

data/lib/rubygems/request_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'tsort'
 
 ##
@@ -76,6 +77,11 @@ class Gem::RequestSet
 
   attr_reader :vendor_set # :nodoc:
 
+  ##
+  # The set of source gems imported via load_gemdeps.
+
+  attr_reader :source_set
+
   ##
   # Creates a RequestSet for a list of Gem::Dependency objects, +deps+.  You
   # can then #resolve and #install the resolved list of dependencies.
@@ -105,6 +111,7 @@ class Gem::RequestSet
     @sorted              = nil
     @specs               = nil
     @vendor_set          = nil
+    @source_set          = nil
 
     yield self if block_given?
   end
@@ -142,7 +149,6 @@ class Gem::RequestSet
       return requests
     end
 
-    cache_dir = options[:cache_dir] || Gem.dir
     @prerelease = options[:prerelease]
 
     requests = []
@@ -157,13 +163,11 @@ class Gem::RequestSet
         end
       end
 
-      path = req.download cache_dir
-
-      inst = Gem::Installer.at path, options
-
-      yield req, inst if block_given?
+      spec = req.spec.install options do |installer|
+        yield req, installer if block_given?
+      end
 
-      requests << inst.install
+      requests << spec
     end
 
     return requests if options[:gemdeps]
@@ -271,10 +275,11 @@ class Gem::RequestSet
   def load_gemdeps path, without_groups = [], installing = false
     @git_set    = Gem::Resolver::GitSet.new
     @vendor_set = Gem::Resolver::VendorSet.new
+    @source_set = Gem::Resolver::SourceSet.new
 
     @git_set.root_dir = @install_dir
 
-    lock_file = "#{File.expand_path(path)}.lock".untaint
+    lock_file = "#{File.expand_path(path)}.lock".dup.untaint
     begin
       tokenizer = Gem::RequestSet::Lockfile::Tokenizer.from_file lock_file
       parser = tokenizer.make_parser self, []
@@ -338,6 +343,7 @@ class Gem::RequestSet
     @sets << set
     @sets << @git_set
     @sets << @vendor_set
+    @sets << @source_set
 
     set = Gem::Resolver.compose_sets(*@sets)
     set.remote = @remote

data/lib/rubygems/request_set/gem_dependency_api.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A semi-compatible DSL for the Bundler Gemfile and Isolate gem dependencies
 # files.
@@ -204,6 +205,7 @@ class Gem::RequestSet::GemDependencyAPI
     @installing         = false
     @requires           = Hash.new { |h, name| h[name] = [] }
     @vendor_set         = @set.vendor_set
+    @source_set         = @set.source_set
     @gem_sources        = {}
     @without_groups     = []
 
@@ -362,6 +364,7 @@ class Gem::RequestSet::GemDependencyAPI
     source_set ||= gem_path       name, options
     source_set ||= gem_git        name, options
     source_set ||= gem_git_source name, options
+    source_set ||= gem_source     name, options
 
     duplicate = @dependencies.include? name
 
@@ -407,11 +410,7 @@ Gem dependencies file #{@path} requires #{name} more than once.
 
     pin_gem_source name, :git, repository
 
-    reference = nil
-    reference ||= options.delete :ref
-    reference ||= options.delete :branch
-    reference ||= options.delete :tag
-    reference ||= 'master'
+    reference = gem_git_reference options
 
     submodules = options.delete :submodules
 
@@ -420,6 +419,36 @@ Gem dependencies file #{@path} requires #{name} more than once.
     true
   end
 
+  ##
+  # Handles the git options from +options+ for git gem.
+  #
+  # Returns reference for the git gem.
+
+  def gem_git_reference options # :nodoc:
+    ref    = options.delete :ref
+    branch = options.delete :branch
+    tag    = options.delete :tag
+
+    reference = nil
+    reference ||= ref
+    reference ||= branch
+    reference ||= tag
+    reference ||= 'master'
+
+    if ref && branch
+      warn <<-WARNING
+Gem dependencies file #{@path} includes git reference for both ref and branch but only ref is used.
+      WARNING
+    end
+    if (ref||branch) && tag
+      warn <<-WARNING
+Gem dependencies file #{@path} includes git reference for both ref/branch and tag but only ref/branch is used.
+      WARNING
+    end
+
+    reference
+  end
+
   private :gem_git
 
   ##
@@ -480,6 +509,23 @@ Gem dependencies file #{@path} requires #{name} more than once.
 
   private :gem_path
 
+  ##
+  # Handles the source: option from +options+ for gem +name+.
+  #
+  # Returns +true+ if the source option was handled.
+
+  def gem_source name, options # :nodoc:
+    return unless source = options.delete(:source)
+
+    pin_gem_source name, :source, source
+
+    @source_set.add_source_gem name, source
+
+    true
+  end
+
+  private :gem_source
+
   ##
   # Handles the platforms: option from +options+.  Returns true if the
   # platform matches the current platform.
@@ -526,6 +572,7 @@ Gem dependencies file #{@path} requires #{name} more than once.
     else
       @requires[name] << name
     end
+    raise ArgumentError, "Unhandled gem options #{options.inspect}" unless options.empty?
   end
 
   private :gem_requires
@@ -611,6 +658,7 @@ Gem dependencies file #{@path} requires #{name} more than once.
 
     add_dependencies groups, spec.development_dependencies
 
+    @vendor_set.add_vendor_gem spec.name, path
     gem_requires spec.name, options
   end
 
@@ -650,6 +698,7 @@ Gem dependencies file #{@path} requires #{name} more than once.
       when :default then '(default)'
       when :path    then "path: #{source}"
       when :git     then "git: #{source}"
+      when :source  then "source: #{source}"
       else               '(unknown)'
       end
 
@@ -798,4 +847,3 @@ Gem dependencies file #{@path} requires #{name} more than once.
   Gem::RequestSet::GemDepedencyAPI = self # :nodoc:
 
 end
-

data/lib/rubygems/request_set/lockfile.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Parses a gem.deps.rb.lock file and constructs a LockSet containing the
 # dependencies found inside.  If the lock file is missing no LockSet is
@@ -129,8 +130,8 @@ class Gem::RequestSet::Lockfile
       [source.repository, source.rev_parse]
     end
 
-    out << "GIT"
     by_repository_revision.each do |(repository, revision), requests|
+      out << "GIT"
       out << "  remote: #{repository}"
       out << "  revision: #{revision}"
       out << "  specs:"
@@ -143,9 +144,8 @@ class Gem::RequestSet::Lockfile
           out << "      #{dep.name}#{dep.requirement.for_lockfile}"
         end
       end
+      out << nil
     end
-
-    out << nil
   end
 
   def relative_path_from dest, base # :nodoc:

data/lib/rubygems/request_set/lockfile/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Gem::RequestSet::Lockfile::Parser
   ###
   # Parses lockfiles
@@ -324,15 +325,24 @@ class Gem::RequestSet::Lockfile::Parser
     @tokens.peek
   end
 
-  def pinned_requirement name # :nodoc:
-    spec = @set.sets.select { |set|
-      Gem::Resolver::GitSet    === set or
-        Gem::Resolver::VendorSet === set
-    }.map { |set|
-      set.specs[name]
-    }.compact.first
+  if [].respond_to? :flat_map
+    def pinned_requirement name # :nodoc:
+      requirement = Gem::Dependency.new name
+      specification = @set.sets.flat_map { |set|
+        set.find_all(requirement)
+      }.compact.first
 
-    spec.version
+      specification && specification.version
+    end
+  else # FIXME: remove when 1.8 is dropped
+    def pinned_requirement name # :nodoc:
+      requirement = Gem::Dependency.new name
+      specification = @set.sets.map { |set|
+        set.find_all(requirement)
+      }.flatten(1).compact.first
+
+      specification && specification.version
+    end
   end
 
   ##
@@ -342,4 +352,3 @@ class Gem::RequestSet::Lockfile::Parser
     @tokens.unshift token
   end
 end
-

data/lib/rubygems/request_set/lockfile/tokenizer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'strscan'
 require 'rubygems/request_set/lockfile/parser'
 

data/lib/rubygems/requirement.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rubygems/version"
 require "rubygems/deprecate"
 

data/lib/rubygems/resolver.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/dependency'
 require 'rubygems/exceptions'
 require 'rubygems/util'
@@ -278,6 +279,7 @@ require 'rubygems/resolver/index_set'
 require 'rubygems/resolver/installer_set'
 require 'rubygems/resolver/lock_set'
 require 'rubygems/resolver/vendor_set'
+require 'rubygems/resolver/source_set'
 
 require 'rubygems/resolver/specification'
 require 'rubygems/resolver/spec_specification'

data/lib/rubygems/resolver/activation_request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Specifies a Specification object that should be activated.  Also contains a
 # dependency that was used to introduce this activation.
@@ -49,15 +50,27 @@ class Gem::Resolver::ActivationRequest
   # Downloads a gem at +path+ and returns the file path.
 
   def download path
-    if @spec.respond_to? :source
+    Gem.ensure_gem_subdirectories path
+
+    if @spec.respond_to? :sources
+      exception = nil
+      path = @spec.sources.find{ |source|
+        begin
+          source.download full_spec, path
+        rescue exception
+        end
+      }
+      return path      if path
+      raise  exception if exception
+
+    elsif @spec.respond_to? :source
       source = @spec.source
+      source.download full_spec, path
+
     else
       source = Gem.sources.first
+      source.download full_spec, path
     end
-
-    Gem.ensure_gem_subdirectories path
-
-    source.download full_spec, path
   end
 
   ##

data/lib/rubygems/resolver/api_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # The global rubygems pool, available via the rubygems.org API.
 # Returns instances of APISpecification.

data/lib/rubygems/resolver/api_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Represents a specification retrieved via the rubygems.org API.
 #

data/lib/rubygems/resolver/best_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # The BestSet chooses the best available method to query a remote index.
 #

data/lib/rubygems/resolver/composed_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A ComposedSet allows multiple sets to be queried like a single set.
 #

data/lib/rubygems/resolver/conflict.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Used internally to indicate that a dependency conflicted
 # with a spec that would be activated.

data/lib/rubygems/resolver/current_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A set which represents the installed gems. Respects
 # all the normal settings that control where to look

data/lib/rubygems/resolver/dependency_request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Used Internally. Wraps a Dependency object to also track which spec
 # contained the Dependency.

data/lib/rubygems/resolver/git_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A GitSet represents gems that are sourced from git repositories.
 #

data/lib/rubygems/resolver/git_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A GitSpecification represents a gem that is sourced from a git repository
 # and is being loaded through a gem dependencies file through the +git:+

data/lib/rubygems/resolver/index_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # The global rubygems pool represented via the traditional
 # source index.

data/lib/rubygems/resolver/index_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Represents a possible Specification object returned from IndexSet.  Used to
 # delay needed to download full Specification objects when only the +name+

data/lib/rubygems/resolver/installed_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # An InstalledSpecification represents a gem that is already installed
 # locally.

data/lib/rubygems/resolver/installer_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A set of gems for installation sourced from remote sources and local .gem
 # files

data/lib/rubygems/resolver/local_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A LocalSpecification comes from a .gem file on the local filesystem.
 

data/lib/rubygems/resolver/lock_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A set of gems from a gem dependencies lockfile.
 
@@ -27,11 +28,9 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
 
   def add name, version, platform # :nodoc:
     version = Gem::Version.new version
-
-    specs = @sources.map do |source|
-      Gem::Resolver::LockSpecification.new self, name, version, source,
-                                           platform
-    end
+    specs = [
+      Gem::Resolver::LockSpecification.new(self, name, version, @sources, platform)
+    ]
 
     @specs.concat specs
 

data/lib/rubygems/resolver/lock_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # The LockSpecification comes from a lockfile (Gem::RequestSet::Lockfile).
 #
@@ -6,13 +7,16 @@
 
 class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
 
-  def initialize set, name, version, source, platform
+  attr_reader :sources
+
+  def initialize set, name, version, sources, platform
     super()
 
     @name     = name
     @platform = platform
     @set      = set
-    @source   = source
+    @source   = sources.first
+    @sources  = sources
     @version  = version
 
     @dependencies = []