berkshelf 1.4.6 → 2.0.0.beta

data/features/outdated_command.feature

@@ -3,15 +3,14 @@ Feature: outdated command
   I want to know what cookbooks are outdated before I run update
   So that I can decide whether to update everything at once
 
-  @slow_process
   Scenario: Running berks outdated with no version constraints
     Given I write to "Berksfile" with:
       """
       site :opscode
-      cookbook "artifact"
-      cookbook "build-essential"
+
+      cookbook 'berkshelf-cookbook-fixture'
       """
-    When I run `berks outdated`
+    When I successfully run `berks outdated`
     Then the output should contain:
       """
       Listing outdated cookbooks with newer versions available...
@@ -21,13 +20,12 @@ Feature: outdated command
       All cookbooks up to date
       """
 
-  @slow_process
   Scenario: Running berks outdated with satisfied version constraints
     Given I write to "Berksfile" with:
       """
       site :opscode
-      cookbook "artifact", ">= 0.11.0"
-      cookbook "build-essential", ">= 1.0.0"
+
+      cookbook 'berkshelf-cookbook-fixture', '>= 0.1'
       """
     When I run `berks outdated`
     Then the output should contain:
@@ -39,13 +37,12 @@ Feature: outdated command
       All cookbooks up to date
       """
 
-  @slow_process
   Scenario: Running berks outdated with unsatisfied version constraints
     Given I write to "Berksfile" with:
       """
       site :opscode
-      cookbook "artifact", "~> 0.9.0"
-      cookbook "build-essential", "~> 0.7.0"
+
+      cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
       """
     When I run `berks outdated`
     Then the output should contain:
@@ -54,9 +51,5 @@ Feature: outdated command
       """
     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
+      Cookbook 'berkshelf-cookbook-fixture (~> 0.1)' is outdated
       """

data/features/package_command.feature

@@ -0,0 +1,39 @@
+Feature: package command
+  As a user
+  I want to be able to package a cookbook
+  So that I can use it outside of Berkshelf
+
+  Scenario: Running the package command
+    Given I write to "Berksfile" with:
+      """
+      site :opscode
+      cookbook 'berkshelf-cookbook-fixture', '~> 1.0.0'
+      """
+    And I successfully run `berks install`
+    When I successfully run `berks package berkshelf-cookbook-fixture`
+    Then a file named "berkshelf-cookbook-fixture.tar.gz" should exist
+    And the output should contain "Cookbook 'berkshelf-cookbook-fixture' saved to "
+    And the exit status should be 0
+
+  Scenario: Running the package command with the --output option
+    Given I write to "Berksfile" with:
+      """
+      site :opscode
+      cookbook 'berkshelf-cookbook-fixture', '~> 1.0.0'
+      """
+    And I successfully run `berks install`
+    When I successfully run `berks package berkshelf-cookbook-fixture --output foo/bar`
+    Then a file named "foo/bar/berkshelf-cookbook-fixture.tar.gz" should exist
+    And the exit status should be 0
+
+  Scenario: Running the package command with an installed cookbook name
+    Given I write to "Berksfile" with:
+      """
+      site :opscode
+      cookbook 'berkshelf-cookbook-fixture', '~> 1.0.0'
+      """
+    And I successfully run `berks install`
+    When I run `berks package non-existent`
+    Then a file named "non-existent.tar.gz" should not exist
+    And the output should contain "Cookbook 'non-existent' is not in your Berksfile"
+    And the CLI should exit with the status code for error "CookbookNotFound"

data/features/show_command.feature

@@ -4,24 +4,23 @@ Feature: show command
   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:
+    Given the cookbook store has the cookbooks:
+      | berkshelf-cookbook-fixture | 1.0.0 |
+    And I write to "Berksfile" with:
       """
       site :opscode
