Merge pull request #59 from RiotGames/berksfile_resolve

Berksfile resolve

lib/berkshelf/berksfile.rb

@@ -151,14 +151,25 @@ def install(options = {})
     #   Server so that it cannot be overwritten
     def upload(chef_server_url, options = {})
       uploader = Uploader.new(chef_server_url, options)
-      resolver = Resolver.new(Berkshelf.downloader, sources(exclude: options[:without]))  
+      solution = resolve(options)
 
-      resolver.resolve.each do |cb|
+      solution.each do |cb|
         Berkshelf.ui.info "Uploading #{cb.cookbook_name} (#{cb.version}) to: '#{chef_server_url}'"
         uploader.upload!(cb, options)
       end
     end
 
+    # Finds a solution for the Berksfile and returns an array of CachedCookbooks.
+    #
+    # @option options [Symbol, Array] :without 
+    #   Group(s) to exclude which will cause any sources marked as a member of the 
+    #   group to not be resolved
+    #
+    # @return [Array<Berkshelf::CachedCookbooks]
+    def resolve(options = {})
+      Resolver.new(Berkshelf.downloader, sources(exclude: options[:without])).resolve
+    end
+
     # Write a collection of hard links to the given path representing the given
     # CachedCookbooks. Useful for getting Cookbooks in a single location for 
     # consumption by Vagrant, or another tool that expect this structure.

spec/unit/berkshelf/berksfile_spec.rb

@@ -121,6 +121,17 @@ module Berkshelf
       end
     end
 
+    describe "#resolve" do
+      let(:resolver) { double('resolver') }
+      before(:each) { Berkshelf::Resolver.stub(:new) { resolver } }
+
+      it "resolves the Berksfile" do
+        resolver.should_receive(:resolve).and_return([double('cached_cookbook_one'), double('cached_cookbook_two')])
+        solution = subject.resolve
+        solution.should have(2).items
+      end
+    end
+
     describe "#install" do
       let(:resolver) { double('resolver') }
       before(:each) { Berkshelf::Resolver.stub(:new) { resolver } }