berkshelf 2.0.18 → 3.0.0.beta1

data/features/outdated_command.feature

@@ -3,50 +3,6 @@ Feature: Displaying outdated cookbooks
   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:
-      """
-      site :opscode
-      cookbook 'berkshelf-cookbook-fixture'
-      """
-    When I successfully 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:
-      """
-      site :opscode
-      cookbook 'berkshelf-cookbook-fixture', '>= 0.1'
-      """
-    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:
-      """
-      site :opscode
-      cookbook 'berkshelf-cookbook-fixture', '~> 0.1'
-      """
-    When I run `berks outdated`
-    Then the output should contain:
-      """
-      Listing outdated cookbooks with newer versions available...
-      """
-    And the output should contain:
-      """
-      Cookbook 'berkshelf-cookbook-fixture (~> 0.1)' is outdated
-      """
+  Scenario: the dependency is up to date
+  Scenario: the dependency has a no version constraint and there are new items
+  Scenario: the dependency has a version constraint and there are new items that satisfy it

data/features/package_command.feature

@@ -8,7 +8,8 @@ Feature: Packaging a cookbook as a tarball for distribution
       | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'fake', '~> 1.0.0'
       """
     When I successfully run `berks package fake`
@@ -17,26 +18,26 @@ Feature: Packaging a cookbook as a tarball for distribution
       """
       Cookbook(s) packaged to
       """
-    And the exit status should be 0
 
   Scenario: With the --output option
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'fake', '~> 1.0.0'
       """
     When I successfully run `berks package fake --output foo/bar`
     Then a file named "foo/bar/fake.tar.gz" should exist
-    And the exit status should be 0
 
   Scenario: With an installed cookbook name
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
-      site :opscode
+      source "http://localhost:26210"
+
       cookbook 'fake', '~> 1.0.0'
       """
     When I run `berks package non-existent`
@@ -45,12 +46,14 @@ Feature: Packaging a cookbook as a tarball for distribution
       """
       Cookbook 'non-existent' is not in your Berksfile
       """
-    And the CLI should exit with the status code for error "CookbookNotFound"
+    And the exit status should be "CookbookNotFound"
 
   Scenario: With an invalid cookbook
     Given a cookbook named "cookbook with spaces"
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'cookbook with spaces', path: './cookbook with spaces'
       """
     When I run `berks package`
@@ -58,4 +61,4 @@ Feature: Packaging a cookbook as a tarball for distribution
       """
       The cookbook 'cookbook with spaces' has invalid filenames:
       """
-    And the CLI should exit with the status code for error "InvalidCookbookFiles"
+    And the exit status should be "InvalidCookbookFiles"

data/features/shelf/show.feature

@@ -9,7 +9,7 @@ Feature: Displaying information about a cookbook in the Berkshelf shelf
       """
       Cookbook 'fake' is not in the Berkshelf shelf
       """
-    And the CLI should exit with the status code for error "CookbookNotFound"
+    And the exit status should be "CookbookNotFound"
 
   Scenario: With cookbooks in the store
     Given the cookbook store has the cookbooks:
@@ -63,7 +63,7 @@ Feature: Displaying information about a cookbook in the Berkshelf shelf
       """
       Cookbook 'fake' (1.2.3) is not in the Berkshelf shelf
       """
-    And the CLI should exit with the status code for error "CookbookNotFound"
+    And the exit status should be "CookbookNotFound"
 
   Scenario: With multiple cookbook versions installed
     Given the cookbook store has the cookbooks:

data/features/shelf/uninstall.feature

@@ -9,7 +9,7 @@ Feature: Removing a cookbook from the Berkshelf shelf
       """
       Cookbook 'fake' is not in the Berkshelf shelf
       """
-    And the CLI should exit with the status code for error "CookbookNotFound"
+    And the exit status should be "CookbookNotFound"
 
   Scenario: With two cookbooks in the store
     Given the cookbook store has the cookbooks:
@@ -26,7 +26,6 @@ Feature: Removing a cookbook from the Berkshelf shelf
       | ekaf | 2.3.4 |
     And the exit status should be 0
 
