chefspec 4.7.0 → 5.0.0

data/lib/chefspec/matchers/notifications_matcher.rb

@@ -22,6 +22,8 @@ module ChefSpec::Matchers
           immediate_notifications.any?(&block)
         elsif @delayed
           delayed_notifications.any?(&block)
+        elsif @before
+          before_notifications.any?(&block)
         else
           all_notifications.any?(&block)
         end
@@ -43,11 +45,17 @@ module ChefSpec::Matchers
       self
     end
 
+    def before
+      @before = true
+      self
+    end
+
     def description
       message = %Q{notify "#{@expected_resource_type}[#{@expected_resource_name}]"}
       message << " with action :#{@action}" if @action
       message << " immediately" if @immediately
       message << " delayed" if @delayed
+      message << " before" if @before
       message
     end
 
@@ -57,6 +65,7 @@ module ChefSpec::Matchers
         message << " with action :#{@action}" if @action
         message << " immediately" if @immediately
         message << " delayed" if @delayed
+        message << " before" if @before
         message << ", but did not."
         message << "\n\n"
         message << "Other notifications were:\n\n#{format_notifications}"
@@ -67,6 +76,7 @@ module ChefSpec::Matchers
         message << " with action :#{@action}" if @action
         message << " immediately" if @immediately
         message << " delayed" if @delayed
+        message << " before" if @before
         message << ", but the _something_ you gave me was nil! If you are running a test like:"
         message << "\n\n"
         message << "  expect(_something_).to notify('...')"
@@ -88,7 +98,7 @@ module ChefSpec::Matchers
     private
 
     def all_notifications
-      immediate_notifications + delayed_notifications
+      immediate_notifications + delayed_notifications + before_notifications
     end
 
     def immediate_notifications
@@ -99,6 +109,10 @@ module ChefSpec::Matchers
       @resource.delayed_notifications
     end
 
+    def before_notifications
+      @resource.before_notifications
+    end
+
     def matches_action?(notification)
       return true if @action.nil?
       @action == notification.action.to_sym
@@ -107,7 +121,14 @@ module ChefSpec::Matchers
     def format_notification(notification)
       notifying_resource = notification.notifying_resource
       resource = notification.resource
-      type = notification.notifying_resource.immediate_notifications.include?(notification) ? :immediately : :delayed
+
+      if notifying_resource.immediate_notifications.include?(notification)
+        type = :immediately
+      elsif notifying_resource.before_notifications.include?(notification)
+        type = :before
+      else
+        type = :delayed
+      end
 
       %Q{  "#{notifying_resource.to_s}" notifies "#{resource_name(resource)}[#{resource.name}]" to :#{notification.action}, :#{type}}
     end

data/lib/chefspec/matchers/subscribes_matcher.rb

@@ -23,6 +23,10 @@ module ChefSpec::Matchers
         @instance.delayed
       end
 
+      if @before
+        @instance.before
+      end
+
       if resource
         runner   = resource.run_context.node.runner
         expected = runner.find_resource(@expected_resource_type, @expected_resource_name)
@@ -48,6 +52,11 @@ module ChefSpec::Matchers
       self
     end
 
+    def before
+      @before = true
+      self
+    end
+
     def description
       @instance.description
     end

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '4.7.0'
+  VERSION = '5.0.0'
 end

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
 require 'chefspec'
 require 'support/hash'
 
+
+ChefSpec::Coverage.start! do
+  set_template 'table.erb'
+end
+
 RSpec.configure do |config|
   config.expect_with(:rspec) { |c| c.syntax = :expect }
   config.filter_run(focus: true)

data/spec/unit/cacher_spec.rb

@@ -13,8 +13,9 @@ describe ChefSpec::Cacher do
   end
 
   let(:cache) { described_class.class_variable_get(:@@cache) }
+  let(:preserve_cache) { false }
 
-  before(:each) { described_class.class_variable_set(:@@cache, {}) }
+  before(:each) { described_class.class_variable_set(:@@cache, {}) unless preserve_cache }
 
   describe 'cached' do
     it 'lazily defines the results for the cache' do
@@ -41,6 +42,21 @@ describe ChefSpec::Cacher do
         end
       end
     end
+
+    context 'when example groups are defined by looping' do
+      let(:preserve_cache) { true }
+
+      ['first', 'second', 'third'].each do |iteration|
+        context "on the #{iteration} iteration" do
+          context 'in caching context' do
+            cached(:cached_iteration) { iteration }
+            it 'caches the iteration for this context' do
+              expect(cached_iteration).to eq iteration
+            end
+          end
+        end
+      end
+    end
   end
 
   describe 'cached!' do

data/spec/unit/matchers/notifications_matcher_spec.rb

@@ -10,6 +10,7 @@ describe ChefSpec::Matchers::NotificationsMatcher do
       performed_action?: true,
       immediate_notifications: [],
       delayed_notifications: [],
+      before_notifications: []
     )
   end
 

