berkshelf 3.0.0.beta7 → 3.0.0.beta8

data/features/commands/vendor.feature

@@ -48,6 +48,38 @@ Feature: Vendoring cookbooks to a directory
     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 a cookbook with transitive dependencies when a lockfile is present
+    Given a cookbook named "bacon"
+    And the cookbook "bacon" has the file "metadata.rb" with:
+      """
+      name 'bacon'
+      version '1.0.0'
+
+      depends 'fake'
+      depends 'ekaf'
+      """
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'bacon', path: './bacon'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        bacon
+          path: ./bacon
+
+      GRAPH
+        bacon (1.0.0)
+          ekaf (>= 0.0.0)
+          fake (>= 0.0.0)
+        ekaf (2.0.0)
+        fake (1.0.0)
+      """
+    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:
       """

data/features/json_formatter.feature

@@ -24,12 +24,12 @@ Feature: --format json
             "name": "berkshelf"
           }
         ],
-        "errors": [
-
-        ],
+        "errors": [],
         "messages": [
+          "Resolving cookbook dependencies...",
           "Fetching cookbook index from http://0.0.0.0:26210..."
-        ]
+        ],
+        "warnings": []
       }
       """
 
@@ -50,12 +50,12 @@ Feature: --format json
             "version": "1.0.0"
           }
         ],
-        "errors": [
-
-        ],
+        "errors": [],
         "messages": [
+          "Resolving cookbook dependencies...",
           "Fetching cookbook index from http://0.0.0.0:26210..."
-        ]
+        ],
+        "warnings": []
       }
       """
 
@@ -88,11 +88,9 @@ Feature: --format json
             "license": "none"
           }
         ],
-        "errors": [
-
-        ],
-        "messages": [
-        ]
+        "errors": [],
+        "messages": [],
+        "warnings": []
       }
       """
 
@@ -101,6 +99,15 @@ Feature: --format json
       """
       cookbook 'example_cookbook', path: '../../fixtures/cookbooks/example_cookbook-0.5.0'
       """
+    And I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        example_cookbook
+          path: ../../fixtures/cookbooks/example_cookbook-0.5.0
+
+      GRAPH
+        example_cookbook (0.5.0)
+      """
     When I successfully run `berks upload --format json`
     Then the output should contain JSON:
       """
@@ -109,16 +116,12 @@ Feature: --format json
           {
             "name": "example_cookbook",
             "version": "0.5.0",
-            "location": "../../fixtures/cookbooks/example_cookbook-0.5.0",
             "uploaded_to": "http://localhost:26310/"
           }
         ],
-        "errors": [
-
-        ],
-        "messages": [
-          "Fetching cookbook index from http://0.0.0.0:26210..."
-        ]
+        "errors": [],
+        "messages": [],
+        "warnings": []
       }
       """
 
@@ -158,11 +161,10 @@ Feature: --format json
             "name": "seth"
           }
         ],
-        "errors": [
-
-        ],
+        "errors": [],
         "messages": [
           "The following cookbooks have newer versions:"
-        ]
+        ],
+        "warnings": []
       }
       """

data/features/lifecycle.feature

@@ -0,0 +1,285 @@
+#
+# The lifecycle feature contains a series of "long-running" lifecycle commands.
+# These tests do not fit into a single command as they are cross-cutting and
+# require more setup than a typical test.
+#
+# These tests are designed to mirror the real-world use cases for Berkshelf in
+# day-to-day work. It also contains a collection of previously known bugs to
+# prevent regressions.
+#
+Feature: Lifecycle commands
+  Background:
+    * the cookbook store has the cookbooks:
+      | ekaf | 1.0.0 |
+      | fake | 1.0.0 |
+
+  Scenario: A trusted lockfile does not fetch the dependency index
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', '1.0.0'
+      """
+    * I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        fake (= 1.0.0)
+
+      GRAPH
+        fake (1.0.0)
+      """
+    * I successfully run `berks install`
+    * the output should not contain "Fetching cookbook index"
+    * the output should contain "Using fake (1.0.0)"
+
+  Scenario: An untrusted lockfile fetches the dependency index
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', '1.0.0'
+      """
+    * I successfully run `berks install`
+    * the output should contain "Fetching cookbook index"
+    * the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake (= 1.0.0)
+
+      GRAPH
+        fake (1.0.0)
+      """
+    * I append to "Berksfile" with:
+      """
+
+      cookbook 'ekaf', '1.0.0'
+      """
+    * I successfully run `berks install`
+    * the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        ekaf (= 1.0.0)
+        fake (= 1.0.0)
+
+      GRAPH
+        ekaf (1.0.0)
+        fake (1.0.0)
+      """
+    * the output should contain "Using ekaf (1.0.0)"
+    * the output should contain "Using fake (1.0.0)"
+
+  Scenario: Removing a direct dependency
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', '1.0.0'
+      """
+    * I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        ekaf (= 1.0.0)
+        fake (= 1.0.0)
+
+      GRAPH
+        ekaf (1.0.0)
+        fake (1.0.0)
+      """
+    * I successfully run `berks install`
+    * the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake (= 1.0.0)
+
+      GRAPH
+        fake (1.0.0)
+      """
+    * the output should not contain "Using ekaf (1.0.0)"
+    * the output should contain "Using fake (1.0.0)"
+
+  Scenario: A trusted lockfile with transitive dependencies does not fetch the dependency index
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    * I write to "metadata.rb" with:
+      """
+      name 'transitive'
+      version '1.2.3'
+      depends 'fake', '1.0.0'
+      """
+    * I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        transitive
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (1.0.0)
+        transitive (1.2.3)
+          fake (= 1.0.0)
+      """
+    * I successfully run `berks install`
+    * the output should not contain "Fetching cookbook index"
+    * the output should contain "Using fake (1.0.0)"
+    * the output should contain "Using transitive (1.2.3)"
+
+  Scenario: An utrusted lockfile because of transitive dependencies fetches the dependency index
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    * I write to "metadata.rb" with:
+      """
+      name 'transitive'
+      version '1.2.3'
+      depends 'fake', '1.0.0'
+      """
+    * I successfully run `berks install`
+    * the output should contain "Fetching cookbook index"
+    * the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        transitive
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (1.0.0)
+        transitive (1.2.3)
+          fake (= 1.0.0)
+      """
+    * I append to "metadata.rb" with:
+      """
+
+      depends 'ekaf', '1.0.0'
+      """
+    * I successfully run `berks install`
+    * the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        transitive
+          path: .
+          metadata: true
+
+      GRAPH
+        ekaf (1.0.0)
+        fake (1.0.0)
+        transitive (1.2.3)
+          ekaf (= 1.0.0)
+          fake (= 1.0.0)
+      """
+    * the output should contain "Using ekaf (1.0.0)"
+    * the output should contain "Using fake (1.0.0)"
+    * the output should contain "Using transitive (1.2.3)"
+
+  Scenario: Removing a transitive dependency
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    * I write to "metadata.rb" with:
+      """
+      name 'transitive'
+      version '1.2.3'
+      depends 'fake', '1.0.0'
+      """
+    * I write to "Berksfile.lock" with:
+      """
+      DEPENDENCIES
+        transitive
+          path: .
+          metadata: true
+
+      GRAPH
+        ekaf (1.0.0)
+        fake (1.0.0)
+        transitive (1.2.3)
+          ekaf (= 1.0.0)
+          fake (= 1.0.0)
+      """
+    * I successfully run `berks install`
+    * the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        transitive
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (1.0.0)
+        transitive (1.2.3)
+          fake (= 1.0.0)
+      """
+    * the output should not contain "Using ekaf (1.0.0)"
+    * the output should contain "Using fake (1.0.0)"
+
+  Scenario: Bumping the version of a local cookbook
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    * I write to "metadata.rb" with:
+      """
+      name 'fake'
+      version '1.0.0'
+      """
+    * I successfully run `berks install`
+    * the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (1.0.0)
+      """
+    * I write to "metadata.rb" with:
+      """
+      name 'fake'
+      version '1.0.1'
+      """
+    * I successfully run `berks install`
+    * the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake
+          path: .
+          metadata: true
+
+      GRAPH
+        fake (1.0.1)
+      """
+    * the output should contain "Using fake (1.0.1)"
+
+  Scenario: Switching a dependency to a new location
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake'
+      """
+    * I write to "Berksfile.lock" with:
+       """
+      DEPENDENCIES
+        fake
+
+      GRAPH
+        fake (1.0.0)
+       """
+    * I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', path: './fake'
+      """
+    * I write to "fake/metadata.rb" with:
+
+      """
+      name 'fake'
+      version '2.0.0'
+      """
+    * I successfully run `berks install`
+    * the file "Berksfile.lock" should contain:
+      """
+      DEPENDENCIES
+        fake
+          path: ./fake
+
+      GRAPH
+        fake (2.0.0)
+      """
+    * the output should not contain "Using fake (1.0.0)"
+    * the output should contain "Using fake (2.0.0)"

data/features/lockfile.feature

@@ -177,7 +177,8 @@ Feature: Creating and reading the Berkshelf lockfile
       DEPENDENCIES
         berkshelf-cookbook-fixture
           git: git://github.com/RiotGames/berkshelf-cookbook-fixture.git
-          ref: 919afa0c402089df23ebdf36637f12271b8a96b4
+          revision: 919afa0c402089df23ebdf36637f12271b8a96b4
+          ref: 919afa0
 
       GRAPH
         berkshelf-cookbook-fixture (1.0.0)
@@ -194,14 +195,14 @@ Feature: Creating and reading the Berkshelf lockfile
       DEPENDENCIES
         berkshelf-cookbook-fixture
           git: git://github.com/RiotGames/berkshelf-cookbook-fixture.git
+          revision: a97b9447cbd41a5fe58eee2026e48ccb503bd3bc
           branch: master
-          ref: a97b9447cbd41a5fe58eee2026e48ccb503bd3bc
 
       GRAPH
         berkshelf-cookbook-fixture (1.0.0)
       """
 
-  Scenario: Updating a Berksfile.lock with a git location and a branch
+  Scenario: Updating a Berksfile.lock with a git location and a tag
     Given I have a Berksfile pointing at the local Berkshelf API with:
       """
       cookbook 'berkshelf-cookbook-fixture', git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git', tag: 'v0.2.0'
@@ -212,8 +213,8 @@ Feature: Creating and reading the Berkshelf lockfile
       DEPENDENCIES
         berkshelf-cookbook-fixture
           git: git://github.com/RiotGames/berkshelf-cookbook-fixture.git
-          branch: v0.2.0
-          ref: 70a527e17d91f01f031204562460ad1c17f972ee
+          revision: 70a527e17d91f01f031204562460ad1c17f972ee
+          tag: v0.2.0
 
       GRAPH
         berkshelf-cookbook-fixture (0.2.0)
@@ -230,7 +231,8 @@ Feature: Creating and reading the Berkshelf lockfile
       DEPENDENCIES
         berkshelf-cookbook-fixture
           git: git://github.com/RiotGames/berkshelf-cookbook-fixture.git
-          ref: 919afa0c402089df23ebdf36637f12271b8a96b4
+          revision: 919afa0c402089df23ebdf36637f12271b8a96b4
+          ref: 919afa0
 
       GRAPH
         berkshelf-cookbook-fixture (1.0.0)
@@ -247,8 +249,8 @@ Feature: Creating and reading the Berkshelf lockfile
       DEPENDENCIES
         berkshelf-cookbook-fixture
           git: git://github.com/RiotGames/berkshelf-cookbook-fixture.git
+          revision: 93f5768b7d14df45e10d16c8bf6fe98ba3ff809a
           branch: rel
-          ref: 93f5768b7d14df45e10d16c8bf6fe98ba3ff809a
           rel: cookbooks/berkshelf-cookbook-fixture
 
       GRAPH