berkshelf 1.0.4 → 1.1.0.rc1

data/.rbenv-version

@@ -1 +1 @@
-1.9.3-p286
+1.9.3-p327

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.9.3-p327@berkshelf --create

data/features/{install.feature → install_command.feature}

@@ -8,7 +8,7 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "mysql", "1.2.4"
       """
-    When I run the install command
+    When I successfully run `berks install`
     Then the cookbook store should have the cookbooks:
       | mysql   | 1.2.4 |
       | openssl | 1.0.0 |
@@ -26,13 +26,30 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "mysql", "= 1.2.4"
       """
-    When I run the install command
+    When I successfully run `berks install`
     Then the output should contain:
       """
       Using mysql (1.2.4)
       """
     And the exit status should be 0
 
+  Scenario: installing a Berksfile that has multiple cookbooks in different groups
+    Given the cookbook store has the cookbooks:
+      | build-essential   | 1.1.2 |
+    And I write to "Berksfile" with:
+      """
+      group :a do
+        cookbook "build-essential", "1.1.2"
+      end
+
+      group :b do
+        cookbook "build-essential", "1.1.2"
+      end
+      """
+    When I successfully run `berks install`
+    Then the output should contain "Using build-essential (1.1.2)"
+    And the exit status should be 0
+
   Scenario: installing a Berksfile that contains a source with dependencies, all of which already have been installed
     Given the cookbook store contains a cookbook "mysql" "1.2.4" with dependencies:
       | openssl      | = 1.0.0 |
@@ -45,7 +62,7 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "mysql", "~> 1.2.0"
       """
-    When I run the install command
+    When I successfully run `berks install`
     Then the output should contain:
       """
       Using mysql (1.2.4)
@@ -58,7 +75,7 @@ Feature: install cookbooks from a Berksfile
   Scenario: installing a Berksfile that contains a path location
     Given a Berksfile with path location sources to fixtures:
       | example_cookbook | example_cookbook-0.5.0 |
-    When I run the install command
+    When I successfully run `berks install`
     Then the output should contain:
       """
       Using example_cookbook (0.5.0) at path:
@@ -70,7 +87,7 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "artifact", git: "git://github.com/RiotGames/artifact-cookbook.git", ref: "0.9.8"
       """
-    When I run the install command
+    When I successfully run `berks install`
     Then the cookbook store should have the git cookbooks:
       | artifact | 0.9.8 | c0a0b456a4716a81645bef1369f5fd1a4e62ce6d |
     And the output should contain:
@@ -84,7 +101,7 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "artifact", github: "RiotGames/artifact-cookbook", ref: "0.9.8"
       """
-    When I run the install command
+    When I successfully run `berks install`
     Then the cookbook store should have the git cookbooks:
       | artifact | 0.9.8 | c0a0b456a4716a81645bef1369f5fd1a4e62ce6d |
     And the output should contain:
@@ -93,31 +110,26 @@ Feature: install cookbooks from a Berksfile
       """
     And the exit status should be 0
 
-  Scenario Outline: installing a Berksfile that contains a Github location and the default protocol
+  Scenario: installing a Berksfile that contains a Github location and the default protocol
     Given I write to "Berksfile" with:
       """
-      cookbook "artifact", github: "RiotGames/artifact-cookbook", ref: "0.9.8"<command postfix>
+      cookbook "artifact", github: "RiotGames/artifact-cookbook", ref: "0.9.8"
       """
-    When I run the install command
+    When I successfully run `berks install`
     Then the cookbook store should have the git cookbooks:
       | artifact | 0.9.8 | c0a0b456a4716a81645bef1369f5fd1a4e62ce6d |
     And the output should contain:
       """
-      Installing artifact (0.9.8) from github: 'RiotGames/artifact-cookbook' with branch: '0.9.8'
+      Installing artifact (0.9.8) from github: 'RiotGames/artifact-cookbook' with branch: '0.9.8' over protocol: 'git'
       """
     And the exit status should be 0
 
-    Examples:
-      | command postfix   |
-      | , protocol: "git" |
-      |                   |
-
   Scenario Outline: installing a Berksfile that contains a Github location and specific protocol
     Given I write to "Berksfile" with:
       """
       cookbook "artifact", github: "RiotGames/artifact-cookbook", ref: "0.9.8", protocol: "<protocol>"
       """
