berkshelf 3.0.0.beta2 → 3.0.0.beta3

data/features/{list_command.feature → commands/list.feature}

@@ -1,16 +1,10 @@
-Feature: Listing cookbooks defined by a Berksfile
-  As a user with a Berksfile
-  I want a way to show all my cookbooks and their versions without opening my Berksfile
-  So that I can be more productive
-
+Feature: berks list
   Scenario: Running the list command
     Given the cookbook store has the cookbooks:
       | fake1 | 1.0.0 |
       | fake2 | 1.0.1 |
-    Given I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'fake1', '1.0.0'
       cookbook 'fake2', '1.0.1'
       """
@@ -21,16 +15,12 @@ Feature: Listing cookbooks defined by a Berksfile
         * fake1 (1.0.0)
         * fake2 (1.0.1)
       """
-    And the exit status should be 0
+
 
   Scenario: Running the list command with no sources defined
-    Given I write to "Berksfile" with:
-      """
-      source "http://localhost:26210"
-      """
+    Given I have a Berksfile pointing at the local Berkshelf API
     When I successfully run `berks list`
     Then the output should contain:
       """
       There are no cookbooks installed by your Berksfile
       """
-    And the exit status should be 0

data/features/{outdated_command.feature → commands/outdated.feature}

@@ -1,8 +1,4 @@
-Feature: Displaying outdated cookbooks
-  As a user
-  I want to know what cookbooks are outdated before I run update
-  So that I can decide whether to update everything at once
-
+Feature: berks outdated
   Scenario: the dependency is up to date
     Given the Chef Server has cookbooks:
       | bacon | 1.0.0 |
@@ -10,58 +6,40 @@ Feature: Displaying outdated cookbooks
     And the Berkshelf API server's cache is up to date
     And the cookbook store has the cookbooks:
       | bacon | 1.1.0 |
-    And I write to "Berksfile" with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'bacon', '~> 1.1.0'
       """
-    And I write to "Berksfile.lock" with:
-      """
-      {
-        "dependencies": {
-          "bacon": {
-            "locked_version": "1.1.0"
-          }
-        }
-      }
-      """
+    And the Lockfile has:
+      | bacon | 1.1.0 |
     When I successfully run `berks outdated`
     Then the output should contain:
       """
       All cookbooks up to date!
       """
 
-  Scenario: the dependency has a no version constraint and there are new items
+
+  Scenario: the dependency has no version constraint and there are new items
     Given the Chef Server has cookbooks:
       | bacon | 1.0.0 |
       | bacon | 1.1.0 |
     And the Berkshelf API server's cache is up to date
     And the cookbook store has the cookbooks:
       | bacon | 1.0.0 |
-    And I write to "Berksfile" with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'bacon'
       """
-    And I write to "Berksfile.lock" with:
-      """
-      {
-        "dependencies": {
-          "bacon": {
-            "locked_version": "1.0.0"
-          }
-        }
-      }
-      """
+    And the Lockfile has:
+      | bacon | 1.0.0 |
     When I successfully run `berks outdated`
     Then the output should contain:
       """
       The following cookbooks have newer versions:
-        * bacon (1.1.0) [http://localhost:26210]
+        * bacon (1.1.0)
       """
 
+
   Scenario: the dependency has a version constraint and there are new items that satisfy it
     Given the Chef Server has cookbooks:
       | bacon | 1.1.0 |
@@ -70,34 +48,23 @@ Feature: Displaying outdated cookbooks
     And the Berkshelf API server's cache is up to date
     And the cookbook store has the cookbooks:
       | bacon | 1.0.0 |
-    And I write to "Berksfile" with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'bacon', '~> 1.0'
       """
-    And I write to "Berksfile.lock" with:
-      """
-      {
-        "dependencies": {
-          "bacon": {
-            "locked_version": "1.0.0"
-          }
-        }
-      }
-      """
+    And the Lockfile has:
+      | bacon | 1.0.0 |
     When I successfully run `berks outdated`
     Then the output should contain:
       """
       The following cookbooks have newer versions:
-        * bacon (1.5.8) [http://localhost:26210]
+        * bacon (1.5.8)
       """
 
+
   Scenario: When there is no lockfile present
-    And I write to "Berksfile" with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'bacon', '1.0.0'
       """
     When I run `berks outdated`
@@ -107,23 +74,14 @@ Feature: Displaying outdated cookbooks
       """
     And the exit status should be "LockfileNotFound"
 
+
   Scenario: When the cookbook is not installed
-    And I write to "Berksfile" with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'bacon', '1.0.0'
       """
-    And I write to "Berksfile.lock" with:
-      """
-      {
-        "dependencies": {
-          "bacon": {
-            "locked_version": "1.0.0"
-          }
-        }
-      }
-      """
+    And the Lockfile has:
+      | bacon | 1.0.0 |
     When I run `berks outdated`
     Then the output should contain:
       """

data/features/{package_command.feature → commands/package.feature}

@@ -1,15 +1,11 @@
-Feature: Packaging a cookbook as a tarball for distribution
-  As a user
-  I want to be able to package a cookbook
-  So that I can use it outside of Berkshelf
+Feature: berks package
+  Background:
+    * the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
 
   Scenario: When no options are passed
-    Given the cookbook store has the cookbooks:
-      | fake | 1.0.0 |
-    And I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'fake', '~> 1.0.0'
       """
     When I successfully run `berks package fake`
@@ -19,25 +15,19 @@ Feature: Packaging a cookbook as a tarball for distribution
       Cookbook(s) packaged to
       """
 
+
   Scenario: With the --output option
-    Given the cookbook store has the cookbooks:
-      | fake | 1.0.0 |
-    And I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'fake', '~> 1.0.0'
       """
     When I successfully run `berks package fake --output foo/bar`
     Then a file named "foo/bar/fake.tar.gz" should exist
 
+
   Scenario: With an installed cookbook name
-    Given the cookbook store has the cookbooks:
-      | fake | 1.0.0 |
-    And I write to "Berksfile" with:
+    Given I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'fake', '~> 1.0.0'
       """
     When I run `berks package non-existent`
@@ -48,12 +38,11 @@ Feature: Packaging a cookbook as a tarball for distribution
       """
     And the exit status should be "CookbookNotFound"
 
+
   Scenario: With an invalid cookbook
     Given a cookbook named "cookbook with spaces"
-    And I write to "Berksfile" with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'cookbook with spaces', path: './cookbook with spaces'
       """
     When I run `berks package`

data/features/{shelf → commands/shelf}/list.feature

@@ -1,15 +1,11 @@
-Feature: Listing all cookbooks in the Berkshelf shelf
-  As a user with a cookbook store
-  I want to show all the cookbooks I have installed
-  So that I can be well informed
-
+Feature: berks shelf list
   Scenario: With no cookbooks in the store
     When I successfully run `berks shelf list`
     Then the output should contain:
       """
       There are no cookbooks in the Berkshelf shelf
       """
-    And the exit status should be 0
+
 
   Scenario: With two cookbooks in the store
     Given the cookbook store has the cookbooks:
@@ -22,7 +18,7 @@ Feature: Listing all cookbooks in the Berkshelf shelf
         * ekaf (2.3.4)
         * fake (1.0.0)
       """
-    And the exit status should be 0
+
 
   Scenario: With multiple cookbook versions installed
     Given the cookbook store has the cookbooks:
@@ -36,4 +32,3 @@ Feature: Listing all cookbooks in the Berkshelf shelf
       Cookbooks in the Berkshelf shelf:
         * fake (1.0.0, 1.1.0, 1.2.0, 2.0.0)
       """
-    And the exit status should be 0

data/features/{shelf → commands/shelf}/show.feature

@@ -1,8 +1,4 @@
-Feature: Displaying information about a cookbook in the Berkshelf shelf
-  As a user with a cookbook store
-  I want to show information about a specific cookbook in my cookbook store
-  So that I can be well informed
-
+Feature: berks shelf show
   Scenario: With a cookbook that is not in the store
     When I run `berks shelf show fake`
     Then the output should contain:
@@ -11,6 +7,7 @@ Feature: Displaying information about a cookbook in the Berkshelf shelf
       """
     And the exit status should be "CookbookNotFound"
 
+
   Scenario: With cookbooks in the store
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 |
@@ -30,7 +27,6 @@ Feature: Displaying information about a cookbook in the Berkshelf shelf
       """
       Name: ekaf
       """
-    And the exit status should be 0
 
 
   Scenario: With cookbooks in the store and the --version option
@@ -52,7 +48,7 @@ Feature: Displaying information about a cookbook in the Berkshelf shelf
       """
       Name: ekaf
       """
-    And the exit status should be 0
+
 
   Scenario: With cookbooks in the store and the --version option doesn't exist
     Given the cookbook store has the cookbooks:
@@ -65,6 +61,7 @@ Feature: Displaying information about a cookbook in the Berkshelf shelf
       """
     And the exit status should be "CookbookNotFound"
 
+
   Scenario: With multiple cookbook versions installed
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 |
@@ -103,7 +100,7 @@ Feature: Displaying information about a cookbook in the Berkshelf shelf
              Email: YOUR_EMAIL
            License: none
       """
-    And the exit status should be 0
+
 
   Scenario: With multiple cookbook versions installed and the --version flag
     Given the cookbook store has the cookbooks:
@@ -149,4 +146,3 @@ Feature: Displaying information about a cookbook in the Berkshelf shelf
              Email: YOUR_EMAIL
            License: none
       """
-    And the exit status should be 0

data/features/{shelf → commands/shelf}/uninstall.feature

@@ -1,8 +1,4 @@
-Feature: Removing a cookbook from the Berkshelf shelf
-  As a user with a cookbook store
-  I want to remove a cookbook because it's a bad version
-  So that I don't have to manually touch things in the ~/.berkshelf directory
-
+Feature: berks shelf uninstall
   Scenario: With no cookbooks in the store
     When I run `berks shelf uninstall fake`
     Then the output should contain:
@@ -11,6 +7,7 @@ Feature: Removing a cookbook from the Berkshelf shelf
       """
     And the exit status should be "CookbookNotFound"
 
+
   Scenario: With two cookbooks in the store
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 |
@@ -24,7 +21,7 @@ Feature: Removing a cookbook from the Berkshelf shelf
       | fake | 1.0.0 |
     And the cookbook store should have the cookbooks:
       | ekaf | 2.3.4 |
-    And the exit status should be 0
+
 
   Scenario: With multiple cookbook versions installed
     Given the cookbook store has the cookbooks:
@@ -45,7 +42,7 @@ Feature: Removing a cookbook from the Berkshelf shelf
       | fake | 1.1.0 |
       | fake | 1.2.0 |
       | fake | 2.0.0 |
-    And the exit status should be 0
+
 
   Scenario: When specifying a version
     Given the cookbook store has the cookbooks:
@@ -64,7 +61,7 @@ Feature: Removing a cookbook from the Berkshelf shelf
       | fake | 1.1.0 |
       | fake | 1.2.0 |
       | fake | 2.0.0 |
-    And the exit status should be 0
+
 
   @spawn
   Scenario: With contingencies
@@ -86,7 +83,7 @@ Feature: Removing a cookbook from the Berkshelf shelf
       """
     And the cookbook store should not have the cookbooks:
       | ekaf | 2.3.4 |
-    And the exit status should be 0
+
 
   Scenario: With contingencies and the --force flag
     Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
@@ -100,4 +97,3 @@ Feature: Removing a cookbook from the Berkshelf shelf
       """
     And the cookbook store should not have the cookbooks:
       | ekaf | 2.3.4 |
-    And the exit status should be 0

data/features/{show_command.feature → commands/show.feature}

@@ -1,27 +1,13 @@
-Feature: Displaying information about a cookbook defined by a Berksfile
-  As a user
-  I want to be able to view the metadata information of a cached cookbook
-  So that I can troubleshoot bugs or satisfy my own curiosity
-
+Feature: berks show
   Scenario: With no options
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 |
-    And I write to "Berksfile" with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'fake', '1.0.0'
       """
-    And I write to "Berksfile.lock" with:
-      """
-      {
-        "dependencies": {
-          "fake": {
-            "locked_version": "1.0.0"
-          }
-        }
-      }
-      """
+    And the Lockfile has:
+      | fake | 1.0.0 |
     When I successfully run `berks show fake`
     Then the output should contain:
       """
@@ -33,11 +19,9 @@ Feature: Displaying information about a cookbook defined by a Berksfile
            License: none
       """
 
+
   Scenario: When the cookbook is not in the Berksfile
-    Given I write to "Berksfile" with:
-      """
-      source "http://localhost:26210"
-      """
+    Given I have a Berksfile pointing at the local Berkshelf API
     When I run `berks show fake`
     Then the output should contain:
       """
@@ -45,11 +29,10 @@ Feature: Displaying information about a cookbook defined by a Berksfile
       """
     And the exit status should be "DependencyNotFound"
 
+
   Scenario: When there is no lockfile present
-    And I write to "Berksfile" with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'fake', '1.0.0'
       """
     When I run `berks show fake`
@@ -59,23 +42,15 @@ Feature: Displaying information about a cookbook defined by a Berksfile
       """
     And the exit status should be "LockfileNotFound"
 
+
   Scenario: When the cookbook is not installed
-    And I write to "Berksfile" with:
+    Given the cookbook store is empty
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
-      source "http://localhost:26210"
-
       cookbook 'fake', '1.0.0'
       """
-    And I write to "Berksfile.lock" with:
-      """
-      {
-        "dependencies": {
-          "fake": {
-            "locked_version": "1.0.0"
-          }
-        }
-      }
-      """
+    And the Lockfile has:
+      | fake | 1.0.0 |
     When I run `berks show fake`
     Then the output should contain:
       """