bundler 2.3.12 → 2.4.18

data/lib/bundler/resolver.rb

@@ -1,420 +1,427 @@
 # frozen_string_literal: true
 
 module Bundler
+  #
+  # This class implements the interface needed by PubGrub for resolution. It is
+  # equivalent to the `PubGrub::BasicPackageSource` class provided by PubGrub by
+  # default and used by the most simple PubGrub consumers.
+  #
   class Resolver
-    require_relative "vendored_molinillo"
-    require_relative "resolver/spec_group"
+    require_relative "vendored_pub_grub"
+    require_relative "resolver/base"
+    require_relative "resolver/candidate"
+    require_relative "resolver/incompatibility"
+    require_relative "resolver/root"
 
     include GemHelpers
 
-    # Figures out the best possible configuration of gems that satisfies
-    # the list of passed dependencies and any child dependencies without
-    # causing any gem activation errors.
-    #
-    # ==== Parameters
-    # *dependencies<Gem::Dependency>:: The list of dependencies to resolve
-    #
-    # ==== Returns
-    # <GemBundle>,nil:: If the list of dependencies can be resolved, a
-    #   collection of gemspecs is returned. Otherwise, nil is returned.
-    def self.resolve(requirements, source_requirements = {}, base = [], gem_version_promoter = GemVersionPromoter.new, additional_base_requirements = [], platforms = nil)
-      base = SpecSet.new(base) unless base.is_a?(SpecSet)
-      resolver = new(source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
-      result = resolver.start(requirements)
-      SpecSet.new(SpecSet.new(result).for(requirements.reject{|dep| dep.name.end_with?("\0") }))
-    end
-
-    def initialize(source_requirements, base, gem_version_promoter, additional_base_requirements, platforms)
-      @source_requirements = source_requirements
+    def initialize(base, gem_version_promoter)
+      @source_requirements = base.source_requirements
       @base = base
-      @resolver = Molinillo::Resolver.new(self, self)
-      @search_for = {}
-      @base_dg = Molinillo::DependencyGraph.new
-      @base.each do |ls|
-        dep = Dependency.new(ls.name, ls.version)
-        @base_dg.add_vertex(ls.name, DepProxy.get_proxy(dep, ls.platform), true)
-      end
-      additional_base_requirements.each {|d| @base_dg.add_vertex(d.name, d) }
-      @platforms = platforms.reject {|p| p != Gem::Platform::RUBY && (platforms - [p]).any? {|pl| generic(pl) == p } }
-      @resolving_only_for_ruby = platforms == [Gem::Platform::RUBY]
       @gem_version_promoter = gem_version_promoter
-      @use_gvp = Bundler.feature_flag.use_gem_version_promoter_for_major_updates? || !@gem_version_promoter.major?
     end
 
-    def start(requirements)
-      @gem_version_promoter.prerelease_specified = @prerelease_specified = {}
-      requirements.each {|dep| @prerelease_specified[dep.name] ||= dep.prerelease? }
-
-      verify_gemfile_dependencies_are_found!(requirements)
-      dg = @resolver.resolve(requirements, @base_dg)
-      dg.
-        map(&:payload).
-        reject {|sg| sg.name.end_with?("\0") }.
-        map(&:to_specs).
-        flatten
-    rescue Molinillo::VersionConflict => e
-      message = version_conflict_message(e)
-      raise VersionConflict.new(e.conflicts.keys.uniq, message)
-    rescue Molinillo::CircularDependencyError => e
-      names = e.dependencies.sort_by(&:name).map {|d| "gem '#{d.name}'" }
-      raise CyclicDependencyError, "Your bundle requires gems that depend" \
-        " on each other, creating an infinite loop. Please remove" \
-        " #{names.count > 1 ? "either " : ""}#{names.join(" or ")}" \
-        " and try again."
-    end
+    def start
+      @requirements = @base.requirements
+      @packages = @base.packages
 
-    include Molinillo::UI
-
-    # Conveys debug information to the user.
-    #
-    # @param [Integer] depth the current depth of the resolution process.
-    # @return [void]
-    def debug(depth = 0)
-      return unless debug?
-      debug_info = yield
-      debug_info = debug_info.inspect unless debug_info.is_a?(String)
-      puts debug_info.split("\n").map {|s| depth == 0 ? "BUNDLER: #{s}" : "BUNDLER(#{depth}): #{s}" }
-    end
+      root, logger = setup_solver
 
-    def debug?
-      return @debug_mode if defined?(@debug_mode)
-      @debug_mode =
-        ENV["BUNDLER_DEBUG_RESOLVER"] ||
-        ENV["BUNDLER_DEBUG_RESOLVER_TREE"] ||
-        ENV["DEBUG_RESOLVER"] ||
-        ENV["DEBUG_RESOLVER_TREE"] ||
-        false
-    end
+      Bundler.ui.info "Resolving dependencies...", true
 
-    def before_resolution
-      Bundler.ui.info "Resolving dependencies...", debug?
+      solve_versions(:root => root, :logger => logger)
     end
 
-    def after_resolution
-      Bundler.ui.info ""
-    end
+    def setup_solver
+      root = Resolver::Root.new(name_for_explicit_dependency_source)
+      root_version = Resolver::Candidate.new(0)
 
-    def indicate_progress
-      Bundler.ui.info ".", false unless debug?
-    end
+      @all_specs = Hash.new do |specs, name|
+        specs[name] = source_for(name).specs.search(name).reject do |s|
+          s.dependencies.any? {|d| d.name == name && !d.requirement.satisfied_by?(s.version) } # ignore versions that depend on themselves incorrectly
+        end.sort_by {|s| [s.version, s.platform.to_s] }
+      end
+
+      @sorted_versions = Hash.new do |candidates, package|
+        candidates[package] = if package.root?
+          [root_version]
+        else
+          all_versions_for(package).sort
+        end
+      end
 
-    include Molinillo::SpecificationProvider
+      root_dependencies = prepare_dependencies(@requirements, @packages)
 
-    def dependencies_for(specification)
-      specification.dependencies_for_activated_platforms
+      @cached_dependencies = Hash.new do |dependencies, package|
+        dependencies[package] = if package.root?
+          { root_version => root_dependencies }
+        else
+          Hash.new do |versions, version|
+            versions[version] = to_dependency_hash(version.dependencies.reject {|d| d.name == package.name }, @packages)
+          end
+        end
+      end
+
+      logger = Bundler::UI::Shell.new
+      logger.level = debug? ? "debug" : "warn"
+
+      [root, logger]
     end
 
-    def search_for(dependency_proxy)
-      platform = dependency_proxy.__platform
-      dependency = dependency_proxy.dep
-      name = dependency.name
-      @search_for[dependency_proxy] ||= begin
-        results = results_for(dependency, @base[name])
+    def solve_versions(root:, logger:)
+      solver = PubGrub::VersionSolver.new(:source => self, :root => root, :logger => logger)
+      result = solver.solve
+      result.map {|package, version| version.to_specs(package) }.flatten.uniq
+    rescue PubGrub::SolveFailure => e
+      incompatibility = e.incompatibility
+
+      names_to_unlock, names_to_allow_prereleases_for, extended_explanation = find_names_to_relax(incompatibility)
+
+      names_to_relax = names_to_unlock + names_to_allow_prereleases_for
+
+      if names_to_relax.any?
+        if names_to_unlock.any?
+          Bundler.ui.debug "Found conflicts with locked dependencies. Will retry with #{names_to_unlock.join(", ")} unlocked...", true
 
-        if vertex = @base_dg.vertex_named(name)
-          locked_requirement = vertex.payload.requirement
+          @base.unlock_names(names_to_unlock)
         end
 
-        if !@prerelease_specified[name] && (!@use_gvp || locked_requirement.nil?)
-          # Move prereleases to the beginning of the list, so they're considered
-          # last during resolution.
-          pre, results = results.partition {|spec| spec.version.prerelease? }
-          results = pre + results
+        if names_to_allow_prereleases_for.any?
+          Bundler.ui.debug "Found conflicts with dependencies with prereleases. Will retrying considering prereleases for #{names_to_allow_prereleases_for.join(", ")}...", true
+
+          @base.include_prereleases(names_to_allow_prereleases_for)
         end
 
-        spec_groups = if results.any?
-          nested = []
-          results.each do |spec|
-            version, specs = nested.last
-            if version == spec.version
-              specs << spec
-            else
-              nested << [spec.version, [spec]]
-            end
-          end
-          nested.reduce([]) do |groups, (version, specs)|
-            next groups if locked_requirement && !locked_requirement.satisfied_by?(version)
-            next groups unless specs.any? {|spec| spec.match_platform(platform) }
+        root, logger = setup_solver
+
+        Bundler.ui.debug "Retrying resolution...", true
+        retry
+      end
 
-            specs_by_platform = Hash.new do |current_specs, current_platform|
-              current_specs[current_platform] = select_best_platform_match(specs, current_platform)
-            end
+      explanation = e.message
+
+      if extended_explanation
+        explanation << "\n\n"
+        explanation << extended_explanation
+      end
+
+      raise SolveFailure.new(explanation)
+    end
 
-            spec_group_ruby = SpecGroup.create_for(specs_by_platform, [Gem::Platform::RUBY], Gem::Platform::RUBY)
-            groups << spec_group_ruby if spec_group_ruby
+    def find_names_to_relax(incompatibility)
+      names_to_unlock = []
+      names_to_allow_prereleases_for = []
+      extended_explanation = nil
 
-            next groups if @resolving_only_for_ruby
+      while incompatibility.conflict?
+        cause = incompatibility.cause
+        incompatibility = cause.incompatibility
 
-            spec_group = SpecGroup.create_for(specs_by_platform, @platforms, platform)
-            groups << spec_group
+        incompatibility.terms.each do |term|
+          package = term.package
+          name = package.name
 
-            groups
+          if base_requirements[name]
+            names_to_unlock << name
+          elsif package.ignores_prereleases?
+            names_to_allow_prereleases_for << name
           end
-        else
-          []
-        end
-        # GVP handles major itself, but it's still a bit risky to trust it with it
-        # until we get it settled with new behavior. For 2.x it can take over all cases.
-        if !@use_gvp
-          spec_groups
-        else
-          @gem_version_promoter.sort_versions(dependency, spec_groups)
+
+          no_versions_incompat = [cause.incompatibility, cause.satisfier].find {|incompat| incompat.cause.is_a?(PubGrub::Incompatibility::NoVersions) }
+          next unless no_versions_incompat
+
+          extended_explanation = no_versions_incompat.extended_explanation
         end
       end
-    end
 
-    def index_for(dependency)
-      source_for(dependency.name).specs
+      [names_to_unlock.uniq, names_to_allow_prereleases_for.uniq, extended_explanation]
     end
 
-    def source_for(name)
-      @source_requirements[name] || @source_requirements[:default]
-    end
+    def parse_dependency(package, dependency)
+      range = if repository_for(package).is_a?(Source::Gemspec)
+        PubGrub::VersionRange.any
+      else
+        requirement_to_range(dependency)
+      end
 
-    def results_for(dependency, base)
-      index_for(dependency).search(dependency, base)
+      PubGrub::VersionConstraint.new(package, :range => range)
     end
 
-    def name_for(dependency)
-      dependency.name
-    end
+    def versions_for(package, range=VersionRange.any)
+      versions = range.select_versions(@sorted_versions[package])
 
-    def name_for_explicit_dependency_source
-      Bundler.default_gemfile.basename.to_s
-    rescue StandardError
-      "Gemfile"
+      sort_versions(package, versions)
     end
 
-    def name_for_locking_dependency_source
-      Bundler.default_lockfile.basename.to_s
-    rescue StandardError
-      "Gemfile.lock"
-    end
+    def no_versions_incompatibility_for(package, unsatisfied_term)
+      cause = PubGrub::Incompatibility::NoVersions.new(unsatisfied_term)
+      name = package.name
+      constraint = unsatisfied_term.constraint
+      constraint_string = constraint.constraint_string
+      requirements = constraint_string.split(" OR ").map {|req| Gem::Requirement.new(req.split(",")) }
 
-    def requirement_satisfied_by?(requirement, activated, spec)
-      requirement.matches_spec?(spec) || spec.source.is_a?(Source::Gemspec)
-    end
+      if name == "bundler" && bundler_pinned_to_current_version?
+        custom_explanation = "the current Bundler version (#{Bundler::VERSION}) does not satisfy #{constraint}"
+        extended_explanation = bundler_not_found_message(requirements)
+      else
+        specs_matching_other_platforms = filter_matching_specs(@all_specs[name], requirements)
 
-    def dependencies_equal?(dependencies, other_dependencies)
-      dependencies.map(&:dep) == other_dependencies.map(&:dep)
-    end
+        platforms_explanation = specs_matching_other_platforms.any? ? " for any resolution platforms (#{package.platforms.join(", ")})" : ""
+        custom_explanation = "#{constraint} could not be found in #{repository_for(package)}#{platforms_explanation}"
 
-    def sort_dependencies(dependencies, activated, conflicts)
-      dependencies.sort_by do |dependency|
-        name = name_for(dependency)
-        vertex = activated.vertex_named(name)
-        [
-          @base_dg.vertex_named(name) ? 0 : 1,
-          vertex.payload ? 0 : 1,
-          vertex.root? ? 0 : 1,
-          amount_constrained(dependency),
-          conflicts[name] ? 0 : 1,
-          vertex.payload ? 0 : search_for(dependency).count,
-          self.class.platform_sort_key(dependency.__platform),
-        ]
+        label = "#{name} (#{constraint_string})"
+        extended_explanation = other_specs_matching_message(specs_matching_other_platforms, label) if specs_matching_other_platforms.any?
       end
+
+      Incompatibility.new([unsatisfied_term], :cause => cause, :custom_explanation => custom_explanation, :extended_explanation => extended_explanation)
     end
 
-    def self.platform_sort_key(platform)
-      # Prefer specific platform to not specific platform
-      return ["99-LAST", "", "", ""] if Gem::Platform::RUBY == platform
-      ["00", *platform.to_a.map {|part| part || "" }]
+    def debug?
+      ENV["BUNDLER_DEBUG_RESOLVER"] ||
+        ENV["BUNDLER_DEBUG_RESOLVER_TREE"] ||
+        ENV["DEBUG_RESOLVER"] ||
+        ENV["DEBUG_RESOLVER_TREE"] ||
+        false
     end
 
-    private
+    def incompatibilities_for(package, version)
+      package_deps = @cached_dependencies[package]
+      sorted_versions = @sorted_versions[package]
+      package_deps[version].map do |dep_package, dep_constraint|
+        low = high = sorted_versions.index(version)
 
-    # returns an integer \in (-\infty, 0]
-    # a number closer to 0 means the dependency is less constraining
-    #
-    # dependencies w/ 0 or 1 possibilities (ignoring version requirements)
-    # are given very negative values, so they _always_ sort first,
-    # before dependencies that are unconstrained
-    def amount_constrained(dependency)
-      @amount_constrained ||= {}
-      @amount_constrained[dependency.name] ||= begin
-        if (base = @base[dependency.name]) && !base.empty?
-          dependency.requirement.satisfied_by?(base.first.version) ? 0 : 1
-        else
-          all = index_for(dependency).search(dependency.name).size
+        # find version low such that all >= low share the same dep
+        while low > 0 && package_deps[sorted_versions[low - 1]][dep_package] == dep_constraint
+          low -= 1
+        end
+        low =
+          if low == 0
+            nil
+          else
+            sorted_versions[low]
+          end
 
-          if all <= 1
-            all - 1_000_000
+        # find version high such that all < high share the same dep
+        while high < sorted_versions.length && package_deps[sorted_versions[high]][dep_package] == dep_constraint
+          high += 1
+        end
+        high =
+          if high == sorted_versions.length
+            nil
           else
-            search = search_for(dependency)
-            search = @prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? }
-            search - all
+            sorted_versions[high]
           end
+
+        range = PubGrub::VersionRange.new(:min => low, :max => high, :include_min => true)
+
+        self_constraint = PubGrub::VersionConstraint.new(package, :range => range)
+
+        dep_term = PubGrub::Term.new(dep_constraint, false)
+        self_term = PubGrub::Term.new(self_constraint, true)
+
+        custom_explanation = if dep_package.meta? && package.root?
+          "current #{dep_package} version is #{dep_constraint.constraint_string}"
         end
+
+        PubGrub::Incompatibility.new([self_term, dep_term], :cause => :dependency, :custom_explanation => custom_explanation)
       end
     end
 
-    def verify_gemfile_dependencies_are_found!(requirements)
-      requirements.map! do |requirement|
-        name = requirement.name
-        next requirement if name == "bundler"
-        next requirement unless search_for(requirement).empty?
-        next unless requirement.current_platform?
-
-        if (base = @base[name]) && !base.empty?
-          version = base.first.version
-          message = "You have requested:\n" \
-            "  #{name} #{requirement.requirement}\n\n" \
-            "The bundle currently has #{name} locked at #{version}.\n" \
-            "Try running `bundle update #{name}`\n\n" \
-            "If you are updating multiple gems in your Gemfile at once,\n" \
-            "try passing them all to `bundle update`"
-        else
-          message = gem_not_found_message(name, requirement, source_for(name))
-        end
-        raise GemNotFound, message
-      end.compact!
+    def all_versions_for(package)
+      name = package.name
+      results = (@base[name] + filter_prereleases(@all_specs[name], package)).uniq {|spec| [spec.version.hash, spec.platform] }
+
+      if name == "bundler" && !bundler_pinned_to_current_version?
+        bundler_spec = Gem.loaded_specs["bundler"]
+        results << bundler_spec if bundler_spec
+      end
+
+      locked_requirement = base_requirements[name]
+      results = filter_matching_specs(results, locked_requirement) if locked_requirement
+
+      versions = results.group_by(&:version).reduce([]) do |groups, (version, specs)|
+        platform_specs = package.platforms.flat_map {|platform| select_best_platform_match(specs, platform) }
+        next groups if platform_specs.empty?
+
+        ruby_specs = select_best_platform_match(specs, Gem::Platform::RUBY)
+        groups << Resolver::Candidate.new(version, :specs => ruby_specs) if ruby_specs.any?
+
+        next groups if platform_specs == ruby_specs || package.force_ruby_platform?
+
+        groups << Resolver::Candidate.new(version, :specs => platform_specs)
+
+        groups
+      end
+
+      sort_versions(package, versions)
     end
 
-    def gem_not_found_message(name, requirement, source, extra_message = "")
-      specs = source.specs.search(name)
+    def source_for(name)
+      @source_requirements[name] || @source_requirements[:default]
+    end
+
+    def default_bundler_source
+      @source_requirements[:default_bundler]
+    end
+
+    def bundler_pinned_to_current_version?
+      !default_bundler_source.nil?
+    end
+
+    def name_for_explicit_dependency_source
+      Bundler.default_gemfile.basename.to_s
+    rescue StandardError
+      "Gemfile"
+    end
+
+    def raise_not_found!(package)
+      name = package.name
+      source = source_for(name)
+      specs = @all_specs[name]
       matching_part = name
-      requirement_label = SharedHelpers.pretty_dependency(requirement)
+      requirement_label = SharedHelpers.pretty_dependency(package.dependency)
       cache_message = begin
                           " or in gems cached in #{Bundler.settings.app_cache_path}" if Bundler.app_cache.exist?
                         rescue GemfileNotFound
                           nil
                         end
-      specs_matching_requirement = specs.select {| spec| requirement.matches_spec?(spec) }
+      specs_matching_requirement = filter_matching_specs(specs, package.dependency.requirement)
 
       if specs_matching_requirement.any?
         specs = specs_matching_requirement
         matching_part = requirement_label
-        requirement_label = "#{requirement_label} #{requirement.__platform}"
+        platforms = package.platforms
+        platform_label = platforms.size == 1 ? "platform '#{platforms.first}" : "platforms '#{platforms.join("', '")}"
+        requirement_label = "#{requirement_label}' with #{platform_label}"
       end
 
-      message = String.new("Could not find gem '#{requirement_label}'#{extra_message} in #{source}#{cache_message}.\n")
+      message = String.new("Could not find gem '#{requirement_label}' in #{source}#{cache_message}.\n")
 
       if specs.any?
-        message << "\nThe source contains the following gems matching '#{matching_part}':\n"
-        message << specs.map {|s| "  * #{s.full_name}" }.join("\n")
+        message << "\n#{other_specs_matching_message(specs, matching_part)}"
       end
 
-      message
+      raise GemNotFound, message
+    end
+
+    private
+
+    def filter_matching_specs(specs, requirements)
+      Array(requirements).flat_map do |requirement|
+        specs.select {| spec| requirement_satisfied_by?(requirement, spec) }
+      end
     end
 
-    def version_conflict_message(e)
-      # only show essential conflicts, if possible
-      conflicts = e.conflicts.dup
+    def filter_prereleases(specs, package)
+      return specs unless package.ignores_prereleases? && specs.size > 1
 
-      if conflicts["bundler"]
-        conflicts.replace("bundler" => conflicts["bundler"])
+      specs.reject {|s| s.version.prerelease? }
+    end
+
+    def requirement_satisfied_by?(requirement, spec)
+      requirement.satisfied_by?(spec.version) || spec.source.is_a?(Source::Gemspec)
+    end
+
+    def sort_versions(package, versions)
+      if versions.size > 1
+        @gem_version_promoter.sort_versions(package, versions).reverse
       else
-        conflicts.delete_if do |_name, conflict|
-          deps = conflict.requirement_trees.map(&:last).flatten(1)
-          !Bundler::VersionRanges.empty?(*Bundler::VersionRanges.for_many(deps.map(&:requirement)))
-        end
+        versions
       end
+    end
 
-      e = Molinillo::VersionConflict.new(conflicts, e.specification_provider) unless conflicts.empty?
+    def repository_for(package)
+      source_for(package.name)
+    end
 
-      e.message_with_trees(
-        :full_message_for_conflict => lambda do |name, conflict|
-          o = if name.end_with?("\0")
-            String.new("Bundler found conflicting requirements for the #{name} version:")
-          else
-            String.new("Bundler could not find compatible versions for gem \"#{name}\":")
-          end
-          o << %(\n)
-          if conflict.locked_requirement
-            o << %(  In snapshot (#{name_for_locking_dependency_source}):\n)
-            o << %(    #{SharedHelpers.pretty_dependency(conflict.locked_requirement)}\n)
-            o << %(\n)
-          end
-          o << %(  In #{name_for_explicit_dependency_source}:\n)
-          trees = conflict.requirement_trees
+    def base_requirements
+      @base.base_requirements
+    end
 
-          # called first, because we want to reduce the amount of work required to find maximal empty sets
-          trees = trees.uniq {|t| t.flatten.map {|dep| [dep.name, dep.requirement] } }
+    def prepare_dependencies(requirements, packages)
+      to_dependency_hash(requirements, packages).map do |dep_package, dep_constraint|
+        name = dep_package.name
 
-          # bail out if tree size is too big for Array#combination to make any sense
-          if trees.size <= 15
-            maximal = 1.upto(trees.size).map do |size|
-              trees.map(&:last).flatten(1).combination(size).to_a
-            end.flatten(1).select do |deps|
-              Bundler::VersionRanges.empty?(*Bundler::VersionRanges.for_many(deps.map(&:requirement)))
-            end.min_by(&:size)
+        next [dep_package, dep_constraint] if name == "bundler"
 
-            trees.reject! {|t| !maximal.include?(t.last) } if maximal
+        versions = versions_for(dep_package, dep_constraint.range)
+        if versions.empty? && dep_package.ignores_prereleases?
+          @sorted_versions.delete(dep_package)
+          dep_package.consider_prereleases!
+          versions = versions_for(dep_package, dep_constraint.range)
+        end
+        next [dep_package, dep_constraint] unless versions.empty?
 
-            trees.sort_by! {|t| t.reverse.map(&:name) }
-          end
+        next unless dep_package.current_platform?
 
-          metadata_requirements = {}
-
-          o << trees.map do |tree|
-            t = "".dup
-            depth = 2
-
-            base_tree = tree.first
-            base_tree_name = base_tree.name
-
-            if base_tree_name.end_with?("\0")
-              metadata_requirements[base_tree_name] = base_tree
-              t = nil
-            else
-              tree.each do |req|
-                t << "  " * depth << SharedHelpers.pretty_dependency(req)
-                unless tree.last == req
-                  if spec = conflict.activated_by_name[req.name]
-                    t << %( was resolved to #{spec.version}, which)
-                  end
-                  t << %( depends on)
-                end
-                t << %(\n)
-                depth += 1
-              end
-            end
-            t
-          end.compact.join("\n")
-
-          if name == "bundler"
-            o << %(\n  Current Bundler version:\n    bundler (#{Bundler::VERSION}))
-
-            conflict_dependency = conflict.requirement
-            conflict_requirement = conflict_dependency.requirement
-            other_bundler_required = !conflict_requirement.satisfied_by?(Gem::Version.new(Bundler::VERSION))
-
-            if other_bundler_required
-              o << "\n\n"
-
-              candidate_specs = source_for(:default_bundler).specs.search(conflict_dependency)
-              if candidate_specs.any?
-                target_version = candidate_specs.last.version
-                new_command = [File.basename($PROGRAM_NAME), "_#{target_version}_", *ARGV].join(" ")
-                o << "Your bundle requires a different version of Bundler than the one you're running.\n"
-                o << "Install the necessary version with `gem install bundler:#{target_version}` and rerun bundler using `#{new_command}`\n"
-              else
-                o << "Your bundle requires a different version of Bundler than the one you're running, and that version could not be found.\n"
-              end
-            end
-          elsif name.end_with?("\0")
-            o << %(\n  Current #{name} version:\n    #{SharedHelpers.pretty_dependency(metadata_requirements[name])}\n\n)
-          elsif conflict.locked_requirement
-            o << "\n"
-            o << %(Running `bundle update` will rebuild your snapshot from scratch, using only\n)
-            o << %(the gems in your Gemfile, which may resolve the conflict.\n)
-          elsif !conflict.existing
-            o << "\n"
-
-            relevant_source = conflict.requirement.source || source_for(name)
-
-            extra_message = if conflict.requirement_trees.first.size > 1
-              ", which is required by gem '#{SharedHelpers.pretty_dependency(conflict.requirement_trees.first[-2])}',"
-            else
-              ""
-            end
-
-            o << gem_not_found_message(name, conflict.requirement, relevant_source, extra_message)
-          end
+        raise_not_found!(dep_package)
+      end.compact.to_h
+    end
+
+    def other_specs_matching_message(specs, requirement)
+      message = String.new("The source contains the following gems matching '#{requirement}':\n")
+      message << specs.map {|s| "  * #{s.full_name}" }.join("\n")
+      message
+    end
 
-          o
+    def requirement_to_range(requirement)
+      ranges = requirement.requirements.map do |(op, version)|
+        ver = Resolver::Candidate.new(version).generic!
+        platform_ver = Resolver::Candidate.new(version).platform_specific!
+
+        case op
+        when "~>"
+          name = "~> #{ver}"
+          bump = Resolver::Candidate.new(version.bump.to_s + ".A")
+          PubGrub::VersionRange.new(:name => name, :min => ver, :max => bump, :include_min => true)
+        when ">"
+          PubGrub::VersionRange.new(:min => platform_ver)
+        when ">="
+          PubGrub::VersionRange.new(:min => ver, :include_min => true)
+        when "<"
+          PubGrub::VersionRange.new(:max => ver)
+        when "<="
+          PubGrub::VersionRange.new(:max => platform_ver, :include_max => true)
+        when "="
+          PubGrub::VersionRange.new(:min => ver, :max => platform_ver, :include_min => true, :include_max => true)
+        when "!="
+          PubGrub::VersionRange.new(:min => ver, :max => platform_ver, :include_min => true, :include_max => true).invert
+        else
+          raise "bad version specifier: #{op}"
         end
-      )
+      end
+
+      ranges.inject(&:intersect)
+    end
+
+    def to_dependency_hash(dependencies, packages)
+      dependencies.inject({}) do |deps, dep|
+        package = packages[dep.name]
+
+        current_req = deps[package]
+        new_req = parse_dependency(package, dep.requirement)
+
+        deps[package] = if current_req
+          current_req.intersect(new_req)
+        else
+          new_req
+        end
+
+        deps
+      end
+    end
+
+    def bundler_not_found_message(conflict_dependencies)
+      candidate_specs = filter_matching_specs(default_bundler_source.specs.search("bundler"), conflict_dependencies)
+
+      if candidate_specs.any?
+        target_version = candidate_specs.last.version
+        new_command = [File.basename($PROGRAM_NAME), "_#{target_version}_", *ARGV].join(" ")
+        "Your bundle requires a different version of Bundler than the one you're running.\n" \
+        "Install the necessary version with `gem install bundler:#{target_version}` and rerun bundler using `#{new_command}`\n"
+      else
+        "Your bundle requires a different version of Bundler than the one you're running, and that version could not be found.\n"
+      end
     end
   end
 end