rubygems-update 2.5.1 → 2.5.2

data/lib/rubygems/resolver/molinillo.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require 'rubygems/resolver/molinillo/lib/molinillo'

data/lib/rubygems/resolver/molinillo/lib/molinillo.rb

@@ -1,5 +1,10 @@
+# frozen_string_literal: true
 require 'rubygems/resolver/molinillo/lib/molinillo/gem_metadata'
 require 'rubygems/resolver/molinillo/lib/molinillo/errors'
 require 'rubygems/resolver/molinillo/lib/molinillo/resolver'
 require 'rubygems/resolver/molinillo/lib/molinillo/modules/ui'
 require 'rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider'
+
+# Gem::Resolver::Molinillo is a generic dependency resolution algorithm.
+module Gem::Resolver::Molinillo
+end

data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'set'
 require 'tsort'
 
@@ -14,8 +15,10 @@ module Gem::Resolver::Molinillo
 
     include TSort
 
+    # @visibility private
     alias_method :tsort_each_node, :each
 
+    # @visibility private
     def tsort_each_child(vertex, &block)
       vertex.successors.each(&block)
     end
@@ -41,12 +44,14 @@ module Gem::Resolver::Molinillo
     #   by {Vertex#name}
     attr_reader :vertices
 
+    # Initializes an empty dependency graph
     def initialize
       @vertices = {}
     end
 
     # Initializes a copy of a {DependencyGraph}, ensuring that all {#vertices}
     # are properly copied.
+    # @param [DependencyGraph] other the graph to copy.
     def initialize_copy(other)
       super
       @vertices = {}
@@ -100,6 +105,7 @@ module Gem::Resolver::Molinillo
       vertex
     end
 
+    # Adds a vertex with the given name, or updates the existing one.
     # @param [String] name
     # @param [Object] payload
     # @return [Vertex] the vertex that was added to `self`
@@ -150,6 +156,8 @@ module Gem::Resolver::Molinillo
 
     private
 
+    # Adds a new {Edge} to the dependency graph without checking for
+    # circularity.
     def add_edge_no_circular(origin, destination, requirement)
       edge = Edge.new(origin, destination, requirement)
       origin.outgoing_edges << edge
@@ -174,6 +182,7 @@ module Gem::Resolver::Molinillo
       attr_accessor :root
       alias_method :root?, :root
 
+      # Initializes a vertex with the given name and payload.
       # @param [String] name see {#name}
       # @param [Object] payload see {#payload}
       def initialize(name, payload)
@@ -240,6 +249,7 @@ module Gem::Resolver::Molinillo
           successors.to_set == other.successors.to_set
       end
 
+      # @param  [Vertex] other the other vertex to compare to
       # @return [Boolean] whether the two vertices are equal, determined
       #   solely by {#name} and {#payload} equality
       def shallow_eql?(other)

data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Gem::Resolver::Molinillo
   # An error that occurred during the resolution process
   class ResolverError < StandardError; end
@@ -11,6 +12,7 @@ module Gem::Resolver::Molinillo
     # @return [Array<Object>] the specifications that depended upon {#dependency}
     attr_accessor :required_by
 
+    # Initializes a new error with the given missing dependency.
     # @param [Object] dependency @see {#dependency}
     # @param [Array<Object>] required_by @see {#required_by}
     def initialize(dependency, required_by = [])
@@ -19,6 +21,8 @@ module Gem::Resolver::Molinillo
       super()
     end
 
+    # The error message for the missing dependency, including the specifications
+    # that had this dependency.
     def message
       sources = required_by.map { |r| "`#{r}`" }.join(' and ')
       message = "Unable to find a specification for `#{dependency}`"
@@ -36,6 +40,7 @@ module Gem::Resolver::Molinillo
     # [Set<Object>] the dependencies responsible for causing the error
     attr_reader :dependencies
 
+    # Initializes a new error with the given circular vertices.
     # @param [Array<DependencyGraph::Vertex>] nodes the nodes in the dependency
     #   that caused the error
     def initialize(nodes)
@@ -50,6 +55,7 @@ module Gem::Resolver::Molinillo
     #   resolution to fail
     attr_reader :conflicts
 
+    # Initializes a new error with the given version conflicts.
     # @param [{String => Resolution::Conflict}] conflicts see {#conflicts}
     def initialize(conflicts)
       pairs = []

data/lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module Gem::Resolver::Molinillo
-  VERSION = '0.4.0'
+  # The version of Gem::Resolver::Molinillo.
+  VERSION = '0.4.1'.freeze
 end

data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Gem::Resolver::Molinillo
   # Provides information about specifcations and dependencies to the resolver,
   # allowing the {Resolver} class to remain generic while still providing power

data/lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Gem::Resolver::Molinillo
   # Conveys information about the resolution process to a user.
   module UI

data/lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Gem::Resolver::Molinillo
   class Resolver
     # A specific resolution from a given {Resolver}
@@ -38,6 +39,7 @@ module Gem::Resolver::Molinillo
       # @return [Array] the dependencies that were explicitly required
       attr_reader :original_requested
 
+      # Initializes a new resolution.
       # @param [SpecificationProvider] specification_provider
       #   see {#specification_provider}
       # @param [UI] resolver_ui see {#resolver_ui}

data/lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require 'rubygems/resolver/molinillo/lib/molinillo/dependency_graph'
 
 module Gem::Resolver::Molinillo
   # This class encapsulates a dependency resolver.
   # The resolver is responsible for determining which set of dependencies to
-  # activate, with feedback from the the {#specification_provider}
+  # activate, with feedback from the {#specification_provider}
   #
   #
   class Resolver
@@ -17,6 +18,7 @@ module Gem::Resolver::Molinillo
     #   during the resolution process
     attr_reader :resolver_ui
 
+    # Initializes a new resolver.
     # @param  [SpecificationProvider] specification_provider
     #   see {#specification_provider}
     # @param  [UI] resolver_ui

data/lib/rubygems/resolver/molinillo/lib/molinillo/state.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
 module Gem::Resolver::Molinillo
   # A state that a {Resolution} can be in
-  # @attr [String] name
-  # @attr [Array<Object>] requirements
-  # @attr [DependencyGraph] activated
-  # @attr [Object] requirement
-  # @attr [Object] possibility
-  # @attr [Integer] depth
-  # @attr [Set<Object>] conflicts
+  # @attr [String] name the name of the current requirement
+  # @attr [Array<Object>] requirements currently unsatisfied requirements
+  # @attr [DependencyGraph] activated the graph of activated dependencies
+  # @attr [Object] requirement the current requirement
+  # @attr [Object] possibilities the possibilities to satisfy the current requirement
+  # @attr [Integer] depth the depth of the resolution
+  # @attr [Set<Object>] conflicts unresolved conflicts
   ResolutionState = Struct.new(
     :name,
     :requirements,

data/lib/rubygems/resolver/requirement_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # The RequirementList is used to hold the requirements being considered
 # while resolving a set of gems.

data/lib/rubygems/resolver/set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Resolver sets are used to look up specifications (and their
 # dependencies) used in resolution.  This set is abstract.

data/lib/rubygems/resolver/source_set.rb

@@ -0,0 +1,48 @@
+##
+# The SourceSet chooses the best available method to query a remote index.
+#
+# Kind off like BestSet but filters the sources for gems
+
+class Gem::Resolver::SourceSet < Gem::Resolver::Set
+
+  ##
+  # Creates a SourceSet for the given +sources+ or Gem::sources if none are
+  # specified.  +sources+ must be a Gem::SourceList.
+
+  def initialize
+    super()
+
+    @links = {}
+    @sets  = {}
+  end
+
+  def find_all req # :nodoc:
+    if set = get_set(req.dependency.name)
+      set.find_all req
+    else
+      []
+    end
+  end
+
+  # potentially no-op
+  def prefetch reqs # :nodoc:
+    reqs.each do |req|
+      if set = get_set(req.dependency.name)
+        set.prefetch reqs
+      end
+    end
+  end
+
+  def add_source_gem name, source
+    @links[name] = source
+  end
+
+private
+
+  def get_set(name)
+    link = @links[name]
+    @sets[link] ||= Gem::Source.new(link).dependency_resolver_set if link
+  end
+
+end
+

data/lib/rubygems/resolver/spec_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # The Resolver::SpecSpecification contains common functionality for
 # Resolver specifications that are backed by a Gem::Specification.

data/lib/rubygems/resolver/specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A Resolver::Specification contains a subset of the information
 # contained in a Gem::Specification.  Only the information necessary for

data/lib/rubygems/resolver/stats.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Gem::Resolver::Stats
   def initialize
     @max_depth = 0

data/lib/rubygems/resolver/vendor_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A VendorSet represents gems that have been unpacked into a specific
 # directory that contains a gemspec.

data/lib/rubygems/resolver/vendor_specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A VendorSpecification represents a gem that has been unpacked into a project
 # and is being loaded through a gem dependencies file through the +path:+

data/lib/rubygems/security.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -339,7 +340,7 @@ module Gem::Security
   # Digest algorithm used to sign gems
 
   DIGEST_ALGORITHM =
-    if defined?(OpenSSL::Digest) then
+    if defined?(OpenSSL::Digest::SHA1) then
       OpenSSL::Digest::SHA1
     end
 
@@ -355,7 +356,7 @@ module Gem::Security
   # Algorithm for creating the key pair used to sign gems
 
   KEY_ALGORITHM =
-    if defined?(OpenSSL::PKey) then
+    if defined?(OpenSSL::PKey::RSA) then
       OpenSSL::PKey::RSA
     end
 

data/lib/rubygems/security/policies.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Gem::Security
 
   ##

data/lib/rubygems/security/policy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/user_interaction'
 
 ##
@@ -157,7 +158,7 @@ class Gem::Security::Policy
     path = Gem::Security.trust_dir.cert_path root
 
     unless File.exist? path then
-      message = "root cert #{root.subject} is not trusted"
+      message = "root cert #{root.subject} is not trusted".dup
 
       message << " (root of signing cert #{chain.last.subject})" if
         chain.length > 1
@@ -292,4 +293,3 @@ class Gem::Security::Policy
   alias to_s name # :nodoc:
 
 end
-

data/lib/rubygems/security/signer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Basic OpenSSL-based package signing class.
 

data/lib/rubygems/security/trust_dir.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # The TrustDir manages the trusted certificates for gem signature
 # verification.

data/lib/rubygems/server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'webrick'
 require 'zlib'
 require 'erb'

data/lib/rubygems/source.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'uri'
 require 'fileutils'
 

data/lib/rubygems/source/git.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'digest'
 require 'rubygems/util'
 

data/lib/rubygems/source/installed.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Represents an installed gem.  This is used for dependency resolution.
 

data/lib/rubygems/source/local.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # The local source finds gems in the current directory for fulfilling
 # dependencies.

data/lib/rubygems/source/lock.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A Lock source wraps an installed gem's source and sorts before other sources
 # during dependency resolution.  This allows RubyGems to prefer gems from

data/lib/rubygems/source/specific_file.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # A source representing a single .gem file.  This is used for installation of
 # local gems.

data/lib/rubygems/source/vendor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # This represents a vendored source that is similar to an installed gem.
 

data/lib/rubygems/source_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/source'
 
 ##
@@ -9,7 +10,7 @@ require 'rubygems/source'
 # Or by adding them:
 #
 #   sources = Gem::SourceList.new
-#   sources.add 'https://rubygems.example'
+#   sources << 'https://rubygems.example'
 #
 # The most common way to get a SourceList is Gem.sources.
 

data/lib/rubygems/source_local.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/source'
 require 'rubygems/source_local'
 

data/lib/rubygems/source_specific_file.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/source/specific_file'
 
 # TODO warn upon require, this file is deprecated.

data/lib/rubygems/spec_fetcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rubygems/remote_fetcher'
 require 'rubygems/user_interaction'
 require 'rubygems/errors'

data/lib/rubygems/specification.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # -*- coding: utf-8 -*-
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
@@ -1191,6 +1192,7 @@ class Gem::Specification < Gem::BasicSpecification
   def self.normalize_yaml_input(input)
     result = input.respond_to?(:read) ? input.read : input
     result = "--- " + result unless result =~ /\A--- /
+    result = result.dup
     result.gsub!(/ !!null \n/, " \n")
     # date: 2011-04-26 00:00:00.000000000Z
     # date: 2011-04-26 00:00:00.000000000 Z
@@ -2333,7 +2335,7 @@ class Gem::Specification < Gem::BasicSpecification
 
   def ruby_code(obj)
     case obj
-    when String            then obj.dump
+    when String            then obj.dump + ".freeze"
     when Array             then '[' + obj.map { |x| ruby_code x }.join(", ") + ']'
     when Hash              then
       seg = obj.keys.sort.map { |k| "#{k.to_s.dump} => #{obj[k].to_s.dump}" }
@@ -2523,14 +2525,14 @@ class Gem::Specification < Gem::BasicSpecification
       dependencies.each do |dep|
         req = dep.requirements_list.inspect
         dep.instance_variable_set :@type, :runtime if dep.type.nil? # HACK
-        result << "      s.add_#{dep.type}_dependency(%q<#{dep.name}>, #{req})"
+        result << "      s.add_#{dep.type}_dependency(%q<#{dep.name}>.freeze, #{req})"
       end
 
       result << "    else"
 
       dependencies.each do |dep|
         version_reqs_param = dep.requirements_list.inspect
-        result << "      s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})"
+        result << "      s.add_dependency(%q<#{dep.name}>.freeze, #{version_reqs_param})"
       end
 
       result << '    end'
@@ -2538,7 +2540,7 @@ class Gem::Specification < Gem::BasicSpecification
       result << "  else"
       dependencies.each do |dep|
         version_reqs_param = dep.requirements_list.inspect
-        result << "    s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})"
+        result << "    s.add_dependency(%q<#{dep.name}>.freeze, #{version_reqs_param})"
       end
       result << "  end"
     end
@@ -2760,10 +2762,13 @@ class Gem::Specification < Gem::BasicSpecification
       end
 
       if !Gem::Licenses.match?(license)
-        warning <<-warning
-WARNING: license value '#{license}' is invalid.  Use a license identifier from
+        suggestions = Gem::Licenses.suggestions(license)
+        message = <<-warning
+license value '#{license}' is invalid.  Use a license identifier from
 http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard license.
         warning
+        message += "Did you mean #{suggestions.map { |s| "'#{s}'"}.join(', ')}?\n" unless suggestions.nil?
+        warning(message)
       end
     }