data/spec/unit/matchers/subscribes_matcher_spec.rb

@@ -30,6 +30,7 @@ describe ChefSpec::Matchers::SubscribesMatcher do
         to_s: 'execute[install]',
         immediate_notifications: [],
         delayed_notifications: [],
+        before_notifications: []
       )
     end
 

data/spec/unit/solo_runner_spec.rb

@@ -141,7 +141,7 @@ describe ChefSpec::SoloRunner do
     end
 
     it 'allows attributes to be set on the node' do
-      subject.node.set['bacon'] = 'ham'
+      subject.node.normal['bacon'] = 'ham'
       expect(subject.node.bacon).to eq('ham')
     end
   end

data/templates/coverage/json.erb

@@ -0,0 +1,8 @@
+{ "resources":[
+  <%= @all_resources.map { |resource| resource.to_json }.join(",\n") %>
+  ],
+  "resource_count": <%= @total %>,
+  "resources_touched": <%= @touched %>,
+  "resource_coverage":    <%= @coverage %>
+
+}

data/templates/coverage/table.erb

@@ -0,0 +1,14 @@
+<%='Touched'.to_s.ljust(8) %> <%='Resource'.to_s.ljust(48) %>   File:Line
+<% @all_resources.each do |resource| %>
+<%=resource.touched?.to_s.ljust(8) %> <%= resource.to_s.ljust(48) %>   <%= resource.source_file %>:<%= resource.source_line %>
+<% end %>
+
+<% if @total == 0 %>
+  No Chef resources found, skipping coverage calculation...
+<% else %>
+ChefSpec Coverage report generated...
+
+  Total Resources:   <%= @total %>
+  Touched Resources: <%= @touched %>
+  Touch Coverage:    <%= @coverage %>%
+<% end %>

data/templates/errors/erb_template_parse_error.erb

@@ -0,0 +1,5 @@
+An Error occured during parsing the Erb Given.
+
+Here is the original error:
+
+    <%= @original_error %>

data/templates/errors/template_not_found.erb

@@ -0,0 +1,9 @@
+The template specified cannot be found.
+
+The template for a Coverage.report!
+cannot be found given the following path:
+  
+  <%= @path %>
+
+please check your set_template parameters.
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '11.14'
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '11.14'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: fauxhai
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,14 @@ files:
 - examples/apt_package/spec/reconfig_spec.rb
 - examples/apt_package/spec/remove_spec.rb
 - examples/apt_package/spec/upgrade_spec.rb
+- examples/apt_repository/recipes/add.rb
+- examples/apt_repository/recipes/remove.rb
+- examples/apt_repository/spec/add_spec.rb
+- examples/apt_repository/spec/remove_spec.rb
+- examples/apt_update/recipes/periodic.rb
+- examples/apt_update/recipes/update.rb
+- examples/apt_update/spec/periodic_spec.rb
+- examples/apt_update/spec/update_spec.rb
 - examples/attributes/attributes/default.rb
 - examples/attributes/recipes/default.rb
 - examples/attributes/spec/default_spec.rb
@@ -337,10 +345,12 @@ files:
 - examples/multiple_actions/spec/sequential_spec.rb
 - examples/multiple_run_action/recipes/default.rb
 - examples/multiple_run_action/spec/default_spec.rb
+- examples/notifications/recipes/before.rb
 - examples/notifications/recipes/chained.rb
 - examples/notifications/recipes/default.rb
 - examples/notifications/recipes/delayed.rb
 - examples/notifications/recipes/immediately.rb
+- examples/notifications/spec/before_spec.rb
 - examples/notifications/spec/chained_spec.rb
 - examples/notifications/spec/default_spec.rb
 - examples/notifications/spec/delayed_spec.rb
@@ -497,10 +507,12 @@ files:
 - examples/stub_node/spec/default_spec.rb
 - examples/stub_search/recipes/default.rb
 - examples/stub_search/spec/default_spec.rb
+- examples/subscribes/recipes/before.rb
 - examples/subscribes/recipes/chained.rb
 - examples/subscribes/recipes/default.rb
 - examples/subscribes/recipes/delayed.rb
 - examples/subscribes/recipes/immediately.rb
+- examples/subscribes/spec/before_spec.rb
 - examples/subscribes/spec/chained_spec.rb
 - examples/subscribes/spec/default_spec.rb
 - examples/subscribes/spec/delayed_spec.rb
@@ -644,6 +656,8 @@ files:
 - lib/chefspec.rb
 - lib/chefspec/api.rb
 - lib/chefspec/api/apt_package.rb
+- lib/chefspec/api/apt_repository.rb
+- lib/chefspec/api/apt_update.rb
 - lib/chefspec/api/batch.rb
 - lib/chefspec/api/chef_gem.rb
 - lib/chefspec/api/chocolatey_package.rb
@@ -755,7 +769,6 @@ files:
 - spec/unit/deprecations_spec.rb
 - spec/unit/errors_spec.rb
 - spec/unit/expect_exception_spec.rb
-- spec/unit/extensions/lwrp_base_spec.rb
 - spec/unit/macros_spec.rb
 - spec/unit/matchers/do_nothing_matcher.rb
 - spec/unit/matchers/include_recipe_matcher_spec.rb
@@ -779,12 +792,16 @@ files:
 - spec/unit/stubs/search_stub_spec.rb
 - spec/unit/stubs/stub_spec.rb
 - templates/coverage/human.erb
+- templates/coverage/json.erb
+- templates/coverage/table.erb
 - templates/errors/cookbook_path_not_found.erb
+- templates/errors/erb_template_parse_error.erb
 - templates/errors/gem_load_error.erb
 - templates/errors/invalid_berkshelf_options.erb
 - templates/errors/may_need_to_specify_platform.erb
 - templates/errors/no_conversion_error.erb
 - templates/errors/not_stubbed.erb
+- templates/errors/template_not_found.erb
 homepage: https://sethvargo.github.io/chefspec/
 licenses:
 - MIT
@@ -797,7 +814,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -805,7 +822,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Write RSpec examples and generate coverage reports for Chef recipes!
@@ -894,7 +911,6 @@ test_files:
 - spec/unit/deprecations_spec.rb
 - spec/unit/errors_spec.rb
 - spec/unit/expect_exception_spec.rb
-- spec/unit/extensions/lwrp_base_spec.rb
 - spec/unit/macros_spec.rb
 - spec/unit/matchers/do_nothing_matcher.rb
 - spec/unit/matchers/include_recipe_matcher_spec.rb
@@ -917,4 +933,3 @@ test_files:
 - spec/unit/stubs/search_registry_spec.rb
 - spec/unit/stubs/search_stub_spec.rb
 - spec/unit/stubs/stub_spec.rb
-has_rdoc: 

data/spec/unit/extensions/lwrp_base_spec.rb

@@ -1,96 +0,0 @@
-require 'spec_helper'
-
-# Chef 12 fixed resource inheritance issues
-if Chef::VERSION.to_f < 12.0
-  module ChefSpec
-    module Extensions
-      describe :LWRPBase do
-        describe '#remove_existing_lwrp' do
-          before do
-            Chef::Provider::MysqlDatabase = nil
-            Chef::Resource::MysqlDatabase = Class.new(Chef::Resource)
-          end
-
-          after do
-            [Chef::Provider, Chef::Resource].each do |mod|
-              next unless mod.const_defined?(:MysqlDatabase, false)
-              mod.send(:remove_const, :MysqlDatabase)
-            end
-          end
-
-          context Chef::Provider do
-            before do
-              Chef::Provider::LWRPBase.remove_existing_lwrp('MysqlDatabase')
-            end
-
-            it 'removes the provider if it already exists' do
-              expect(Chef::Provider.constants).to_not include(:MysqlDatabase)
-            end
-
-            it 'does not remove resource'  do
-              expect(Chef::Resource.constants).to include(:MysqlDatabase)
-            end
-
-            it 'does not throw an error if the resource does not already exist' do
-              expect {
-                Chef::Provider::LWRPBase.remove_existing_lwrp 'Human'
-              }.to_not raise_error
-            end
-          end
-
-          context Chef::Resource do
-            let!(:resource_class) { Chef::Resource::MysqlDatabase }
-
-            before do
-              Chef::Resource::LWRPBase.remove_existing_lwrp('MysqlDatabase')
-            end
-
-            it 'removes the resource if it already exists' do
-              expect(Chef::Resource.constants).to_not include(:MysqlDatabase)
-            end
-
-            if Chef::Resource.respond_to?(:resource_classes)
-              it 'removes the resource from Chef::Resource.resource_classes' do
-                expect(Chef::Resource.resource_classes).to_not include(resource_class)
-              end
-            end
-
-            it 'does not remove the provider'  do
-              Chef::Resource::LWRPBase.remove_existing_lwrp('MysqlDatabase')
-              expect(Chef::Provider.constants).to include(:MysqlDatabase)
-            end
-
-            it 'does not throw an error if the resource does not already exist' do
-              expect {
-                Chef::Resource::LWRPBase.remove_existing_lwrp 'Human'
-              }.to_not raise_error
-            end
-          end
-        end
-      end
-
-      describe '#build_from_file' do
-        let(:args){ %w{mycookbook thisfile context} }
-
-        shared_context "wrapping" do
-          it 'wraps the existing chef build_from_file method' do
-            klass = mod::LWRPBase
-            allow(klass).to receive(:build_from_file_without_removal)
-            expect(klass).to receive(:build_from_file_without_removal).with(*args)
-            klass.build_from_file(*args)
-          end
-        end
-
-        context Chef::Provider do
-          let(:mod){ Chef::Provider }
-          include_context "wrapping"
-        end
-
-        context Chef::Resource do
-          let(:mod){ Chef::Resource }
-          include_context "wrapping"
-        end
-      end
-    end
-  end
-end