chefspec 4.0.2 → 4.1.0

data/chefspec.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   # ChefSpec requires Ruby 1.9+
   s.required_ruby_version = '>= 1.9'
 
-  s.add_dependency 'chef',    '~> 11.12'
+  s.add_dependency 'chef',    '>= 11.14'
   s.add_dependency 'fauxhai', '~> 2.0'
   s.add_dependency 'rspec',   '~> 3.0'
 

data/examples/apt_package/spec/install_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'apt_package::install' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'installs a apt_package with the default action' do
     expect(chef_run).to install_apt_package('default_action')

data/examples/apt_package/spec/purge_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'apt_package::purge' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'purges a apt_package with an explicit action' do
     expect(chef_run).to purge_apt_package('explicit_action')

data/examples/apt_package/spec/reconfig_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'apt_package::reconfig' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'reconfigs a apt_package with an explicit action' do
     expect(chef_run).to reconfig_apt_package('explicit_action')

data/examples/apt_package/spec/remove_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'apt_package::remove' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'removes a apt_package with an explicit action' do
     expect(chef_run).to remove_apt_package('explicit_action')

data/examples/apt_package/spec/upgrade_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'apt_package::upgrade' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'upgrades a apt_package with an explicit action' do
     expect(chef_run).to upgrade_apt_package('explicit_action')

data/examples/attributes/spec/default_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'attributes::default' do
   let(:chef_run) do
-    ChefSpec::Runner.new do |node|
+    ChefSpec::SoloRunner.new do |node|
       node.automatic['ipaddress'] = '500.500.500.500' # Intentionally not a real IP
       node.set['attributes']['message'] = 'The new message is here'
     end.converge(described_recipe)

data/examples/batch/spec/run_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'batch::run' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'runs a batch with the default action' do
     expect(chef_run).to run_batch('default_action')

data/examples/cached/spec/default_spec.rb

@@ -5,7 +5,7 @@ RSpec.configure do |config|
 end
 
 describe 'cached::default' do
