chefspec 0.4.0 → 0.5.0

data/lib/chefspec/chef_runner.rb

@@ -51,7 +51,10 @@ module ChefSpec
       end
 
       Chef::Config[:solo] = true
+      Chef::Config[:cache_type] = "Memory"
+      Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest) }
       Chef::Config[:cookbook_path] = options[:cookbook_path]
+      Chef::Config[:client_key] = nil
       Chef::Log.verbose = true if Chef::Log.respond_to?(:verbose)
       Chef::Log.level(options[:log_level])
       @client = Chef::Client.new
@@ -99,6 +102,14 @@ module ChefSpec
       find_resource('directory', path)
     end
 
+    # Find any cookbook_file declared with the given path
+    #
+    # @param [String] path The cookbook_file path
+    # @return [Chef::Resource::Directory] The matching cookbook_file, or Nil
+    def cookbook_file(path)
+      find_resource('cookbook_file', path)
+    end
+
     # Find any file declared with the given path
     #
     # @param [String] path The file path

data/lib/chefspec/matchers/file.rb

@@ -3,7 +3,7 @@ require 'chefspec/matchers/shared'
 module ChefSpec
   module Matchers
 
-    define_resource_matchers([:create, :delete], [:file, :directory], :path)
+    define_resource_matchers([:create, :delete], [:file, :directory, :cookbook_file], :path)
 
     RSpec::Matchers.define :be_owned_by do |user, group|
       match do |file|

data/lib/chefspec/matchers/file_content.rb

@@ -6,7 +6,7 @@ module ChefSpec
       match do |chef_run|
         chef_run.resources.any? do |resource|
           if resource.name == path
-            if resource.action.include?(:create) || resource.action.include?(:create_if_missing)
+            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)
@@ -14,6 +14,11 @@ module ChefSpec
                 when 'file'
                   @actual_content = resource.content
                   @actual_content.to_s.include? content
+                when 'cookbook_file'
+                  cookbook_name = resource.cookbook || resource.cookbook_name
+                  cookbook = chef_run.node.cookbook_collection[cookbook_name]
+                  @actual_content = File.read(cookbook.preferred_filename_on_disk_location(chef_run.node, :files, resource.source, resource.path))
+                  @actual_content.to_s.include? content
               end
             end
           end

data/lib/chefspec/matchers/package.rb

@@ -3,7 +3,7 @@ require 'chefspec/matchers/shared'
 module ChefSpec
   module Matchers
 
-    define_resource_matchers([:install, :remove, :upgrade, :purge], [:package], :package_name)
+    define_resource_matchers([:install, :remove, :upgrade, :purge], [:package, :gem_package], :package_name)
 
     RSpec::Matchers.define :install_package_at_version do |package_name, version|
       match do |chef_run|
@@ -12,5 +12,12 @@ 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|
+          resource_type(resource) == 'gem_package' and resource.package_name == package_name and resource.action.to_s.include? 'install' and resource.version == version
+        end
+      end
+    end
   end
-end
+end

data/lib/chefspec/monkey_patches/hash.rb

@@ -3,14 +3,14 @@ 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)
+  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]
     else
-      super.method_missing(method_id)
+      super
     end
   end
 end

data/lib/chefspec/version.rb

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

metadata

@@ -1,58 +1,84 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: chefspec
-version: !ruby/object:Gem::Version
-  version: 0.4.0
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
-authors:
+authors: 
 - Andrew Crump
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-14 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: &2152367380 !ruby/object:Gem::Requirement
+
+date: 2012-02-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 0
+        - 9
+        - 12
         version: 0.9.12
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.10'
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 10
+        version: "0.10"
+  requirement: *id001
   type: :runtime
   prerelease: false
-  version_requirements: *2152367380
-- !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: &2152365220 !ruby/object:Gem::Requirement
+  name: chef
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
   type: :runtime
   prerelease: false
-  version_requirements: *2152365220
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2152364200 !ruby/object:Gem::Requirement
+  name: erubis
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.6.0
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
+        version: 2.8.0
+  requirement: *id003
   type: :runtime
   prerelease: false
-  version_requirements: *2152364200
+  name: rspec
 description: Write RSpec examples for Opscode Chef recipes
 email: 
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/chef/knife/cookbook_create_specs.rb
 - lib/chefspec/chef_runner.rb
 - lib/chefspec/matchers/execute.rb
@@ -67,34 +93,38 @@ files:
 - lib/chefspec/version.rb
 - lib/chefspec.rb
 homepage: http://acrmp.github.com/chefspec
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1029718533477551194
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1029718533477551194
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: chefspec-0.4.0
+summary: chefspec-0.5.0
 test_files: []
+
+has_rdoc: