chefspec 1.3.1 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 499bad18b2da5ab00aedf8c46c95c6045e95f81c
+  data.tar.gz: f4e98dc5b9a45a149174f0d0e20b3c22e3781b00
+SHA512:
+  metadata.gz: cd4ac9f716914dfc745cfa45f9461d714d2f8e487fd33d28f00e886d54be9f234c18e71c6799b3e92f90581d60bd73acdac7ad35870ee1f3bfbef302faf1266e
+  data.tar.gz: 90ba125ef150adc1643f5dfabe85a893f5501b63cc7a8fce4e815012f78d7825d2743aef0d59c7238c3fbf9e863e26e094a294afc86a069b11782b92d58785e0

data/lib/chef/expect_exception.rb

@@ -0,0 +1,34 @@
+class Chef
+  module ExpectException
+    class << self
+      def expected?(chef_message, exception, *args)
+        @b.call(chef_message, exception)
+      end
+
+      def expect(klass, message)
+        expect_block do |chef_message, exception|
+          match?(exception, klass, message)
+        end
+      end
+
+      def expect_block(&block)
+        @b = block
+      end
+
+      def clear
+        @b = lambda{|cm, e| false}
+        clear_seen
+      end
+
+      def clear_seen
+        @seen = []
+      end
+
+      def match?(exception, klass, message)
+        exception.class == klass and exception.message == message
+      end
+    end
+
+    clear
+  end
+end

data/lib/chef/formatters/chefspec.rb

@@ -1,15 +1,10 @@
 if defined?(Chef::Formatters::Base)
   class Chef
     module Formatters
-      # A specific formatter for Chef 11. This base for this formatter was
-      # taken from Chef::Formatters:Min and all the output was then removed.
-      #
-      # @author Seth Vargo <sethvargo@gmail.com>
-      class ChefSpec < Formatters::Base
+      class ChefSpec < Base
         cli_name(:chefspec)
 
-        attr_reader :updated_resources
-        attr_reader :updates_by_resource
+        attr_reader :updated_resources, :updates_by_resource
 
         def initialize(out, err)
           super
@@ -17,6 +12,10 @@ if defined?(Chef::Formatters::Base)
           @updates_by_resource = Hash.new {|h, k| h[k] = []}
         end
 
+        def error_expected?(message, exception, *args)
+          ExpectException.expected?(message, exception, *args)
+        end
+
         # Called at the very start of a Chef Run
         def run_start(version)
           puts "Starting Chef Client, version #{version}"
@@ -28,6 +27,7 @@ if defined?(Chef::Formatters::Base)
 
         # called at the end of a failed run
         def run_failed(exception)
+          return if error_expected?(:run_failed, exception)
           puts "chef client failed. #{@updated_resources.size} resources updated"
         end
 
@@ -48,7 +48,7 @@ if defined?(Chef::Formatters::Base)
 
         # Failed to register this client with the server.
         def registration_failed(node_name, exception, config)
-          super
+          super unless error_expected?(:registration_failed, exception, config, node_name)
         end
 
         def node_load_start(node_name, config)
@@ -56,6 +56,11 @@ if defined?(Chef::Formatters::Base)
 
         # Failed to load node data from the server
         def node_load_failed(node_name, exception, config)
+          super unless error_expected?(:node_load_failed, exception)
+        end
+
+        def run_list_expand_failed(expanded_run_list, exception)
+          super unless error_expected?(:run_list_expand_failed, exception, expanded_run_list)
         end
 
         # Default and override attrs from roles have been computed, but not yet applied.
@@ -70,6 +75,11 @@ if defined?(Chef::Formatters::Base)
         # Called when there is an error getting the cookbook collection from the
         # server.
         def cookbook_resolution_failed(expanded_run_list, exception)
+          super unless error_expected?(:cookbook_resolution_failed, exception, expanded_run_list)
+        end
+
+        def cookbook_sync_failed(cookbooks, exception)
+          super unless error_expected?(:cookbook_sync_failed, exception, cookbooks)
         end
 
         # Called when the cookbook collection is returned from the server.
@@ -116,8 +126,28 @@ if defined?(Chef::Formatters::Base)
         def file_loaded(path)
         end
 
-        def file_load_failed(path, exception)
-          super
+        def file_load_failed(path, exception, message = :file_load_failed, &block)
+          super(path, exception, &block) unless error_expected?(message, exception, path)
+        end
+
+        def library_file_load_failed(path, exception)
+          file_load_failed(path, exception, :library_file_load_failed)
+        end
+
+        def lwrp_file_load_failed(path, exception)
+          file_load_failed(path, exception, :lwrp_file_load_failed)
+        end
+
+        def attribute_file_load_failed(path, exception)
+          file_load_failed(path, exception, :attribute_file_load_failed)
+        end
+
+        def definition_file_load_failed(path, exception)
+          file_load_failed(path, exception, :definition_file_load_failed)
+        end
+
+        def recipe_file_load_failed(path, exception)
+          file_load_failed(path, exception, :recipe_file_load_failed)
         end
 
         # Called when recipes have been loaded.
@@ -138,10 +168,12 @@ if defined?(Chef::Formatters::Base)
 
         # Called when a resource fails, but will retry.
         def resource_failed_retriable(resource, action, retry_count, exception)
+          super unless error_expected?(:resource_failed_retriable, exception, retry_count, action, resource)
         end
 
         # Called when a resource fails and will not be retried.
         def resource_failed(resource, action, exception)
+          super unless error_expected?(:resource, exception, exception, resource)
         end
 
         # Called when a resource action has been skipped b/c of a conditional
@@ -160,6 +192,10 @@ if defined?(Chef::Formatters::Base)
 
         ## TODO: callback for assertion fallback in why run
 
+        def recipe_not_found(exception)
+          super unless error_expected?(:recipe_not_found, exception)
+        end
+
         # Called when a change has been made to a resource. May be called multiple
         # times per resource, e.g., a file may have its content updated, and then
         # its permissions updated.
@@ -191,7 +227,6 @@ if defined?(Chef::Formatters::Base)
         # callback for it.
         def msg(message)
         end
-
       end
     end
   end

data/lib/chefspec.rb

@@ -1,5 +1,6 @@
 require 'chef'
 require 'chef/formatters/chefspec'
+require 'chef/expect_exception'
 require 'chefspec/chef_runner'
 require 'chefspec/version'
 
@@ -20,6 +21,7 @@ if defined?(RSpec)
   require 'chefspec/matchers/env'
   require 'chefspec/matchers/include_recipe'
   require 'chefspec/matchers/script'
+  require 'chefspec/matchers/python'
 
   require 'chefspec/helpers/describe'
   RSpec.configure do |c|
@@ -32,3 +34,15 @@ require 'chefspec/monkey_patches/conditional'
 require 'chefspec/monkey_patches/hash'
 require 'chefspec/monkey_patches/lwrp_base'
 require 'chefspec/monkey_patches/provider'
+
+module ChefSpec
+  class << self
+    def chef_11?
+      Gem::Requirement.new('~> 11.0').satisfied_by?(Gem::Version.new(Chef::VERSION))
+    end
+
+    def chef_10?
+      Gem::Requirement.new('~> 10.0').satisfied_by?(Gem::Version.new(Chef::VERSION))
+    end
+  end
+end

data/lib/chefspec/chef_runner.rb

@@ -18,6 +18,20 @@ module ChefSpec
 
     @resources = []
 
+    @needs_formatter_registered = Chef::Config.respond_to?(:add_formatter)
+    @nfr_mutex = Mutex.new
+
+    def self.register_formatter
+      return unless @needs_formatter_registered
+      @nfr_mutex.synchronize do
+        return unless @needs_formatter_registered
+        @needs_formatter_registered = false
+        # As of Chef 11, Chef uses custom formatters which munge the RSpec output.
+        # This uses a custom formatter which basically tells Chef to shut up.
+        Chef::Config.add_formatter('chefspec')
+      end
+    end
+
     attr_accessor :resources
     attr_reader :step_into
     attr_reader :run_context
@@ -126,9 +140,7 @@ module ChefSpec
       @dummy_config = Tempfile.new 'chef-config'
       Chef::Config[:config_file] = @dummy_config.path
 
-      # As of Chef 11, Chef uses custom formatters which munge the RSpec output.
-      # This uses a custom formatter which basically tells Chef to shut up.
-      Chef::Config.add_formatter('chefspec') if Chef::Config.respond_to?(:add_formatter)
+      self.class.register_formatter
 
       Chef::Log.verbose = true if Chef::Log.respond_to?(:verbose)
       Chef::Log.level(@options[:log_level])
@@ -188,7 +200,7 @@ module ChefSpec
     end
 
     FILE_RESOURCES    = %w(directory cookbook_file file template link remote_directory remote_file)
-    PACKAGE_RESOURCES = %w(package apt_package dpkg_package easy_install_package freebsd_package macports_package portage_package rpm_package chef_gem solaris_package yum_package zypper_package)
+    PACKAGE_RESOURCES = %w(package apt_package dpkg_package easy_install_package freebsd_package macports_package portage_package rpm_package chef_gem solaris_package yum_package zypper_package python_pip)
     SCRIPT_RESOURCES  = %w(script powershell bash csh perl python ruby)
     MISC_RESOURCES    = %w(cron env user execute service log route ruby_block git subversion group mount ohai ifconfig deploy http_request)
 

data/lib/chefspec/helpers/describe.rb

@@ -2,7 +2,11 @@ module ChefSpec
   module Helpers
     module Describe
       def described_recipe
-        self.class.metadata[:example_group][:description_args].first
+        metahash = self.class.metadata
+        while metahash.has_key? :example_group
+          metahash = metahash[:example_group]
+        end
+        metahash[:description_args].first
       end
 
       def described_cookbook

data/lib/chefspec/matchers/execute.rb

@@ -22,7 +22,7 @@ module ChefSpec
 
       def expected_resource?(resource,command)
         resource_type(resource) == 'execute' &&
-          resource.command == command
+          command === resource.command
       end
 
       def expected_attributes?(resource)

data/lib/chefspec/matchers/file.rb

@@ -11,73 +11,72 @@ module ChefSpec
       end
     end
 
-    RSpec::Matchers.define :create_remote_file do |path|
-      match do |chef_run|
-        if @attributes
-          chef_run.resources.any? do |resource|
-            expected_remote_file?(resource,path) &&
-              expected_attributes?(resource)
-          end
-        else
-          chef_run.resources.any? do |resource|
-            expected_remote_file?(resource,path)
+    {:create_remote_file => [:create], :create_remote_file_if_missing => [:create_if_missing]}.each do |matcher, corr_action|
+      RSpec::Matchers.define matcher do |path|
+        match do |chef_run|
+          if @attributes
+            chef_run.resources.any? do |resource|
+              expected_remote_file?(resource,path,corr_action) &&
+                expected_attributes?(resource)
+            end
+          else
+            chef_run.resources.any? do |resource|
+              expected_remote_file?(resource,path,corr_action)
+            end
           end
         end
-      end
 
-      chain :with do |attributes|
-        @attributes = attributes
-      end
+        chain :with do |attributes|
+          @attributes = attributes
+        end
 
-      def expected_remote_file?(resource,path)
-        # The resource action *might* be an array!
-        # (see https://tickets.opscode.com/browse/CHEF-2094)
-        action = resource.action.is_a?(Array) ? resource.action.first :
-          resource.action
-        resource_type(resource) == 'remote_file' &&
-          resource.path         == path &&
-          action.to_sym         == :create
-      end
+        def expected_remote_file?(resource,path,corr_action)
+          resource_type(resource) == 'remote_file' &&
+          resource.path == path &&
+          !(corr_action & Array(resource.action).map(&:to_sym)).empty?
+        end
 
-      def expected_attributes?(resource)
-        @attributes.all? do |attribute,expected|
-          actual = resource.send(attribute)
-          attribute.to_sym == :source ? equal_source?(actual, expected) :
-            actual == expected
+        def expected_attributes?(resource)
+          @attributes.all? do |attribute,expected|
+            actual = resource.send(attribute)
+            attribute.to_sym == :source ? equal_source?(actual, expected) :
+              actual == expected
+          end
         end
-      end
 
-      # Compare two remote_file source attributes for equality.
-      #
-      # @param actual [String, Array<String>] The actual source.
-      # @param expected [String, Array<String>] The expected source.
-      # @return [Boolean] true if they are equal or false if not.
-      def equal_source?(actual, expected)
-        # NOTE: Chef stores the source attribute internally as an array since
-        # version 11 in order to support mirrors.
-        # (see http://docs.opscode.com/breaking_changes_chef_11.html#remote-file-mirror-support-may-break-subclasses)
+        # Compare two remote_file source attributes for equality.
+        #
+        # @param actual [String, Array<String>] The actual source.
+        # @param expected [String, Array<String>] The expected source.
+        # @return [Boolean] true if they are equal or false if not.
+        def equal_source?(actual, expected)
+          # NOTE: Chef stores the source attribute internally as an array since
+          # version 11 in order to support mirrors.
+          # (see http://docs.opscode.com/breaking_changes_chef_11.html#remote-file-mirror-support-may-break-subclasses)
 
-        # Handle wrong formated expectation for Chef versions >= 11.
-        if actual.is_a?(Array) && expected.is_a?(String)
-          actual == [expected]
+          # Handle wrong formated expectation for Chef versions >= 11.
+          if actual.is_a?(Array) && expected.is_a?(String)
+            actual == [expected]
 
-        # Handle wrong formated expectation for Chef versions < 11.
-        elsif actual.is_a?(String) && expected.is_a?(Array)
-          [actual] == expected
+          # Handle wrong formated expectation for Chef versions < 11.
+          elsif actual.is_a?(String) && expected.is_a?(Array)
+            [actual] == expected
 
-        # Else assume the actual matches the expected type (String or Array).
-        else
-          actual == expected
+          # Else assume the actual matches the expected type (String or Array).
+          else
+            actual == expected
+          end
         end
-      end
 
-      failure_message_for_should do |actual|
-        message = "No remote_file named '#{path}' found"
-        message << " with:\n#{@attributes}" unless @attributes.nil?
-      end
+        failure_message_for_should do |actual|
+          message = "No remote_file named '#{path}' for action #{corr_action} found"
+          message << " with:\n#{@attributes}" unless @attributes.nil?
+          message
+        end
 
-      failure_message_for_should_not do |actual|
-        "Found remote_file named '#{path}' that should not exist."
+        failure_message_for_should_not do |actual|
+          "Found remote_file named '#{path}' that should not exist."
+        end
       end
     end
   end

data/lib/chefspec/matchers/file_content.rb

@@ -2,34 +2,30 @@ require 'chefspec/matchers/shared'
 
 module ChefSpec
   module Matchers
-    RSpec::Matchers.define :create_file_with_content do |path, content|
+    RSpec::Matchers.define :create_file_with_content do |path, expected|
       match do |chef_run|
-        chef_run.resources.any? do |resource|
-          if resource.name == path
-            if (Array(resource.action).map { |action| action.to_sym } & [:create, :create_if_missing]).any?
-              case resource_type(resource)
-                when 'template'
-                  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'
-                  cookbook_name = resource.cookbook || resource.cookbook_name
-                  cookbook = chef_run.run_context.cookbook_collection[cookbook_name]
-                  @actual_content = File.read(cookbook.preferred_filename_on_disk_location(chef_run.node, :files, resource.source, resource.path))
-              end
+        chef_run.resources.select { |resource| resource.name == path }.any? do |resource|
+          unless ([:create, :create_if_missing] & Array(resource.action).map(&:to_sym)).empty?
+            @actual_content = case resource_type(resource)
+            when 'template'
+              content_from_template(chef_run, resource)
+            when 'file'
+              content_from_file(chef_run, resource)
+            when 'cookbook_file'
+              content_from_cookbook_file(chef_run, resource)
+            end
 
-              if content.is_a?(Regexp)
-                @actual_content.to_s =~ content
-              else
-                @actual_content.to_s.include? content
-              end
+            if expected.is_a?(Regexp)
+              @actual_content.to_s =~ expected
+            else
+              @actual_content.to_s.include?(expected)
             end
           end
         end
       end
+
       failure_message_for_should do |actual|
-        "File content:\n#{@actual_content} does not match expected:\n#{content}"
+        "File content:\n#{@actual_content} does not match expected:\n#{expected}"
       end
     end
   end

data/lib/chefspec/matchers/package.rb

@@ -2,11 +2,7 @@ require 'chefspec/matchers/shared'
 
 module ChefSpec
   module Matchers
-
-    CHEF_GEM_SUPPORTED = defined?(::Chef::Resource::ChefGem)
-    PACKAGE_TYPES = [:package, :gem_package, :chef_gem, :yum_package]
-    PACKAGE_TYPES << :chef_gem if CHEF_GEM_SUPPORTED
-    define_resource_matchers([:install, :remove, :upgrade, :purge], PACKAGE_TYPES, :package_name)
+    define_resource_matchers([:install, :remove, :upgrade, :purge], [:package, :gem_package, :chef_gem, :yum_package], :package_name)
 
     RSpec::Matchers.define :install_package_at_version do |package_name, version|
       match do |chef_run|
@@ -15,6 +11,7 @@ module ChefSpec
         end
       end
     end
+
     RSpec::Matchers.define :install_yum_package_at_version do |package_name, version|
       match do |chef_run|
        chef_run.resources.any? do |resource|
@@ -22,6 +19,7 @@ module ChefSpec
         end
       end
     end
+
     RSpec::Matchers.define :install_gem_package_at_version do |package_name, version|
       match do |chef_run|
        chef_run.resources.any? do |resource|
@@ -29,12 +27,13 @@ module ChefSpec
         end
       end
     end
+
     RSpec::Matchers.define :install_chef_gem_at_version do |package_name, version|
       match do |chef_run|
        chef_run.resources.any? do |resource|
           resource_type(resource) == 'chef_gem' and resource.package_name == package_name and resource.action.to_s.include? 'install' and resource.version == version
         end
       end
-    end if CHEF_GEM_SUPPORTED
+    end
   end
 end

data/lib/chefspec/matchers/python.rb

@@ -0,0 +1,7 @@
+require 'chefspec/matchers/shared'
+
+module ChefSpec
+  module Matchers
+    define_resource_matchers([:install, :upgrade, :remove, :purge], [:python_pip], :name)
+  end
+end

data/lib/chefspec/matchers/ruby_block.rb

@@ -5,9 +5,9 @@ module ChefSpec
     RSpec::Matchers.define :execute_ruby_block do |block_name|
       match do |chef_run|
         chef_run.resources.any? do |resource|
-          resource_type(resource) == 'ruby_block' and resource.name == block_name
+          resource_type(resource) == 'ruby_block' and block_name === resource.name
         end
       end
     end
   end
-end
+end

data/lib/chefspec/matchers/shared.rb

@@ -3,6 +3,7 @@ begin
   require 'chef/provider/template_finder'
 rescue LoadError
 end
+
 # Given a resource return the unqualified type it is
 #
 # @param [String] resource A Chef Resource
@@ -29,10 +30,11 @@ def define_resource_matchers(actions, resource_types, name_attribute)
     RSpec::Matchers.define "#{action}_#{resource_type}".to_sym do |name|
       match do |chef_run|
         accepted_types = [resource_type.to_s]
