rubygems-update 3.0.9 → 3.1.0.pre1

data/lib/rubygems/request.rb

@@ -13,7 +13,7 @@ class Gem::Request
   def self.create_with_proxy(uri, request_class, last_modified, proxy) # :nodoc:
     cert_files = get_cert_files
     proxy ||= get_proxy_from_env(uri.scheme)
-    pool       = ConnectionPools.new proxy_uri(proxy), cert_files
+    pool = ConnectionPools.new proxy_uri(proxy), cert_files
 
     new(uri, request_class, last_modified, pool.pool_for(uri))
   end
@@ -168,8 +168,10 @@ class Gem::Request
 
     no_env_proxy = env_proxy.nil? || env_proxy.empty?
 
-    return get_proxy_from_env 'http' if no_env_proxy and _scheme != 'http'
-    return :no_proxy                 if no_env_proxy
+    if no_env_proxy
+      return (_scheme == 'https' || _scheme == 'http') ?
+        :no_proxy : get_proxy_from_env('http')
+    end
 
     uri = URI(Gem::UriFormatter.new(env_proxy).normalize)
 

data/lib/rubygems/request/connection_pools.rb

@@ -5,7 +5,9 @@ class Gem::Request::ConnectionPools # :nodoc:
   @client = Net::HTTP
 
   class << self
+
     attr_accessor :client
+
   end
 
   def initialize(proxy_uri, cert_files)
@@ -40,7 +42,7 @@ class Gem::Request::ConnectionPools # :nodoc:
   def get_no_proxy_from_env
     env_no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
 
-    return [] if env_no_proxy.nil?  or env_no_proxy.empty?
+    return [] if env_no_proxy.nil? or env_no_proxy.empty?
 
     env_no_proxy.split(/\s*,\s*/)
   end
@@ -74,9 +76,7 @@ class Gem::Request::ConnectionPools # :nodoc:
   end
 
   def net_http_args(uri, proxy_uri)
-    # URI::Generic#hostname was added in ruby 1.9.3, use it if exists, otherwise
-    # don't support IPv6 literals and use host.
-    hostname = uri.respond_to?(:hostname) ? uri.hostname : uri.host
+    hostname = uri.hostname
     net_http_args = [hostname, uri.port]
 
     no_proxy = get_no_proxy_from_env

data/lib/rubygems/request/http_pool.rb

@@ -6,6 +6,7 @@
 # use it.
 
 class Gem::Request::HTTPPool # :nodoc:
+
   attr_reader :cert_files, :proxy_uri
 
   def initialize(http_args, cert_files, proxy_uri)

data/lib/rubygems/request/https_pool.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 class Gem::Request::HTTPSPool < Gem::Request::HTTPPool # :nodoc:
+
   private
 
   def setup_connection(connection)
     Gem::Request.configure_connection_for_https(connection, @cert_files)
     super
   end
+
 end

data/lib/rubygems/request_set.rb

@@ -457,9 +457,9 @@ class Gem::RequestSet
     node.spec.dependencies.each do |dep|
       next if dep.type == :development and not @development
 
-      match = @requests.find { |r|
+      match = @requests.find do |r|
         dep.match? r.spec.name, r.spec.version, @prerelease
-      }
+      end
 
       unless match
         next if dep.type == :development and @development_shallow

data/lib/rubygems/request_set/gem_dependency_api.rb

@@ -443,7 +443,7 @@ Gem dependencies file #{@path} requires #{name} more than once.
 Gem dependencies file #{@path} includes git reference for both ref and branch but only ref is used.
       WARNING
     end
-    if (ref||branch) && tag
+    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
@@ -483,7 +483,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
 
   def gem_group(name, options) # :nodoc:
     g = options.delete :group
-    all_groups  = g ? Array(g) : []
+    all_groups = g ? Array(g) : []
 
     groups = options.delete :groups
     all_groups |= groups if groups

data/lib/rubygems/request_set/lockfile.rb

@@ -5,6 +5,7 @@
 # constructed.
 
 class Gem::RequestSet::Lockfile
+
   ##
   # Raised when a lockfile cannot be parsed
 
@@ -35,6 +36,7 @@ class Gem::RequestSet::Lockfile
       @path   = path
       super "#{message} (at line #{line} column #{column})"
     end
+
   end
 
   ##
@@ -79,7 +81,7 @@ class Gem::RequestSet::Lockfile
 
     @gem_deps_file.untaint unless gem_deps_file.tainted?
 
-    @platforms      = []
+    @platforms = []
   end
 
   def add_DEPENDENCIES(out) # :nodoc:
@@ -153,7 +155,7 @@ class Gem::RequestSet::Lockfile
     base = File.expand_path(base)
 
     if dest.index(base) == 0
-      offset = dest[base.size+1..-1]
+      offset = dest[base.size + 1..-1]
 
       return '.' unless offset
 
@@ -233,6 +235,7 @@ class Gem::RequestSet::Lockfile
   def requests
     @set.sorted_requests
   end
+
 end
 
 require 'rubygems/request_set/lockfile/tokenizer'

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 class Gem::RequestSet::Lockfile::Parser
+
   ###
   # Parses lockfiles
 
@@ -327,9 +328,9 @@ class Gem::RequestSet::Lockfile::Parser
 
   def pinned_requirement(name) # :nodoc:
     requirement = Gem::Dependency.new name
-    specification = @set.sets.flat_map { |set|
+    specification = @set.sets.flat_map do |set|
       set.find_all(requirement)
-    }.compact.first
+    end.compact.first
 
     specification && specification.version
   end
@@ -340,4 +341,5 @@ class Gem::RequestSet::Lockfile::Parser
   def unget(token) # :nodoc:
     @tokens.unshift token
   end
+
 end

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

@@ -2,6 +2,7 @@
 require 'rubygems/request_set/lockfile/parser'
 
 class Gem::RequestSet::Lockfile::Tokenizer
+
   Token = Struct.new :type, :value, :column, :line
   EOF   = Token.new :EOF
 
@@ -109,4 +110,5 @@ class Gem::RequestSet::Lockfile::Tokenizer
 
     @tokens
   end
+
 end

data/lib/rubygems/requirement.rb

@@ -10,6 +10,7 @@ require "rubygems/deprecate"
 # together in RubyGems.
 
 class Gem::Requirement
