chefspec 4.0.2 → 4.1.0

data/examples/state_attrs/spec/default_spec.rb

@@ -1,9 +1,9 @@
 require 'chefspec'
 
-ChefSpec::Runner.define_runner_method(:state_attrs_lwrp)
+ChefSpec.define_matcher(:state_attrs_lwrp)
 
 describe 'state_attrs::default' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
   let(:lwrp) { chef_run.state_attrs_lwrp('name') }
 
   it 'has the correct state attributes' do

data/examples/step_into/spec/default_spec.rb

@@ -2,7 +2,7 @@ require 'chefspec'
 
 describe 'step_into::default' do
   context 'without :step_into' do
-    let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+    let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
     it 'does not execute the LWRPs action' do
       expect(chef_run).to_not write_log('message')
@@ -10,7 +10,10 @@ describe 'step_into::default' do
   end
 
   context 'with :step_into' do
-    let(:chef_run) { ChefSpec::Runner.new(step_into: ['step_into_lwrp']).converge(described_recipe) }
+    let(:chef_run) do
+      ChefSpec::SoloRunner.new(step_into: ['step_into_lwrp'])
+        .converge(described_recipe)
+      end
 
     it 'does execute the LWRPs action' do
       expect(chef_run).to write_log('message')

data/examples/stub_command/spec/default_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'stub_command::default' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   context 'when the command is not stubbed' do
     it 'raises an exception' do

data/examples/stub_data_bag/spec/default_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'stub_data_bag::default' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   context 'when the data_bag is not stubbed' do
     it 'raises an exception' do

data/examples/stub_data_bag_item/spec/default_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'stub_data_bag_item::default' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   context 'when the data_bag_item is not stubbed' do
     it 'raises an exception' do

data/examples/stub_search/spec/default_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'stub_search::default' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
 
   context 'when the search is not stubbed' do
     it 'raises an exception' do

data/examples/subscribes/spec/chained_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'subscribes::chained' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
   let(:service)  { chef_run.service('service') }
   let(:log)      { chef_run.log('log') }
 

data/examples/subscribes/spec/default_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'subscribes::default' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
   let(:service)  { chef_run.service('receiving_resource') }
 
   it 'subscribes to the template creation' do

data/examples/subscribes/spec/delayed_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'subscribes::delayed' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
   let(:service) { chef_run.service('receiving_resource') }
 
   it 'subscribes to the template creation' do

data/examples/subscribes/spec/immediately_spec.rb

@@ -1,7 +1,7 @@
 require 'chefspec'
 
 describe 'subscribes::immediately' do
-  let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }
+  let(:chef_run) { ChefSpec::SoloRunner.converge(described_recipe) }
   let(:service) { chef_run.service('receiving_resource') }
 
   it 'sends a notification to the service' do

data/examples/subversion/spec/checkout_spec.rb

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

data/examples/subversion/spec/export_spec.rb

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

data/examples/subversion/spec/force_export_spec.rb

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

data/examples/subversion/spec/sync_spec.rb

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

data/examples/template/spec/create_if_missing_spec.rb

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

data/examples/template/spec/create_spec.rb

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

data/examples/template/spec/delete_spec.rb

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

data/examples/template/spec/touch_spec.rb

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

data/examples/use_inline_resources/spec/default_spec.rb

@@ -1,7 +1,10 @@
 require 'chefspec'
 
 describe 'use_inline_resources::default' do
-  let(:chef_run) { ChefSpec::Runner.new(step_into: ['use_inline_resources_lwrp']).converge(described_recipe) }
+  let(:chef_run) do
+    ChefSpec::SoloRunner.new(step_into: ['use_inline_resources_lwrp'])
+      .converge(described_recipe)
+    end
 
   it 'uses the LWRP' do
     expect(chef_run).to run_use_inline_resources_lwrp('resource')

data/examples/user/spec/create_spec.rb

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

data/examples/user/spec/lock_spec.rb

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

data/examples/user/spec/manage_spec.rb

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

data/examples/user/spec/modify_spec.rb

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

data/examples/user/spec/remove_spec.rb

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

data/examples/user/spec/unlock_spec.rb

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

data/examples/yum_package/spec/install_spec.rb

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

data/examples/yum_package/spec/purge_spec.rb

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

data/examples/yum_package/spec/remove_spec.rb

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

data/examples/yum_package/spec/upgrade_spec.rb

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

data/features/batch.feature

@@ -1,6 +1,3 @@
-@not_chef_11_0_0
-@not_chef_11_2_0
-@not_chef_11_4_4
 Feature: The batch matcher
   Background:
     * I am using the "batch" cookbook

data/features/powershell_script.feature

@@ -1,6 +1,3 @@
-@not_chef_11_0_0
-@not_chef_11_2_0
-@not_chef_11_4_4
 Feature: The powershell_script matcher
   Background:
     * I am using the "powershell_script" cookbook

