bundler 4.0.23 → 4.1.0.beta1

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/assignment.rb

@@ -1,4 +1,4 @@
-module Bundler::PubGrub
+module Gem::PubGrub
   class Assignment
     attr_reader :term, :cause, :decision_level, :index
     def initialize(term, cause, decision_level, index)

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/basic_package_source.rb

@@ -1,10 +1,10 @@
 require_relative 'version_constraint'
 require_relative 'incompatibility'
 
-module Bundler::PubGrub
+module Gem::PubGrub
   # Types:
   #
-  # Where possible, Bundler::PubGrub will accept user-defined types, so long as they quack.
+  # Where possible, Gem::PubGrub will accept user-defined types, so long as they quack.
   #
   # ## "Package":
   #
@@ -32,7 +32,7 @@ module Bundler::PubGrub
   #
   # This class represents the requirement one package has on another. It is
   # returned by dependencies_for(package, version) and will be passed to
-  # parse_dependency to convert it to a format Bundler::PubGrub understands.
+  # parse_dependency to convert it to a format Gem::PubGrub understands.
   #
   # It must also have a reasonable definition of #==
   #
@@ -59,13 +59,13 @@ module Bundler::PubGrub
 
     # Override me!
     #
-    # Convert a (user-defined) dependency into a format Bundler::PubGrub understands.
+    # Convert a (user-defined) dependency into a format Gem::PubGrub understands.
     #
     # Package is passed to this method but for many implementations is not
     # needed.
     #
-    # Returns: either a Bundler::PubGrub::VersionRange, Bundler::PubGrub::VersionUnion, or a
-    #   Bundler::PubGrub::VersionConstraint
+    # Returns: either a Gem::PubGrub::VersionRange, Gem::PubGrub::VersionUnion, or a
+    #   Gem::PubGrub::VersionConstraint
     def parse_dependency(package, dependency)
       raise NotImplementedError
     end
@@ -155,7 +155,7 @@ module Bundler::PubGrub
         dep_constraint = parse_dependency(dep_package, dep_constraint_name)
         if !dep_constraint
           # falsey indicates this dependency was invalid
-          cause = Bundler::PubGrub::Incompatibility::InvalidDependency.new(dep_package, dep_constraint_name)
+          cause = Gem::PubGrub::Incompatibility::InvalidDependency.new(dep_package, dep_constraint_name)
           return [Incompatibility.new([Term.new(self_constraint, true)], cause: cause)]
         elsif !dep_constraint.is_a?(VersionConstraint)
           # Upgrade range/union to VersionConstraint

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/failure_writer.rb

@@ -1,4 +1,4 @@
-module Bundler::PubGrub
+module Gem::PubGrub
   class FailureWriter
     def initialize(root)
       @root = root

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/incompatibility.rb

@@ -1,4 +1,4 @@
-module Bundler::PubGrub
+module Gem::PubGrub
   class Incompatibility
     ConflictCause = Struct.new(:incompatibility, :satisfier) do
       alias_method :conflict, :incompatibility
@@ -61,11 +61,11 @@ module Bundler::PubGrub
         "(root dependency)"
       when :dependency
         "#{terms[0].to_s(allow_every: true)} depends on #{terms[1].invert}"
-      when Bundler::PubGrub::Incompatibility::InvalidDependency
+      when Gem::PubGrub::Incompatibility::InvalidDependency
         "#{terms[0].to_s(allow_every: true)} depends on unknown package #{cause.package}"
-      when Bundler::PubGrub::Incompatibility::NoVersions
+      when Gem::PubGrub::Incompatibility::NoVersions
         "no versions satisfy #{cause.constraint}"
-      when Bundler::PubGrub::Incompatibility::ConflictCause
+      when Gem::PubGrub::Incompatibility::ConflictCause
         if failure?
           "version solving has failed"
         elsif terms.length == 1

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/package.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Bundler::PubGrub
+module Gem::PubGrub
   class Package
 
     attr_reader :name

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/partial_solution.rb

@@ -1,6 +1,6 @@
 require_relative 'assignment'
 