-    When I run the install command
+    When I successfully run `berks install`
     Then the cookbook store should have the git cookbooks:
       | artifact | 0.9.8 | c0a0b456a4716a81645bef1369f5fd1a4e62ce6d |
     And the output should contain:
@@ -138,19 +150,19 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "artifact", github: "RiotGames/artifact-cookbook", ref: "0.9.8", protocol: "somethingabsurd"
       """
-    When I run the install command
+    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.
       """
-    And the exit status should be 110      
+    And the exit status should be 110
 
   Scenario: installing a Berksfile that contains an explicit site location
     Given I write to "Berksfile" with:
       """
       cookbook "mysql", "1.2.4", site: "http://cookbooks.opscode.com/api/v1/cookbooks"
       """
-    When I run the install command
+    When I successfully run `berks install`
     Then the cookbook store should have the cookbooks:
       | mysql   | 1.2.4 |
       | openssl | 1.0.0 |
@@ -168,7 +180,7 @@ Feature: install cookbooks from a Berksfile
       metadata
       """
     When I cd to "sparkle_motion"
-    And I run the install command
+    And I successfully run `berks install`
     Then the output should contain:
       """
       Using sparkle_motion (0.0.0) at path:
@@ -178,7 +190,7 @@ Feature: install cookbooks from a Berksfile
   Scenario: running install with no Berksfile or Berksfile.lock
     Given I do not have a Berksfile
     And I do not have a Berksfile.lock
-    When I run the install command
+    When I run `berks install`
     Then the output should contain:
       """
       No Berksfile or Berksfile.lock found at:
@@ -190,7 +202,7 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "doesntexist"
       """
-    And I run the install command
+    And I run `berks install`
     Then the output should contain:
       """
       Cookbook 'doesntexist' not found in any of the default locations
@@ -202,23 +214,23 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "nginx", git: "/something/on/disk"
       """
-    When I run the install command
+    When I run `berks install`
     Then the output should contain:
       """
       '/something/on/disk' is not a valid Git URI.
       """
     And the CLI should exit with the status code for error "InvalidGitURI"
 
-  Scenario: installing when there are sources with duplicate names defined
+  Scenario: installing when there are sources with duplicate names defined in the same group
     Given I write to "Berksfile" with:
       """
       cookbook "artifact"
       cookbook "artifact"
       """
-    When I run the install command
+    When I run `berks install`
     Then the output should contain:
       """
-      Berksfile contains two sources named 'artifact'. Remove one and try again.
+      Berksfile contains multiple sources named 'artifact'. Use only one, or put them in different groups.
       """
     And the CLI should exit with the status code for error "DuplicateSourceDefined"
 
@@ -227,7 +239,7 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "artifact", "= 0.9.8", git: "git://github.com/RiotGames/artifact-cookbook.git", ref: "0.10.0"
       """
-    When I run the install command
+    When I run `berks install`
     Then the output should contain:
       """
       A cookbook satisfying 'artifact' (= 0.9.8) not found at git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: '0.10.0'
@@ -241,7 +253,7 @@ Feature: install cookbooks from a Berksfile
       """
     And the cookbook store has the cookbooks:
       | artifact | 0.10.0 |
-    When I run the install command
+    When I successfully run `berks install`
     Then the output should contain:
       """
       Installing artifact (0.10.0) from git: 'git://github.com/RiotGames/artifact-cookbook.git' with branch: '0.10.0'
@@ -253,7 +265,7 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "artifact", whatisthis: "I don't even know", anotherwat: "isthat"
       """
-    When I run the install command
+    When I run `berks install`
     Then the output should contain:
       """
       Invalid options for Cookbook Source: 'whatisthis', 'anotherwat'.
@@ -268,7 +280,7 @@ Feature: install cookbooks from a Berksfile
       """
     And the Chef server has cookbooks:
       | artifact | 0.10.2 |
-    When I run the install command
+    When I successfully run `berks install`
     Then the output should contain:
       """
       Installing artifact (0.10.2) from chef_api:
@@ -295,7 +307,7 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "artifact", chef_api: "https://api.opscode.com/organizations/vialstudios", client_key: "/Users/reset/.chef/knife.rb"
       """
-    When I run the install command
+    When I run `berks install`
     Then the output should contain:
       """
       Source 'artifact' is a 'chef_api' location with a URL for it's value but is missing options: 'node_name'.
