berkshelf 2.0.6 → 2.0.7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.7
+
+* Fix crash when parsing a lockfile that contains path locations which no longer exist
+
 # 2.0.6
 
 * Fix installation failures due to latest release of ActiveSupport

data/LICENSE

@@ -1,6 +1,6 @@
 Copyright 2012-2013 Riot Games
 
-    Jamie Winsor (<reset@riotgames.com>)
+    Jamie Winsor (<jamie@vialstudios.com>)
     Josiah Kiehl (<jkiehl@riotgames.com>)
     Michael Ivey (<michael.ivey@riotgames.com>)
     Justin Campbell (<justin.campbell@riotgames.com>)

data/README.md

@@ -75,7 +75,7 @@ If you need to disable SSL, you can in `~/.berkshelf/config.json` like so:
 
 Authors
 -------
-- Jamie Winsor (<reset@riotgames.com>)
+- Jamie Winsor (<jamie@vialstudios.com>)
 - Josiah Kiehl (<jkiehl@riotgames.com>)
 - Michael Ivey (<michael.ivey@riotgames.com>)
 - Justin Campbell (<justin.campbell@riotgames.com>)

data/berkshelf.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
     'Seth Vargo'
   ]
   s.email                 = [
-    'reset@riotgames.com',
+    'jamie@vialstudios.com',
     'jkiehl@riotgames.com',
     'michael.ivey@riotgames.com',
     'justin.campbell@riotgames.com',

data/features/install_command.feature

@@ -74,6 +74,18 @@ Feature: install cookbooks from a Berksfile
       """
     And the exit status should be 0
 
+  Scenario: installing a Berksfile from a remote directory that contains a path location
+    Given I write to "tmp_berks/Berksfile" with:
+      """
+      cookbook 'example_cookbook', path: '../../../spec/fixtures/cookbooks/example_cookbook-0.5.0'
+      """
+    When I successfully run `berks install -b ./tmp_berks/Berksfile`
+    Then the output should contain:
+      """
+      Using example_cookbook (0.5.0) at '
+      """
+    And the exit status should be 0
+
   Scenario: installing a Berksfile that contains a Git location
     Given I write to "Berksfile" with:
       """

data/features/lockfile.feature

@@ -70,6 +70,36 @@ Feature: Creating and reading the Berkshelf lockfile
       }
       """
 
+  Scenario: Reading the Berksfile.lock when it contains an invalid path location
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+    And I write to "Berksfile" with:
+      """
+      cookbook 'fake'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      {
+        "sources":{
+          "non-existent":{
+            "path":"/this/path/does/not/exist"
+          }
+        }
+      }
+      """
+    When I successfully run `berks install`
+    Then the file "Berksfile.lock" should contain JSON:
+      """
+      {
+        "sources":{
+          "fake":{
+            "locked_version":"1.0.0"
+          }
+        }
+      }
+      """
+    And the exit status should be 0
+
   Scenario: Installing a cookbook with dependencies
     Given the cookbook store has the cookbooks:
       | dep | 1.0.0 |

data/lib/berkshelf/berksfile.rb

@@ -161,6 +161,7 @@ module Berkshelf
       options = args.last.is_a?(Hash) ? args.pop : Hash.new
       name, constraint = args
 
+      options[:path] &&= File.expand_path(options[:path], File.dirname(filepath))
       options[:group] = Array(options[:group])
 
       if @@active_group
@@ -258,7 +259,7 @@ module Berkshelf
       end
 
       if options[:path]
-        metadata_file = File.expand_path(File.join(options[:path], 'metadata.rb'))
+        metadata_file = File.join(options[:path], 'metadata.rb')
       end
 
       options[:constraint] = constraint

data/lib/berkshelf/lockfile.rb

@@ -33,7 +33,17 @@ module Berkshelf
       hash = parse(contents)
 
       hash[:sources].each do |name, options|
-        add(CookbookSource.new(berksfile, name.to_s, options))
+        # Dynamically calculate paths relative to the Berksfile if a path is given
+        options[:path] &&= File.expand_path(options[:path], File.dirname(filepath))
+
+        begin
+          add(CookbookSource.new(berksfile, name.to_s, options))
+        rescue Berkshelf::CookbookNotFound
+          # It's possible that a source is locked that contains a path location, and
+          # that path location was renamed or no longer exists. When loading the
+          # lockfile, Berkshelf will throw an error if it can't find a cookbook that
+          # previously existed at a path location.
+        end
       end
     end
 

data/lib/berkshelf/version.rb

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

data/spec/fixtures/cookbooks/nginx-0.100.5/templates/default/plugins/nginx.rb.erb

@@ -1,5 +1,5 @@
 #
-# Author:: Jamie Winsor (<reset@riotgames.com>)
+# Author:: Jamie Winsor (<jamie@vialstudios.com>)
 #
 # Copyright 2012, Riot Games
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -513,7 +513,7 @@ dependencies:
         version: '0'
 description: Manages a Cookbook's, or an Application's, Cookbook dependencies
 email:
-- reset@riotgames.com
+- jamie@vialstudios.com
 - jkiehl@riotgames.com
 - michael.ivey@riotgames.com
 - justin.campbell@riotgames.com