-module Bundler::PubGrub
+module Gem::PubGrub
   class PartialSolution
     attr_reader :assignments, :decisions
     attr_reader :attempted_solutions

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/rubygems.rb

@@ -1,4 +1,4 @@
-module Bundler::PubGrub
+module Gem::PubGrub
   module RubyGems
     extend self
 
@@ -30,7 +30,7 @@ module Bundler::PubGrub
     end
 
     def requirement_to_constraint(package, requirement)
-      Bundler::PubGrub::VersionConstraint.new(package, range: requirement_to_range(requirement))
+      Gem::PubGrub::VersionConstraint.new(package, range: requirement_to_range(requirement))
     end
 
     def parse_range(dep)
@@ -39,7 +39,7 @@ module Bundler::PubGrub
 
     def parse_constraint(package, dep)
       range = parse_range(dep)
-      Bundler::PubGrub::VersionConstraint.new(package, range: range)
+      Gem::PubGrub::VersionConstraint.new(package, range: range)
     end
   end
 end

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/solve_failure.rb

@@ -1,6 +1,6 @@
 require_relative 'failure_writer'
 
-module Bundler::PubGrub
+module Gem::PubGrub
   class SolveFailure < StandardError
     attr_reader :incompatibility
 

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/static_package_source.rb

@@ -4,7 +4,7 @@ require_relative 'version_constraint'
 require_relative 'incompatibility'
 require_relative 'basic_package_source'
 
-module Bundler::PubGrub
+module Gem::PubGrub
   class StaticPackageSource < BasicPackageSource
     class DSL
       def initialize(packages, root_deps)
@@ -27,7 +27,7 @@ module Bundler::PubGrub
 
       # Exclude redundant self-referencing dependencies
       def clean_deps(name, version, deps)
-        deps.reject {|dep_name, req| name == dep_name && Bundler::PubGrub::RubyGems.parse_range(req).include?(version) }
+        deps.reject {|dep_name, req| name == dep_name && Gem::PubGrub::RubyGems.parse_range(req).include?(version) }
       end
     end
 
@@ -55,7 +55,7 @@ module Bundler::PubGrub
     def parse_dependency(package, dependency)
       return false unless @packages.key?(package)
 
-      Bundler::PubGrub::RubyGems.parse_constraint(package, dependency)
+      Gem::PubGrub::RubyGems.parse_constraint(package, dependency)
     end
   end
 end

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/strategy.rb

@@ -1,4 +1,4 @@
-module Bundler::PubGrub
+module Gem::PubGrub
   class Strategy
     def initialize(source)
       @source = source
@@ -27,7 +27,7 @@ module Bundler::PubGrub
       versions = @source.versions_for(package, range)
 
       indexes = @version_indexes[package]
-      versions.min_by { |version| indexes[version] }
+      versions.min_by { |version| indexes[version] || Float::INFINITY }
     end
 
     def next_term_to_try_from(unsatisfied)

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/term.rb

@@ -1,4 +1,4 @@
-module Bundler::PubGrub
+module Gem::PubGrub
   class Term
     attr_reader :package, :constraint, :positive
 

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/version.rb

@@ -1,3 +1,3 @@
-module Bundler::PubGrub
+module Gem::PubGrub
   VERSION = "0.5.0"
 end

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/version_constraint.rb

@@ -1,11 +1,11 @@
 require_relative 'version_range'
 
-module Bundler::PubGrub
+module Gem::PubGrub
   class VersionConstraint
     attr_reader :package, :range
 
-    # @param package [Bundler::PubGrub::Package]
-    # @param range [Bundler::PubGrub::VersionRange]
+    # @param package [Gem::PubGrub::Package]
+    # @param range [Gem::PubGrub::VersionRange]
     def initialize(package, range: nil)
       @package = package
       @range = range

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/version_range.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Bundler::PubGrub
+module Gem::PubGrub
   class VersionRange
     attr_reader :min, :max, :include_min, :include_max
 

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/version_solver.rb

@@ -4,14 +4,14 @@ require_relative 'incompatibility'
 require_relative 'solve_failure'
 require_relative 'strategy'
 