@@ -307,7 +319,7 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "artifact", chef_api: "https://api.opscode.com/organizations/vialstudios", node_name: "reset"
       """
-    When I run the install command
+    When I run `berks install`
     Then the output should contain:
       """
       Source 'artifact' is a 'chef_api' location with a URL for it's value but is missing options: 'client_key'.
@@ -319,7 +331,7 @@ Feature: install cookbooks from a Berksfile
       """
       cookbook "artifact", chef_api: "https://api.opscode.com/organizations/vialstudios"
       """
-    When I run the install command
+    When I run `berks install`
     Then the output should contain:
       """
       Source 'artifact' is a 'chef_api' location with a URL for it's value but is missing options: 'node_name', 'client_key'.
@@ -332,7 +344,7 @@ Feature: install cookbooks from a Berksfile
       cookbook "ohai"
       cookbook "doesntexist", git: "git://github.com/asdjhfkljashflkjashfakljsf"
       """
-    When I run the install command
+    When I run `berks install`
     Then the output should contain:
       """
       Installing ohai (1.1.2) from site: 'http://cookbooks.opscode.com/api/v1/cookbooks'

data/features/list_command.feature

@@ -0,0 +1,24 @@
+Feature: list command
+  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
+
+  @slow_process
+  Scenario: Running the list command
+    Given I write to "Berksfile" with:
+      """
+      cookbook "build-essential", "1.2.0"
+      cookbook "chef-client", "1.2.0"
+      cookbook "mysql", "1.2.4"
+      """
+    And I successfully run `berks install`
+    When I run `berks list`
+    Then the output should contain:
+      """
+      Cookbooks installed by your Berksfile:
+        * build-essential (1.2.0)
+        * chef-client (1.2.0)
+        * mysql (1.2.4)
+        * openssl (1.0.0)
+      """
+    And the exit status should be 0

data/features/outdated_command.feature

@@ -0,0 +1,56 @@
+Feature: outdated command
+  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
+
+  Scenario: Running berks outdated with no version constraints
+    Given I write to "Berksfile" with:
+      """
+      cookbook "artifact"
+      cookbook "build-essential"
+      """
+    When I run `berks outdated`
+    Then the output should contain:
+      """
+      Listing outdated cookbooks with newer versions available...
+      """
+    And the output should contain:
+      """
+      All cookbooks up to date
+      """
+
+  Scenario: Running berks outdated with satisfied version constraints
+    Given I write to "Berksfile" with:
+      """
+      cookbook "artifact", ">= 0.11.0"
+      cookbook "build-essential", ">= 1.0.0"
+      """
+    When I run `berks outdated`
+    Then the output should contain:
+      """
+      Listing outdated cookbooks with newer versions available...
+      """
+    And the output should contain:
+      """
+      All cookbooks up to date
+      """
+
+  Scenario: Running berks outdated with unsatisfied version constraints
+    Given I write to "Berksfile" with:
+      """
+      cookbook "artifact", "~> 0.9.0"
+      cookbook "build-essential", "~> 0.7.0"
+      """
+    When I run `berks outdated`
+    Then the output should contain:
+      """
+      Listing outdated cookbooks with newer versions available...
+      """
+    And the output should contain:
+      """
+      Cookbook 'artifact (~> 0.9.0)' is outdated
+      """
+    And the output should contain:
+      """
+      Cookbook 'build-essential (~> 0.7.0)' is outdated
+      """

data/features/show_command.feature

@@ -0,0 +1,26 @@
+Feature: show command
+  As a user with a Berksfile
+  I want a way to show the path to a cookbooks on my local file system
+  So that I can view the source and debug
+
+  Scenario: Running the show command with an installed cookbook name
+    Given I write to "Berksfile" with:
+      """
+      cookbook "build-essential", "1.2.0"
+      cookbook "chef-client", "1.2.0"
+      cookbook "mysql", "1.2.4"
+      """
+    And I successfully run `berks install`
+    When I run `berks show build-essential`
+    Then the output should contain "berkshelf/tmp/berkshelf/cookbooks/build-essential-1.2.0"
+    And the exit status should be 0
+
+  Scenario: Running the show command with a not installed cookbook name
+    Given I write to "Berksfile" with:
+      """
+      cookbook "mysql", "1.2.4"
+      """
+    And I successfully run `berks install`
+    When I run `berks show build-essential`
+    Then the output should contain "Cookbook 'build-essential' was not installed by your Berksfile"
+    And the CLI should exit with the status code for error "CookbookNotFound"

data/features/step_definitions/chef_server_steps.rb

@@ -19,3 +19,9 @@ Then /^the Chef server should have the cookbooks:$/ do |cookbooks|
     server_has_cookbook?(name, version).should be_true
   end
 end
+
+Then /^the Chef server should not have the cookbooks:$/ do |cookbooks|
+  cookbooks.raw.each do |name, version|
+    server_has_cookbook?(name, version).should be_false
+  end
+end

data/features/step_definitions/cli_steps.rb

@@ -46,10 +46,6 @@ When /^I run the install command with flags:$/ do |flags|
   run_simple(unescape("berks install #{flags.raw.join(" ")}"), false)
 end
 
-When /^I run the update command$/ do
-  run_simple(unescape("berks update"), true)
-end
-
 When /^I run the upload command$/ do
   run_simple(unescape("berks upload"), true)
 end

data/features/support/env.rb

@@ -12,9 +12,9 @@ Spork.prefork do
   APP_ROOT = File.expand_path('../../../', __FILE__)
 
   ENV["BERKSHELF_PATH"] = File.join(APP_ROOT, "tmp", "berkshelf")
-  ENV["BERKSHELF_CHEF_CONFIG"] = File.join(APP_ROOT, "tmp", "knife.rb")
-  
-  # Workaround for RSA Fingerprint prompt in Travis CI 
+  ENV["BERKSHELF_CHEF_CONFIG"] = File.join(APP_ROOT, "spec", "knife.rb")
+
+  # Workaround for RSA Fingerprint prompt in Travis CI
   git_ssh_path = '/tmp/git_ssh.sh'
   unless File.exist? git_ssh_path
     git_ssh = File.new(git_ssh_path, 'w+')
@@ -38,7 +38,7 @@ Spork.prefork do
   Before do
     clean_cookbook_store
     @aruba_io_wait_seconds = 5
-    @aruba_timeout_seconds = 8
+    @aruba_timeout_seconds = 16
   end
 
   Before('@slow_process') do

data/features/update_command.feature

@@ -0,0 +1,55 @@
+Feature: update
+  As a user
+  I want a way to update the versions without clearing out the files I've downloaded
+  So that I can update faster than a clean install
+
+  Scenario: knife berkshelf update
+    Given I write to "Berksfile" with:
+      """
+      cookbook "artifact", "0.10.0"
+      """
+    Given I write to "Berksfile.lock" with:
+      """
+      cookbook 'artifact', :locked_version => '0.1.0'
+      """
+    When I successfully run `berks update`
+    Then the file "Berksfile.lock" should contain exactly:
+      """
+      cookbook 'artifact', :locked_version => '0.10.0'
+      """
+
+  Scenario: knife berkshelf update a single cookbook
+    Given I write to "Berksfile" with:
+      """
+      cookbook "artifact", "0.10.0"
+      cookbook "build-essential", "~> 1.1.0"
+      """
+    Given I write to "Berksfile.lock" with:
+      """
+      cookbook 'artifact', :locked_version => '0.10.0'
+      cookbook 'build-essential', :locked_version => '1.1.0'
+      """
+    When I successfully run `berks update build-essential`
+    Then the file "Berksfile.lock" should contain exactly:
+      """
+      cookbook 'artifact', :locked_version => '0.10.0'
+      cookbook 'build-essential', :locked_version => '1.1.2'
+      """
+
+  Scenario: knife berkshelf update a cookbook that isn't in the Berksfile
+    Given I write to "Berksfile" with:
+      """
+      cookbook "artifact", "0.10.0"
+      cookbook "build-essential", "~> 1.1.0"
+      """
+    Given I write to "Berksfile.lock" with:
+      """
+      cookbook 'artifact', :locked_version => '0.10.0'
+      cookbook 'build-essential', :locked_version => '1.1.0'
+      """
+    When I run `berks update foo`
+    Then the output should contain:
+      """
+      Could not find cookbooks 'foo' in any of the sources. Is it in your Berksfile?
+      """
+    And the CLI should exit with the status code for error "CookbookNotFound"