-
   Scenario: With multiple cookbook versions installed
     Given the cookbook store has the cookbooks:
       | fake | 1.0.0 |
@@ -67,6 +66,7 @@ Feature: Removing a cookbook from the Berkshelf shelf
       | fake | 2.0.0 |
     And the exit status should be 0
 
+  @spawn
   Scenario: With contingencies
     Given the cookbook store contains a cookbook "fake" "1.0.0" with dependencies:
       | ekaf | 2.3.4 |

data/features/show_command.feature

@@ -8,6 +8,8 @@ Feature: Displaying information about a cookbook defined by a Berksfile
       | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'fake', '1.0.0'
       """
     When I successfully run `berks show fake`
@@ -26,6 +28,8 @@ Feature: Displaying information about a cookbook defined by a Berksfile
       | fake | 1.0.0 |
     And I write to "Berksfile" with:
       """
+      source "http://localhost:26210"
+
       cookbook 'fake', '1.0.0'
       """
     When I successfully run `berks show fake --format json`
@@ -46,13 +50,16 @@ Feature: Displaying information about a cookbook defined by a Berksfile
 
         ],
         "messages": [
-
+          "building universe..."
         ]
       }
       """
 
   Scenario: When the cookbook is not in the Berksfile
-    Given an empty file named "Berksfile"
+    Given I write to "Berksfile" with:
+      """
+      source "http://localhost:26210"
+      """
     When I run `berks show fake`
     Then the output should contain "Cookbook 'fake' is not installed by your Berksfile"
-    And the CLI should exit with the status code for error "CookbookNotFound"
+    And the exit status should be "CookbookNotFound"

data/features/step_definitions/chef/config_steps.rb

@@ -0,0 +1,12 @@
+Given(/^I do not have a Berkshelf config$/) do
+  FileUtils.rm_f(ENV['BERKSHELF_CONFIG'])
+end
+
+Given /^I do not have a Chef config$/ do
+	path = tmp_path.join('knife.rb').to_s
+  Berkshelf.chef_config = Berkshelf::Chef::Config.new(path)
+  Berkshelf::Chef::Config.instance.save
+
+  ENV['BERKSHELF_CHEF_CONFIG'] = path
+  set_env 'BERKSHELF_CHEF_CONFIG', path
+end

data/features/step_definitions/chef_server_steps.rb

@@ -1,12 +1,10 @@
 World(Berkshelf::RSpec::ChefAPI)
 
-Given /^the Chef server does not have the cookbooks:$/ do |cookbooks|
-  cookbooks.raw.each do |name, version|
-    purge_cookbook(name, version)
-  end
+Given(/^the Chef Server is empty$/) do
+  Berkshelf::RSpec::ChefServer.reset!
 end
 
-Given /^the Chef server has cookbooks:$/ do |cookbooks|
+Given /^the Chef Server has cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version|
     purge_cookbook(name, version)
     cb_path = generate_cookbook(tmp_path, name, version)
@@ -14,32 +12,34 @@ Given /^the Chef server has cookbooks:$/ do |cookbooks|
   end
 end
 
-Then /^the Chef server should have the cookbooks:$/ do |cookbooks|
+Then /^the Chef Server should have the cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version|
     expect(server_has_cookbook?(name, version)).to be_true
   end
 end
 
-Then /^the Chef server should not have the cookbooks:$/ do |cookbooks|
+Then /^the Chef Server should not have the cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version|
     expect(server_has_cookbook?(name, version)).to be_false
   end
 end
 
-Given(/^I have an environment named "(.*?)"$/) do |environment_name|
+Then(/^the version locks in the "(.*?)" environment 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(/^The Chef Server has 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'])
+Given(/^The Chef Server does not have an environment named "(.*?)"$/) do |environment_name|
+  if environment_exists?(environment_name)
+    delete_environment(environment_name)
   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

@@ -1,80 +1,4 @@
-require 'aruba/api'
-
-World(Aruba::Api)
-World(Berkshelf::RSpec::FileSystemMatchers)
-
-Then /^I trace$/ do
-end
-
-When /^I sleep$/ do
-  sleep 10
-end
-
-Then /^a file named "(.*?)" should exist in the current directory$/ do |filename|
-  in_current_dir do
-    expect(File.exists?(filename)).to be_true # not sure why Aruba's
-                                          # #check_file_presence
-                                          # doesn't work here. It
-                                          # looks in the wrong
-                                          # directory.
-  end
-end
-
-Then /^the file "(.*?)" should contain in the current directory:$/ do |filename, string|
-  in_current_dir do
-    expect(File.read(filename)).to match(Regexp.new(string))
-  end
-end
-
-When /^I run the init command with the cookbook "(.*?)" as the target$/ do |cookbook_name|
-  run_simple(unescape("berks init #{cookbook_name}"), true)
-end
-
-When /^I run the init command with the directory "(.*?)" as the target$/ do |directory_name|
-  run_simple(unescape("berks init #{directory_name}"), true)
-end
-
-When /^I run the init command with no value for the target$/ do
-  run_simple(unescape("berks init"), true)
-end
-
-When /^I run the install command$/ do
-  run_simple(unescape("berks install"), false)
-end
-
-When /^I run the install command with flags:$/ do |flags|
-  run_simple(unescape("berks install #{flags.raw.join(" ")}"), false)
-end
-
-When /^I run the upload command$/ do
-  run_simple(unescape("berks upload"), true)
-end
-
-When /^I run the upload command with flags:$/ do |flags|
-  run_simple(unescape("berks upload #{flags.raw.join(" ")}"), false)
-end
-
-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
-
-When /^I run the "(.*?)" command interactively$/ do |command|
-  run_interactive("berks #{command}")
-end
-
-Then /^the CLI should exit with the status code for error "(.*?)"$/ do |error_constant|
-  exit_status = Berkshelf.const_get(error_constant).status_code
-  assert_exit_status(exit_status)
+Then /^the exit status should be "(.+)"$/ do |name|
+  code = Berkshelf.const_get(name).status_code
+  assert_exit_status(code)
 end

data/features/step_definitions/config_steps.rb

@@ -0,0 +1,43 @@
+require 'tempfile'
+
+Given /^I already have a Berkshelf config file$/ do
+  path   = Tempfile.new('berkshelf').path
+  config = Berkshelf::Config.new(path)
+  config.save
+
+  Berkshelf.config = config
+
+  ENV['BERKSHELF_CONFIG'] = path
+  set_env 'BERKSHELF_CONFIG', path
+end
+
+Given /^I have a Berkshelf config file containing:$/ do |contents|
+  path = Berkshelf.config.path
+  FileUtils.mkdir_p(Pathname.new(path).dirname.to_s)
+
+  File.open(path, 'w+') { |f| f.write(contents) }
+
+  Berkshelf.config = Berkshelf::Config.from_file(path)
+end
+
+Then /^a Berkshelf config file should exist and contain:$/ do |table|
+  # Have to reload the config...
+  Berkshelf.config.reload
+
+  check_file_presence([Berkshelf.config.path], true)
+
+  table.raw.each do |key, value|
+    expect(Berkshelf.config[key]).to eq(value)
+  end
+end
+
+Then /^a Berkshelf config file should exist at "(.+)" and contain:$/ do |path, table|
+  check_file_presence([path], true)
+
+  path = File.expand_path(File.join('tmp', 'aruba', path))
+  Berkshelf.config = Berkshelf::Config.from_file(path)
+
+  table.raw.each do |key, value|
+    expect(Berkshelf.config[key]).to eq(value)
+  end
+end

data/features/step_definitions/environment_steps.rb

@@ -0,0 +1,7 @@
+Given /^the environment variable (.+) is nil$/ do |variable|
+  set_env(variable, nil)
+end
+
+Given /^the environment variable (.+) is "(.+)"$/ do |variable, value|
+  set_env(variable, value)
+end

data/features/step_definitions/filesystem_steps.rb

@@ -2,15 +2,7 @@ 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
+World(Berkshelf::RSpec::FileSystemMatchers)
 
 Given /^a cookbook named "(.*?)"$/ do |name|
   steps %{
@@ -19,44 +11,17 @@ Given /^a cookbook named "(.*?)"$/ do |name|
   }
 end
 
-Given /^I do not have a Berksfile$/ do
-  in_current_dir { FileUtils.rm_f(Berkshelf::DEFAULT_FILENAME) }
-end
-
-Given /^I do not have a Berksfile\.lock$/ do
-  in_current_dir { FileUtils.rm_f("#{Berkshelf::DEFAULT_FILENAME}.lock") }
-end
-
-Given /^I have a default Berkshelf config file$/ do
-  Berkshelf::Config.new.save
-end
-
-Given /^I have a Berkshelf config file containing:$/ do |contents|
-  ::File.open(Berkshelf::Config.path, 'w+') do |f|
-    f.write(contents)
-  end
-end
-
-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
 
 Given /^the cookbook store has the cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version, license|
-    generate_cookbook(cookbook_store, name, version, license: license)
+    generate_cookbook(cookbook_store.storage_path, name, version, license: license)
   end
 end
 
-Given /^the cookbook store has the cookbooks installed by git:$/ do |cookbooks|
+Given /^the cookbook store has the git cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version, sha|
     folder   = "#{name}-#{sha}"
     metadata = File.join(folder, 'metadata.rb')
@@ -70,12 +35,16 @@ Given /^the cookbook store has the cookbooks installed by git:$/ do |cookbooks|
 end
 
 Given /^the cookbook store contains a cookbook "(.*?)" "(.*?)" with dependencies:$/ do |name, version, dependencies|
-  generate_cookbook(cookbook_store, name, version, dependencies: dependencies.raw)
+  generate_cookbook(cookbook_store.storage_path, name, version, dependencies: dependencies.raw)
+end
+
+Given(/^the cookbook store is empty$/) do
+  Berkshelf::CookbookStore.instance.clean!
 end
 
 Then /^the cookbook store should have the cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version|
-    expect(cookbook_store).to have_structure {
+    expect(cookbook_store.storage_path).to have_structure {
       directory "#{name}-#{version}" do
         file "metadata.rb" do
           contains version
@@ -85,9 +54,9 @@ Then /^the cookbook store should have the cookbooks:$/ do |cookbooks|
   end
 end
 
-Then /^the cookbook store should have the cookbooks installed by git:$/ do |cookbooks|
+Then /^the cookbook store should have the git cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version, sha1|
-    expect(cookbook_store).to have_structure {
+    expect(cookbook_store.storage_path).to have_structure {
       directory "#{name}-#{sha1}" do
         file "metadata.rb" do
           contains version
@@ -99,21 +68,16 @@ end
 
 Then /^the cookbook store should not have the cookbooks:$/ do |cookbooks|
   cookbooks.raw.each do |name, version|
-    expect(cookbook_store).to_not have_structure {
+    expect(cookbook_store.storage_path).to_not have_structure {
       directory "#{name}-#{version}"
     }
   end
 end
 
-Then /^I should have the cookbook "(.*?)"$/ do |name|
-  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)
   expect(cb_path).to have_structure {
     directory "attributes"
-    directory "definitions"
     directory "files" do
       directory "default"
     end
@@ -206,7 +170,6 @@ Then /^I should have a new cookbook skeleton "(.*?)" with no Bundler support$/ d
   cb_path = Pathname.new(current_dir).join(name)
   expect(cb_path).to have_structure {
     directory "attributes"
-    directory "definitions"
     directory "files" do
       directory "default"
     end
@@ -287,11 +250,3 @@ Then /^the file "(.*?)" in the directory "(.*?)" should not contain:$/ do |file_
     end
   }
 end
-
-Then /^the current directory should have the following files:$/ do |files|
-  check_file_presence(files.raw.map{|file_row| file_row[0]}, true)
-end
-
-Then /^the current directory should not have the following files:$/ do |files|
-  check_file_presence(files.raw.map{|file_row| file_row[0]}, false)
-end