berkshelf 2.0.3 → 2.0.4

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.0.4
+
+* Fix bug where community cookbooks compressed with bzip2 would not download and install
+* Fix bug regression in Git caching which was previously fixed in 1.4.4
+* Fix validation bug where a cookbook would be considered invalid if any spaces were present in the path to the directory containing the cookbook
+* Fix issues with uploading cookbooks on Windows
+
 # 2.0.3
 
 * Fix issue where groups defined in the Berksfile would not be evaluated

data/Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
+  gem 'test-kitchen', '>= 1.0.0.alpha7'
+
   require 'rbconfig'
 
   if RbConfig::CONFIG['target_os'] =~ /darwin/i

data/berkshelf.gemspec

@@ -32,20 +32,21 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activesupport',     '>= 3.2.0'
   s.add_dependency 'addressable',       '~> 2.3.4'
+  s.add_dependency 'buff-shell_out',    '~> 0.1'
   s.add_dependency 'celluloid',         '>= 0.14.0'
   s.add_dependency 'chozo',             '>= 0.6.1'
   s.add_dependency 'faraday',           '>= 0.8.5'
   s.add_dependency 'hashie',            '>= 2.0.2'
   s.add_dependency 'minitar',           '~> 0.5.4'
   s.add_dependency 'retryable',         '~> 1.3.3'
-  s.add_dependency 'ridley',            '~> 1.0.2'
-  s.add_dependency 'solve',             '>= 0.4.4'
-  s.add_dependency 'test-kitchen',      '>= 1.0.0.alpha7'
+  s.add_dependency 'ridley',            '~> 1.2.1'
+  s.add_dependency 'solve',             '>= 0.5.0'
   s.add_dependency 'thor',              '~> 0.18.0'
+  s.add_dependency 'rbzip2',            '~> 0.2.0'
 
   s.add_development_dependency 'aruba',         '~> 0.5'
   s.add_development_dependency 'cane',          '~> 2.5'
-  s.add_development_dependency 'chef-zero',     '~> 1.1'
+  s.add_development_dependency 'chef-zero',     '~> 1.5.0'
   s.add_development_dependency 'fuubar',        '~> 1.1'
   s.add_development_dependency 'rake',          '~> 0.9'
   s.add_development_dependency 'rspec',         '~> 2.13'

data/features/berksfile.feature

@@ -0,0 +1,56 @@
+Feature: Evaluating a Berksfile
+  As a user with a Berksfile
+  I want to evaluate things and see nice errors
+  So I can identify my syntax errors and faults
+
+  Scenario: Containing pure Ruby
+    Given I write to "Berksfile" with:
+      """
+      if ENV['BACON']
+        puts "If you don't got bacon..."
+      else
+        puts "No bacon :'("
+      end
+      """
+    And the environment variable BACON is "1"
+    When I successfully run `berks install`
+    Then the output should contain:
+      """
+      If you don't got bacon...
+      """
+    And the exit status should be 0
+
+  Scenario: Calling valid DSL methods:
+    Given I write to "Berksfile" with:
+      """
+      site :opscode
+      """
+    When I successfully run `berks install`
+    And the exit status should be 0
+
+  Scenario: Containing methods I shouldn't be able to call
+    Given I write to "Berksfile" with:
+      """
+      add_location(:foo)
+      """
+    When I run `berks install`
+    Then the output should contain:
+      """
+      An error occurred while reading the Berksfile:
+
+        undefined method `add_location' for
+      """
+    And the CLI should exit with the status code for error "BerksfileReadError"
+
+  Scenario: Containing Ruby syntax errors
+    Given I write to "Berksfile" with:
+      """
+      ptus "This is a ruby syntax error"
+      """
+    When I run `berks install`
+    Then the output should contain:
+      """
+      An error occurred while reading the Berksfile:
+
+        undefined method `ptus' for
+      """

data/features/install_command.feature

@@ -70,7 +70,7 @@ Feature: install cookbooks from a Berksfile
     When I successfully run `berks install`
     Then the output should contain:
       """
-      Using example_cookbook (0.5.0) at path:
+      Using example_cookbook (0.5.0) at '
       """
     And the exit status should be 0
 
@@ -80,7 +80,7 @@ Feature: install cookbooks from a Berksfile
       cookbook "berkshelf-cookbook-fixture", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git"
       """
     When I successfully run `berks install`
-    Then the cookbook store should have the git cookbooks:
+    Then the cookbook store should have the cookbooks installed by git:
       | berkshelf-cookbook-fixture | 1.0.0 | a97b9447cbd41a5fe58eee2026e48ccb503bd3bc |
     And the output should contain:
       """
@@ -88,13 +88,54 @@ Feature: install cookbooks from a Berksfile
       """
     And the exit status should be 0
 
+  Scenario: installing a Berksfile that contains a Git location that has already been downloaded
+    Given I write to "Berksfile" with:
+      """
+      cookbook "berkshelf-cookbook-fixture", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git"
+      """
+    And the cookbook store has the cookbooks installed by git:
+      | berkshelf-cookbook-fixture | 1.0.0 | a97b9447cbd41a5fe58eee2026e48ccb503bd3bc |
+    And I successfully run `berks install`
+    When I successfully run `berks install`
+    Then the exit status should be 0
+
+  Scenario: installing a Berksfile that contains a Git location with a rel
+    Given I write to "Berksfile" with:
+      """
+      cookbook "berkshelf-cookbook-fixture", github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'rel', rel: 'cookbooks/berkshelf-cookbook-fixture'
+      """
+    When I successfully run `berks install`
+    Then the cookbook store should have the cookbooks installed by git:
+      | berkshelf-cookbook-fixture | 1.0.0 | 93f5768b7d14df45e10d16c8bf6fe98ba3ff809a |
+    And the output should contain:
+      """
+      Installing berkshelf-cookbook-fixture (1.0.0)
+      """
+    And the exit status should be 0
+
+  Scenario: installing a Berksfile that contains a Git location with a rel that has already been downloaded
+    Given I write to "Berksfile" with:
+      """
+      site :opscode
+      cookbook 'berkshelf-cookbook-fixture', github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'rel', rel: 'cookbooks/berkshelf-cookbook-fixture'
+      """
+    And the cookbook store has the cookbooks installed by git:
+      | berkshelf-cookbook-fixture | 1.0.0 | 93f5768b7d14df45e10d16c8bf6fe98ba3ff809a |
+    And I successfully run `berks install`
+    When I run `berks install`
+    Then the output should contain:
+      """
+      Installing berkshelf-cookbook-fixture (1.0.0)
+      """
+    And the exit status should be 0
+
   Scenario: installing a Berksfile that contains a Git location with a tag
     Given I write to "Berksfile" with:
       """
       cookbook "berkshelf-cookbook-fixture", git: "git://github.com/RiotGames/berkshelf-cookbook-fixture.git", tag: "v0.2.0"
       """
     When I successfully run `berks install`
-    Then the cookbook store should have the git cookbooks:
+    Then the cookbook store should have the cookbooks installed by git:
       | berkshelf-cookbook-fixture | 0.2.0 | 70a527e17d91f01f031204562460ad1c17f972ee |
     And the output should contain:
       """
@@ -108,7 +149,7 @@ Feature: install cookbooks from a Berksfile
       cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v0.2.0"
       """
     When I successfully run `berks install`
-    Then the cookbook store should have the git cookbooks:
+    Then the cookbook store should have the cookbooks installed by git:
       | berkshelf-cookbook-fixture | 0.2.0 | 70a527e17d91f01f031204562460ad1c17f972ee |
     And the output should contain:
       """
@@ -122,7 +163,7 @@ Feature: install cookbooks from a Berksfile
       cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v0.2.0"
       """
     When I successfully run `berks install`
-    Then the cookbook store should have the git cookbooks:
+    Then the cookbook store should have the cookbooks installed by git:
       | berkshelf-cookbook-fixture | 0.2.0 | 70a527e17d91f01f031204562460ad1c17f972ee |
     And the output should contain:
       """
@@ -136,7 +177,7 @@ Feature: install cookbooks from a Berksfile
       cookbook "berkshelf-cookbook-fixture", github: "RiotGames/berkshelf-cookbook-fixture", tag: "v1.0.0", protocol: "<protocol>"
       """
     When I successfully run `berks install`
-    Then the cookbook store should have the git cookbooks:
+    Then the cookbook store should have the cookbooks installed by git:
       | berkshelf-cookbook-fixture | 1.0.0 | b4f968c9001ad8de30f564a2107fab9cfa91f771 |
     And the output should contain:
       """
@@ -184,9 +225,24 @@ Feature: install cookbooks from a Berksfile
       """
     When I cd to "sparkle_motion"
     And I successfully run `berks install`
-    Then the output should contain:
+    Then the output should contain exactly:
+      """
+      Using sparkle_motion (0.0.0) from metadata
+
+      """
+    And the exit status should be 0
+
+  Scenario: running install when current project is a cookbook and the 'metadata' is specified with a path
+    Given a cookbook named "fake"
+    And I write to "Berksfile" with:
+      """
+      metadata path: './fake'
       """
-      Using sparkle_motion (0.0.0) at path:
+    When I successfully run `berks install`
+    Then the output should contain exactly:
+      """
+      Using fake (0.0.0) from metadata at './fake'
+
       """
     And the exit status should be 0
 
@@ -237,6 +293,39 @@ Feature: install cookbooks from a Berksfile
       """
     And the CLI should exit with the status code for error "DuplicateSourceDefined"
 
+  Scenario: When a version constraint in the metadata exists, but does not satisfy
+    Given a cookbook named "fake"
+    And I write to "Berksfile" with:
+      """
+      site :opscode
+      cookbook 'fake', path: './fake'
+      """
+    And the cookbook "fake" has the file "metadata.rb" with:
+      """
+      name 'fake'
+      version '1.0.0'
+
+      depends 'berkshelf-cookbook-fixture', '~> 0.2.0'
+      """
+    And the cookbook store has the cookbooks:
+      | berkshelf-cookbook-fixture | 0.2.0 |
+    And I successfully run `berks install`
+    And the cookbook "fake" has the file "metadata.rb" with:
+      """
+      name 'fake'
+      version '1.0.0'
+
+      depends 'berkshelf-cookbook-fixture', '~> 1.0.0'
+      """
+    When I successfully run `berks install`
+    Then the output should contain:
+      """
+      Installing berkshelf-cookbook-fixture (1.0.0)
+      """
+    And the cookbook store should have the cookbooks:
+      | berkshelf-cookbook-fixture | 1.0.0 |
+    And the exit status should be 0
+
   Scenario: installing when a git source defines a branch that does not satisfy the version constraint
     Given I write to "Berksfile" with:
       """
@@ -334,12 +423,9 @@ Feature: install cookbooks from a Berksfile
     When I run `berks install`
     Then the output should contain:
       """
-      An error occurred during Git execution:
-
-        fatal: remote error:
-        Repository not found.
+      Failed to download 'doesntexist' from git:
       """
-      And the CLI should exit with the status code for error "GitError"
+      And the CLI should exit with the status code for error "CookbookNotFound"
 
   Scenario: invalid site symbol
     Given I write to "Berksfile" with:

data/features/json_formatter.feature

@@ -68,7 +68,7 @@ Feature: --format json
           {
             "name": "example_cookbook",
             "version": "0.5.0",
-            "location": "path: '<%= File.expand_path(File.join(fixtures_path, 'cookbooks', 'example_cookbook-0.5.0')) %>'",
+            "location": "../../spec/fixtures/cookbooks/example_cookbook-0.5.0",
             "uploaded_to": "http://localhost:4000/"
           }
         ],

data/features/lockfile.feature

@@ -29,6 +29,7 @@ Feature: Creating and reading the Berkshelf lockfile
       | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
+      site :opscode
       cookbook 'fake', '1.0.0'
       """
     And I write to "Berksfile.lock" with:
@@ -40,11 +41,11 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha":"80396ed07db133e0192593adebb360c27eed88c2",
-        "sources":{
-          "fake":{
-            "locked_version":"1.0.0",
-            "constraint":"= 1.0.0"
+        "sha": "374a3d22920abae4a6d620a14a32b90d8babda8f",
+        "sources": {
+          "fake": {
+            "constraint": "= 1.0.0",
+            "locked_version": "1.0.0"
           }
         }
       }
@@ -65,10 +66,9 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha":"4b614de85168d72fda4b255fc31796b4c474c3fc",
+        "sha":"ebf27d476739b5aba7e7e8a61de23b3330e20a7d",
         "sources":{
           "fake":{
-            "locked_version":"0.0.0",
             "constraint":"= 0.0.0",
             "path":"./fake"
           }
@@ -183,7 +183,7 @@ Feature: Creating and reading the Berkshelf lockfile
     And I write to "Berksfile.lock" with:
       """
       {
-        "sha":"7d07c22eca03bf6da5aaf38ae81cb9a8a439c692",
+        "sha":"c6438d7590f4d695d8abae83ff22586ba6d3a52e",
         "sources":{
           "berkshelf-cookbook-fixture":{
             "constraint":"= 1.0.0",
@@ -331,41 +331,68 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha": "42a13f91f1ba19ce8c6776fe267e74510dee27ce",
+        "sha": "a148a5a75397588393801a2fd55df1325080868c",
         "sources":{
           "fake":{
-            "path":"./fake",
-            "locked_version":"0.0.0"
+            "path":"./fake"
           }
         }
       }
       """
 
-  Scenario: Lockfile when `metadata` is specified
-    Given I write to "metadata.rb" with:
+  Scenario: Installing a Berksfile with a metadata location
+    Given a cookbook named "fake"
+    And the cookbook "fake" has the file "Berksfile" with:
       """
-      name 'fake'
-      version '1.0.0'
+      site :opscode
+      metadata
       """
-    And I write to "Berksfile" with:
+    When I cd to "fake"
+    And I successfully run `berks install`
+    Then the file "Berksfile.lock" should contain JSON:
+      """
+      {
+        "sha": "a7371143bae509b849bf94e5d65987581bf93133",
+        "sources": {
+          "fake": {
+            "path": "."
+          }
+        }
+      }
+      """
+
+  Scenario: Installing a Berksfile with a metadata location
+    Given a cookbook named "fake"
+    And the cookbook "fake" has the file "Berksfile" with:
       """
       site :opscode
       metadata
       """
-    When I successfully run `berks install`
+    And the cookbook "fake" has the file "Berksfile.lock" with:
+      """
+      {
+        "sha": "a7371143bae509b849bf94e5d65987581bf93133",
+        "sources": {
+          "fake": {
+            "path": "."
+          }
+        }
+      }
+      """
+    When I cd to "fake"
+    And I successfully run `berks install`
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sha": "9e7f8da566fec49ac41c0d862cfdf728eee10568",
-        "sources":{
-          "fake":{
-            "path":".",
-            "locked_version":"1.0.0",
-            "constraint":"= 1.0.0"
+        "sha": "a7371143bae509b849bf94e5d65987581bf93133",
+        "sources": {
+          "fake": {
+            "path": "."
           }
         }
       }
       """
+    And the exit status should be 0
 
   Scenario: Updating a Berksfile.lock with a different site location
   Given pending we have a reliable non-opscode site to test

data/features/step_definitions/filesystem_steps.rb

@@ -56,6 +56,19 @@ Given /^the cookbook store has the cookbooks:$/ do |cookbooks|
   end
 end
 
+Given /^the cookbook store has the cookbooks installed by git:$/ do |cookbooks|
+  cookbooks.raw.each do |name, version, sha|
+    folder   = "#{name}-#{sha}"
+    metadata = File.join(folder, 'metadata.rb')
+
+    create_dir(folder)
+    write_file(metadata, [
+      "name '#{name}'",
+      "version '#{version}'"
+    ].join("\n"))
+  end
+end
+
 Given /^the cookbook store contains a cookbook "(.*?)" "(.*?)" with dependencies:$/ do |name, version, dependencies|
   generate_cookbook(cookbook_store, name, version, dependencies: dependencies.raw)
 end
@@ -72,7 +85,7 @@ Then /^the cookbook store should have the cookbooks:$/ do |cookbooks|
   end
 end
 
-Then /^the cookbook store should have the git cookbooks:$/ do |cookbooks|
+Then /^the cookbook store should have the cookbooks installed by git:$/ do |cookbooks|
   cookbooks.raw.each do |name, version, sha1|
     expect(cookbook_store).to have_structure {
       directory "#{name}-#{sha1}" do