chefspec 1.1.0 → 1.2.0

data/lib/chefspec/chef_runner.rb

@@ -5,6 +5,10 @@ require 'fauxhai'
 
 require 'chefspec/matchers/shared'
 
+begin
+  require 'berkshelf'
+rescue LoadError; end
+
 # ChefSpec allows you to write rspec examples for Chef recipes to gain faster feedback without the need to converge a
 # node.
 module ChefSpec
@@ -26,7 +30,7 @@ module ChefSpec
     # @option options [Symbol] :log_level The log level to use (default is :warn)
     # @option options [String] :platform The platform to load Ohai attributes from (must be present in fauxhai)
     # @option options [String] :version The version of the platform to load Ohai attributes from (must be present in fauxhai)
-    # @option options [String] :ohai_data_path Path of a json file that will be passed to fauxhai as :path option 
+    # @option options [String] :ohai_data_path Path of a json file that will be passed to fauxhai as :path option
     # @yield [node] Configuration block for Chef::Node
     def initialize(options={})
       defaults = {:cookbook_path => default_cookbook_path, :log_level => :warn, :dry_run => false, :step_into => []}
@@ -75,7 +79,7 @@ module ChefSpec
       Chef::Config[:cache_type] = "Memory"
       Chef::Config[:cache_options] = { :path => File.join(File.expand_path('~'), '.chef', 'checksums') }
       Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest) }
-      Chef::Config[:cookbook_path] = @options[:cookbook_path]
+      Chef::Config[:cookbook_path] = cookbook_paths
       Chef::Config[:client_key] = nil
 
       # As of Chef 11, Chef uses custom formatters which munge the RSpec output.
@@ -140,7 +144,7 @@ module ChefSpec
       return "chef_run: #{@node.run_list.to_s}" unless @node.run_list.empty?
       'chef_run'
     end
-    
+
     # Find the resource with the declared type and name
     #
     # @param [String] type The type of resource - e.g. 'file' or 'directory'
@@ -149,7 +153,7 @@ module ChefSpec
     def find_resource(type, name)
       resources.find{|resource| resource_type(resource) == type and resource.name == name}
     end
-    
+
     private
 
     # Populate basic OHAI attributes required to get recipes working. This is a minimal set - if your recipe example
@@ -177,6 +181,22 @@ module ChefSpec
       Pathname.new(File.join(caller(2).first.split(':').slice(0..-3).join(':'), '..', '..', '..')).cleanpath.to_s
     end
 
+    # The cookbook path, appended with some "common" directories to search
+    # as well (such as vendor/cookbooks)
+    #
+    # @return [Array<String>] The cookbook_paths
+    def cookbook_paths
+      vendor_path = File.expand_path(File.join('vendor', 'cookbooks'))
+      test_path   = File.expand_path(File.join('test', 'cookbooks'))
+      spec_path   = File.expand_path(File.join('spec', 'cookbooks'))
+
+      Array(@options[:cookbook_path]).
+        push(vendor_path).
+        push(test_path).
+        push(spec_path).
+        select { |path| File.exists?(path) }
+    end
+
   end
 
 end

data/lib/chefspec/matchers/file_content.rb

@@ -9,7 +9,8 @@ module ChefSpec
             if (Array(resource.action).map { |action| action.to_sym } & [:create, :create_if_missing]).any?
               case resource_type(resource)
                 when 'template'
-                  @actual_content = render(resource, chef_run.node)
+                  template_finder = template_finder(chef_run.run_context, resource, chef_run.node)
+                  @actual_content = render(resource, chef_run.node, template_finder)
                 when 'file'
                   @actual_content = resource.content
                 when 'cookbook_file'

data/lib/chefspec/matchers/shared.rb

@@ -1,3 +1,8 @@
+begin
+  require 'chef/mixin/template'
+  require 'chef/provider/template_finder'
+rescue LoadError
+end
 # Given a resource return the unqualified type it is
 #
 # @param [String] resource A Chef Resource
@@ -44,11 +49,16 @@ end
 #
 # @param [Chef::Resource::Template] template The template to render
 # @param [Chef::Node] node The node which may be required to render the template
+# @param [Chef::Provider::TemplateFinder] a TemplateFinder use for rendering templates containing partials
 # @return [String] The result result of rendering the template
-def render(template, node)
+def render(template, node, template_finder)
   # Duplicates functionality in the Chef Template provider
   context = {}; context.merge!(template.variables)
   context[:node] = node
+  unless template_finder.nil?
+    context[:template_finder] = template_finder
+    Erubis::Context.send(:include, Chef::Mixin::Template::ChefContext)
+  end
   Erubis::Eruby.new(IO.read(template_path(template, node))).evaluate(context)
 end
 
@@ -65,3 +75,9 @@ def template_path(template, node)
   end
   cookbook.preferred_filename_on_disk_location(node, :templates, template.source)
 end
+
+def template_finder(run_context, template, node)
+  if Chef::Provider.const_defined?(:TemplateFinder)
+    Chef::Provider::TemplateFinder.new(run_context,template.cookbook_name, node)
+  end
+end

data/lib/chefspec/minitest.rb

@@ -154,7 +154,7 @@ module ChefSpec
                 when :file
                   f.content
                 when :template
-                  render(f, node)
+                  render(f, node, template_finder(run_context, f, node))
                 else raise NotImplementedError,
                   ":#{f.resource_name} not supported for comparison"
               end.include?(content)

data/lib/chefspec/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3143489054534407734
+      hash: -3769472040999822905
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,12 +248,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3143489054534407734
+      hash: -3769472040999822905
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: chefspec-1.1.0
+summary: chefspec-1.2.0
 test_files: []
 has_rdoc: