berkshelf 2.0.0.beta → 2.0.0

data/features/configure_command.feature

@@ -1,11 +1,11 @@
-Feature: configure command
+Feature: Configuring Berkshelf via the command line
   As CLI user of Berkshelf
   I want a command to generate a Berkshelf configuration file based on my input
   So I can quickly get up and running with the least amount of resistance
 
-  Scenario: generating a new config file
+  Scenario: Using custom values
     Given I do not have a Berkshelf config file
-    When I run the "configure" command interactively
+    When I run `berks configure` interactively
     And I type "https://api.opscode.com/organizations/vialstudios"
     And I type "node_name"
     And I type "client_key"
@@ -27,10 +27,10 @@ Feature: configure command
       | vagrant.vm.box              | Berkshelf-minimal                                 |
       | vagrant.vm.box_url          | https://dl.dropbox.com/Berkshelf.box              |
 
-  Scenario: generating a config with default values
+  Scenario: Accepting the default values
     Given I do not have a Berkshelf config file
     And I have a default Chef config
-    When I run the "configure" command interactively
+    When I run `berks configure` interactively
     And I type ""
     And I type ""
     And I type ""
@@ -51,16 +51,16 @@ Feature: configure command
       | vagrant.vm.box              | Berkshelf-CentOS-6.3-x86_64-minimal |
       | vagrant.vm.box_url          | https://dl.dropbox.com/u/31081437/Berkshelf-CentOS-6.3-x86_64-minimal.box |
 
-  Scenario: attempting to generate a new config when one already exists
+  Scenario: Creating a Berkshelf configuration file when one already exists
     Given I have a default Berkshelf config file
-    When I run the "configure" command interactively
+    When I run `berks configure` interactively
     Then the output should contain:
       """
       A configuration file already exists. Re-run with the --force flag if you wish to overwrite it.
       """
     And the CLI should exit with the status code for error "ConfigExists"
 
-  Scenario Outline: Generating a local Berkshelf config
+  Scenario Outline: Using the --path option
     Given I do not have a Berkshelf config file at "<path>"
     When I run the "configure --path <path>" command interactively
     And I type "https://api.opscode.com/organizations/vialstudios"

data/features/contingent_command.feature

@@ -1,18 +1,47 @@
-Feature: contingent command
+Feature: Running the contingent command
   As a user with a Berksfile
   I want a way to the cookbooks that depend on another
   So that I can better understand my infrastructure
 
-  @slow_process
-  Scenario: Running the contingent command against a cookbook
-    Given I write to "Berksfile" with:
+  Scenario: When there are dependent cookbooks
+    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 the cookbook store contains a cookbook "ekaf" "1.0.0" with dependencies:
+      | dep | ~> 1.0.0 |
+    And I write to "Berksfile" with:
       """
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0', github: 'RiotGames/berkshelf-cookbook-fixture', branch: 'deps'
+      cookbook 'fake', '1.0.0'
+      cookbook 'ekaf', '1.0.0'
       """
-    And I successfully run `berks contingent hostsfile`
+    And I successfully run `berks contingent dep`
     Then the output should contain:
       """
-      Cookbooks contingent upon hostsfile:
-        * berkshelf-cookbook-fixture (1.0.0)
+      Cookbooks in this Berksfile contingent upon dep:
+        * ekaf (1.0.0)
+        * fake (1.0.0)
       """
     And the exit status should be 0
+
+  Scenario: When there are no dependent cookbooks
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+    And I write to "Berksfile" with:
+      """
+      cookbook 'fake', '1.0.0'
+      """
+    And I successfully run `berks contingent dep`
+    Then the output should contain:
+      """
+      There are no cookbooks contingent upon 'dep' defined in this Berksfile
+      """
+    And the exit status should be 0
+
+  Scenario: When the cookbook is not in the Berksfile
+    Given an empty file named "Berksfile"
+    And I successfully run `berks contingent dep`
+    Then the output should contain:
+      """
+      There are no cookbooks contingent upon 'dep' defined in this Berksfile
+      """

data/features/cookbook_command.feature

@@ -1,29 +1,32 @@
-Feature: cookbook command
+Feature: Creating a new cookbook
   As a Cookbook author
   I want a way to quickly generate a Cookbook skeleton that contains supporting Berkshelf files
   So I can quickly and automatically generate a Cookbook containing Berkshelf supporting files or other common supporting files
 
-  Scenario: creating a new cookbook skeleton
-    When I run the cookbook command to create "sparkle_motion"
+  Scenario: With the default options
+    When I successfully run `berks cookbook sparkle_motion`
     Then I should have a new cookbook skeleton "sparkle_motion"
     And the exit status should be 0
 
-  Scenario Outline: creating a new cookbook skeleton with affirmative options
+  Scenario Outline: With various options
     When I run the cookbook command to create "sparkle_motion" with options:
       | --<option> |
     Then I should have a new cookbook skeleton "sparkle_motion" with <feature> support
     And the exit status should be 0
 
   Examples:
-    | option        | feature       |
-    | foodcritic    | Foodcritic    |
-    | chef-minitest | Chef-Minitest |
-    | scmversion    | SCMVersion    |
-    | no-bundler    | no Bundler    |
-    | skip-git      | no Git        |
-    | skip-vagrant  | no Vagrant    |
+    | option            | feature         |
+    | foodcritic        | Foodcritic      |
+    | chef-minitest     | Chef-Minitest   |
+    | scmversion        | SCMVersion      |
+    | no-bundler        | no Bundler      |
+    # Disable testing of skip git until Test Kitchen supports the skip_git flag in it's generator
+    # https://github.com/opscode/test-kitchen/issues/141
+    # | skip-git          | no Git          |
+    | skip-vagrant      | no Vagrant      |
+    | skip-test-kitchen | no Test Kitchen |
 
-  Scenario Outline: creating a new cookbook skeleton with options without the supporting gem installed
+  Scenario Outline: When a required supporting gem is not installed
     Given the gem "<gem>" is not installed
     When I run the cookbook command to create "sparkle_motion" with options:
       | --<option> |
@@ -36,9 +39,9 @@ Feature: cookbook command
     | foodcritic | Foodcritic | foodcritic      |
     | scmversion | SCMVersion | thor-scmversion |
 
-  Scenario: creating a new cookbook skeleton with bundler support without bundler installed
+  Scenario: When bundler is not installed
     Given the gem "bundler" is not installed
-    When I run the cookbook command to create "sparkle_motion"
+    When I successfully run `berks cookbook sparkle_motion`
     Then I should have a new cookbook skeleton "sparkle_motion"
     And the output should contain a warning to suggest supporting the default for "bundler" by installing "bundler"
     And the exit status should be 0

data/features/groups_install.feature

@@ -1,51 +1,55 @@
-Feature: installing groups
+Feature: Installing specific groups
   As a user
   I want to be able specify groups of cookbooks to include or exclude
   So I don't install cookbooks that are part of a group that I do not want to install
 
-  Scenario: except groups
+  Scenario: Using the --except option
+    Given the cookbook store has the cookbooks:
+      | default  | 1.0.0 |
+      | takeme   | 1.0.0 |
     Given I write to "Berksfile" with:
       """
       group :notme do
-        cookbook 'nginx', '= 0.101.2'
+        cookbook 'notme', '1.0.0'
       end
 
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
+      cookbook 'default', '1.0.0'
 
       group :takeme do
-        cookbook 'hostsfile', '1.0.1'
+        cookbook 'takeme', '1.0.0'
       end
       """
     When I successfully run `berks install --except notme`
-    Then the cookbook store should have the cookbooks:
-      | berkshelf-cookbook-fixture | 1.0.0 |
-      | hostsfile | 1.0.1 |
-    And the cookbook store should not have the cookbooks:
-      | nginx | 0.101.2 |
+    Then the output should contain:
+      """
+      Using default (1.0.0)
+      Using takeme (1.0.0)
+      """
+    And the output should not contain "Using notme (1.0.0)"
     And the exit status should be 0
 
-  Scenario: only groups
+  Scenario: Using the --only option
+    Given the cookbook store has the cookbooks:
+      | takeme   | 1.0.0 |
     Given I write to "Berksfile" with:
       """
       group :notme do
-        cookbook 'nginx', '= 0.101.2'
+        cookbook 'notme', '1.0.0'
       end
 
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
+      cookbook 'default', '1.0.0'
 
       group :takeme do
-        cookbook 'hostsfile', '1.0.1'
+        cookbook 'takeme', '1.0.0'
       end
       """
     When I successfully run `berks install --only takeme`
-    Then the cookbook store should have the cookbooks:
-      | hostsfile | 1.0.1 |
-    And the cookbook store should not have the cookbooks:
-      | nginx     | 0.101.2 |
-      | berkshelf-cookbook-fixture | 1.0.0 |
+    Then the output should contain "Using takeme (1.0.0)"
+    Then the output should not contain "Using notme (1.0.0)"
+    Then the output should not contain "Using default (1.0.0)"
     And the exit status should be 0
 
-  Scenario: attempting to provide an only and except option
+  Scenario: Attempting to provide an only and except option
     Given I write to "Berksfile" with:
       """
       group :notme do

data/features/install_command.feature

@@ -3,30 +3,6 @@ Feature: install cookbooks from a Berksfile
   I want to be able to run knife berkshelf install to install my cookbooks
   So that I don't have to download my cookbooks and their dependencies manually
 
-  Scenario: installing with the old lockfile format
-    Given I write to "Berksfile" with:
-      """
-      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
-      """
-    Given I write to "Berksfile.lock" with:
-      """
-      cookbook 'berkshelf-cookbook-fixture', :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 file "Berksfile.lock" should contain JSON:
-      """
-      {
-        "sha":"bfb1de046fdc2a0c38cd5bbaddddce8bc1cd3c24",
-        "sources":{
-          "berkshelf-cookbook-fixture":{
-            "locked_version":"1.0.0",
-            "constraint":"= 1.0.0"
-          }
-        }
-      }
-      """
-
   Scenario: installing a Berksfile that contains a source with a default location
     Given I write to "Berksfile" with:
       """
@@ -182,7 +158,7 @@ Feature: install cookbooks from a Berksfile
     When I run `berks install`
     Then the output should contain:
       """
-      'somethingabsurd' is not a supported Git protocol for the 'github' location key. Please use 'git' instead.
+      'somethingabsurd' is not supported for the 'github' location key - please use 'git' instead
       """
     And the exit status should be 110
 
@@ -244,7 +220,7 @@ Feature: install cookbooks from a Berksfile
     When I run `berks install`
     Then the output should contain:
       """
-      '/something/on/disk' is not a valid Git URI.
+      '/something/on/disk' is not a valid Git URI
       """
     And the CLI should exit with the status code for error "InvalidGitURI"
 
@@ -275,7 +251,7 @@ Feature: install cookbooks from a Berksfile
       does not satisfy the version constraint:
         berkshelf-cookbook-fixture \(= 1.0.0\)
 
-      This occurs when the Chef Server has a cookbook with a missing/mis-matched version number in its `metadata.rb`\.
+      This occurs when the Chef Server has a cookbook with a missing/mis-matched version number in its `metadata.rb`
       """
     And the CLI should exit with the status code for error "CookbookValidationFailure"
 
@@ -322,6 +298,20 @@ Feature: install cookbooks from a Berksfile
       | berkshelf-cookbook-fixture | 1.0.0 |
     And the exit status should be 0
 
+  Scenario: when the :site is not defined
+    Given I write to "Berksfile" with:
+      """
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0', site: nil
+      """
+    When I successfully run `berks install`
+    Then the output should contain:
+      """
+      Installing berkshelf-cookbook-fixture (1.0.0) from site:
+      """
+    And the cookbook store should have the cookbooks:
+      | berkshelf-cookbook-fixture | 1.0.0 |
+    And the exit status should be 0
+
   Scenario: with a chef_api source location specifying :config when a Berkshelf config is not found at the given path
     Given I write to "Berksfile" with:
       """
@@ -331,9 +321,9 @@ Feature: install cookbooks from a Berksfile
       | -c /tmp/notthere.lol |
     Then the output should contain:
       """
-      You specified a path to a configuration file that did not exist: '/tmp/notthere.lol'
+      No Berkshelf config file found at: '/tmp/notthere.lol'!
       """
-    And the CLI should exit with the status code for error "BerksConfigNotFound"
+    And the CLI should exit with the status code for error "ConfigNotFound"
 
   Scenario: with a git error during download
     Given I write to "Berksfile" with:
@@ -344,9 +334,10 @@ Feature: install cookbooks from a Berksfile
     When I run `berks install`
     Then the output should contain:
       """
-      Installing berkshelf-cookbook-fixture (1.0.0) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'
-      Failed to download 'doesntexist' from git: 'git://github.com/asdjhfkljashflkjashfakljsf' with branch: 'master'
-      An error occured during Git execution:
+      An error occurred during Git execution:
+
+        fatal: remote error:
+        Repository not found.
       """
       And the CLI should exit with the status code for error "GitError"
 
@@ -359,5 +350,5 @@ Feature: install cookbooks from a Berksfile
     When I run `berks install`
     Then the output should contain:
       """
-      Unknown site shortname: :somethingabsurd. Supported shortnames are: :opscode
+      Unknown site shortname 'somethingabsurd' - supported shortnames are:
       """

data/features/licenses.feature

@@ -0,0 +1,112 @@
+Feature: Installing cookbooks with specific licenses
+  As a user
+  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
+
+  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
+      cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
+      """
+    And I have a Berkshelf config file containing:
+      """
+      {
+        "allowed_licenses": ["mit"]
+      }
+      """
+    When I successfully run `berks install`
+    Then the output should not contain:
+      """
+      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
+      cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
+      """
+    And I have a Berkshelf config file containing:
+      """
+      {
+        "allowed_licenses": ["apache2"]
+      }
+      """
+    When I successfully run `berks install`
+    Then the output should contain:
+      """
+      '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
+      cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
+      """
+    And I have a Berkshelf config file containing:
+      """
+      {
+        "allowed_licenses": ["mit"],
+        "raise_license_exception": true
+      }
+      """
+    When I successfully run `berks install`
+    Then the output should not contain:
+      """
+      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
+      cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
+      """
+    And I have a Berkshelf config file containing:
+      """
+      {
+        "allowed_licenses": ["apache2"],
+        "raise_license_exception": true
+      }
+      """
+    When I run `berks install`
+    Then the output should contain:
+      """
+      'mit' is not in your list of allowed licenses
+      """
+    And the CLI should exit with the status code for error "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'
+      """
+    And I have a Berkshelf config file containing:
+      """
+      {
+        "allowed_licenses": ["apache2"],
+        "raise_license_exception": true
+      }
+      """
+    When I 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