data/features/render_file.feature

@@ -5,12 +5,7 @@ Feature: The render_file matcher
   Scenario Outline: Running specs
     * I successfully run `rspec spec/<Matcher>_spec.rb`
     * the output should contain "0 failures"
-  Examples:
-    | Matcher |
-    | default |
-  @not_chef_11_0_0
-  @not_chef_11_2_0
-  @not_chef_11_4_4
   Examples:
     | Matcher          |
+    | default          |
     | template_helpers |

data/features/server.feature

@@ -1,6 +1,3 @@
-# Need to spawn a sub-process; otherwise future tests will fail because the
-# server is running
-@spawn
 Feature: The ChefSpec server
   Background:
     * I am using the "server" cookbook

data/features/smartos_package.feature

@@ -1,7 +1,3 @@
-@not_chef_11_0_0
-@not_chef_11_2_0
-@not_chef_11_4_4
-@not_chef_11_6_0
 Feature: The smartos_package matcher
   Background:
     * I am using the "smartos_package" cookbook

data/features/solaris_package.feature

@@ -1,7 +1,3 @@
-@not_chef_11_0_0
-@not_chef_11_2_0
-@not_chef_11_4_4
-@not_chef_11_6_0
 Feature: The solaris_package matcher
   Background:
     * I am using the "solaris_package" cookbook

data/features/state_attrs.feature

@@ -1,7 +1,3 @@
-@not_chef_11_0_0
-@not_chef_11_2_0
-@not_chef_11_4_4
-@not_chef_11_6_0
 Feature: Testing state attributes
   Background:
     * I am using the "state_attrs" cookbook

data/features/support/env.rb

@@ -23,13 +23,6 @@ Before do
   @dirs = [Dir.mktmpdir]
 end
 
-Before('@spawn') do
-  Aruba.process = Aruba::SpawnProcess
-
-  # Raise the timeout
-  @aruba_timeout_seconds = 15
-end
-
 After do
   # Cleanup the test files
   FileUtils.rm_rf(@dirs.first)

data/gemfiles/{chef-11.12.0.gemfile → chef-11.16.0.gemfile}

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'chef', '~> 11.12.0'
+gem 'chef', '~> 11.16.0'
 
 gemspec :path => '..'

data/gemfiles/chef-12.0.0.alpha.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'chef', '~> 12.0.0.alpha'
+
+gemspec :path => '..'

data/lib/chefspec.rb

@@ -1,5 +1,47 @@
 require 'rspec'
 
+module ChefSpec
+  #
+  # Defines a new runner method on the Chef runner.
+  #
+  # @param [Symbol] resource_name
+  #   the name of the resource to define a method
+  #
+  # @return [self]
+  #
+  def define_matcher(resource_name)
+    matchers[resource_name.to_sym] = Proc.new do |identity|
+      find_resource(resource_name, identity)
+    end
+
+    self
+  end
+  module_function :define_matcher
+
+  #
+  # The source root of the ChefSpec gem. This is useful when requiring files
+  # that are relative to the root of the project.
+  #
+  # @return [Pathname]
+  #
+  def root
+    @root ||= Pathname.new(File.expand_path('../../', __FILE__))
+  end
+  module_function :root
+
+  protected
+
+  #
+  # The list of custom defined matchers.
+  #
+  # @return [Hash<String, Proc>]
+  #
+  def matchers
+    @matchers ||= {}
+  end
+  module_function :matchers
+end
+
 require_relative 'chefspec/extensions/chef/client'
 require_relative 'chefspec/extensions/chef/conditional'
 require_relative 'chefspec/extensions/chef/data_query'
@@ -22,6 +64,7 @@ require_relative 'chefspec/stubs/search_registry'
 require_relative 'chefspec/stubs/search_stub'
 
 require_relative 'chefspec/api'
+require_relative 'chefspec/cacher'
 require_relative 'chefspec/coverage'
 require_relative 'chefspec/errors'
 require_relative 'chefspec/expect_exception'
@@ -30,20 +73,9 @@ require_relative 'chefspec/macros'
 require_relative 'chefspec/matchers'
 require_relative 'chefspec/renderer'
 require_relative 'chefspec/rspec'
-require_relative 'chefspec/runner'
+require_relative 'chefspec/server_runner'
+require_relative 'chefspec/solo_runner'
 require_relative 'chefspec/util'
 require_relative 'chefspec/version'
 
-module ChefSpec
-  extend self
-
-  #
-  # The source root of the ChefSpec gem. This is useful when requiring files
-  # that are relative to the root of the project.
-  #
-  # @return [Pathname]
-  #
-  def root
-    @root ||= Pathname.new(File.expand_path('../../', __FILE__))
-  end
-end
+require_relative 'chefspec/deprecations'