From 8be3be3247e067ee50769c3b0e281d09225650fa Mon Sep 17 00:00:00 2001
From: "Samuel E. Giddins" <segiddins@segiddins.me>
Date: Sun, 26 Jul 2015 19:06:56 -0700
Subject: [Resolver] Update for Molinillo API changes

---
 lib/bundler/resolver.rb        | 10 ++++++----
 spec/install/bundler_spec.rb   |  6 +++---
 spec/install/gems/flex_spec.rb |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 67e18c8616..7b0946ff9b 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -17,10 +17,12 @@ module Bundler
             depth = 2
             tree.each do |req|
               t << "  " * depth << req.to_s
-              if spec = conflict.activated_by_name[req.name]
-                t << %(, resolved to #{spec.version},)
+              unless tree.last == req
+                if spec = conflict.activated_by_name[req.name]
+                  t << %(, resolved to #{spec.version},)
+                end
+                t << %( depends on)
               end
-              t << %( depends on) unless tree.last == req
               t << %(\n)
               depth += 1
             end
@@ -177,7 +179,7 @@ module Bundler
       @resolver = Molinillo::Resolver.new(self, self)
       @search_for = {}
       @base_dg = Molinillo::DependencyGraph.new
-      @base.each {|ls| @base_dg.add_root_vertex ls.name, Dependency.new(ls.name, ls.version) }
+      @base.each {|ls| @base_dg.add_vertex(ls.name, Dependency.new(ls.name, ls.version), true) }
     end
 
     def start(requirements)
diff --git a/spec/install/bundler_spec.rb b/spec/install/bundler_spec.rb
index 883b0fd694..bec405eced 100644
--- a/spec/install/bundler_spec.rb
+++ b/spec/install/bundler_spec.rb
@@ -98,10 +98,10 @@ describe "bundle install" do
         Resolving dependencies...
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
-            activemerchant depends on
+            activemerchant, resolved to 1.0, depends on
               activesupport (>= 2.0.0)
 
-            rails_fail depends on
+            rails_fail, resolved to 1.0, depends on
               activesupport (= 1.2.3)
       E
       expect(out).to eq(nice_error)
@@ -119,7 +119,7 @@ describe "bundle install" do
         Resolving dependencies...
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
-            rails_fail depends on
+            rails_fail, resolved to 1.0, depends on
               activesupport (= 1.2.3)
 
             activesupport (= 2.3.5)
diff --git a/spec/install/gems/flex_spec.rb b/spec/install/gems/flex_spec.rb
index ee304dd4aa..d2f9427513 100644
--- a/spec/install/gems/flex_spec.rb
+++ b/spec/install/gems/flex_spec.rb
@@ -200,11 +200,11 @@ describe "bundle flex_install" do
             rack (= 0.9.1)
 
           In Gemfile:
-            rack-obama (= 2.0) depends on
+            rack-obama (= 2.0), resolved to 2.0, depends on
               rack (= 1.2)
 
-            rack_middleware depends on
-              rack (= 0.9.1)  
+            rack_middleware, resolved to 1.0, depends on
+              rack (= 0.9.1)
 
         Running `bundle update` will rebuild your snapshot from scratch, using only
         the gems in your Gemfile, which may resolve the conflict.
-- 
cgit v1.2.1