chefspec 3.0.0.beta.2 → 3.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 500cc20cbae81f4fe09ee9a0ad02d0910b30f901
-  data.tar.gz: 1fd9ab8312366fd9b755b6ce0b1ac7fa88d5befd
+  metadata.gz: 7308d36040d62aec7a7c6cf1f8db5a055bc443db
+  data.tar.gz: 2431011f1b6831872267062ebd68bd8081858bb3
 SHA512:
-  metadata.gz: 9955d1c754d878ea7db155b89d79bd44e6868d0f1f8bf91fa2561ddf2bae1df303194dedb506a12d8c5dae87dbdebeaa6ddc9ae09d23c7422805093e3dc08de0
-  data.tar.gz: 6d9a11b65adec8e5910c7460a1aac740438bb005cc64070344ba2a939031f41e51c9b5196d7b1b169d92df63ff1608d947d2e7366c9d4e65d30e760f2af12cf6
+  metadata.gz: 1ab357238fb71ea97cda205efa9fcf964ca892ac072ab551c4a7476269580f3531edde90bb53f52334cde560e6a1195e9f7c736eade511048907c221eb227656
+  data.tar.gz: e56256e20086ca15252e5dea80822b7d1545b7aa8c28e22c825c165a76d428f8d05a826750fba45bb5050ae7de64b3ab6a73cd25c1839a44dadfa10807ebbe8b

data/lib/chefspec.rb

@@ -4,6 +4,7 @@ require_relative 'chefspec/extensions/chef/client'
 require_relative 'chefspec/extensions/chef/conditional'
 require_relative 'chefspec/extensions/chef/data_query'
 require_relative 'chefspec/extensions/chef/lwrp_base'
+require_relative 'chefspec/extensions/chef/provider'
 require_relative 'chefspec/extensions/chef/resource'
 require_relative 'chefspec/extensions/chef/securable'
 
@@ -25,6 +26,7 @@ require_relative 'chefspec/formatter'
 require_relative 'chefspec/macros'
 require_relative 'chefspec/matchers'
 require_relative 'chefspec/renderer'
+require_relative 'chefspec/reporter'
 require_relative 'chefspec/rspec'
 require_relative 'chefspec/runner'
 require_relative 'chefspec/version'

data/lib/chefspec/berkshelf.rb

@@ -24,11 +24,9 @@ module ChefSpec
     # Setup and install the necessary dependencies in the temporary directory.
     #
     def setup!
-      FileUtils.rm_rf(@tmpdir) # Berkshelf 3.0 requires the directory to be empty
-      FileUtils.mkdir_p(@tmpdir)
-
       ::Berkshelf.ui.mute do
         if ::Berkshelf::Berksfile.method_defined?(:vendor)
+          FileUtils.rm_rf(@tmpdir) # Berkshelf 3.0 requires the directory to not exist
           ::Berkshelf::Berksfile.from_file('Berksfile').vendor(@tmpdir)
         else
           ::Berkshelf::Berksfile.from_file('Berksfile').install(path: @tmpdir)

data/lib/chefspec/extensions/chef/provider.rb

@@ -0,0 +1,20 @@
+require 'chef/provider'
+
+class Chef::Provider
+  alias_method :old_run_action, :run_action unless method_defined?(:old_run_action)
+
+  def run_action(action = nil)
+    Chef::Log.debug("Running action '#{action}' for #{self} (skipping because ChefSpec)")
+    @new_resource.updated_by_last_action(true)
+
+    if node.runner.step_into.include?(@new_resource.resource_name.to_s)
+      Chef::Log.debug("Stepping into LWRP #{@new_resource.resource_name.to_s}")
+
+      if whyrun_supported?
+        Chef::Log.warn("#{self} does not support whyrun mode. This could be dangerous!")
+      end
+
+      old_run_action(action)
+    end
+  end
+end

data/lib/chefspec/extensions/chef/resource.rb

@@ -1,42 +1,31 @@
 require 'chef/resource'
 
 class Chef::Resource
-  alias :old_run_action :run_action unless method_defined?(:old_run_action)
+  alias_method :old_initialize, :initialize
 
-  #
-  # Pretend to run resource actions, adding them to the resource collection
-  # to prevent actually executing resources
-  #
-  # @see Chef::Resource#run_action
-  #
-  def run_action(action, notification_type = nil, notifying_resource = nil)
-    return if should_skip?(action)
+  def initialize(*args)
+    @performed_actions = {}
+    old_initialize(*args)
+  end
 
-    if node.runner.step_into.include?(self.resource_name.to_s)
-      instance_eval { @not_if = []; @only_if = [] }
-      old_run_action(action, notification_type, notifying_resource)
-    end
+  def perform_action(action, options = {})
+    @performed_actions[action.to_sym] ||= {}
+    @performed_actions[action.to_sym].merge!(options)
+  end
 
-    if node.runner.compiling?
-      @compile_time = true
-    end
+  def unperform_action(action)
+    @performed_actions.delete(action.to_sym)
+  end
 
-    Chef::Log.info("Processing #{self} action #{action} (#{defined_at})")
+  def performed_action(action)
+    @performed_actions[action.to_sym]
+  end
 
-    # Append the currently run action to the existing resource actions,
-    # making sure it's a unique array of symbols.
-    @action = [self.action, action].flatten.compact.map(&:to_sym).uniq
-    node.runner.resources[self.to_s] ||= self
+  def performed_action?(action)
+    !!performed_action(action)
   end
 
-  #
-  # Determine if the current resource is a compile-time resource (as opposed
-  # to a converge time resource). Compile-time resources are executed with the
-  # +run_action+ command at load time, rather than at comverge time.
-  #
-  # @return [Boolean]
-  #
-  def compile_time?
-    !!@compile_time
+  def performed_actions
+    @performed_actions.keys
   end
 end

data/lib/chefspec/matchers/link_to_matcher.rb

@@ -6,7 +6,10 @@ module ChefSpec::Matchers
 
     def matches?(link)
       @link = link
-      @link.is_a?(Chef::Resource::Link) && @path === @link.to
+
+      @link.is_a?(Chef::Resource::Link) &&
+      @link.performed_action?(:create) &&
+      @path === @link.to
     end
 
     def description

data/lib/chefspec/matchers/notifications_matcher.rb

@@ -9,18 +9,20 @@ module ChefSpec::Matchers
     def matches?(resource)
       @resource = resource
 
-      block = Proc.new do |notified|
-        notified.resource.resource_name.to_s == @expected_resource_type &&
-        (@expected_resource_name === notified.resource.identity.to_s || @expected_resource_name === notified.resource.name.to_s) &&
-        matches_action?(notified)
-      end
+      if @resource
+        block = Proc.new do |notified|
+          notified.resource.resource_name.to_s == @expected_resource_type &&
+          (@expected_resource_name === notified.resource.identity.to_s || @expected_resource_name === notified.resource.name.to_s) &&
+          matches_action?(notified)
+        end
 
-      if @immediately
-        immediate_notifications.any?(&block)
-      elsif @delayed
-        delayed_notifications.any?(&block)
-      else
-        all_notifications.any?(&block)
+        if @immediately
+          immediate_notifications.any?(&block)
+        elsif @delayed
+          delayed_notifications.any?(&block)
+        else
+          all_notifications.any?(&block)
+        end
       end
     end
 
@@ -48,15 +50,29 @@ module ChefSpec::Matchers
     end
 
     def failure_message_for_should
-      message = "expected '#{@resource.resource_name}[#{@resource.name}]' to notify '#{@expected_resource_type}[#{@expected_resource_name}]'"
-      message << " with action #{@action.inspect}" if @action
-      message << " immediately" if @immediately
-      message << " delayed" if @delayed
-      message << ", but did not."
-      message << "\n\n"
-      message << "Other notifications were:\n#{format_notifications}"
-      message << "\n "
-      message
+      if @resource
+        message = "expected '#{@resource.resource_name}[#{@resource.name}]' to notify '#{@expected_resource_type}[#{@expected_resource_name}]'"
+        message << " with action #{@action.inspect}" if @action
+        message << " immediately" if @immediately
+        message << " delayed" if @delayed
+        message << ", but did not."
+        message << "\n\n"
+        message << "Other notifications were:\n\n#{format_notifications}"
+        message << "\n "
+        message
+      else
+        message = "expected _something_ to notify '#{@expected_resource_type}[#{@expected_resource_name}]"
+        message << " with action #{@action.inspect}" if @action
+        message << " immediately" if @immediately
+        message << " delayed" if @delayed
+        message << ", but the _something_ you gave me was nil! If you are running a test like:"
+        message << "\n\n"
+        message << "  expect(_something_).to notify('...')"
+        message << "\n\n"
+        message << "Make sure that `_something_` exists, because I got nil"
+        message << "\n "
+        message
+      end
     end
 
     private
@@ -78,10 +94,11 @@ module ChefSpec::Matchers
       end
 
       def format_notification(notification)
+        notifying_resource = notification.notifying_resource
         resource = notification.resource
         type = notification.notifying_resource.immediate_notifications.include?(notification) ? :immediately : :delayed
 
-        "notifies :#{notification.action}, '#{resource.resource_name}[#{resource.name}]', :#{type}"
+        "  #{notifying_resource.to_s} notifies '#{resource.resource_name}[#{resource.name}]' to :#{notification.action}, :#{type}"
       end
 
       def format_notifications

data/lib/chefspec/matchers/render_file_matcher.rb

