berkshelf 2.0.7 → 2.0.8

data/features/install_command.feature

@@ -264,7 +264,7 @@ Feature: install cookbooks from a Berksfile
     When I run `berks install`
     Then the output should contain:
       """
-      No Berksfile or Berksfile.lock found at:
+      No Berksfile or Berksfile.lock found at '
       """
     And the CLI should exit with the status code for error "BerksfileNotFound"
 

data/lib/berkshelf/berksfile.rb

@@ -6,11 +6,13 @@ module Berkshelf
       #
       # @return [Berksfile]
       def from_file(file)
-        new(file).dsl_eval_file(file)
-      rescue Errno::ENOENT => ex
-        raise BerksfileNotFound, "No Berksfile or Berksfile.lock found at: #{file}"
-      rescue => ex
-        raise BerksfileReadError.new(ex)
+        raise BerksfileNotFound.new(file) unless File.exist?(file)
+
+        begin
+          new(file).dsl_eval_file(file)
+        rescue => ex
+          raise BerksfileReadError.new(ex)
+        end
       end
 
       # Copy all cached_cookbooks to the given directory. Each cookbook will be contained in
@@ -401,6 +403,8 @@ module Berkshelf
     # @option options [String] :path
     #   a path to "vendor" the cached_cookbooks resolved by the resolver. Vendoring
     #   is a technique for packaging all cookbooks resolved by a Berksfile.
+    # @option options [Boolean] :update_lockfile (true)
+    #   a boolean method indicating whether we should update the lockfile
     #
     # @raise [Berkshelf::OutdatedCookbookSource]
     #   if the lockfile constraints do not satisfy the Berskfile constraints
@@ -419,7 +423,7 @@ module Berkshelf
 
       self.class.vendor(@cached_cookbooks, options[:path]) if options[:path]
 
-      lockfile.update(local_sources)
+      lockfile.update(local_sources) unless options[:update_lockfile] == false
 
       self.cached_cookbooks
     end
@@ -511,7 +515,7 @@ module Berkshelf
     #   if an attempt to upload a cookbook which has been frozen on the target server is made
     #   and the :halt_on_frozen option was true
     def upload(options = {})
-      options = options.reverse_merge(force: false, freeze: true, skip_dependencies: false, halt_on_frozen: false)
+      options = options.reverse_merge(force: false, freeze: true, skip_dependencies: false, halt_on_frozen: false, update_lockfile: false)
 
       cached_cookbooks = install(options)
       upload_opts      = options.slice(:force, :freeze)

data/lib/berkshelf/cookbook_source.rb

@@ -186,7 +186,7 @@ module Berkshelf
     def inspect
       '#<Berkshelf::CookbookSource: ' << [
         "#{name} (#{version_constraint})",
-        "locked_version: #{locked_version.inspect}",
+        "locked_version: #{locked_version ? locked_version.to_s : 'nil'}",
         "groups: #{groups}",
         "location: #{location || 'default'}>"
       ].join(', ')

data/lib/berkshelf/errors.rb

@@ -19,7 +19,20 @@ module Berkshelf
     end
   end
 
-  class BerksfileNotFound < BerkshelfError; status_code(100); end
+  class BerksfileNotFound < BerkshelfError
+    status_code(100)
+
+    # @param [#to_s] filepath
+    #   the path where a Berksfile was not found
+    def initialize(filepath)
+      @filepath = File.dirname(File.expand_path(filepath)) rescue filepath
+    end
+
+    def to_s
+      "No Berksfile or Berksfile.lock found at '#{@filepath}'!"
+    end
+  end
+
   class NoVersionForConstraints < BerkshelfError; status_code(101); end
   class DuplicateLocationDefined < BerkshelfError; status_code(102); end
   class CookbookNotFound < BerkshelfError; status_code(103); end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "2.0.7"
+  VERSION = "2.0.8"
 end

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -585,7 +585,7 @@ describe Berkshelf::Berksfile do
       Dir.stub(:glob).and_return(['/there-are/no-spaces/in-this/recipes/default.rb'])
       expect {
         subject.validate_files!(cookbook)
-      }.to_not raise_error(Berkshelf::InvalidCookbookFiles)
+      }.to_not raise_error
     end
 
     it 'does not raise an exception with spaces in the path' do

data/spec/unit/berkshelf/formatters/null_spec.rb

@@ -7,7 +7,7 @@ describe Berkshelf::Formatters::Null do
     it "does not raise an error for :#{meth}" do
       expect {
         subject.send(meth)
-      }.to_not raise_error(Berkshelf::AbstractFunction)
+      }.to_not raise_error
     end
 
     it "returns nil for :#{meth}" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport