berkshelf 0.3.1 → 0.3.2

data/lib/berkshelf/cookbook_source/site_location.rb

@@ -35,7 +35,7 @@ module Berkshelf
         #         0.100.0 => "http://cookbooks.opscode.com/api/v1/cookbooks/nginx/versions/0_100_0"
         #       }
         #
-        # @return [Array]
+        # @return [Array, nil]
         #   an array where the first element is a DepSelector::Version representing the best version
         #   for the given constraint and the second element is the URI to where the corrosponding
         #   version of the Cookbook can be downloaded from
@@ -48,6 +48,8 @@ module Berkshelf
               return [ version, uri ]
             end
           end
+
+          nil
         end
       end
 
@@ -193,7 +195,7 @@ module Berkshelf
             solution = self.class.solve_for_constraint(version_constraint, versions)
             
             unless solution
-              raise NoSolution, "Could not satisfy version constraint: #{version_constraint} for Cookbook '#{name}'"
+              raise NoSolution, "No cookbook version of '#{name}' found at '#{api_uri}' that would satisfy constraint (#{version_constraint})."
             end
 
             solution

data/lib/berkshelf/version.rb

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

data/spec/unit/berkshelf/cookbook_source/site_location_spec.rb

@@ -30,6 +30,12 @@ module Berkshelf
         it "should return the best match for the constraint and versions given" do
           subject.solve_for_constraint(constraint, versions)[0].to_s.should eql("0.101.2")
         end
+
+        context "given a solution can not be found for constraint" do
+          it "returns nil" do
+            subject.solve_for_constraint(DepSelector::VersionConstraint.new(">= 1.0"), versions).should be_nil
+          end
+        end
       end
     end
 

data/spec/unit/berkshelf/init_generator_spec.rb

@@ -8,7 +8,7 @@ module Berkshelf
 
     context "with default options" do
       before do
-        generator = subject.new([], :path => target_root)
+        generator = subject.new([target_root])
         capture(:stdout) { generator.invoke_all }
       end
 
@@ -22,21 +22,21 @@ module Berkshelf
 
     context "with a .chefignore" do
       before do
-        generator = subject.new([], :path => target_root, :chefignore => true)
+        generator = subject.new([target_root], chefignore: true)
         capture(:stdout) { generator.invoke_all }
       end
 
       specify do
         target_root.should have_structure {
           file "Berksfile"
-          file ".chefignore"
+          file "chefignore"
         }
       end
     end
 
     context "with a metadata entry in the Berksfile" do
       before do
-        generator = subject.new([], :path => target_root, :metadata_entry => true)
+        generator = subject.new([target_root], metadata_entry: true)
         capture(:stdout) { generator.invoke_all }
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -458,7 +458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 135561862523341822
+      hash: -2415493654956634358
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23