-        accepted_types << 'template' if action.to_s == 'create' and resource_type.to_s == 'file'
+        accepted_types += ['template', 'cookbook_file']  if action.to_s == 'create' and resource_type.to_s == 'file'
         chef_run.resources.any? do |resource|
-          accepted_types.include? resource_type(resource) and resource.send(name_attribute) == name and
-              resource_actions(resource).include? action.to_s
+          (accepted_types.include? resource_type(resource) and
+           name === resource.send(name_attribute) and
+           resource_actions(resource).include? action.to_s)
         end
       end
       failure_message_for_should do |actual|
@@ -45,39 +47,83 @@ def define_resource_matchers(actions, resource_types, name_attribute)
   end
 end
 
-# Render a template.
+# Compute the contents of a template using Chef's templating logic.
+#
+# @param [Chef::RunContext] chef_run
+#   the run context for the node
+# @param [Chef::Provider::Template] template
+#   the template resource
 #
-# @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, 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)
+# @return [String]
+def content_from_template(chef_run, template)
+  cookbook_name = template.cookbook || template.cookbook_name
+  template_location = cookbook_collection(chef_run.node)[cookbook_name].preferred_filename_on_disk_location(chef_run.node, :templates, template.source)
+
+  if Chef::Mixin::Template.const_defined?(:TemplateContext) # Chef 11+
+    template_context = Chef::Mixin::Template::TemplateContext.new([])
+    template_context.update({
+      :node => chef_run.node,
+      :template_finder => template_finder(chef_run, cookbook_name),
+    }.merge(template.variables))
+    template_context.render_template(template_location)
+  else
+    template.provider.new(template, chef_run.run_context).send(:render_with_context, template_location) do |file|
+      File.read(file.path)
+    end
   end
-  Erubis::Eruby.new(IO.read(template_path(template, node))).evaluate(context)
 end
 
-# Given a template, return the path on disk.
+# Get the contents of a file resource.
 #
-# @param [Chef::Resource::Template] template The template
-# @return [String] The path on disk
-def template_path(template, node)
-  cookbook_name = template.cookbook || template.cookbook_name
+# @param [Chef::RunContext] chef_run
+#   the run context for the node
+# @param [Chef::Provider::File] file
+#   the file resource
+#
+# @return [String]
+def content_from_file(chef_run, file)
+  file.content
+end
+
+# Get the contents of a cookbook file using Chef.
+#
+# @param [Chef::RunContext] chef_run
+#   the run context for the node
+# @param [Chef::Provider::CookbookFile] cookbook_file
+#   the file resource
+def content_from_cookbook_file(chef_run, cookbook_file)
+  cookbook_name = cookbook_file.cookbook || cookbook_file.cookbook_name
+  cookbook = chef_run.run_context.cookbook_collection[cookbook_name]
+  File.read(cookbook.preferred_filename_on_disk_location(chef_run.node, :files, cookbook_file.source, cookbook_file.path))
+end
+
+# The cookbook collection for the current Chef run context. Handles
+# the differing cases between Chef 10 and Chef 11.
+#
+# @param [Chef::Node] node
+#   the Chef node to get the cookbook collection from
+#
+# @return [Array<Chef::Cookbook>]
+def cookbook_collection(node)
   if node.respond_to?(:run_context)
-    cookbook = node.run_context.cookbook_collection[cookbook_name] # Chef 11+
+    node.run_context.cookbook_collection # Chef 11+
   else
-    cookbook = node.cookbook_collection[cookbook_name] # Chef 10 and lower
+    node.cookbook_collection # Chef 10
   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)