@@ -59,7 +59,7 @@ module ChefSpec::Matchers
       # @return [Boolean]
       #
       def has_create_action?
-        !([:create, :create_if_missing] & Array(resource.action).map(&:to_sym)).empty?
+        [:create, :create_if_missing].any? { |action| resource.performed_action?(action) }
       end
 
       #

data/lib/chefspec/matchers/resource_matcher.rb

@@ -39,7 +39,7 @@ module ChefSpec::Matchers
       @runner = runner
 
       if resource
-        resource_actions.include?(@expected_action) && unmatched_parameters.empty? && correct_phase?
+        resource.performed_action?(@expected_action) && unmatched_parameters.empty? && correct_phase?
       else
         false
       end
@@ -47,7 +47,7 @@ module ChefSpec::Matchers
 
     def failure_message_for_should
       if resource
-        if resource_actions.include?(@expected_action)
+        if resource.performed_action?(@expected_action)
           if unmatched_parameters.empty?
             if @compile_time
               "expected '#{resource.to_s}' to be run at compile time, but was converge time"
@@ -62,7 +62,7 @@ module ChefSpec::Matchers
             }.join("\n  ")
           end
         else
-          "expected '#{resource.to_s}' actions #{resource_actions.inspect}" \
+          "expected '#{resource.to_s}' actions #{resource.performed_actions.inspect}" \
           " to include ':#{@expected_action}'"
         end
       else
@@ -76,7 +76,7 @@ module ChefSpec::Matchers
 
     def failure_message_for_should_not
       if resource
-        message = "expected '#{resource.to_s}' actions #{resource_actions.inspect} to not exist"
+        message = "expected '#{resource.to_s}' actions #{resource.performed_actions.inspect} to not exist"
       else
         message = "expected '#{resource.to_s}' to not exist"
       end
@@ -119,9 +119,9 @@ module ChefSpec::Matchers
 
       def correct_phase?
         if @compile_time
-          resource.compile_time?
+          resource.performed_action(@expected_action)[:compile_time]
         elsif @converge_time
-          !resource.compile_time?
+          resource.performed_action(@expected_action)[:converge_time]
         else
           true
         end
@@ -140,7 +140,7 @@ module ChefSpec::Matchers
       # @return [Array<Chef::Resource>]
       #
       def similar_resources
-        @_similar_resources ||= @runner.find_resources(@resource_name).values
+        @_similar_resources ||= @runner.find_resources(@resource_name)
       end
 
       #
@@ -155,15 +155,6 @@ module ChefSpec::Matchers
         @_resource ||= @runner.find_resource(@resource_name, @expected_identity)
       end
 
-      #
-      # The list of actions on this resource.
-      #
-      # @return [Array<Symbol>]
-      #
-      def resource_actions
-        @_resource_actions ||= Array(resource.action).map(&:to_sym)
-      end
-
       #
       # The list of parameters passed to the {with} matcher.
       #

data/lib/chefspec/reporter.rb

@@ -0,0 +1,51 @@
+require 'chef/event_dispatch/base'
+
+module ChefSpec
+  class Reporter < ::Chef::EventDispatch::Base
+    #
+    # Called when a resource is converged ({Chef::Resource#run_action}).
+    # This appends the action to the resource's +performed_actions+ so that
+    # ChefSpec can assert the resource received the proper message.
+    #
+    # @param [Chef::Resource] resource
+    #   the resource to report on
+    # @param [Symbol] action
+    #   the action
+    #
+    def resource_action_start(resource, action, notification_type = nil, notifier = nil)
+      if @converging
+        resource.perform_action(action, converge_time: true)
+      else
+        resource.perform_action(action, compile_time: true)
+      end
+    end
+
+    #
+    # Called when a resource action is skipped (due to a resource guard
+    # or +action :nothing+). This removes the given action from the list
+    # of +performed_actions+ on the resource.
+    #
+    # @param [Chef::Resource] resource
+    #   the resource to report on
+    # @param [Symbol] action
+    #   the action
+    # @param [Chef::Resource::Conditional] conditional
+    #   the conditional that ran
+    #
+    def resource_skipped(resource, action, conditional)
+      resource.unperform_action(action)
+    end
+
+    #
+    # Called when we start convering. This method sets an instance variable
+    # that other classes use to determine if a resource action was run during
+    # compile time or converge time.
+    #
+    # @param [Chef::RunContext] run_context
+    #   the Chef run context
+    #
+    def converge_start(run_context)
+      @converging = true
+    end
+  end
+end

data/lib/chefspec/runner.rb

@@ -74,10 +74,11 @@ module ChefSpec
       Chef::Config.reset!
       Chef::Config.formatters.clear
       Chef::Config.add_formatter('chefspec')