-  cached(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  cached(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'does not raise an exception' do
     expect { chef_run }.to_not raise_error

data/examples/chef_gem/spec/install_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'chef_gem::install' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'installs a chef_gem with the default action' do
     expect(chef_run).to install_chef_gem('default_action')

data/examples/chef_gem/spec/purge_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'chef_gem::purge' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'purges a chef_gem with an explicit action' do
     expect(chef_run).to purge_chef_gem('explicit_action')

data/examples/chef_gem/spec/reconfig_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'chef_gem::reconfig' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'reconfigs a chef_gem with an explicit action' do
     expect(chef_run).to reconfig_chef_gem('explicit_action')

data/examples/chef_gem/spec/remove_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'chef_gem::remove' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'removes a chef_gem with an explicit action' do
     expect(chef_run).to remove_chef_gem('explicit_action')

data/examples/chef_gem/spec/upgrade_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'chef_gem::upgrade' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'upgrades a chef_gem with an explicit action' do
     expect(chef_run).to upgrade_chef_gem('explicit_action')

data/examples/compile_time/spec/default_spec.rb

@@ -1,5 +1,5 @@
 describe 'compile_time::default' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'matches without .at_compile_time' do
     expect(chef_run).to install_package('compile_time')

data/examples/cookbook_file/spec/create_if_missing_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'cookbook_file::create_if_missing' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'creates a cookbook_file with an explicit action' do
     expect(chef_run).to create_cookbook_file_if_missing('/tmp/explicit_action')

data/examples/cookbook_file/spec/create_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'cookbook_file::create' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'creates a cookbook_file with the default action' do
     expect(chef_run).to create_cookbook_file('/tmp/default_action')

data/examples/cookbook_file/spec/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'cookbook_file::delete' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'deletes a cookbook_file with an explicit action' do
     expect(chef_run).to delete_cookbook_file('/tmp/explicit_action')

data/examples/cookbook_file/spec/touch_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'cookbook_file::touch' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'touches a cookbook_file with an explicit action' do
     expect(chef_run).to touch_cookbook_file('/tmp/explicit_action')

data/examples/cron/spec/create_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'cron::create' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'creates a cron with the default action' do
     expect(chef_run).to create_cron('default_action')

data/examples/cron/spec/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'cron::delete' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'deletes a cron with an explicit action' do
     expect(chef_run).to delete_cron('explicit_action')

data/examples/custom_matcher/libraries/matcher.rb

@@ -1,5 +1,5 @@
 if defined?(ChefSpec)
-  ChefSpec::Runner.define_runner_method :custom_matcher_thing
+  ChefSpec.define_matcher :custom_matcher_thing
 
   #
   # When defining a custom LWRP matcher, you should always add some

data/examples/custom_matcher/spec/install_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'custom_matcher::install' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'installs a custom_matcher with the default action' do
     expect(chef_run).to install_custom_matcher_thing('default_action')

data/examples/custom_matcher/spec/remove_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'custom_matcher::remove' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'removes a custom_matcher with an explicit action' do
     expect(chef_run).to remove_custom_matcher_thing('explicit_action')

data/examples/deploy/spec/deploy_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'deploy::deploy' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'deploys a deploy with an explicit action' do
     expect(chef_run).to deploy_deploy('/tmp/explicit_action')

data/examples/deploy/spec/force_deploy_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'deploy::force_deploy' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'force deploys a deploy with an explicit action' do
     expect(chef_run).to force_deploy_deploy('/tmp/explicit_action')

data/examples/deploy/spec/rollback_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'deploy::rollback' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'rollsback deploys a deploy with an explicit action' do
     expect(chef_run).to rollback_deploy('/tmp/explicit_action')

data/examples/directory/spec/create_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'directory::create' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'creates a directory with the default action' do
     expect(chef_run).to create_directory('/tmp/default_action')

data/examples/directory/spec/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'directory::delete' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'deletes a directory with an explicit action' do
     expect(chef_run).to delete_directory('/tmp/explicit_action')

data/examples/do_nothing/spec/default_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'do_nothing::default' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'includes the `other` recipe' do
     execute = chef_run.execute('install')

data/examples/dpkg_package/spec/install_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'dpkg_package::install' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'installs a dpkg_package with the default action' do
     expect(chef_run).to install_dpkg_package('default_action')

data/examples/dpkg_package/spec/purge_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'dpkg_package::purge' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'purges a dpkg_package with an explicit action' do
     expect(chef_run).to purge_dpkg_package('explicit_action')

data/examples/dpkg_package/spec/remove_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'dpkg_package::remove' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'removes a dpkg_package with an explicit action' do
     expect(chef_run).to remove_dpkg_package('explicit_action')

data/examples/easy_install_package/spec/install_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'easy_install_package::install' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'installs a easy_install_package with the default action' do
     expect(chef_run).to install_easy_install_package('default_action')

data/examples/easy_install_package/spec/purge_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'easy_install_package::purge' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'purges a easy_install_package with an explicit action' do
     expect(chef_run).to purge_easy_install_package('explicit_action')

data/examples/easy_install_package/spec/remove_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'easy_install_package::remove' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'removes a easy_install_package with an explicit action' do
     expect(chef_run).to remove_easy_install_package('explicit_action')

data/examples/easy_install_package/spec/upgrade_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'easy_install_package::upgrade' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'upgrades a easy_install_package with an explicit action' do
     expect(chef_run).to upgrade_easy_install_package('explicit_action')

data/examples/env/spec/create_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'env::create' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'creates a env with the default action' do
     expect(chef_run).to create_env('default_action')

data/examples/env/spec/delete_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'env::delete' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'deletes a env with an explicit action' do
     expect(chef_run).to delete_env('explicit_action')

data/examples/env/spec/modify_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'env::modify' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'modifies a env with an explicit action' do
     expect(chef_run).to modify_env('explicit_action')

data/examples/erl_call/spec/run_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'erl_call::run' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'runs a erl_call with the default action' do
     expect(chef_run).to run_erl_call('default_action')

data/examples/execute/spec/run_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'execute::run' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'runs a execute with the default action' do
     expect(chef_run).to run_execute('default_action')

data/examples/expect_exception/spec/compile_error_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'expect_exception::compile_error' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'raises an error' do
     expect(Chef::Formatters::ErrorMapper).to_not receive(:file_load_failed)

data/examples/expect_exception/spec/converge_error_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'expect_exception::converge_error' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   it 'raises an error' do
     expect(Chef::Formatters::ErrorMapper).to_not receive(:file_load_failed)