chefspec 0.7.0 → 0.8.0

data/lib/chefspec/chef_runner.rb

@@ -10,10 +10,10 @@ module ChefSpec
   # The main entry point for running recipes within RSpec.
   class ChefRunner
 
-    @step_into = []
     @resources = []
 
     attr_accessor :resources
+    attr_reader :step_into
     attr_reader :run_context
     attr_reader :node
 
@@ -24,16 +24,17 @@ module ChefSpec
     # @option options [Symbol] :log_level The log level to use (default is :warn)
     # @yield [node] Configuration block for Chef::Node
     def initialize(options={})
-      defaults = {:cookbook_path => default_cookbook_path, :log_level => :warn, :dry_run => false}
+      defaults = {:cookbook_path => default_cookbook_path, :log_level => :warn, :dry_run => false, :step_into => []}
       options = {:cookbook_path => options} unless options.respond_to?(:to_hash) # backwards-compatibility
       options = defaults.merge(options)
 
       the_runner = self
       @resources = []
+      @step_into = options[:step_into]
       @do_dry_run = options[:dry_run]
 
       Chef::Resource.class_eval do
-        alias :old_run_action :run_action
+        alias :old_run_action :run_action unless method_defined?(:old_run_action)
 
         if self.class.methods.include?(:class_variable_set)
           self.class_variable_set :@@runner, the_runner
@@ -41,13 +42,27 @@ module ChefSpec
           @@runner = the_runner
         end
 
-        def run_action(action)
-          Chef::Log.info("Processing #{self} action #{action} (#{defined_at})") if self.respond_to? :defined_at
-          if self.class.methods.include?(:class_variable_get)
-            self.class.class_variable_get(:@@runner).resources << self
+        def run_action(*args)
+          action = args.first
+          runner = if self.class.methods.include?(:class_variable_get)
+            self.class.class_variable_get(:@@runner)
           else
-            @@runner.resources << self
+            @@runner
+          end
+
+          if runner.step_into.include?(self.resource_name.to_s)
+            # Ignore not_if / only_if guards
+            if self.only_if.is_a?(Array) # 0.10.x
+              self.instance_eval { @not_if = []; @only_if = [] }
+            else # 0.9.x
+              self.only_if { true }
+              self.not_if { false }
+            end
+            self.old_run_action(action)
           end
+
+          Chef::Log.info("Processing #{self} action #{action} (#{defined_at})") if self.respond_to? :defined_at
+          runner.resources << self
         end
       end
 
@@ -60,6 +75,7 @@ module ChefSpec
       Chef::Log.level(options[:log_level])
       @client = Chef::Client.new
       fake_ohai(@client.ohai)
+      @client.load_node if @client.respond_to?(:load_node) # chef >= 10.14.0
       @node = @client.build_node
       if block_given?
         yield @node
@@ -170,7 +186,7 @@ module ChefSpec
     #
     # @return [String] The path to the cookbooks directory
     def default_cookbook_path
-      Pathname.new(File.join(caller(2).first.split(':').slice(0..-3).join(':'), '..', '..', '..')).cleanpath
+      Pathname.new(File.join(caller(2).first.split(':').slice(0..-3).join(':'), '..', '..', '..')).cleanpath.to_s
     end
 
     # Find the resource with the declared type and name

data/lib/chefspec/matchers/shared.rb

@@ -41,13 +41,15 @@ def render(template, node)
   # Duplicates functionality in the Chef Template provider
   context = {}; context.merge!(template.variables)
   context[:node] = node
-  Erubis::Eruby.new(IO.read(template_path(template))).evaluate(context)
+  Erubis::Eruby.new(IO.read(template_path(template, node))).evaluate(context)
 end
 
 # Given a template, return the path on disk.
 #
 # @param [Chef::Resource::Template] template The template
 # @return [String] The path on disk
-def template_path(template)
-  File.join("cookbooks/#{template.cookbook || template.cookbook_name}/templates/default", template.source)
+def template_path(template, node)
+  cookbook_name = template.cookbook || template.cookbook_name
+  cookbook = node.cookbook_collection[cookbook_name]
+  cookbook.preferred_filename_on_disk_location(node, :templates, template.source, template.path)
 end

data/lib/chefspec/monkey_patches/provider.rb

@@ -11,9 +11,10 @@ class Chef
       # @param [String] filename File to load as a LWRP
       # @param [Chef::RunContext] run_context Context of a Chef Run
       # @return [Chef::Provider] the created provider
-      def build_from_file(cookbook_name, filename, run_context)
+      def build_from_file(*args)
+        cookbook_name, filename = args[0,2]
         remove_existing_lwrp(convert_to_class_name(filename_to_qualified_string(cookbook_name, filename)))
-        old_build_from_file(cookbook_name, filename, run_context)
+        old_build_from_file(*args)
       end
 
       # Remove any existing Chef provider or resource with the specified name.

data/lib/chefspec/version.rb

@@ -1,4 +1,4 @@
 module ChefSpec
   # The gem version
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -516424648685498603
+      hash: -1887236234485155709
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,12 +121,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -516424648685498603
+      hash: -1887236234485155709
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
-summary: chefspec-0.7.0
+summary: chefspec-0.8.0
 test_files: []
 has_rdoc: