Refactoring -- Decoupling gem source logic from finder

1 files changed, 13 insertions, 1 deletions

diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 0966a877f6..309e4ac00d 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -24,13 +24,25 @@ module Bundler
 
     attr_reader :errors
 
+    # 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, index = Gem.source_index)
+      Bundler.logger.info "Calculating dependencies..."
+
       resolver = new(index)
       result = catch(:success) do
         resolver.resolve(requirements, {})
         nil
       end
-      result && result.values
+      result && GemBundle.new(result.values)
     end
 
     def initialize(index)