berkshelf 0.3.0 → 0.3.1

data/lib/berkshelf/berksfile.rb

@@ -151,14 +151,25 @@ module Berkshelf
     #   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.

data/lib/berkshelf/init_generator.rb

@@ -29,7 +29,7 @@ module Berkshelf
       template "Berksfile.erb", File.join(target_path, "Berksfile")
 
       if options[:chefignore]
-        copy_file "chefignore", File.join(target_path, ".chefignore")
+        copy_file "chefignore", File.join(target_path, "chefignore")
       end
     end
   end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -121,6 +121,17 @@ EOF
       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 } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dep_selector
@@ -458,7 +458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2507702980010171500
+      hash: 135561862523341822
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23