berkshelf 2.0.0.beta → 2.0.0

data/features/step_definitions/filesystem_steps.rb

@@ -3,6 +3,15 @@ require 'aruba/api'
 World(Aruba::Api)
 World(Berkshelf::RSpec::ChefAPI)
 
+Given /^I dynamically write to "(.+)" with:$/ do |file, contents|
+  steps %{
+    Given I write to "#{file}" with:
+      """
+      #{ERB.new(contents).result(binding)}
+      """
+  }
+end
+
 Given /^a cookbook named "(.*?)"$/ do |name|
   steps %{
     Given a directory named "#{name}"
@@ -42,8 +51,8 @@ Given /^the cookbook "(.*?)" has the file "(.*?)" with:$/ do |cookbook_name, fil
 end
 
 Given /^the cookbook store has the cookbooks:$/ do |cookbooks|
-  cookbooks.raw.each do |name, version|
-    generate_cookbook(cookbook_store, name, version)
+  cookbooks.raw.each do |name, version, license|
+    generate_cookbook(cookbook_store, name, version, license: license)
   end
 end
 
@@ -126,7 +135,7 @@ Then /^I should have a new cookbook skeleton "(.*?)" with Chef-Minitest support$
   cb_path = Pathname.new(current_dir).join(name)
   expect(cb_path).to have_structure {
     file "Berksfile" do
-      contains "cookbook \"minitest-handler\""
+      contains "cookbook 'minitest-handler'"
     end
     file "Vagrantfile" do
       contains "recipe[minitest-handler::default]"

data/features/step_definitions/utility_steps.rb

@@ -22,7 +22,6 @@ Then /^the output should be the same as \`(.+)\`$/ do |command|
 end
 
 # The built-in regex matcher does not support multi-line matching :(
-# @author Seth Vargo <sethvargo@gmail.com>
 Then /^the output should match multiline:$/ do |expected|
   regex = Regexp.new(expected.strip, Regexp::MULTILINE)
   expect(regex).to match(all_output)

data/features/support/env.rb

@@ -11,7 +11,7 @@ Spork.prefork do
 
   ENV['RUBY_ENV'] = 'test'
   ENV['BERKSHELF_PATH'] = File.join(APP_ROOT, 'tmp', 'berkshelf')
-  ENV['BERKSHELF_CHEF_CONFIG'] = File.join(APP_ROOT, 'spec', 'knife.rb')
+  ENV['BERKSHELF_CHEF_CONFIG'] = File.join(APP_ROOT, 'spec', 'config', 'knife.rb')
 
   # Workaround for RSA Fingerprint prompt in Travis CI
   git_ssh_path = '/tmp/git_ssh.sh'
@@ -34,7 +34,7 @@ Spork.prefork do
     clean_cookbook_store
     generate_berks_config(File.join(ENV['BERKSHELF_PATH'], 'config.json'))
     @aruba_io_wait_seconds = 5
-    @aruba_timeout_seconds = 16
+    @aruba_timeout_seconds = 30
   end
 
   Before('@slow_process') do
@@ -42,6 +42,15 @@ Spork.prefork do
     @aruba_io_wait_seconds = 30
   end
 
+  # Chef Zero
+  require 'chef_zero/server'
+  @server = ChefZero::Server.new(port: 4000, generate_real_keys: false)
+  @server.start_background
+
+  at_exit do
+    @server.stop if @server && @server.running?
+  end
+
   def cookbook_store
     Pathname.new(File.join(ENV['BERKSHELF_PATH'], 'cookbooks'))
   end
@@ -65,7 +74,5 @@ Spork.prefork do
 end
 
 Spork.each_run do
-  Berkshelf::RSpec::Knife.load_knife_config(File.join(APP_ROOT, 'spec/knife.rb'))
-
   require 'berkshelf'
 end

data/features/update_command.feature

@@ -1,15 +1,17 @@
-Feature: update command
+Feature: Updating a cookbook defined by a Berksfile
   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: updating with the old lockfile format
-    Given I write to "Berksfile" with:
+  Scenario: With the old lockfile format
+    Given the cookbook store has the cookbooks:
+      | berkshelf-cookbook-fixture | 0.1.0 |
+    And I write to "Berksfile" with:
       """
       site :opscode
       cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       """
-    Given I write to "Berksfile.lock" with:
+    And I write to "Berksfile.lock" with:
       """
       cookbook 'berkshelf-cookbook-fixture', :locked_version => '0.1.0'
       """
@@ -21,21 +23,25 @@ Feature: update command
         "sha":"b2714a4f9bdf500cb20267067160a0b3c1d8404c",
         "sources":{
           "berkshelf-cookbook-fixture":{
-            "locked_version":"0.2.0",
+            "locked_version":"0.1.0",
             "constraint":"~> 0.1"
           }
         }
       }
       """
 
-  Scenario: Updating all cookbooks
-    Given I write to "Berksfile" with:
+  Scenario: Without a cookbook specified
+    Given the cookbook store has the cookbooks:
+      | berkshelf-cookbook-fixture | 0.1.0 |
+      | berkshelf-cookbook-fixture | 0.2.0 |
+      | hostsfile                  | 1.0.1 |
+    And I write to "Berksfile" with:
       """
       site :opscode
       cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       cookbook 'hostsfile', '~> 1.0.0'
       """
-    Given I write to "Berksfile.lock" with:
+    And I write to "Berksfile.lock" with:
       """
       {
         "sha":"9d10199aa2652f9e965149c4346db20c78e97553",
@@ -69,7 +75,11 @@ Feature: update command
       }
       """
 
-  Scenario: Updating a single cookbook
+  Scenario: With a single cookbook specified
+    Given the cookbook store has the cookbooks:
+      | berkshelf-cookbook-fixture | 0.1.0 |
+      | berkshelf-cookbook-fixture | 0.2.0 |
+      | hostsfile                  | 1.0.1 |
     Given I write to "Berksfile" with:
       """
       site :opscode
@@ -110,7 +120,9 @@ Feature: update command
       }
       """
 
-  Scenario: Update a cookbook that doesn't exist
+  Scenario: With a cookbook that does not exist
+    Given the cookbook store has the cookbooks:
+      | berkshelf-cookbook-fixture | 0.1.0 |
     Given I write to "Berksfile" with:
       """
       site :opscode

data/features/upload_command.feature

@@ -1,117 +1,125 @@
-Feature: upload command
+Feature: Uploading cookbooks to a Chef Server
   As a Berkshelf CLI user
   I need a way to upload cookbooks to a Chef server that I have installed into my Bookshelf
   So they are available to Chef clients
 
-  @no_run @chef_server
-  Scenario: running the upload command when the Sources in the Berksfile are already installed
-    Given I write to "Berksfile" with:
+  @chef_server @slow_process
+  Scenario: With no arguments
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+      | ekaf | 2.0.0 |
+    And I write to "Berksfile" with:
       """
-      cookbook "mysql", "1.2.4"
+      cookbook 'fake', '1.0.0'
+      cookbook 'ekaf', '2.0.0'
       """
     And the Chef server does not have the cookbooks:
-      | mysql   | 1.2.4 |
-      | openssl | 1.0.0 |
-    And I run the install command
-    When I run the upload command
-    Then the output should not contain "Using mysql (1.2.4)"
-    And the output should not contain "Using openssl (1.0.0)"
-    And the output should contain "Uploading mysql (1.2.4) to:"
-    And the output should contain "Uploading openssl (1.0.0) to:"
-    And the Chef server should have the cookbooks:
-      | mysql   | 1.2.4 |
-      | openssl | 1.0.0 |
-    And the exit status should be 0
-
-  @chef_server @slow_process
-  Scenario: running the upload command when the Sources in the Berksfile have not been installed
-    Given I write to "Berksfile" with:
+      | fake   | 1.0.0 |
+      | ekaf   | 2.0.0 |
+    When I successfully run `berks upload`
+    Then the output should contain:
       """
-      cookbook "mysql", "1.2.4"
-      cookbook "openssl", "= 1.0.0"
+      Uploading fake (1.0.0) to: 'http://localhost:4000/'
+      Uploading ekaf (2.0.0) to: 'http://localhost:4000/'
       """
-    And the Chef server does not have the cookbooks:
-      | mysql   | 1.2.4 |
-      | openssl | 1.0.0 |
-    When I run the upload command
-    Then the output should contain "Installing mysql (1.2.4) from site:"
-    And the output should contain "Installing openssl (1.0.0) from site:"
-    And the output should contain "Uploading mysql (1.2.4) to:"
-    And the output should contain "Uploading openssl (1.0.0) to:"
     And the Chef server should have the cookbooks:
-      | mysql   | 1.2.4 |
-      | openssl | 1.0.0 |
+      | fake   | 1.0.0 |
+      | ekaf   | 2.0.0 |
     And the exit status should be 0
 
   @chef_server
-  Scenario: running the upload command with a Berksfile containing a source that has a path location
-    Given a Berksfile with path location sources to fixtures:
-      | example_cookbook | example_cookbook-0.5.0 |
+  Scenario: With a path location in the Berksfile
+    Given a cookbook named "fake"
+    And I write to "Berksfile" with:
+      """
+      cookbook 'fake', path: './fake'
+      """
     And the Chef server does not have the cookbooks:
-      | example_cookbook | 0.5.0 |
-    When I run the upload command
-    Then the output should contain "Using example_cookbook (0.5.0) at path:"
-    And the output should contain "Uploading example_cookbook (0.5.0) to:"
+      | fake | 0.0.0 |
+    When I successfully run `berks upload`
+    Then the output should contain:
+      """
+      Uploading fake (0.0.0) to: 'http://localhost:4000/'
+      """
     And the Chef server should have the cookbooks:
-      | example_cookbook | 0.5.0 |
+      | fake | 0.0.0 |
     And the exit status should be 0
 
   @chef_server
-  Scenario: running the upload command with a Berksfile containing a source that has a Git location
-    Given I write to "Berksfile" with:
+  Scenario: With a git location in the Berksfile
+    Given the cookbook store has the cookbooks:
+      | berkshelf-cookbook-fixture | 0.1.0 |
+    And I write to "Berksfile" with:
       """
-      cookbook "artifact", git: "git://github.com/RiotGames/artifact-cookbook.git", ref: "0.9.8"
+      cookbook 'berkshelf-cookbook-fixture', ref: 'v0.1.0'
       """
     And the Chef server does not have the cookbooks:
-      | artifact | 0.9.8 |
-    When I run the upload command
-    Then the output should contain "Installing artifact (0.9.8) from git:"
-    And the output should contain "Uploading artifact (0.9.8) to:"
+      | berkshelf-cookbook-fixture | 0.1.0 |
+    When I successfully run `berks upload`
+    Then the output should contain:
+      """
+      Uploading berkshelf-cookbook-fixture (0.1.0) to: 'http://localhost:4000/'
+      """
     And the Chef server should have the cookbooks:
-      | artifact | 0.9.8 |
+      | berkshelf-cookbook-fixture | 0.1.0 |
     And the exit status should be 0
 
   @chef_server @slow_process
-  Scenario: Running the upload command for a single cookbook
-    Given I write to "Berksfile" with:
+  Scenario: With a single cookbook
+    Given the cookbook store has the cookbooks:
+      | fake  | 1.0.0 |
+      | ekaf  | 2.0.0 |
+    And the cookbook store contains a cookbook "reset" "3.4.5" with dependencies:
+      | fake | ~> 1.0.0 |
+    And I write to "Berksfile" with:
       """
-      cookbook "build-essential", "1.2.0"
-      cookbook "mysql", "1.2.4"
-      cookbook "openssl", "= 1.0.0"
+      cookbook 'fake', '1.0.0'
+      cookbook 'ekaf', '2.0.0'
+      cookbook 'reset', '3.4.5'
       """
-    And I successfully run `berks install`
     And the Chef server does not have the cookbooks:
-      | mysql           | 1.2.4 |
-      | openssl         | 1.0.0 |
-      | build-essential | 1.2.0 |
-    When I run `berks upload mysql`
-    Then the output should contain "Uploading mysql (1.2.4)"
-    And the output should contain "Uploading openssl (1.0.0)"
-    And the output should not contain "Uploading build-essential (1.2.0)"
+      | fake  | 1.0.0 |
+      | ekaf  | 2.0.0 |
+      | reset | 3.4.5 |
+    When I successfully run `berks upload reset`
+    Then the output should contain:
+      """
+      Uploading reset (3.4.5) to: 'http://localhost:4000/'
+      Uploading fake (1.0.0) to: 'http://localhost:4000/'
+      """
     And the Chef server should have the cookbooks:
-      | mysql | 1.2.4 |
-      | openssl | 1.0.0 |
+      | reset | 3.4.5 |
+      | fake  | 1.0.0 |
     And the Chef server should not have the cookbooks:
-      | build-essential | 1.2.0 |
+      | ekaf  | 2.0.0 |
     And the exit status should be 0
 
   @chef_server @slow_process
-  Scenario: explicitly specifying multiple cookbooks to upload
+  Scenario: With multiple cookbooks
+    Given the cookbook store has the cookbooks:
+      | ntp  | 1.0.0 |
+      | vim  | 1.0.0 |
+      | apt  | 1.0.0 |
     Given I write to "Berksfile" with:
       """
-      cookbook "ntp"
-      cookbook "vim"
-      cookbook "apt"
+      cookbook 'ntp', '1.0.0'
+      cookbook 'vim', '1.0.0'
+      cookbook 'apt', '1.0.0'
       """
-    And I successfully run `berks install`
     And the Chef server does not have the cookbooks:
       | ntp |
       | vim |
       | apt |
-    When I run `berks upload ntp vim`
-    Then the output should contain "Uploading ntp"
-    And the output should contain "Uploading vim"
-    And the output should not contain "Uploading apt"
+    When I successfully run `berks upload ntp vim`
+    Then the output should contain:
+      """
+      Uploading ntp (1.0.0) to: 'http://localhost:4000/'
+      Uploading vim (1.0.0) to: 'http://localhost:4000/'
+      """
+    And the output should not contain:
+      """
+      Uploading apt (1.0.0) to: 'http://localhost:4000/'
+      """
     And the Chef server should have the cookbooks:
       | ntp |
       | vim |
@@ -120,99 +128,138 @@ Feature: upload command
     And the exit status should be 0
 
   @chef_server @slow_process
-  Scenario: uploading a single group of cookbooks with the --only flag
+  Scenario: With the --only flag
+    Given the cookbook store has the cookbooks:
+      | core    | 1.0.0 |
+      | system  | 1.0.0 |
     Given I write to "Berksfile" with:
       """
-      group :core do
-        cookbook "ntp"
+      group :group_a do
+        cookbook 'core', '1.0.0'
       end
 
-      group :system do
-        cookbook "vim"
+      group :group_b do
+        cookbook 'system', '1.0.0'
       end
       """
-    And I successfully run `berks install`
     And the Chef server does not have the cookbooks:
-      | ntp |
-      | vim |
-    When I run `berks upload --only core`
-    Then the output should contain "Uploading ntp"
-    And the output should not contain "Uploading vim"
+      | core   | 1.0.0 |
+      | system | 1.0.0 |
+    When I successfully run `berks upload --only group_a`
+    Then the output should contain:
+      """
+      Uploading core (1.0.0) to: 'http://localhost:4000/'
+      """
+    And the output should not contain:
+      """
+      Uploading system (1.0.0) to: 'http://localhost:4000/'
+      """
     And the Chef server should have the cookbooks:
-      | ntp |
+      | core | 1.0.0 |
     And the Chef server should not have the cookbooks:
-      | vim |
+      | system | 1.0.0 |
     And the exit status should be 0
 
   @chef_server @slow_process
-  Scenario: uploading multiple groups of cookbooks with the --only flag
+  Scenario: With the --only flag specifying multiple groups
+    Given the cookbook store has the cookbooks:
+      | core    | 1.0.0 |
+      | system  | 1.0.0 |
     Given I write to "Berksfile" with:
       """
-      group :core do
-        cookbook "ntp"
+      group :group_a do
+        cookbook 'core', '1.0.0'
       end
 
-      group :system do
-        cookbook "vim"
+      group :group_b do
+        cookbook 'system', '1.0.0'
       end
       """
-    And I successfully run `berks install`
     And the Chef server does not have the cookbooks:
-      | ntp |
-      | vim |
-    When I run `berks upload --only core system`
-    Then the output should contain "Uploading ntp"
-    And the output should contain "Uploading vim"
+      | core   | 1.0.0 |
+      | system | 1.0.0 |
+    When I successfully run `berks upload --only group_a group_b`
+    Then the output should contain:
+      """
+      Uploading core (1.0.0) to: 'http://localhost:4000/'
+      Uploading system (1.0.0) to: 'http://localhost:4000/'
+      """
     And the Chef server should have the cookbooks:
-      | ntp |
-      | vim |
+      | core   | 1.0.0 |
+      | system | 1.0.0 |
     And the exit status should be 0
 
   @chef_server @slow_process
-  Scenario: skip uploading one group of cookbooks with the --except flag
+  Scenario: With the --except flag
+    Given the cookbook store has the cookbooks:
+      | core    | 1.0.0 |
+      | system  | 1.0.0 |
     Given I write to "Berksfile" with:
       """
-      group :core do
-        cookbook "ntp"
+      group :group_a do
+        cookbook 'core', '1.0.0'
       end
 
-      group :system do
-        cookbook "vim"
+      group :group_b do
+        cookbook 'system', '1.0.0'
       end
       """
-    And I successfully run `berks install`
     And the Chef server does not have the cookbooks:
-      | ntp |
-      | vim |
-    When I run `berks upload --except core`
-    Then the output should not contain "Uploading ntp"
-    And the output should contain "Uploading vim"
-    And the Chef server should not have the cookbooks:
-      | ntp |
+      | core   | 1.0.0 |
+      | system | 1.0.0 |
+    When I successfully run `berks upload --except group_b`
+    Then the output should contain:
+      """
+      Uploading core (1.0.0) to: 'http://localhost:4000/'
+      """
+    And the output should not contain:
+      """
+      Uploading system (1.0.0) to: 'http://localhost:4000/'
+      """
     And the Chef server should have the cookbooks:
-      | vim |
+      | core | 1.0.0 |
+    And the Chef server should not have the cookbooks:
+      | system | 1.0.0 |
     And the exit status should be 0
 
   @chef_server @slow_process
-  Scenario: skip uploading multiple groups of cookbooks with the --except flag
+  Scenario: With the --except flag specifying multiple groups
+    Given the cookbook store has the cookbooks:
+      | core    | 1.0.0 |
+      | system  | 1.0.0 |
     Given I write to "Berksfile" with:
       """
-      group :core do
-        cookbook "ntp"
+      group :group_a do
+        cookbook 'core', '1.0.0'
       end
 
-      group :system do
-        cookbook "vim"
+      group :group_b do
+        cookbook 'system', '1.0.0'
       end
       """
-    And I successfully run `berks install`
     And the Chef server does not have the cookbooks:
-      | ntp |
-      | vim |
-    When I run `berks upload --except core system`
-    Then the output should not contain "Uploading ntp"
-    And the output should not contain "Uploading vim"
+      | core   | 1.0.0 |
+      | system | 1.0.0 |
+    When I successfully run `berks upload --except group_a group_b`
+    Then the output should not contain:
+      """
+      Uploading core (1.0.0) to: 'http://localhost:4000/'
+      Uploading system (1.0.0) to: 'http://localhost:4000/'
+      """
     And the Chef server should not have the cookbooks:
-      | ntp |
-      | vim |
+      | core   | 1.0.0 |
+      | system | 1.0.0 |
     And the exit status should be 0
+
+  Scenario: With an invalid cookbook
+    Given a cookbook named "cookbook with spaces"
+    And I write to "Berksfile" 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 CLI should exit with the status code for error "InvalidCookbookFiles"