chefspec 3.0.0.beta.3 → 3.0.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7308d36040d62aec7a7c6cf1f8db5a055bc443db
-  data.tar.gz: 2431011f1b6831872267062ebd68bd8081858bb3
+  metadata.gz: de6569c7801bd9192460934175605ba237962958
+  data.tar.gz: 005ba7b59b0d660be5b71565c4a8fa0c0edeb719
 SHA512:
-  metadata.gz: 1ab357238fb71ea97cda205efa9fcf964ca892ac072ab551c4a7476269580f3531edde90bb53f52334cde560e6a1195e9f7c736eade511048907c221eb227656
-  data.tar.gz: e56256e20086ca15252e5dea80822b7d1545b7aa8c28e22c825c165a76d428f8d05a826750fba45bb5050ae7de64b3ab6a73cd25c1839a44dadfa10807ebbe8b
+  metadata.gz: b17504fd6a5fc2642a43a47a720cfedaac7cc0553efe9c0b243c3aac2cf0fc41c962807eb1e9531981bb89728535823f72d7c4375662900c6849b166cb7149db
+  data.tar.gz: cec924c49870eb6afb3fc9756fc7e4acf8cf5d44a8da80b7034e91f236ef05e26e334023ec7058058f47bf1f7b83fda23b4600f7e78b2e2404d26c4d52d27793

data/lib/chefspec.rb

@@ -4,7 +4,6 @@ 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'
 
@@ -26,7 +25,6 @@ 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/extensions/chef/resource.rb

@@ -2,21 +2,37 @@ require 'chef/resource'
 
 class Chef::Resource
   alias_method :old_initialize, :initialize
-
   def initialize(*args)
     @performed_actions = {}
     old_initialize(*args)
   end
 
+  alias_method :old_run_action, :run_action
+  def run_action(action, notification_type = nil, notifying_resource = nil)
+    resolve_notification_references
+    validate_action(action)
+
+    Chef::Log.info("Processing #{self} action #{action} (#{defined_at})")
+
+    unless should_skip?(action)
+      if node.runner.step_into?(self)
+        instance_eval { @not_if = []; @only_if = [] }
+        old_run_action(action, notification_type, notifying_resource)
+      end
+
+      if node.runner.compiling?
+        perform_action(action, compile_time: true)
+      else
+        perform_action(action, converge_time: true)
+      end
+    end
+  end
+
   def perform_action(action, options = {})
     @performed_actions[action.to_sym] ||= {}
     @performed_actions[action.to_sym].merge!(options)
   end
 
-  def unperform_action(action)
-    @performed_actions.delete(action.to_sym)
-  end
-
   def performed_action(action)
     @performed_actions[action.to_sym]
   end

data/lib/chefspec/matchers/render_file_matcher.rb

@@ -23,11 +23,11 @@ module ChefSpec::Matchers
       if @expected_content
         message << " with:"
         message << "\n\n"
-        message << @expected_content
+        message << @expected_content.to_s
         message << "\n\n"
         message << "but got:"
         message << "\n\n"
-        message << @actual_content
+        message << @actual_content.to_s
         message << "\n "
       end
       message
@@ -38,7 +38,7 @@ module ChefSpec::Matchers
       if @expected_content
         message << " with:"
         message << "\n\n"
-        message << @expected_content
+        message << @expected_content.to_s
         message << "\n\n"
       end
       message << " to not be in Chef run"

data/lib/chefspec/runner.rb

@@ -75,7 +75,7 @@ module ChefSpec
       Chef::Config.formatters.clear
       Chef::Config.add_formatter('chefspec')
       Chef::Config[:cache_type]     = 'Memory'
-      Chef::Config[:event_handlers] = ChefSpec::Reporter.new
+      Chef::Config[:client_key]     = nil
       Chef::Config[:cookbook_path]  = Array(options[:cookbook_path])
       Chef::Config[:force_logger]   = true
       Chef::Config[:solo]           = true
@@ -115,6 +115,7 @@ module ChefSpec
       # Setup the run_context
       @run_context = Chef::RunContext.new(client.node, {}, client.events)
 
+      @converging = true
       @client.converge(@run_context)
       self
     end
@@ -148,6 +149,7 @@ module ChefSpec
       # Setup the run_context
       @run_context = client.setup_run_context
 
+      @converging = true
       @client.converge(@run_context)
       self
     end
@@ -221,12 +223,28 @@ module ChefSpec
     end
 
     #
-    # The list of LWRPs to step into and evaluate.
+    # Boolean method to determine the current phase of the Chef run (compiling
+    # or converging)
     #
-    # @return [Array<String>]
+    # @return [Boolean]
+    #
+    def compiling?
+      !@converging
+    end
+
+    #
+    # Determines if the runner should step into the given resource. The
+    # +step_into+ option takes a string, but this method coerces everything
+    # to symbols for safety.
+    #
+    # @param [Chef::Resource] resource
+    #   the Chef resource to try and step in to
+    #
+    # @return [Boolean]
     #
-    def step_into
-      @step_into ||= Array(options[:step_into] || [])
+    def step_into?(resource)
+      key = resource.resource_name.to_sym
+      Array(options[:step_into]).map(&:to_sym).include?(key)
     end
 
     #

data/lib/chefspec/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.3
+  version: 3.0.0.beta.4
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -171,7 +171,6 @@ 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
@@ -183,7 +182,6 @@ 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
@@ -221,6 +219,6 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: chefspec-3.0.0.beta.3
+summary: chefspec-3.0.0.beta.4
 test_files: []
 has_rdoc: 

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

@@ -1,20 +0,0 @@
-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/reporter.rb

@@ -1,51 +0,0 @@
-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