chefspec 0.3.0 → 0.4.0

data/lib/chefspec/chef_runner.rb

@@ -34,16 +34,16 @@ module ChefSpec
       Chef::Resource.class_eval do
         alias :old_run_action :run_action
 
-        if self.class.method_defined?(:class_variable_set)
-          class_variable_set :@@runner, the_runner
+        if self.class.methods.include?(:class_variable_set)
+          self.class_variable_set :@@runner, the_runner
         else
           @@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.method_defined?(:class_variable_get)
-            self.class_variable_get(:@@runner).resources << self
+          if self.class.methods.include?(:class_variable_get)
+            self.class.class_variable_get(:@@runner).resources << self
           else
             @@runner.resources << self
           end
@@ -107,6 +107,14 @@ module ChefSpec
       find_resource('file', path)
     end
 
+    # Find any template declared with the given path
+    #
+    # @param [String] path The template path
+    # @return [Chef::Resource::Directory] The matching template, or Nil
+    def template(path)
+      find_resource('template', path)
+    end
+
     # This runner as a string.
     #
     # @return [String] Currently includes the run_list. Format of the string may change between versions of this gem.

data/lib/chefspec/matchers/file_content.rb

@@ -10,10 +10,10 @@ module ChefSpec
               case resource_type(resource)
                 when 'template'
                   @actual_content = render(resource, chef_run.node)
-                  content == @actual_content
+                  @actual_content.to_s.include? content
                 when 'file'
                   @actual_content = resource.content
-                  content == @actual_content
+                  @actual_content.to_s.include? content
               end
             end
           end

data/lib/chefspec/matchers/package.rb

@@ -8,7 +8,7 @@ module ChefSpec
     RSpec::Matchers.define :install_package_at_version do |package_name, version|
       match do |chef_run|
        chef_run.resources.any? do |resource|
-          resource_type(resource) == 'package' and resource.package_name == package_name and resource.action.include? :install and resource.version == version
+          resource_type(resource) == 'package' and resource.package_name == package_name and resource.action.to_s.include? 'install' and resource.version == version
         end
       end
     end

data/lib/chefspec/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-02 00:00:00.000000000Z
+date: 2011-11-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &2151873320 !ruby/object:Gem::Requirement
+  requirement: &2152367380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *2151873320
+  version_requirements: *2152367380
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &2151885360 !ruby/object:Gem::Requirement
+  requirement: &2152365220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151885360
+  version_requirements: *2152365220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151891840 !ruby/object:Gem::Requirement
+  requirement: &2152364200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,7 +46,7 @@ dependencies:
         version: 2.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151891840
+  version_requirements: *2152364200
 description: Write RSpec examples for Opscode Chef recipes
 email: 
 executables: []
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4357686734109657142
+      hash: 1029718533477551194
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,11 +90,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4357686734109657142
+      hash: 1029718533477551194
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: chefspec-0.3.0
+summary: chefspec-0.4.0
 test_files: []