chefspec 0.0.2 → 0.1.0

data/lib/chefspec.rb

@@ -1,4 +1,5 @@
 require 'chef'
+require 'rspec'
 require 'chefspec/chef_runner'
 require 'chefspec/matchers/execute'
 require 'chefspec/matchers/file'

data/lib/chefspec/chef_runner.rb

@@ -13,7 +13,7 @@ module ChefSpec
     @step_into = []
     @resources = []
 
-    attr_reader :resources
+    attr_accessor :resources
     attr_reader :node
 
     # Instantiate a new runner to run examples with.
@@ -21,44 +21,58 @@ module ChefSpec
     # @param [string] cookbook_path The path to the chef cookbook(s) to be tested
     def initialize(cookbook_path=default_cookbook_path)
       the_runner = self
+      @resources = []
 
       Chef::Resource.class_eval do
         alias :old_run_action :run_action
 
-        @@runner = the_runner
+        if self.class.method_defined?(:class_variable_set)
+          class_variable_set :@@runner, the_runner
+        else
+          @@runner = the_runner
+        end
 
         def run_action(action)
-          @@runner.resources << self
+          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
+          else
+            @@runner.resources << self
+          end
         end
       end
 
       Chef::Config[:solo] = true
       Chef::Config[:cookbook_path] = cookbook_path
-      Chef::Log.verbose = true
+      Chef::Log.verbose = true if Chef::Log.respond_to?(:verbose)
       Chef::Log.level(:debug)
       @client = Chef::Client.new
       @client.run_ohai
       @node = @client.build_node
     end
 
-    # Infer the default cookbook path from the location of the calling spec.
-    #
-    # @return [String] The path to the cookbooks directory
-    def default_cookbook_path
-      File.join(caller(2).first.split(':').slice(0..-3).to_s, "..", "..", "..")
-    end
-
     # Run the specified recipes, but without actually converging the node.
     #
     # @param [array] recipe_names The names of the recipes to execute
     def converge(*recipe_names)
       recipe_names.each do |recipe_name|
-        @client.node.run_list << recipe_name
+        @node.run_list << recipe_name
+      end
+
+      @client.instance_eval do
+        if defined?(@expanded_run_list_with_versions) # 0.10.x
+          @run_list_expansion = @node.expand!('disk')
+          @expanded_run_list_with_versions = @run_list_expansion.recipes.with_version_constraints_strings
+        end
       end
 
       @resources = []
-      run_context = Chef::RunContext.new(@client.node, Chef::CookbookCollection.new(Chef::CookbookLoader.new))
 
+      if @client.respond_to?(:setup_run_context) # 0.10.x
+        run_context = @client.setup_run_context
+      else
+        run_context = Chef::RunContext.new(@client.node, Chef::CookbookCollection.new(Chef::CookbookLoader.new)) # 0.9.x
+      end
       runner = Chef::Runner.new(run_context)
       runner.converge
     end
@@ -81,6 +95,13 @@ module ChefSpec
 
     private
 
+    # Infer the default cookbook path from the location of the calling spec.
+    #
+    # @return [String] The path to the cookbooks directory
+    def default_cookbook_path
+      Pathname.new(File.join(caller(2).first.split(':').slice(0..-3).first, "..", "..", "..")).cleanpath
+    end
+
     # Find the resource with the declared type and name
     #
     # @param [String] type The type of resource - e.g. 'file' or 'directory'

data/lib/chefspec/matchers/file.rb

@@ -7,10 +7,8 @@ module ChefSpec
 
     RSpec::Matchers.define :be_owned_by do |user, group|
       match do |file|
-        file.owner == user and file.group == group
+        file.nil? ? false : file.owner == user and file.group == group
       end
     end
   end
-end
-
-
+end

data/lib/chefspec/matchers/package.rb

@@ -7,8 +7,8 @@ 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.to_s == 'install' and resource.version == version
+       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
         end
       end
     end

data/lib/chefspec/matchers/shared.rb

@@ -3,7 +3,7 @@
 # @param [String] resource A Chef Resource
 # @return [String] The resource type
 def resource_type(resource)
-  resource.class.name.split("::").last.downcase
+  resource.resource_name.to_s
 end
 
 # Define simple RSpec matchers for the product of resource types and actions

data/lib/chefspec/monkey_patches/hash.rb

@@ -1,7 +1,7 @@
 # Ruby stdlib Hash class
 class Hash
 
-  # Monkey-patch to stdlib Hash to give us auto-vivifying hashes like Chef.
+  # 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

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Andrew Crump
@@ -15,15 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-31 00:00:00 Z
+date: 2011-08-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: chef
-  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 35
         segments: 
@@ -31,11 +29,18 @@ dependencies:
         - 9
         - 12
         version: 0.9.12
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 10
+        version: "0.10"
+  name: chef
   type: :runtime
+  prerelease: false
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,7 +52,9 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
+  name: rspec
   type: :runtime
+  prerelease: false
   requirement: *id002
 description: Write RSpec examples for Opscode Chef recipes
 email: 
@@ -99,6 +106,6 @@ rubyforge_project:
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: chefspec-0.0.2
+summary: chefspec-0.1.0
 test_files: []