+# Return a new instance of the TemplateFinder if we are running on Chef 11.
+#
+# @param [Chef::RunContext] chef_run
+#   the run context for the noe
+# @param [String] cookbook_name
+#   the name of the cookbook
+#
+# @return [Chef::Provider::TemplateFinder, nil]
+def template_finder(chef_run, cookbook_name)
+  if Chef::Provider.const_defined?(:TemplateFinder) # Chef 11+
+    Chef::Provider::TemplateFinder.new(chef_run.run_context, cookbook_name, chef_run.node)
+  else
+    nil
   end
 end

data/lib/chefspec/minitest.rb

@@ -134,13 +134,6 @@ module ChefSpec
           resources.select{|r| r.resource_name == type}
         end
 
-        def cookbook_file_content(file_resource)
-          file = cookbook_files(file_resource.cookbook_name).find do |f|
-            Pathname.new(f).basename.to_s == file_resource.path
-          end
-          File.read(file)
-        end
-
         def cookbook_files(cookbook)
           run_context.cookbook_collection[cookbook].file_filenames
         end
@@ -150,11 +143,11 @@ module ChefSpec
             f.path == file.path &&
               case f.resource_name
                 when :cookbook_file
-                  cookbook_file_content(f)
+                  content_from_cookbook_file(chef_run, f)
                 when :file
-                  f.content
+                  content_from_file(chef_run, f)
                 when :template
-                  render(f, node, template_finder(run_context, f, node))
+                  content_from_template(chef_run, f)
                 else raise NotImplementedError,
                   ":#{f.resource_name} not supported for comparison"
               end.include?(content)
@@ -179,6 +172,7 @@ module ChefSpec
         :cookbook_path => default_cookbook_path).converge recipe_for_module(spec_mod)
       override_minitest_resources(chef_run.run_context, spec_mod)
       override_minitest_assertions(chef_run)
+      share_object(spec_mod, :chef_run, chef_run)
       share_object(spec_mod, :node, chef_run.node)
       share_object(spec_mod, :resources, chef_run.resources)
       share_object(spec_mod, :run_context, chef_run.run_context)

data/lib/chefspec/monkey_patches/hash.rb

@@ -1,14 +1,21 @@
 # Ruby stdlib Hash class
 class Hash
-
   # Monkey-patch to stdlib Hash to give us Mash style lookup
-  # @param [Symbol] method_id The method name
-  def method_missing(method_id, *)
-    key = method_id.id2name
-    if has_key?(key)
-      self[key]
-    elsif has_key?(key.to_sym)
-      self[key.to_sym]
+  def method_missing(m, *args, &block)
+    if has_key?(m.to_sym)
+      self[m.to_sym]
+    elsif has_key?(m.to_s)
+      self[m.to_s]
+    else
+      super
+    end
+  end
+
+  # Monkey-patch to stdlib Hash to correspond to Mash-style lookup
+  # @see {Hash#respond_to?}
+  def respond_to?(m)
+    if has_key?(m.to_sym) || has_key?(m.to_s)
+      true
     else
       super
     end

data/lib/chefspec/version.rb

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

metadata

@@ -1,90 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 1.3.1
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrew Crump
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fauxhai
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: minitest-chef-handler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -92,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,105 +83,94 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.7'
 description: Write RSpec examples for Opscode Chef recipes
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/chef/expect_exception.rb
 - lib/chef/formatters/chefspec.rb
 - lib/chef/knife/cookbook_create_specs.rb
 - lib/chefspec/chef_runner.rb
@@ -214,6 +186,7 @@ files:
 - lib/chefspec/matchers/log.rb
 - lib/chefspec/matchers/notifications.rb
 - lib/chefspec/matchers/package.rb
+- lib/chefspec/matchers/python.rb
 - lib/chefspec/matchers/ruby_block.rb
 - lib/chefspec/matchers/script.rb
 - lib/chefspec/matchers/service.rb
@@ -229,33 +202,26 @@ files:
 homepage: http://acrmp.github.com/chefspec
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1265930440020953415
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1265930440020953415
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: chefspec-1.3.1
+specification_version: 4
+summary: chefspec-2.0.0
 test_files: []
 has_rdoc: