berkshelf 2.0.18 → 3.0.0.beta1

data/features/json_formatter.feature

@@ -3,27 +3,36 @@ Feature: --format json
   I want to be able to get all output in JSON format
   So I can easily parse the output in scripts
 
+  Background:
+    Given the Berkshelf API server's cache is empty
+    And the Chef Server is empty
+    And the cookbook store is empty
+
   Scenario: JSON output installing a cookbook from the default location
     Given I write to "Berksfile" with:
       """
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
+      source "http://localhost:26210"
+
+      cookbook 'berkshelf', '1.0.0'
       """
+    And the Chef Server has cookbooks:
+      | berkshelf | 1.0.0 |
+    And the Berkshelf API server cache is up to date
     When I successfully run `berks install --format json`
-    Then the stdout should contain JSON:
+    Then the output should contain JSON:
       """
       {
         "cookbooks": [
           {
             "version": "1.0.0",
-            "location": "site: 'http://cookbooks.opscode.com/api/v1/cookbooks'",
-            "name": "berkshelf-cookbook-fixture"
+            "name": "berkshelf"
           }
         ],
         "errors": [
 
         ],
         "messages": [
-
+          "building universe..."
         ]
       }
       """
@@ -33,10 +42,12 @@ Feature: --format json
       | berkshelf-cookbook-fixture   | 1.0.0 |
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
     When I successfully run `berks install --format json`
-    Then the stdout should contain JSON:
+    Then the output should contain JSON:
       """
       {
         "cookbooks": [
@@ -49,19 +60,20 @@ Feature: --format json
 
         ],
         "messages": [
-
+          "building universe..."
         ]
       }
       """
 
-  @chef_server
   Scenario: JSON output when running the upload command
-    Given a Berksfile with path location sources to fixtures:
-      | example_cookbook | example_cookbook-0.5.0 |
-    And the Chef server does not have the cookbooks:
-      | example_cookbook | 0.5.0 |
+    Given I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+
+      cookbook 'example_cookbook', path: '../../spec/fixtures/cookbooks/example_cookbook-0.5.0'
+      """
     When I successfully run `berks upload --format json`
-    Then the stdout should contain JSON:
+    Then the output should contain JSON:
       """
       {
         "cookbooks": [
@@ -69,14 +81,14 @@ Feature: --format json
             "name": "example_cookbook",
             "version": "0.5.0",
             "location": "../../spec/fixtures/cookbooks/example_cookbook-0.5.0",
-            "uploaded_to": "http://localhost:4000/"
+            "uploaded_to": "http://localhost:26310/"
           }
         ],
         "errors": [
 
         ],
         "messages": [
-
+          "building universe..."
         ]
       }
       """

data/features/licenses.feature

@@ -3,12 +3,18 @@ Feature: Installing cookbooks with specific licenses
   I want to ensure my company only uses cookbooks that fall in our legal realm
   So that I can safely install and legally use community cookbooks
 
+  Background:
+    Given the Berkshelf API server's cache is empty
+    And the Chef Server is empty
+    And the cookbook store is empty
+
   Scenario: With licenses defined
     Given the cookbook store has the cookbooks:
       | berkshelf-cookbook-fixture | 0.1.0 | mit |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       """
     And I have a Berkshelf config file containing:
@@ -22,14 +28,14 @@ Feature: Installing cookbooks with specific licenses
       """
       is not in your list of allowed licenses
       """
-    And the exit status should be 0
 
   Scenario: With a license that is not listed
     Given the cookbook store has the cookbooks:
       | berkshelf-cookbook-fixture | 0.1.0 | mit |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       """
     And I have a Berkshelf config file containing:
@@ -43,14 +49,14 @@ Feature: Installing cookbooks with specific licenses
       """
       'mit' is not in your list of allowed licenses
       """
-    And the exit status should be 0
 
   Scenario: With raise_license_exception defined
     Given the cookbook store has the cookbooks:
       | berkshelf-cookbook-fixture | 0.1.0 | mit |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       """
     And I have a Berkshelf config file containing:
@@ -65,14 +71,14 @@ Feature: Installing cookbooks with specific licenses
       """
       is not in your list of allowed licenses
       """
-    And the exit status should be 0
 
   Scenario: With a license that is not listed
     Given the cookbook store has the cookbooks:
       | berkshelf-cookbook-fixture | 0.1.0 | mit |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       """
     And I have a Berkshelf config file containing:
@@ -87,15 +93,16 @@ Feature: Installing cookbooks with specific licenses
       """
       'mit' is not in your list of allowed licenses
       """
-    And the CLI should exit with the status code for error "LicenseNotAllowed"
+    And the exit status should be "LicenseNotAllowed"
 
   Scenario: With a :path location
     Given the cookbook store has the cookbooks:
       | fake | 0.1.0 | mit |
     And I write to "Berksfile" with:
       """
-      site :opscode
-      cookbook 'fake', path: '../berkshelf/cookbooks/fake-0.1.0'
+      source "http://localhost:26210"
+
+      cookbook 'fake', path: '../../spec/tmp/berkshelf/cookbooks/fake-0.1.0'
       """
     And I have a Berkshelf config file containing:
       """
@@ -104,9 +111,8 @@ Feature: Installing cookbooks with specific licenses
         "raise_license_exception": true
       }
       """
-    When I run `berks install`
+    When I successfully run `berks install`
     Then the output should not contain:
       """
       'mit' is not in your list of allowed licenses
       """
-    And the exit status should be 0

data/features/list_command.feature

@@ -9,6 +9,8 @@ Feature: Listing cookbooks defined by a Berksfile
       | fake2 | 1.0.1 |
     Given I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'fake1', '1.0.0'
       cookbook 'fake2', '1.0.1'
       """
@@ -22,7 +24,10 @@ Feature: Listing cookbooks defined by a Berksfile
     And the exit status should be 0
 
   Scenario: Running the list command with no sources defined
-    Given an empty file named "Berksfile"
+    Given I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+      """
     When I successfully run `berks list`
     Then the output should contain:
       """

data/features/lockfile.feature

@@ -8,26 +8,30 @@ Feature: Creating and reading the Berkshelf lockfile
       | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'fake', '1.0.0'
       """
     When I successfully run `berks install`
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "fake":{
+            "constraint":"= 1.0.0",
             "locked_version":"1.0.0"
           }
         }
       }
       """
 
-  Scenario: Wiring the Berksfile.lock when an old lockfile is present
+  Scenario: Wiring the Berksfile.lock when a 1.0 lockfile is present
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'fake', '1.0.0'
       """
     And I write to "Berksfile.lock" with:
@@ -35,12 +39,46 @@ Feature: Creating and reading the Berkshelf lockfile
       cookbook 'fake', :locked_version => '1.0.0'
       """
     When I successfully run `berks install`
-    Then the output should contain "You are using the old lockfile format. Attempting to convert..."
+    Then the output should warn about the old lockfile format
+    Then the file "Berksfile.lock" should contain JSON:
+      """
+      {
+        "dependencies": {
+          "fake": {
+            "constraint": "= 1.0.0",
+            "locked_version": "1.0.0"
+          }
+        }
+      }
+      """
+
+  Scenario: Wiring the Berksfile.lock when a 2.0 lockfile is present
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+    And I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+
+      cookbook 'fake', '1.0.0'
+      """
+    And I write to "Berksfile.lock" with:
+      """
+      {
+        "dependencies": {
+          "fake": {
+            "constraint": "= 1.0.0",
+            "locked_version": "1.0.0"
+          }
+        }
+      }
+      """
+    When I successfully run `berks install`
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources": {
+        "dependencies": {
           "fake": {
+            "constraint": "= 1.0.0",
             "locked_version": "1.0.0"
           }
         }
@@ -51,19 +89,22 @@ Feature: Creating and reading the Berkshelf lockfile
     Given a cookbook named "fake"
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'fake', '0.0.0', path: './fake'
       """
-    And I dynamically write to "Berksfile.lock" with:
+    And I write to "Berksfile.lock" with:
       """
-      cookbook 'fake', :locked_version => '0.0.0', path: '<%= File.expand_path('tmp/aruba/fake') %>'
+      cookbook 'fake', :locked_version => '0.0.0', path: '../../tmp/aruba/fake'
       """
     When I successfully run `berks install`
-    Then the output should contain "You are using the old lockfile format. Attempting to convert..."
+    Then the output should warn about the old lockfile format
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "fake":{
+            "constraint":"= 0.0.0",
             "path":"./fake"
           }
         }
@@ -75,12 +116,14 @@ Feature: Creating and reading the Berkshelf lockfile
       | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'fake'
       """
     And I write to "Berksfile.lock" with:
       """
       {
-        "sources":{
+        "dependencies":{
           "non-existent":{
             "path":"/this/path/does/not/exist"
           }
@@ -91,14 +134,13 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "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:
@@ -107,18 +149,21 @@ Feature: Creating and reading the Berkshelf lockfile
       | dep | ~> 1.0.0 |
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'fake', '1.0.0'
       """
     When I successfully run `berks install`
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies": {
           "fake":{
-            "locked_version":"1.0.0"
+            "constraint": "= 1.0.0",
+            "locked_version": "1.0.0"
           },
           "dep":{
-            "locked_version":"1.0.0"
+            "locked_version": "1.0.0"
           }
         }
       }
@@ -129,14 +174,16 @@ Feature: Creating and reading the Berkshelf lockfile
       | berkshelf-cookbook-fixture | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '~> 1.0.0'
       """
     And I write to "Berksfile.lock" with:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
+            "constraint":"~> 1.0.0",
             "locked_version":"1.0.0"
           }
         }
@@ -146,8 +193,9 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
+            "constraint":"~> 1.0.0",
             "locked_version":"1.0.0"
           }
         }
@@ -160,14 +208,16 @@ Feature: Creating and reading the Berkshelf lockfile
       | berkshelf-cookbook-fixture | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       """
     And I write to "Berksfile.lock" with:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
+            "constraint":"~> 0.1",
             "locked_version":"0.1.0"
           }
         }
@@ -177,8 +227,9 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
+            "constraint":"~> 0.1",
             "locked_version":"0.2.0"
           }
         }
@@ -190,14 +241,16 @@ Feature: Creating and reading the Berkshelf lockfile
       | berkshelf-cookbook-fixture | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
     And I write to "Berksfile.lock" with:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
+            "constraint":"= 1.0.0",
             "locked_version":"1.0.0"
           }
         }
@@ -207,8 +260,9 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
+            "constraint":"= 1.0.0",
             "locked_version":"1.0.0"
           }
         }
@@ -217,17 +271,18 @@ Feature: Creating and reading the Berkshelf lockfile
 
   Scenario: Updating a Berksfile.lock with a git location
     Given the cookbook store has the cookbooks:
-      | berkshelf-cookbook-fixture | 919afa0c402089df23ebdf36637f12271b8a96b4 |
+      | berkshelf-cookbook-fixture | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git', ref: '919afa0c4'
       """
     When I successfully run `berks install`
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
             "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
             "ref":"919afa0c402089df23ebdf36637f12271b8a96b4",
@@ -239,17 +294,18 @@ Feature: Creating and reading the Berkshelf lockfile
 
   Scenario: Updating a Berksfile.lock with a git location and a branch
     Given the cookbook store has the cookbooks:
-      | berkshelf-cookbook-fixture | master |
+      | berkshelf-cookbook-fixture | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', git: 'git://github.com/RiotGames/berkshelf-cookbook-fixture.git', branch: 'master'
       """
     When I successfully run `berks install`
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
             "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
             "ref":"a97b9447cbd41a5fe58eee2026e48ccb503bd3bc",
@@ -264,14 +320,15 @@ Feature: Creating and reading the Berkshelf lockfile
       | berkshelf-cookbook-fixture | 70a527e17d91f01f031204562460ad1c17f972ee |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       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 file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
             "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
             "ref":"70a527e17d91f01f031204562460ad1c17f972ee",
@@ -286,14 +343,15 @@ Feature: Creating and reading the Berkshelf lockfile
       | berkshelf-cookbook-fixture | 919afa0c402089df23ebdf36637f12271b8a96b4 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', github: 'RiotGames/berkshelf-cookbook-fixture', ref: '919afa0c4'
       """
     When I successfully run `berks install`
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
             "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
             "ref":"919afa0c402089df23ebdf36637f12271b8a96b4",
@@ -306,14 +364,15 @@ Feature: Creating and reading the Berkshelf lockfile
   Scenario: Updating a Berksfile.lock when a git location with :rel
     Given I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'rel', rel: 'cookbooks/berkshelf-cookbook-fixture'
       """
     When I successfully run `berks install`
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "berkshelf-cookbook-fixture":{
             "git":"git://github.com/RiotGames/berkshelf-cookbook-fixture.git",
             "ref":"93f5768b7d14df45e10d16c8bf6fe98ba3ff809a",
@@ -328,14 +387,15 @@ Feature: Creating and reading the Berkshelf lockfile
     Given a cookbook named "fake"
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'fake', path: './fake'
       """
     When I successfully run `berks install`
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources":{
+        "dependencies":{
           "fake":{
             "path":"./fake"
           }
@@ -347,7 +407,8 @@ Feature: Creating and reading the Berkshelf lockfile
     Given a cookbook named "fake"
     And the cookbook "fake" has the file "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       metadata
       """
     When I cd to "fake"
@@ -355,7 +416,7 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources": {
+        "dependencies": {
           "fake": {
             "path": "."
           }
@@ -367,13 +428,14 @@ Feature: Creating and reading the Berkshelf lockfile
     Given a cookbook named "fake"
     And the cookbook "fake" has the file "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       metadata
       """
     And the cookbook "fake" has the file "Berksfile.lock" with:
       """
       {
-        "sources": {
+        "dependencies": {
           "fake": {
             "path": "."
           }
@@ -385,46 +447,28 @@ Feature: Creating and reading the Berkshelf lockfile
     Then the file "Berksfile.lock" should contain JSON:
       """
       {
-        "sources": {
+        "dependencies": {
           "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
-  # Given I write to "Berksfile" with:
-  #   """
-  #   cookbook 'fake', site: 'example.com'
-  #   """
-  # When I successfully run `berks install`
-  # Then the file "Berksfile.lock" should contain JSON:
-  #   """
-  #   {
-  #     "sources":{
-  #       "sudo":{
-  #         "site":"opscode",
-  #         "locked_version":"2.0.4"
-  #       }
-  #     }
-  #   }
-  #   """
 
   Scenario: Installing when the locked version is no longer satisfied
     Given the cookbook store has the cookbooks:
       | berkshelf-cookbook-fixture | 1.0.0 |
     Given I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
     And I successfully run `berks install`
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'berkshelf-cookbook-fixture', '~> 1.3.0'
       """
     When I run `berks install`
@@ -437,16 +481,17 @@ Feature: Creating and reading the Berkshelf lockfile
         In Berksfile.lock:
           berkshelf-cookbook-fixture (1.0.0)
 
-      Try running `berks update berkshelf-cookbook-fixture, which will try to find  'berkshelf-cookbook-fixture' matching '~> 1.3.0'
+      Try running `berks update berkshelf-cookbook-fixture, which will try to find 'berkshelf-cookbook-fixture' matching '~> 1.3.0'
       """
-    And the CLI should exit with the status code for error "OutdatedCookbookSource"
+    And the exit status should be "OutdatedDependency"
 
   Scenario: Installing when the Lockfile is empty
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'fake', '1.0.0'
       """
     And an empty file named "Berksfile.lock"
@@ -455,12 +500,12 @@ Feature: Creating and reading the Berkshelf lockfile
       """
       Using fake (1.0.0)
       """
-    And the exit status should be 0
 
   Scenario: Installing when the Lockfile is in a bad state
     Given I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'fake', '1.0.0'
       """
     Given I write to "Berksfile.lock" with:
@@ -472,5 +517,4 @@ Feature: Creating and reading the Berkshelf lockfile
       """
       Error reading the Berkshelf lockfile `Berksfile.lock` (JSON::ParserError)
       """
-    And the CLI should exit with the status code for error "LockfileParserError"
-
+    And the exit status should be "LockfileParserError"