-      Chef::Config[:cache_type]    = 'Memory'
-      Chef::Config[:cookbook_path] = Array(options[:cookbook_path])
-      Chef::Config[:force_logger]  = true
-      Chef::Config[:solo]          = true
+      Chef::Config[:cache_type]     = 'Memory'
+      Chef::Config[:event_handlers] = ChefSpec::Reporter.new
+      Chef::Config[:cookbook_path]  = Array(options[:cookbook_path])
+      Chef::Config[:force_logger]   = true
+      Chef::Config[:solo]           = true
 
       yield node if block_given?
     end
@@ -100,9 +101,6 @@ module ChefSpec
     #   A reference to the calling Runner (for chaining purposes)
     #
     def apply(*recipe_names)
-      # Start compiling
-      @compiling = true
-
       recipe_names.each do |recipe_name|
         cookbook, recipe = Chef::Recipe.parse_recipe_name(recipe_name)
         recipe_path = File.join(Dir.pwd, 'recipes', "#{recipe}.rb")
@@ -111,19 +109,13 @@ module ChefSpec
         recipe.from_file(recipe_path)
       end
 
-      # Reset the resource collection
-      @resources = {}
-
       # Expand the run_list
       expand_run_list!
 
       # Setup the run_context
       @run_context = Chef::RunContext.new(client.node, {}, client.events)
 
-      # We are done compiling now
-      @compiling = false
-
-      Chef::Runner.new(@run_context).converge
+      @client.converge(@run_context)
       self
     end
 
@@ -145,27 +137,18 @@ module ChefSpec
     #   A reference to the calling Runner (for chaining purposes)
     #
     def converge(*recipe_names)
-      # Start compiling
-      @compiling = true
-
       node.run_list.reset!
       recipe_names.each { |recipe_name| node.run_list.add(recipe_name) }
 
       return self if dry_run?
 
-      # Reset the resource collection
-      @resources = {}
-
       # Expand the run_list
       expand_run_list!
 
       # Setup the run_context
       @run_context = client.setup_run_context
 
-      # We are done compiling now
-      @compiling = false
-
-      Chef::Runner.new(@run_context).converge
+      @client.converge(@run_context)
       self
     end
 
@@ -188,8 +171,8 @@ module ChefSpec
     #
     # @return [Hash<String, Chef::Resource>]
     #
-    def resources
-      @resources ||= {}
+    def resource_collection
+      @resource_collection ||= @run_context.resource_collection
     end
 
     #
@@ -209,9 +192,11 @@ module ChefSpec
     #   The matching resource, or nil if one is not found
     #
     def find_resource(type, name)
-      return resources["#{type}[#{name}]"] if resources["#{type}[#{name}]"]
+      begin
+        return resource_collection.lookup("#{type}[#{name}]")
+      rescue Chef::Exceptions::ResourceNotFound; end
 
-      resources.values.find do |resource|
+      resource_collection.all_resources.find do |resource|
         resource.resource_name.to_sym == type && (name === resource.identity || name === resource.name)
       end
     end
@@ -230,7 +215,7 @@ module ChefSpec
     #   The matching resources
     #
     def find_resources(type)
-      resources.select do |_, resource|
+      resource_collection.all_resources.select do |resource|
         resource.resource_name.to_s == type.to_s
       end
     end
@@ -253,17 +238,6 @@ module ChefSpec
       !!options[:dry_run]
     end
 
-    #
-    # Boolean method to determine if the Runner is still compiling recipes.
-    # This is used by the +Resource+ class to determine if a resource was
-    # invoked at compile-time or converge-time.
-    #
-    # @return [Boolean]
-    #
-    def compiling?
-      !!@compiling
-    end
-
     #
     # This runner as a string.
     #

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '3.0.0.beta.2'
+  VERSION = '3.0.0.beta.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.2
+  version: 3.0.0.beta.3
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -171,6 +171,7 @@ files:
 - lib/chefspec/extensions/chef/conditional.rb
 - lib/chefspec/extensions/chef/data_query.rb
 - lib/chefspec/extensions/chef/lwrp_base.rb
+- lib/chefspec/extensions/chef/provider.rb
 - lib/chefspec/extensions/chef/resource.rb
 - lib/chefspec/extensions/chef/securable.rb
 - lib/chefspec/formatter.rb
@@ -182,6 +183,7 @@ files:
 - lib/chefspec/matchers/resource_matcher.rb
 - lib/chefspec/matchers.rb
 - lib/chefspec/renderer.rb
+- lib/chefspec/reporter.rb
 - lib/chefspec/rspec.rb
 - lib/chefspec/runner.rb
 - lib/chefspec/stubs/command_registry.rb
@@ -219,6 +221,6 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: chefspec-3.0.0.beta.2
+summary: chefspec-3.0.0.beta.3
 test_files: []
 has_rdoc: