chefspec 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5868a82ecd4f7dd2ae15c73f08bdd3f407873b33
-  data.tar.gz: 442370c544b95393e0e615a991417a4e1ecc253d
+  metadata.gz: 654732428da134b8c055847663deb22bad8e8102
+  data.tar.gz: 44db5468f942a6d6b88b6734c62d6862bfd55e4d
 SHA512:
-  metadata.gz: 64e63ea25673e6c2634069474f565b15db07e6d03cf05494e312ff61a426b35854d7842e3d8264c492a598309e967b799537c4b117889dfeacc89ab2bbfb3885
-  data.tar.gz: de9ba082834b7e5ad26ae9e5bf7f2ae91af39dafb6cfb4d6109112dcb1e52e22d0179492098e0cf8b307c78cf2ae1ddac90301a11d06b88c633cdd8a7545c18b
+  metadata.gz: 7500f6cfa7ebc3e2e817cbeb4437a99ce93a20358b202d05d43c4cf16195ffd4928f01cba962d81b07feb60a317879c8fe6def6dd97b0b547ab440376f7b9f91
+  data.tar.gz: df9c2a7b44bf179c9f95a21871f2dcfa60a1b5ca117283e5b0ee59114e9eec294a67f75114e923580aaec89c24e9db3c71eb0de235b8864e99e1e22b606a594f

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

@@ -7,21 +7,24 @@ class Chef
         alias_method :old_build_from_file, :build_from_file
 
         #
-        # Override Opscode provider to remove any existing LWRP
+        # Override Opscode provider to remove any existing LWRPs to suppress
+        # constant re-definition warnings.
         #
         # @param [String] cookbook_name
-        #   The name of the cookbook
+        #   the name of the cookbook
         # @param [String] filename
-        #   File to load as a LWRP
+        #   file to load as a LWRP
         # @param [Chef::RunContext] run_context
-        #   Context of a Chef Run
+        #   context of a Chef Run
         #
         # @return [Chef::Provider]
         #
-        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(*args)
+        def build_from_file(cookbook_name, filename, run_context)
+          provider_name = filename_to_qualified_string(cookbook_name, filename)
+          class_name    = convert_to_class_name(provider_name)
+
+          remove_existing_lwrp(class_name)
+          old_build_from_file(cookbook_name, filename, run_context)
         end
 
         #
@@ -37,7 +40,23 @@ class Chef
             end
           end
         end
+      end
 
+      module InlineResources
+        module ClassMethods
+          #
+          # For LWRPs that call +use_inline_resources+, do not create another
+          # +resource_collection+ so that everything is added to the parent
+          # +resource_collection+.
+          #
+          # @param [String] name
+          #
+          # @override Chef::Provider::LWRPBase::InlineResources::ClassMethods#action
+          #
+          def action(name, &block)
+            define_method("action_#{name}", &block)
+          end
+        end
       end
     end
   end

data/lib/chefspec/matchers/render_file_matcher.rb

@@ -17,7 +17,7 @@ module ChefSpec::Matchers
     def description
       message = %Q{render file "#{@path}"}
       if @expected_content
-        if @expected_content.include?("\n")
+        if @expected_content.to_s.include?("\n")
           message << " with content <suppressed>"
         else
           message << " with content #{@expected_content.inspect}"

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -219,6 +219,6 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: chefspec-3.0.0
+summary: chefspec-3.0.1
 test_files: []
 has_rdoc: