berkshelf 3.0.0.beta6 → 3.0.0.beta7

data/features/commands/show.feature

@@ -6,8 +6,14 @@ Feature: berks show
       """
       cookbook 'fake', '1.0.0'
       """
-    And the Lockfile has:
-      | fake | 1.0.0 |
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake (= 1.0.0)
+
+      GRAPH
+        fake (1.0.0)
+      """
     When I successfully run `berks show fake`
     Then the output should contain:
       """
@@ -19,12 +25,43 @@ Feature: berks show
            License: none
       """
 
+  Scenario: When the parameter is a transitive dependency
+    Given the cookbook store has the cookbooks:
+      | dep | 1.0.0 |
+    And the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
+      | dep | ~> 1.0.0 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', '1.0.0'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake (= 1.0.0)
+
+      GRAPH
+        dep (1.0.0)
+        fake (1.0.0)
+          dep (~> 1.0.0)
+      """
+    And I successfully run `berks install`
+    When I successfully run `berks show dep`
+    Then the output should contain:
+      """
+              Name: dep
+           Version: 1.0.0
+       Description: A fabulous new cookbook
+            Author: YOUR_COMPANY_NAME
+             Email: YOUR_EMAIL
+           License: none
+      """
+
   Scenario: When the cookbook is not in the Berksfile
     Given I have a Berksfile pointing at the local Berkshelf API
     When I run `berks show fake`
     Then the output should contain:
       """
-      Could not find cookbook(s) 'fake' in any of the configured dependencies. Is it in your Berksfile?
+      Could not find cookbook 'fake'. Make sure it is in your Berksfile, then run `berks install` to download and install the missing dependencies.
       """
     And the exit status should be "DependencyNotFound"
 
@@ -36,9 +73,9 @@ Feature: berks show
     When I run `berks show fake`
     Then the output should contain:
       """
-      Could not find cookbook 'fake (= 1.0.0)'. Try running `berks install` to download and install the missing dependencies.
+      Could not find cookbook 'fake'. Make sure it is in your Berksfile, then run `berks install` to download and install the missing dependencies.
       """
-    And the exit status should be "CookbookNotFound"
+    And the exit status should be "DependencyNotFound"
 
   Scenario: When the cookbook is not installed
     Given the cookbook store is empty
@@ -46,11 +83,17 @@ Feature: berks show
       """
       cookbook 'fake', '1.0.0'
       """
-    And the Lockfile has:
-      | fake | 1.0.0 |
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake (= 1.0.0)
+
+      GRAPH
+        fake (1.0.0)
+      """
     When I run `berks show fake`
     Then the output should contain:
       """
-      Could not find cookbook 'fake (1.0.0)'. Try running `berks install` to download and install the missing dependencies.
+      Could not find cookbook 'fake (1.0.0)'. Run `berks install` to download and install the missing cookbook.
       """
     And the exit status should be "CookbookNotFound"

data/features/commands/update.feature

@@ -11,36 +11,64 @@ Feature: berks update
   Scenario: Without a cookbook specified
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      cookbook 'fake', '~> 0.1'
       cookbook 'ekaf', '~> 1.0.0'
+      cookbook 'fake', '~> 0.1'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        ekaf (~> 1.0.0)
+        fake (~> 0.1)
+
+      GRAPH
+        ekaf (1.0.0)
+        fake (0.1.0)
       """
-    And the Lockfile has:
-      | fake | 0.1.0 |
-      | ekaf | 1.0.0 |
     When I successfully run `berks update`
-    Then the Lockfile should have:
-      | fake | 0.2.0 |
-      | ekaf | 1.0.1 |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        ekaf (~> 1.0.0)
+        fake (~> 0.1)
+
+      GRAPH
+        ekaf (1.0.1)
+        fake (0.2.0)
+      """
 
   Scenario: With a single cookbook specified
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      cookbook 'fake', '~> 0.1'
       cookbook 'ekaf', '~> 1.0.0'
+      cookbook 'fake', '~> 0.1'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        ekaf (~> 1.0.0)
+        fake (~> 0.1)
+
+      GRAPH
+        ekaf (1.0.0)
+        fake (0.1.0)
       """
-    And the Lockfile has:
-      | fake | 0.1.0 |
-      | ekaf | 1.0.0 |
     When I successfully run `berks update fake`
-    Then the Lockfile should have:
-      | fake | 0.2.0 |
-      | ekaf | 1.0.0 |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        ekaf (~> 1.0.0)
+        fake (~> 0.1)
+
+      GRAPH
+        ekaf (1.0.0)
+        fake (0.2.0)
+      """
 
   Scenario: With a cookbook that does not exist
     Given I have a Berksfile pointing at the local Berkshelf API
     When I run `berks update not_real`
     Then the output should contain:
       """
-      Could not find cookbook(s) 'not_real' in any of the configured dependencies. Is it in your Berksfile?
+      Could not find cookbook 'not_real'. Make sure it is in your Berksfile, then run `berks install` to download and install the missing dependencies.
       """
     And the exit status should be "DependencyNotFound"

data/features/commands/upload.feature

@@ -49,7 +49,7 @@ Feature: berks upload
     When I run `berks upload reset`
     Then the output should contain:
       """
-      Could not find cookbook(s) 'reset' in any of the configured dependencies. Is it in your Berksfile?
+      Could not find cookbook 'reset'. Make sure it is in your Berksfile, then run `berks install` to download and install the missing dependencies.
       """
     And the exit status should be "DependencyNotFound"
 
@@ -169,6 +169,7 @@ Feature: berks upload
     Given a cookbook named "fake"
     And the cookbook "fake" has the file "Berksfile" with:
       """
+      source 'https://api.berkshelf.com'
       metadata
       """
     And the Chef Server has frozen cookbooks:
@@ -182,6 +183,7 @@ Feature: berks upload
 
         * fake (0.0.0)
       """
+
   Scenario: When the syntax check is skipped
     Given a cookbook named "fake"
     And the cookbook "fake" has the file "recipes/default.rb" with:
@@ -200,6 +202,7 @@ Feature: berks upload
       """
     And the cookbook "fake" has the file "Berksfile" with:
       """
+      source 'https://api.berkshelf.com'
       metadata
       """
     And I cd to "fake"

data/features/commands/vendor.feature

@@ -30,6 +30,24 @@ Feature: Vendoring cookbooks to a directory
     When I successfully run `berks vendor cukebooks`
     And the directory "cukebooks/fake" should contain version "0.0.0" of the "fake" cookbook
 
+  Scenario: vendoring a cookbook with transitive dependencies
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    And I write to "metadata.rb" with:
+      """
+      name 'bacon'
+      version '1.0.0'
+
+      depends 'fake'
+      depends 'ekaf'
+      """
+    When I successfully run `berks vendor vendor`
+    Then the directory "vendor/bacon" should contain version "1.0.0" of the "bacon" cookbook
+    And the directory "vendor/fake" should contain version "1.0.0" of the "fake" cookbook
+    And the directory "vendor/ekaf" should contain version "2.0.0" of the "ekaf" cookbook
+
   Scenario: vendoring without an explicit path to vendor into
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
@@ -46,3 +64,12 @@ Feature: Vendoring cookbooks to a directory
     And a directory named "cukebooks"
     When I run `berks vendor cukebooks`
     And the exit status should be "VendorError"
+
+  Scenario: vendoring into a nested directory
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake'
+      """
+    When I successfully run `berks vendor path/to/cukebooks`
+    Then the directory "path/to/cukebooks/fake" should contain version "1.0.0" of the "fake" cookbook
+

data/features/json_formatter.feature

@@ -28,14 +28,14 @@ Feature: --format json
 
         ],
         "messages": [
-          "building universe..."
+          "Fetching cookbook index from http://0.0.0.0:26210..."
         ]
       }
       """
 
   Scenario: JSON output installing a cookbook we already have
     Given the cookbook store has the cookbooks:
-      | berkshelf-cookbook-fixture   | 1.0.0 |
+      | berkshelf-cookbook-fixture | 1.0.0 |
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
       cookbook 'berkshelf-cookbook-fixture', '1.0.0'
@@ -54,7 +54,7 @@ Feature: --format json
 
         ],
         "messages": [
-          "building universe..."
+          "Fetching cookbook index from http://0.0.0.0:26210..."
         ]
       }
       """
@@ -66,8 +66,14 @@ Feature: --format json
       """
       cookbook 'fake', '1.0.0'
       """
-    And the Lockfile has:
-      | fake | 1.0.0 |
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake (= 1.0.0)
+
+      GRAPH
+        fake (1.0.0)
+      """
     When I successfully run `berks show fake --format json`
     Then the output should contain JSON:
       """
@@ -111,7 +117,7 @@ Feature: --format json
 
         ],
         "messages": [
-          "building universe..."
+          "Fetching cookbook index from http://0.0.0.0:26210..."
         ]
       }
       """
@@ -128,8 +134,14 @@ Feature: --format json
       """
       cookbook 'seth', '~> 0.1'
       """
-    And the Lockfile has:
-      | seth | 0.1.0 |
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        seth (~> 0.1)
+
+      GRAPH
+        seth (0.1.0)
+      """
     And I successfully run `berks outdated --format json`
     Then the output should contain JSON:
       """

data/features/lockfile.feature

@@ -17,37 +17,14 @@ Feature: Creating and reading the Berkshelf lockfile
       cookbook 'fake', '1.0.0'
       """
     When I successfully run `berks install`
-    Then the Lockfile should have:
-      | fake | 1.0.0 |
-
-  Scenario: Writing the Berksfile.lock when a 1.0 lockfile is present
-    Given I have a Berksfile pointing at the local Berkshelf API with:
-      """
-      cookbook 'fake', '1.0.0'
-      """
-    And I write to "Berksfile.lock" with:
+    Then the file "Berksfile.lock" should contain:
       """
-      cookbook 'fake', :locked_version => '1.0.0'
-      """
-    When I successfully run `berks install`
-    Then the output should warn about the old lockfile format
-    And the Lockfile should have:
-      | fake | 1.0.0 |
+      DEPENDENCIES
+        fake (= 1.0.0)
 
-  Scenario: Writing the Berksfile.lock when a 1.0 lockfile is present and contains a full path
-    Given a cookbook named "fake"
-    And I have a Berksfile pointing at the local Berkshelf API with:
-      """
-      cookbook 'fake', '0.0.0', path: './fake'
+      GRAPH
+        fake (1.0.0)
       """
-    And I write to "Berksfile.lock" with:
-      """
-      cookbook 'fake', :locked_version => '0.0.0', path: '../../tmp/aruba/fake'
-      """
-    When I successfully run `berks install`
-    Then the output should warn about the old lockfile format
-    Then the Lockfile should have:
-      | fake | ./fake |
 
   Scenario: Writing the Berksfile.lock when a 2.0 lockfile is present
     Given I have a Berksfile pointing at the local Berkshelf API with:
@@ -65,19 +42,39 @@ Feature: Creating and reading the Berkshelf lockfile
       }
       """
     When I successfully run `berks install`
-    Then the Lockfile should have:
-      | fake | 1.0.0 |
+    Then the output should contain:
+      """
+      It looks like you are using an older version of the lockfile.
+      """
+    And the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake (= 1.0.0)
+
+      GRAPH
+        fake (1.0.0)
+      """
 
   Scenario: Reading the Berksfile.lock when it contains an invalid path location
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
       cookbook 'fake'
       """
-    And the Lockfile has:
-      | non-existent | /this/path/does/not/exist |
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        non-existent (~> 0.1)
+          path: /this/path/does/not/exist
+      """
     When I successfully run `berks install`
-    Then the Lockfile should have:
-      | fake | 1.0.0 |
+    And the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake
+
+      GRAPH
+        fake (1.0.0)
+      """
 
   Scenario: Installing a cookbook with dependencies
     Given the cookbook store has the cookbooks:
@@ -89,42 +86,85 @@ Feature: Creating and reading the Berkshelf lockfile
       cookbook 'fake', '1.0.0'
       """
     When I successfully run `berks install`
-    Then the Lockfile should have:
-      | fake | 1.0.0 |
-      | dep  | 1.0.0 |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake (= 1.0.0)
+
+      GRAPH
+        dep (1.0.0)
+        fake (1.0.0)
+          dep (~> 1.0.0)
+      """
 
   Scenario: Writing the Berksfile.lock with a pessimistic lock
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
       cookbook 'fake', '~> 1.0.0'
       """
-    And the Lockfile has:
-      | fake | 1.0.0 |
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake (~> 1.0.0)
+
+      GRAPH
+        fake (1.0.0)
+      """
     When I successfully run `berks install`
-    Then the Lockfile should have:
-      | fake | 1.0.0 |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake (~> 1.0.0)
+
+      GRAPH
+        fake (1.0.0)
+      """
 
   Scenario: Updating with a Berksfile.lock with pessimistic lock
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
       cookbook 'fake', '~> 0.1'
       """
-    And the Lockfile has:
-      | fake | 0.1.0 |
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake (~> 0.1)
+
+      GRAPH
+        fake (0.1.0)
+      """
     When I successfully run `berks update fake`
-    Then the Lockfile should have:
-      | fake | 0.2.0 |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake (~> 0.1)
+
+      GRAPH
+        fake (0.2.0)
+      """
 
   Scenario: Updating with a Berksfile.lock with hard lock
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
       cookbook 'fake', '0.1.0'
       """
-    And the Lockfile has:
-      | fake | 0.1.0 |
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake (= 0.1.0)
+
+      GRAPH
+        fake (0.1.0)
+      """
     When I successfully run `berks update fake`
-    Then the Lockfile should have:
-      | fake | 0.1.0 |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake (= 0.1.0)
+
+      GRAPH
+        fake (0.1.0)
+      """
 
   Scenario: Updating a Berksfile.lock with a git location
     Given I have a Berksfile pointing at the local Berkshelf API with:
@@ -132,8 +172,16 @@ Feature: Creating and reading the Berkshelf lockfile
       cookbook 'berkshelf-cookbook-fixture', git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git', ref: '919afa0c4'
       """
     When I successfully run `berks install`
-    Then the Lockfile should have:
-      | berkshelf-cookbook-fixture | 1.0.0 | 919afa0c402089df23ebdf36637f12271b8a96b4 |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        berkshelf-cookbook-fixture
+          git: git://github.com/RiotGames/berkshelf-cookbook-fixture.git
+          ref: 919afa0c402089df23ebdf36637f12271b8a96b4
+
+      GRAPH
+        berkshelf-cookbook-fixture (1.0.0)
+      """
 
   Scenario: Updating a Berksfile.lock with a git location and a branch
     Given I have a Berksfile pointing at the local Berkshelf API with:
@@ -141,8 +189,17 @@ Feature: Creating and reading the Berkshelf lockfile
       cookbook 'berkshelf-cookbook-fixture', git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git', branch: 'master'
       """
     When I successfully run `berks install`
-    Then the Lockfile should have:
-      | berkshelf-cookbook-fixture | 1.0.0 | a97b9447cbd41a5fe58eee2026e48ccb503bd3bc |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        berkshelf-cookbook-fixture
+          git: git://github.com/RiotGames/berkshelf-cookbook-fixture.git
+          branch: master
+          ref: a97b9447cbd41a5fe58eee2026e48ccb503bd3bc
+
+      GRAPH
+        berkshelf-cookbook-fixture (1.0.0)
+      """
 
   Scenario: Updating a Berksfile.lock with a git location and a branch
     Given I have a Berksfile pointing at the local Berkshelf API with:
@@ -150,8 +207,17 @@ Feature: Creating and reading the Berkshelf lockfile
       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 Lockfile should have:
-      | berkshelf-cookbook-fixture | 0.2.0 | 70a527e17d91f01f031204562460ad1c17f972ee |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        berkshelf-cookbook-fixture
+          git: git://github.com/RiotGames/berkshelf-cookbook-fixture.git
+          branch: v0.2.0
+          ref: 70a527e17d91f01f031204562460ad1c17f972ee
+
+      GRAPH
+        berkshelf-cookbook-fixture (0.2.0)
+      """
 
   Scenario: Updating a Berksfile.lock with a GitHub location
     Given I have a Berksfile pointing at the local Berkshelf API with:
@@ -159,8 +225,16 @@ Feature: Creating and reading the Berkshelf lockfile
       cookbook 'berkshelf-cookbook-fixture', github: 'RiotGames/berkshelf-cookbook-fixture', ref: '919afa0c4'
       """
     When I successfully run `berks install`
-    Then the Lockfile should have:
-      | berkshelf-cookbook-fixture | 1.0.0 | 919afa0c402089df23ebdf36637f12271b8a96b4 |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        berkshelf-cookbook-fixture
+          git: git://github.com/RiotGames/berkshelf-cookbook-fixture.git
+          ref: 919afa0c402089df23ebdf36637f12271b8a96b4
+
+      GRAPH
+        berkshelf-cookbook-fixture (1.0.0)
+      """
 
   Scenario: Updating a Berksfile.lock when a git location with :rel
     Given I have a Berksfile pointing at the local Berkshelf API with:
@@ -168,8 +242,18 @@ Feature: Creating and reading the Berkshelf lockfile
       cookbook 'berkshelf-cookbook-fixture', github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'rel', rel: 'cookbooks/berkshelf-cookbook-fixture'
       """
     When I successfully run `berks install`
-    Then the Lockfile should have:
-      | berkshelf-cookbook-fixture | 1.0.0 | 93f5768b7d14df45e10d16c8bf6fe98ba3ff809a | cookbooks/berkshelf-cookbook-fixture |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        berkshelf-cookbook-fixture
+          git: git://github.com/RiotGames/berkshelf-cookbook-fixture.git
+          branch: rel
+          ref: 93f5768b7d14df45e10d16c8bf6fe98ba3ff809a
+          rel: cookbooks/berkshelf-cookbook-fixture
+
+      GRAPH
+        berkshelf-cookbook-fixture (1.0.0)
+      """
 
   Scenario: Updating a Berksfile.lock with a path location
     Given a cookbook named "fake"
@@ -178,8 +262,15 @@ Feature: Creating and reading the Berkshelf lockfile
       cookbook 'fake', path: './fake'
       """
     When I successfully run `berks install`
-    Then the Lockfile should have:
-      | fake | ./fake |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake
+          path: ./fake
+
+      GRAPH
+        fake (0.0.0)
+      """
 
   Scenario: Installing a Berksfile with a metadata location
     Given a cookbook named "fake"
@@ -189,29 +280,59 @@ Feature: Creating and reading the Berkshelf lockfile
       metadata
       """
     When I successfully run `berks install`
-    Then the Lockfile should have:
-      | fake | . |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake
+          path: .
+          metadata: true
 
-  Scenario: Installing a Berksfile with a metadata location
+      GRAPH
+        fake (0.0.0)
+      """
+
+  Scenario: Installing a Berksfile with a locked metadata location
     Given a cookbook named "fake"
     And I cd to "fake"
     And I have a Berksfile pointing at the local Berkshelf API with:
       """
       metadata
       """
-    And the Lockfile has:
-      | fake | . |
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (0.0.0)
+      """
     When I successfully run `berks install`
-    Then the Lockfile should have:
-      | fake | . |
+    Then the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (0.0.0)
+      """
 
   Scenario: Installing when the locked version is no longer satisfied
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
       cookbook 'fake', '~> 1.3.0'
       """
-    And the Lockfile has:
-      | fake | 1.0.0 |
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake (~> 1.3.0)
+
+      GRAPH
+        fake (1.0.0)
+      """
     When I run `berks install`
     Then the output should contain:
       """
@@ -250,6 +371,6 @@ Feature: Creating and reading the Berkshelf lockfile
     When I run `berks install`
     Then the output should contain:
       """
-      Error reading the Berkshelf lockfile `Berksfile.lock` (JSON::ParserError)
+      Error reading the Berkshelf lockfile:
       """
     And the exit status should be "LockfileParserError"