-      cookbook "build-essential", "1.2.0"
-      cookbook "chef-client", "1.2.0"
-      cookbook "mysql", "1.2.4"
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
-    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"
+    When I successfully run `berks show berkshelf-cookbook-fixture`
+    Then the output should contain "berkshelf/tmp/berkshelf/cookbooks/berkshelf-cookbook-fixture-1.0.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"
+      site :opscode
+      cookbook 'berkshelf-cookbook-fixture', '1.0.0'
       """
-    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

@@ -16,12 +16,30 @@ end
 
 Then /^the Chef server should have the cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version|
-    server_has_cookbook?(name, version).should be_true
+    expect(server_has_cookbook?(name, version)).to 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
+    expect(server_has_cookbook?(name, version)).to be_false
   end
 end
+
+Given(/^I have an environment named "(.*?)"$/) do |environment_name|
+  delete_environment(environment_name)
+  begin
+    create_environment(environment_name)
+  rescue Ridley::Errors::HTTPConflict; end
+end
+
+Then(/^the version locks in "(.*?)" should be:$/) do |environment_name, version_locks|
+  environment_cookbook_versions = environment(environment_name).cookbook_versions
+  version_locks.hashes.each do |hash|
+    expect(environment_cookbook_versions[hash['cookbook']]).to eq(hash['version_lock'])
+  end
+end
+
+Given(/^I do not have an environment named "(.*?)"$/) do |environment_name|
+  delete_environment(environment_name) if environment_exists? environment_name
+end

data/features/step_definitions/cli_steps.rb

@@ -12,7 +12,7 @@ end
 
 Then /^a file named "(.*?)" should exist in the current directory$/ do |filename|
   in_current_dir do
-    File.exists?(filename).should be_true # not sure why Aruba's
+    expect(File.exists?(filename)).to be_true # not sure why Aruba's
                                           # #check_file_presence
                                           # doesn't work here. It
                                           # looks in the wrong
@@ -22,7 +22,7 @@ end
 
 Then /^the file "(.*?)" should contain in the current directory:$/ do |filename, string|
   in_current_dir do
-    File.read(filename).should match(Regexp.new(string))
+    expect(File.read(filename)).to match(Regexp.new(string))
   end
 end
 
@@ -58,6 +58,14 @@ When /^I run the cookbook command to create "(.*?)"$/ do |name|
   run_simple(unescape("berks cookbook #{name}"), false)
 end
 
+When /^I (successfully )?run the apply command on "(.*?)"$/ do |successfully, environment_name|
+  run_simple(unescape("berks apply #{environment_name}"), !!successfully)
+end
+
+When /^I (successfully )?run the apply command on "(.*?)" with flags:$/ do |successfully, environment_name, flags|
+  run_simple(unescape("berks apply #{environment_name} #{flags.raw.join(" ")}"), !!successfully)
+end
+
 When /^I run the cookbook command to create "(.*?)" with options:$/ do |name, options|
   run_simple(unescape("berks cookbook #{name} #{options.raw.join(" ")}"))
 end

data/features/step_definitions/configure_cli_steps.rb

@@ -6,6 +6,13 @@ end
 
 Then /^a Berkshelf config file should exist and contain:$/ do |table|
   config = Berkshelf::Config.from_file(Berkshelf::Config.path)
+  table.raw.each do |key, value|
+    expect(config.get_attribute(key)).to eq(value)
+  end
+end
+
+Then /^a Berkshelf config file should exist at "(.+)" and contain:$/ do |path, table|
+  config = Berkshelf::Config.from_file(File.expand_path("tmp/aruba/#{path}"))
   table.raw.each do |key, value|
     config.get_attribute(key).should eql(value)
   end

data/features/step_definitions/filesystem_steps.rb

@@ -15,7 +15,7 @@ Given /^I do not have a Berksfile$/ do
 end
 
 Given /^I do not have a Berksfile\.lock$/ do
-  in_current_dir { FileUtils.rm_f(Berkshelf::Lockfile::DEFAULT_FILENAME) }
+  in_current_dir { FileUtils.rm_f("#{Berkshelf::DEFAULT_FILENAME}.lock") }
 end
 
 Given /^I have a default Berkshelf config file$/ do
@@ -32,6 +32,11 @@ Given /^I do not have a Berkshelf config file$/ do
   remove_file Berkshelf::Config.path if ::File.exists? Berkshelf::Config.path
 end
 
+Given /^I do not have a Berkshelf config file at "(.+)"$/ do |path|
+  remove_file(path) if File.exists?(path)
+end
+
+
 Given /^the cookbook "(.*?)" has the file "(.*?)" with:$/ do |cookbook_name, file_name, content|
   write_file(::File.join(cookbook_name, file_name), content)
 end
@@ -48,7 +53,7 @@ end
 
 Then /^the cookbook store should have the cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version|
-    cookbook_store.should have_structure {
+    expect(cookbook_store).to have_structure {
       directory "#{name}-#{version}" do
         file "metadata.rb" do
           contains version
@@ -60,7 +65,7 @@ end
 
 Then /^the cookbook store should have the git cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version, sha1|
-    cookbook_store.should have_structure {
+    expect(cookbook_store).to have_structure {
       directory "#{name}-#{sha1}" do
         file "metadata.rb" do
           contains version
@@ -72,19 +77,19 @@ end
 
 Then /^the cookbook store should not have the cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version|
-    cookbook_store.should_not have_structure {
+    expect(cookbook_store).to_not have_structure {
       directory "#{name}-#{version}"
     }
   end
 end
 
 Then /^I should have the cookbook "(.*?)"$/ do |name|
-  Pathname.new(current_dir).join(name).should be_cookbook
+  expect(Pathname.new(current_dir).join(name)).to be_cookbook
 end
 
 Then /^I should have a new cookbook skeleton "(.*?)"$/ do |name|
   cb_path = Pathname.new(current_dir).join(name)
-  cb_path.should have_structure {
+  expect(cb_path).to have_structure {
     directory "attributes"
     directory "definitions"
     directory "files" do
@@ -119,7 +124,7 @@ Then /^I should have a new cookbook skeleton "(.*?)" with Chef-Minitest support$
   steps %Q{ Then I should have a new cookbook skeleton "#{name}" }
 
   cb_path = Pathname.new(current_dir).join(name)
-  cb_path.should have_structure {
+  expect(cb_path).to have_structure {
     file "Berksfile" do
       contains "cookbook \"minitest-handler\""
     end
@@ -151,7 +156,7 @@ Then /^I should have a new cookbook skeleton "(.*?)" with Foodcritic support$/ d
   steps %Q{ Then I should have a new cookbook skeleton "#{name}" }
 
   cb_path = Pathname.new(current_dir).join(name)
-  cb_path.should have_structure {
+  expect(cb_path).to have_structure {
     file "Gemfile" do
       contains "gem 'thor-foodcritic'"
     end
@@ -165,7 +170,7 @@ Then /^I should have a new cookbook skeleton "(.*?)" with SCMVersion support$/ d
   steps %Q{ Then I should have a new cookbook skeleton "#{name}" }
 
   cb_path = Pathname.new(current_dir).join(name)
-  cb_path.should have_structure {
+  expect(cb_path).to have_structure {
     file "Gemfile" do
       contains "gem 'thor-scmversion'"
     end
@@ -177,7 +182,7 @@ end
 
 Then /^I should have a new cookbook skeleton "(.*?)" with no Bundler support$/ do |name|
   cb_path = Pathname.new(current_dir).join(name)
-  cb_path.should have_structure {
+  expect(cb_path).to have_structure {
     directory "attributes"
     directory "definitions"
     directory "files" do
@@ -204,13 +209,13 @@ Then /^I should have a new cookbook skeleton "(.*?)" with no Bundler support$/ d
 end
 
 Then /^I should have a new cookbook skeleton "(.*?)" with no Git support$/ do |name|
-  Pathname.new(current_dir).join(name).should have_structure {
+  expect(Pathname.new(current_dir).join(name)).to have_structure {
     no_file ".gitignore"
   }
 end
 
 Then /^I should have a new cookbook skeleton "(.*?)" with no Vagrant support$/ do |name|
-  Pathname.new(current_dir).join(name).should have_structure {
+  expect(Pathname.new(current_dir).join(name)).to have_structure {
     file "Gemfile" do
       does_not_contain "gem 'vagrant'"
     end
@@ -227,7 +232,7 @@ Then /^the cookbook "(.*?)" should not have the following files:$/ do |name, fil
 end
 
 Then /^the file "(.*?)" in the cookbook "(.*?)" should contain:$/ do |file_name, cookbook_name, content|
-  Pathname.new(current_dir).join(cookbook_name).should have_structure {
+  expect(Pathname.new(current_dir).join(cookbook_name)).to have_structure {
     file "Berksfile" do
       contains content
     end
@@ -236,7 +241,7 @@ Then /^the file "(.*?)" in the cookbook "(.*?)" should contain:$/ do |file_name,
 end
 
 Then /^the resulting "(.+)" Vagrantfile should contain:$/ do |cookbook_name, content|
-  Pathname.new(current_dir).join(cookbook_name).should have_structure {
+  expect(Pathname.new(current_dir).join(cookbook_name)).to have_structure {
     file "Vagrantfile" do
       content.respond_to?(:raw) ?
         content.raw.flatten.each { |string| contains string } :

data/features/step_definitions/json_steps.rb

@@ -1,10 +1,27 @@
-Then /^the output should be JSON$/ do
-  lambda { parse_json(all_output) }.should_not raise_error
+class Hash
+  def sort_by_key(&block)
+    self.keys.sort(&block).reduce({}) do |seed, key|
+      seed[key] = self[key]
+      if seed[key].is_a?(Hash)
+        seed[key] = seed[key].sort_by_key(&block)
+      elsif seed[key].is_a?(Array)
+        seed[key] = seed[key].map { |i| i.sort_by_key(&block) }
+      end
+      seed
+    end
+  end
 end
 
 Then /^the file "(.*?)" should contain JSON:$/ do |file, data|
-  target = MultiJson.decode(data)
-  actual = MultiJson.decode(File.read(File.join(current_dir, file)))
+  target = JSON.pretty_generate(JSON.parse(data).sort_by_key)
+  actual = JSON.pretty_generate(JSON.parse(File.read(File.join(current_dir, file))).sort_by_key)
 
-  target.should eql(actual)
+  expect(actual).to eq(target)
+end
+
+Then /^the output should contain JSON:$/ do |data|
+  target = JSON.pretty_generate(JSON.parse(ERB.new(data).result(binding)).sort_by_key)
+  actual = JSON.pretty_generate(JSON.parse(all_output).sort_by_key)
+
+  expect(actual).to eq(target)
 end

data/features/step_definitions/utility_steps.rb

@@ -2,6 +2,11 @@ Given /^pending\s+"([^\"]+)"$/ do |msg|
   pending
 end
 
+Given(/^the BERKSHELF_EDITOR and VISUAL environment variables are not set$/) do
+  set_env "BERKSHELF_EDITOR", nil
+  set_env "VISUAL", nil
+end
+
 Given /^the environment variable (.+) is nil$/ do |variable|
   set_env variable, nil
 end
@@ -14,4 +19,11 @@ Then /^the output should be the same as \`(.+)\`$/ do |command|
   run_simple(command)
   output = output_from(command)
   expect(all_output).to include(output)
-end
+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)
+end

data/features/support/env.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'bundler'
 require 'spork'
-require "json_spec/cucumber"
 
 Spork.prefork do
   require 'rspec'
@@ -12,48 +11,39 @@ 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', 'config', 'knife.rb')
+  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+')
-    git_ssh.puts "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $1 $2"
+    git_ssh.puts 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $1 $2'
     git_ssh.chmod 0775
     git_ssh.flush
     git_ssh.close
   end
 
-  ENV["GIT_SSH"] = git_ssh_path
+  ENV['GIT_SSH'] = git_ssh_path
 
-  Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
+  Dir[File.join(APP_ROOT, 'spec/support/**/*.rb')].each {|f| require f}
 
   World(Berkshelf::TestGenerators)
 
   Before do
     set_env 'RUBY_ENV', 'test'
     clean_cookbook_store
-    generate_berks_config(File.join(ENV["BERKSHELF_PATH"], 'config.json'))
+    generate_berks_config(File.join(ENV['BERKSHELF_PATH'], 'config.json'))
     @aruba_io_wait_seconds = 5
-    @aruba_timeout_seconds = 30
+    @aruba_timeout_seconds = 16
   end
 
   Before('@slow_process') do
     @aruba_timeout_seconds = 60
-    @aruba_io_wait_seconds = 10
-  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?
+    @aruba_io_wait_seconds = 30
   end
 
   def cookbook_store
-    Pathname.new(File.join(ENV["BERKSHELF_PATH"], "cookbooks"))
+    Pathname.new(File.join(ENV['BERKSHELF_PATH'], 'cookbooks'))
   end
 
   def clean_cookbook_store
@@ -72,13 +62,10 @@ Spork.prefork do
   def fixtures_path
     app_root_path.join('spec/fixtures')
   end
-
-  # Set the output json_spec will parse for testing JSON responses
-  def last_json
-    all_output
-  end
 end
 
 Spork.each_run do
+  Berkshelf::RSpec::Knife.load_knife_config(File.join(APP_ROOT, 'spec/knife.rb'))
+
   require 'berkshelf'
 end