-module Bundler::PubGrub
+module Gem::PubGrub
   class VersionSolver
     attr_reader :logger
     attr_reader :source
     attr_reader :solution
     attr_reader :strategy
 
-    def initialize(source:, root: Package.root, strategy: Strategy.new(source), logger: Bundler::PubGrub.logger)
+    def initialize(source:, root: Package.root, strategy: Strategy.new(source), logger: Gem::PubGrub.logger)
       @logger = logger
 
       @source = source

data/lib/{bundler → rubygems}/vendor/pub_grub/lib/pub_grub/version_union.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Bundler::PubGrub
+module Gem::PubGrub
   class VersionUnion
     attr_reader :ranges
 

data/lib/rubygems/vendor/pub_grub/lib/pub_grub.rb

@@ -0,0 +1,57 @@
+# Skip reloading when an identical copy (e.g. the one shipped inside the Bundler
+# gem) was already required from a different path, to avoid redefinition warnings.
+return if defined?(Gem::PubGrub::VERSION)
+
+require_relative "pub_grub/package"
+require_relative "pub_grub/static_package_source"
+require_relative "pub_grub/term"
+require_relative "pub_grub/version_range"
+require_relative "pub_grub/version_constraint"
+require_relative "pub_grub/version_union"
+require_relative "pub_grub/version_solver"
+require_relative "pub_grub/incompatibility"
+require_relative 'pub_grub/solve_failure'
+require_relative 'pub_grub/failure_writer'
+require_relative 'pub_grub/version'
+
+module Gem::PubGrub
+  # Minimal logger that doesn't require the 'logger' gem
+  class NullLogger
+    def info(&block); end
+    def debug(&block); end
+    def warn(&block); end
+    def error(&block); end
+  end
+
+  class StderrLogger
+    def info(&block)
+      $stderr.puts "INFO: #{block.call}" if block
+    end
+
+    def debug(&block)
+      $stderr.puts "DEBUG: #{block.call}" if block
+    end
+
+    def warn(&block)
+      $stderr.puts "WARN: #{block.call}" if block
+    end
+
+    def error(&block)
+      $stderr.puts "ERROR: #{block.call}" if block
+    end
+  end
+
+  class << self
+    attr_writer :logger
+
+    def logger
+      @logger || default_logger
+    end
+
+    private
+
+    def default_logger
+      @logger = $DEBUG ? StderrLogger.new : NullLogger.new
+    end
+  end
+end

data/lib/{bundler → rubygems}/vendor/securerandom/lib/securerandom.rb

@@ -10,7 +10,7 @@ require 'random/formatter'
 #
 # You can use this library in your application by requiring it:
 #
-#   require 'bundler/vendor/securerandom/lib/securerandom'
+#   require 'rubygems/vendor/securerandom/lib/securerandom'
 #
 # It supports the following secure random number generators:
 #
@@ -18,7 +18,7 @@ require 'random/formatter'
 # * /dev/urandom
 # * Win32
 #
-# Bundler::SecureRandom is extended by the Random::Formatter module which
+# Gem::SecureRandom is extended by the Random::Formatter module which
 # defines the following methods:
 #
 # * alphanumeric
@@ -32,13 +32,17 @@ require 'random/formatter'
 # * urlsafe_base64
 # * uuid
 #
-# These methods are usable as class methods of Bundler::SecureRandom such as
-# +Bundler::SecureRandom.hex+.
+# These methods are usable as class methods of Gem::SecureRandom such as
+# +Gem::SecureRandom.hex+.
 #
 # If a secure random number generator is not available,
 # +NotImplementedError+ is raised.
 
-module Bundler::SecureRandom
+# Skip reloading when an identical copy (e.g. the one shipped inside the Bundler
+# gem) was already required from a different path, to avoid redefinition warnings.
+return if defined?(Gem::SecureRandom::VERSION)
+
+module Gem::SecureRandom
 
   # The version
   VERSION = "0.4.1"
@@ -99,4 +103,4 @@ module Bundler::SecureRandom
   end
 end
 
-Bundler::SecureRandom.extend(Random::Formatter)
+Gem::SecureRandom.extend(Random::Formatter)