berkshelf 3.0.0.beta2 → 3.0.0.beta3

data/features/commands/update.feature

@@ -0,0 +1,48 @@
+Feature: berks update
+  Background:
+    * the cookbook store has the cookbooks:
+      | fake | 0.1.0 |
+      | fake | 0.2.0 |
+      | fake | 1.0.0 |
+      | ekaf | 1.0.0 |
+      | ekaf | 1.0.1 |
+
+
+  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'
+      """
+    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 |
+
+
+  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'
+      """
+    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 |
+
+
+  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?
+      """
+    And the exit status should be "DependencyNotFound"

data/features/commands/upload.feature

@@ -0,0 +1,197 @@
+Feature: berks upload
+  Background:
+    * the Berkshelf API server's cache is empty
+    * the Chef Server is empty
+    * the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+      | ekaf | 2.0.0 |
+      | oops | 3.0.0 |
+
+
+  Scenario: multiple cookbooks with no arguments
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', '1.0.0'
+      cookbook 'ekaf', '2.0.0'
+      """
+    When I successfully run `berks upload`
+    Then the Chef Server should have the cookbooks:
+      | fake | 1.0.0 |
+      | ekaf | 2.0.0 |
+
+
+  Scenario: a cookbook with a path location
+    Given a cookbook named "fake"
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', path: './fake'
+      """
+    When I successfully run `berks upload`
+    Then the Chef Server should have the cookbooks:
+      | fake | 0.0.0 |
+
+
+  Scenario: specifying a single cookbook with dependencies
+    Given the cookbook store contains a cookbook "reset" "3.4.5" with dependencies:
+      | fake | = 1.0.0 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', '1.0.0'
+      cookbook 'ekaf', '2.0.0'
+      cookbook 'reset', '3.4.5'
+      """
+    When I successfully run `berks upload reset`
+    Then the Chef Server should have the cookbooks:
+      | reset | 3.4.5 |
+      | fake  | 1.0.0 |
+    And the Chef Server should not have the cookbooks:
+      | ekaf  | 2.0.0 |
+
+
+  Scenario: specifying a dependency not defined in the Berksfile
+    Given I have a Berksfile pointing at the local Berkshelf API
+    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?
+      """
+    And the exit status should be "DependencyNotFound"
+
+
+  Scenario: specifying multiple cookbooks to upload
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', '1.0.0'
+      cookbook 'ekaf', '2.0.0'
+      cookbook 'oops', '3.0.0'
+      """
+    When I successfully run `berks upload fake ekaf`
+    Then the Chef Server should have the cookbooks:
+      | fake |
+      | ekaf |
+    And the Chef Server should not have the cookbooks:
+      | oops |
+
+
+  Scenario: uploading a single groups of demands with the --only flag
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', group: :take_me
+      cookbook 'ekaf', group: :not_me
+      """
+    When I successfully run `berks upload --only take_me`
+    Then the Chef Server should have the cookbooks:
+      | fake | 1.0.0 |
+    And the Chef Server should not have the cookbooks:
+      | ekaf | 2.0.0 |
+
+
+  Scenario: uploading multiple groups of demands with the --only flag
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', group: :take_me
+      cookbook 'ekaf', group: :not_me
+      """
+    When I successfully run `berks upload --only take_me not_me`
+    And the Chef Server should have the cookbooks:
+      | fake | 1.0.0 |
+      | ekaf | 2.0.0 |
+
+
+  Scenario: skipping a single group to upload with the --except flag
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', group: :take_me
+      cookbook 'ekaf', group: :not_me
+      """
+    When I successfully run `berks upload --except not_me`
+    And the Chef Server should have the cookbooks:
+      | fake | 1.0.0 |
+    And the Chef Server should not have the cookbooks:
+      | ekaf | 2.0.0 |
+
+
+  Scenario: skipping multiple groups with the --except flag
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', group: :take_me
+      cookbook 'ekaf', group: :not_me
+      """
+    When I successfully run `berks upload --except take_me not_me`
+    And the Chef Server should not have the cookbooks:
+      | fake | 1.0.0 |
+      | ekaf | 2.0.0 |
+
+
+  Scenario: attempting to upload an invalid cookbook
+    Given a cookbook named "cookbook with spaces"
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'cookbook with spaces', path: './cookbook with spaces'
+      """
+    When I run `berks upload`
+    Then the output should contain:
+      """
+      The cookbook 'cookbook with spaces' has invalid filenames:
+      """
+    And the exit status should be "InvalidCookbookFiles"
+
+
+  Scenario: With unicode characters
+    Given a cookbook named "fake"
+    And I cd to "fake"
+    And I write to "README.md" with:
+      """
+      Jamié Wiñsor
+      赛斯瓦戈
+      Μιψηαελ Ιωευ
+      جوستين كامبل
+      """
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    When I successfully run `berks upload fake`
+    Then the output should contain:
+      """
+      Uploading fake (0.0.0)
+      """
+
+
+  Scenario: When the cookbook already exist
+    And the Chef Server has frozen cookbooks:
+      | fake  | 1.0.0 |
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', '1.0.0'
+      """
+    When I successfully run `berks upload`
+    Then the output should contain:
+      """
+      Skipping fake (1.0.0) (already uploaded)
+      """
+    And the output should contain:
+      """
+      Skipped uploading some cookbooks because they already existed on the remote server. Re-run with the `--force` flag to force overwrite these cookbooks:
+
+        * fake (1.0.0)
+      """
+
+
+  Scenario: When the cookbook already exist and is a metadata location
+    Given a cookbook named "fake"
+    And the cookbook "fake" has the file "Berksfile" with:
+      """
+      metadata
+      """
+    And the Chef Server has frozen cookbooks:
+      | fake  | 0.0.0 |
+    And I cd to "fake"
+    When I successfully run `berks upload`
+    Then the output should contain:
+      """
+      Skipping fake (0.0.0) (already uploaded)
+      Skipped uploading some cookbooks because they already existed on the remote server. Re-run with the `--force` flag to force overwrite these cookbooks:
+
+        * fake (0.0.0)
+      """

data/features/commands/vendor.feature

@@ -0,0 +1,53 @@
+Feature: Vendoring cookbooks to a directory
+  Background:
+    * the Berkshelf API server's cache is empty
+    * the Chef Server has cookbooks:
+      | fake | 1.0.0 |
+      | ekaf | 2.0.0 |
+    * the Berkshelf API server's cache is up to date
+
+
+  Scenario: successfully vendoring a Berksfile with multiple cookbook demands
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake'
+      cookbook 'ekaf'
+      """
+    When I successfully run `berks vendor cukebooks`
+    Then the directory "cukebooks/fake" should contain version "1.0.0" of the "fake" cookbook
+    And the directory "cukebooks/ekaf" should contain version "2.0.0" of the "ekaf" cookbook
+
+
+  Scenario: attempting to vendor when no Berksfile is present
+    When I run `berks vendor cukebooks`
+    Then the exit status should be "BerksfileNotFound"
+
+
+  Scenario: vendoring a Berksfile with a metadata demand
+    Given a cookbook named "fake"
+    And I cd to "fake"
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    When I successfully run `berks vendor cukebooks`
+    And the directory "cukebooks/fake" should contain version "0.0.0" of the "fake" cookbook
+
+
+  Scenario: vendoring without an explicit path to vendor into
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake'
+      """
+    When I successfully run `berks vendor`
+    And the directory "berks-cookbooks/fake" should contain version "1.0.0" of the "fake" cookbook
+
+
+  Scenario: vendoring to a directory that already exists
+    Given I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake'
+      """
+    And a directory named "cukebooks"
+    When I run `berks vendor cukebooks`
+    And the exit status should be "VendorError"

data/features/community_site.feature

@@ -0,0 +1,39 @@
+Feature: Installing cookbooks from the community site
+  Scenario: when the cookbook exists
+    Given I have a Berksfile pointing at the community API endpoint with:
+      """
+      cookbook 'apache2', '1.6.6'
+      """
+    When I successfully run `berks install`
+    Then the output should contain:
+      """
+      Installing apache2 (1.6.6)
+      """
+    And the cookbook store should have the cookbooks:
+      | apache2 | 1.6.6 |
+
+
+  Scenario: when the cookbook does not exist
+    Given I have a Berksfile pointing at the community API endpoint with:
+      """
+      cookbook '1234567890'
+      """
+    When I run `berks install`
+    Then the output should contain:
+      """
+      Unable to find a solution for demands: 1234567890 (>= 0.0.0)
+      """
+    And the exit status should be "NoSolutionError"
+
+
+  Scenario: when the cookbook exists, but the version does not
+    Given I have a Berksfile pointing at the community API endpoint with:
+      """
+      cookbook 'apache2', '0.0.0'
+      """
+    When I run `berks install`
+    Then the output should contain:
+      """
+      Unable to find a solution for demands: apache2 (= 0.0.0)
+      """
+    And the exit status should be "NoSolutionError"

data/features/config.feature

@@ -1,20 +1,55 @@
 Feature: Reading a Berkshelf configuration file
-  As a Cookbook author
-  I want to quickly generate a cookbook with my own customizations
-  So that I don't have to spend time modifying the default generated output each time
-
   Scenario: Missing a Berkshelf configuration file
     When I successfully run `berks cookbook sparkle_motion`
     Then the resulting "sparkle_motion" Vagrantfile should contain:
-      | config.vm.box = "Berkshelf-CentOS-6.3-x86_64-minimal" |
-      | config.vm.box_url = "https://dl.dropbox.com/u/31081437/Berkshelf-CentOS-6.3-x86_64-minimal.box" |
+      | config.omnibus.chef_version = :latest |
+      | config.vm.box = "opscode_ubuntu-12.04_provisionerless" |
+      | config.vm.box_url = "https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box" |
+
+
+  Scenario: Using a Berkshelf configuration file that disables the vagrant-omnibus plugin
+    Given I have a Berkshelf config file containing:
+    """
+    {
+      "vagrant": {
+        "omnibus": {
+          "enabled": false,
+          "version": "11.4.4"
+        },
+        "vm": {
+          "box": "my_box",
+          "box_url": "http://files.vagrantup.com/lucid64.box",
+          "forward_port": {
+            "12345": "54321"
+          },
+          "network": {
+            "bridged": true,
+            "hostonly": "12.34.56.78"
+          }
+        }
+      }
+    }
+    """
+    When I successfully run `berks cookbook sparkle_motion`
+    Then the resulting "sparkle_motion" Vagrantfile should contain:
+      | #config.omnibus.chef_version = :latest |
+      | config.vm.box = "my_box" |
+      | config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
+      | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
+      | config.vm.network :private_network, ip: "12.34.56.78" |
+      | config.vm.network :public_network |
     And the exit status should be 0
 
-  Scenario: Using a Berkshelf configuration file
+
+  Scenario: Using a Berkshelf configuration file that sets the vagrant-omnibus plugin chef version
     Given I have a Berkshelf config file containing:
     """
     {
       "vagrant": {
+        "omnibus": {
+          "enabled": true,
+          "version": "11.4.4"
+        },
         "vm": {
           "box": "my_box",
           "box_url": "http://files.vagrantup.com/lucid64.box",
@@ -31,6 +66,7 @@ Feature: Reading a Berkshelf configuration file
     """
     When I successfully run `berks cookbook sparkle_motion`
     Then the resulting "sparkle_motion" Vagrantfile should contain:
+      | config.omnibus.chef_version = "11.4.4" |
       | config.vm.box = "my_box" |
       | config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
       | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
@@ -38,6 +74,40 @@ Feature: Reading a Berkshelf configuration file
       | config.vm.network :public_network |
     And the exit status should be 0
 
+
+  Scenario: Using a Berkshelf configuration file that sets the vagrant-omnibus plugin chef version to latest
+    Given I have a Berkshelf config file containing:
+    """
+    {
+      "vagrant": {
+        "omnibus": {
+          "enabled": true,
+          "version": "latest"
+        },
+        "vm": {
+          "box": "my_box",
+          "box_url": "http://files.vagrantup.com/lucid64.box",
+          "forward_port": {
+            "12345": "54321"
+          },
+          "network": {
+            "bridged": true,
+            "hostonly": "12.34.56.78"
+          }
+        }
+      }
+    }
+    """
+    When I successfully run `berks cookbook sparkle_motion`
+    Then the resulting "sparkle_motion" Vagrantfile should contain:
+      | config.omnibus.chef_version = :latest |
+      | config.vm.box = "my_box" |
+      | config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
+      | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
+      | config.vm.network :private_network, ip: "12.34.56.78" |
+      | config.vm.network :public_network |
+
+
   Scenario: Using a partial Berkshelf configuration file
     Given I have a Berkshelf config file containing:
     """
@@ -54,7 +124,7 @@ Feature: Reading a Berkshelf configuration file
     When I successfully run `berks cookbook sparkle_motion`
     Then the resulting "sparkle_motion" Vagrantfile should contain:
       | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
-    And the exit status should be 0
+
 
   Scenario: Using an invalid Berkshelf configuration file
     Given I have a Berkshelf config file containing:
@@ -72,6 +142,7 @@ Feature: Reading a Berkshelf configuration file
     And the output should contain "vagrant.vm.box Expected attribute: 'vagrant.vm.box' to be a type of: 'String'"
     And the exit status should be "InvalidConfiguration"
 
+
   Scenario: Using a Berkshelf configuration file with Chef configuration information
     Given I have a Berkshelf config file containing:
     """
@@ -94,4 +165,3 @@ Feature: Reading a Berkshelf configuration file
       | chef.chef_server_url        = "localhost:4000"      |
       | chef.validation_client_name = "my_client-validator" |
       | chef.validation_key_path    = "/a/b/c/my_client-validator.pem" |
-    Then the exit status should be 0