+
   OPS = { #:nodoc:
     "="  =>  lambda { |v, r| v == r },
     "!=" =>  lambda { |v, r| v != r },
@@ -22,7 +23,7 @@ class Gem::Requirement
 
   SOURCE_SET_REQUIREMENT = Struct.new(:for_lockfile).new "!" # :nodoc:
 
-  quoted  = OPS.keys.map { |k| Regexp.quote k }.join "|"
+  quoted = OPS.keys.map { |k| Regexp.quote k }.join "|"
   PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*".freeze # :nodoc:
 
   ##
@@ -31,10 +32,15 @@ class Gem::Requirement
   PATTERN = /\A#{PATTERN_RAW}\z/.freeze
 
   ##
-  # The default requirement matches any version
+  # The default requirement matches any non-prerelease version
 
   DefaultRequirement = [">=", Gem::Version.new(0)].freeze
 
+  ##
+  # The default requirement matches any version
+
+  DefaultPrereleaseRequirement = [">=", Gem::Version.new("0.a")].freeze
+
   ##
   # Raised when a bad requirement is encountered
 
@@ -68,13 +74,14 @@ class Gem::Requirement
     end
   end
 
-  ##
-  # A default "version requirement" can surely _only_ be '>= 0'.
-
   def self.default
     new '>= 0'
   end
 
+  def self.default_prerelease
+    new '>= 0.a'
+  end
+
   ###
   # A source set requirement, used for Gemfiles and lockfiles
 
@@ -103,6 +110,8 @@ class Gem::Requirement
 
     if $1 == ">=" && $2 == "0"
       DefaultRequirement
+    elsif $1 == ">=" && $2 == "0.a"
+      DefaultPrereleaseRequirement
     else
       [$1 || "=", Gem::Version.new($2)]
     end
@@ -129,7 +138,6 @@ class Gem::Requirement
       @requirements = [DefaultRequirement]
     else
       @requirements = requirements.map! { |r| self.class.parse r }
-      sort_requirements!
     end
   end
 
@@ -143,7 +151,6 @@ class Gem::Requirement
     new = new.map { |r| self.class.parse r }
 
     @requirements.concat new
-    sort_requirements!
   end
 
   ##
@@ -152,11 +159,11 @@ class Gem::Requirement
   def for_lockfile # :nodoc:
     return if [DefaultRequirement] == @requirements
 
-    list = requirements.sort_by { |_, version|
+    list = requirements.sort_by do |_, version|
       version
-    }.map { |op, version|
+    end.map do |op, version|
       "#{op} #{version}"
-    }.uniq
+    end.uniq
 
     " (#{list.join ', '})"
   end
@@ -185,7 +192,7 @@ class Gem::Requirement
   end
 
   def hash # :nodoc:
-    requirements.hash
+    requirements.sort.hash
   end
 
   def marshal_dump # :nodoc:
@@ -294,18 +301,13 @@ class Gem::Requirement
     end
   end
 
-  def sort_requirements! # :nodoc:
-    @requirements.sort! do |l, r|
-      comp = l.last <=> r.last # first, sort by the requirement's version
-      next comp unless comp == 0
-      l.first <=> r.first # then, sort by the operator (for stability)
-    end
-  end
 end
 
 class Gem::Version
+
   # This is needed for compatibility with older yaml
   # gemspecs.
 
   Requirement = Gem::Requirement # :nodoc:
+
 end

data/lib/rubygems/resolver.rb

@@ -11,6 +11,7 @@ require 'rubygems/util/list'
 # all the requirements.
 
 class Gem::Resolver
+
   require 'rubygems/resolver/molinillo'
 
   ##
@@ -234,23 +235,21 @@ class Gem::Resolver
       raise exc
     end
 
-    sources = []
-
     groups = Hash.new { |hash, key| hash[key] = [] }
 
     # create groups & sources in the same loop
-    sources = possibles.map { |spec|
+    sources = possibles.map do |spec|
       source = spec.source
       groups[source] << spec
       source
-    }.uniq.reverse
+    end.uniq.reverse
 
     activation_requests = []
 
     sources.each do |source|
       groups[source].
         sort_by { |spec| [spec.version, Gem::Platform.local =~ spec.platform ? 1 : 0] }.
-        map { |spec| ActivationRequest.new spec, dependency, [] }.
+        map { |spec| ActivationRequest.new spec, dependency }.
         each { |activation_request| activation_requests << activation_request }
     end
 

data/lib/rubygems/resolver/activation_request.rb

@@ -18,14 +18,10 @@ class Gem::Resolver::ActivationRequest
   ##
   # Creates a new ActivationRequest that will activate +spec+.  The parent
   # +request+ is used to provide diagnostics in case of conflicts.
-  #
-  # +others_possible+ indicates that other specifications may also match this
-  # activation request.
 
-  def initialize(spec, request, others_possible = true)
+  def initialize(spec, request)
     @spec = spec
     @request = request
-    @others_possible = others_possible
   end
 
   def ==(other) # :nodoc:
@@ -54,12 +50,12 @@ class Gem::Resolver::ActivationRequest
 
     if @spec.respond_to? :sources
       exception = nil
-      path = @spec.sources.find{ |source|
+      path = @spec.sources.find do |source|
         begin
           source.download full_spec, path
         rescue exception
         end
-      }
+      end
       return path      if path
       raise  exception if exception
 
@@ -77,7 +73,7 @@ class Gem::Resolver::ActivationRequest
   # The full name of the specification to be activated.
 
   def full_name
-    @spec.full_name
+    name_tuple.full_name
   end
 
   alias_method :to_s, :full_name
@@ -90,21 +86,8 @@ class Gem::Resolver::ActivationRequest
   end
 
   def inspect # :nodoc:
-    others =
-      case @others_possible
-      when true then # TODO remove at RubyGems 3
-        ' (others possible)'
-      when false then # TODO remove at RubyGems 3
-        nil
-      else
-        unless @others_possible.empty?
-          others = @others_possible.map { |s| s.full_name }
-          " (others possible: #{others.join ', '})"
-        end
-      end
-
-    '#<%s for %p from %s%s>' % [
-      self.class, @spec, @request, others
+    '#<%s for %p from %s>' % [
+      self.class, @spec, @request
     ]
   end
 
@@ -131,19 +114,6 @@ class Gem::Resolver::ActivationRequest
     @spec.name
   end
 
-  ##
-  # Indicate if this activation is one of a set of possible
-  # requests for the same Dependency request.
-
-  def others_possible?
-    case @others_possible
-    when true, false then
-      @others_possible
-    else
-      not @others_possible.empty?
-    end
-  end
-
   ##
   # Return the ActivationRequest that contained the dependency
   # that we were activated for.
@@ -160,19 +130,6 @@ class Gem::Resolver::ActivationRequest
       q.breakable
       q.text ' for '
       q.pp @request
-
-      case @others_possible
-      when false then
-      when true then
-        q.breakable
-        q.text 'others possible'
-      else
-        unless @others_possible.empty?
-          q.breakable
-          q.text 'others '
-          q.pp @others_possible.map { |s| s.full_name }
-        end
-      end
     end
   end
 
@@ -183,4 +140,17 @@ class Gem::Resolver::ActivationRequest
     @spec.version
   end
 
+  ##
+  # The platform of this activation request's specification
+
+  def platform
+    @spec.platform
+  end
+
+  private
+
+  def name_tuple
+    @name_tuple ||= Gem::NameTuple.new(name, version, platform)
+  end
+
 end