chefspec 1.2.0 → 1.3.0

data/lib/chefspec.rb

@@ -20,9 +20,15 @@ if defined?(RSpec)
   require 'chefspec/matchers/env'
   require 'chefspec/matchers/include_recipe'
   require 'chefspec/matchers/script'
+
+  require 'chefspec/helpers/describe'
+  RSpec.configure do |c|
+    c.include ChefSpec::Helpers::Describe
+  end
 end
 
 require 'chefspec/minitest'
+require 'chefspec/monkey_patches/conditional'
 require 'chefspec/monkey_patches/hash'
 require 'chefspec/monkey_patches/lwrp_base'
 require 'chefspec/monkey_patches/provider'

data/lib/chefspec/chef_runner.rb

@@ -22,6 +22,7 @@ module ChefSpec
     attr_reader :step_into
     attr_reader :run_context
     attr_reader :node
+    attr_reader :stubbed_commands
 
     # Instantiate a new runner to run examples with.
     #
@@ -33,7 +34,13 @@ module ChefSpec
     # @option options [String] :ohai_data_path Path of a json file that will be passed to fauxhai as :path option
     # @yield [node] Configuration block for Chef::Node
     def initialize(options={})
-      defaults = {:cookbook_path => default_cookbook_path, :log_level => :warn, :dry_run => false, :step_into => []}
+      defaults = {
+        :cookbook_path => default_cookbook_path,
+        :log_level => :warn,
+        :dry_run => false,
+        :step_into => [],
+        :evaluate_guards => false
+      }
       options = {:cookbook_path => options} unless options.respond_to?(:to_hash) # backwards-compatibility
       @options = defaults.merge(options)
 
@@ -41,6 +48,24 @@ module ChefSpec
       @resources = []
       @step_into = @options[:step_into]
       @do_dry_run = @options[:dry_run]
+      @evaluate_guards = @options[:evaluate_guards]
+      @actually_run_shell_guards = @options[:actually_run_shell_guards]
+      @stubbed_commands = []
+
+      Chef::Resource::Conditional.class_eval do
+        if self.class.methods.include?(:class_variable_set)
+          self.class_variable_set :@@runner, the_runner
+        else
+          @@runner = the_runner
+        end
+        def runner
+          if self.class.methods.include?(:class_variable_get)
+            self.class.send(:class_variable_get, :@@runner)
+          else
+            @@runner
+          end
+        end
+      end
 
       Chef::Resource.class_eval do
         alias :old_run_action :run_action unless method_defined?(:old_run_action)
@@ -59,6 +84,16 @@ module ChefSpec
             @@runner
           end
 
+          if runner.evaluate_guards?
+            if self.respond_to?(:should_skip?) # Chef >= 0.10
+              if self.method(:should_skip?).arity == 1
+                return if self.should_skip?(action)
+              else
+                return if self.should_skip?
+              end
+            end
+          end
+
           if runner.step_into.include?(self.resource_name.to_s)
             # Ignore not_if / only_if guards
             if self.only_if.is_a?(Array) # 0.10.x
@@ -82,6 +117,11 @@ module ChefSpec
       Chef::Config[:cookbook_path] = cookbook_paths
       Chef::Config[:client_key] = nil
 
+      # it should be saved to an instance variable to prevent automatic
+      # unlinking during garbage collection
+      @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)
@@ -97,6 +137,15 @@ module ChefSpec
       end
     end
 
+    def stub_command(command, result)
+      # We want to preserve insertion order so that stubs are applied in a
+      # known order. Ruby 1.9 hashes behave like this but we are still
+      # supporting 1.8.
+      @stubbed_commands.reject!{|existing_cmd, _| existing_cmd == command}
+      @stubbed_commands << [command, result]
+      self
+    end
+
     # Run the specified recipes, but without actually converging the node.
     #
     # @param [array] recipe_names The names of the recipes to execute
@@ -126,6 +175,14 @@ module ChefSpec
       self
     end
 
+    def evaluate_guards?
+      !! @evaluate_guards
+    end
+
+    def actually_run_shell_guards?
+      !! @actually_run_shell_guards
+    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)
     SCRIPT_RESOURCES  = %w(script powershell bash csh perl python ruby)

data/lib/chefspec/helpers/describe.rb

@@ -0,0 +1,13 @@
+module ChefSpec
+  module Helpers
+    module Describe
+      def described_recipe
+        self.class.metadata[:example_group][:description_args].first
+      end
+
+      def described_cookbook
+        described_recipe.split('::').first
+      end
+    end
+  end
+end

data/lib/chefspec/monkey_patches/conditional.rb

@@ -0,0 +1,19 @@
+class Chef
+  class Resource
+    class Conditional
+      alias_method :original_evaluate_command, :evaluate_command
+      def evaluate_command
+        runner.stubbed_commands.each do |stubbed_cmd, result|
+          case command
+            when stubbed_cmd then return result
+          end
+        end
+        if runner.actually_run_shell_guards?
+          return original_evaluate_command
+        end
+        raise RSpec::Mocks::MockExpectationError.new(
+          "The following shell guard was unstubbed: #{description}")
+      end
+    end
+  end
+end

data/lib/chefspec/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -201,29 +201,31 @@ extra_rdoc_files: []
 files:
 - lib/chef/formatters/chefspec.rb
 - lib/chef/knife/cookbook_create_specs.rb
+- lib/chefspec.rb
 - lib/chefspec/chef_runner.rb
+- lib/chefspec/helpers/describe.rb
+- lib/chefspec/minitest.rb
+- lib/chefspec/monkey_patches/lwrp_base.rb
+- lib/chefspec/monkey_patches/hash.rb
+- lib/chefspec/monkey_patches/conditional.rb
+- lib/chefspec/monkey_patches/provider.rb
+- lib/chefspec/version.rb
+- lib/chefspec/matchers/file_content.rb
+- lib/chefspec/matchers/ruby_block.rb
+- lib/chefspec/matchers/execute.rb
 - lib/chefspec/matchers/cron.rb
+- lib/chefspec/matchers/link.rb
+- lib/chefspec/matchers/user.rb
 - lib/chefspec/matchers/env.rb
-- lib/chefspec/matchers/execute.rb
+- lib/chefspec/matchers/script.rb
+- lib/chefspec/matchers/package.rb
 - lib/chefspec/matchers/file.rb
-- lib/chefspec/matchers/file_content.rb
-- lib/chefspec/matchers/group.rb
 - lib/chefspec/matchers/include_recipe.rb
-- lib/chefspec/matchers/link.rb
 - lib/chefspec/matchers/log.rb
-- lib/chefspec/matchers/notifications.rb
-- lib/chefspec/matchers/package.rb
-- lib/chefspec/matchers/ruby_block.rb
-- lib/chefspec/matchers/script.rb
 - lib/chefspec/matchers/service.rb
 - lib/chefspec/matchers/shared.rb
-- lib/chefspec/matchers/user.rb
-- lib/chefspec/minitest.rb
-- lib/chefspec/monkey_patches/hash.rb
-- lib/chefspec/monkey_patches/lwrp_base.rb
-- lib/chefspec/monkey_patches/provider.rb
-- lib/chefspec/version.rb
-- lib/chefspec.rb
+- lib/chefspec/matchers/group.rb
+- lib/chefspec/matchers/notifications.rb
 homepage: http://acrmp.github.com/chefspec
 licenses:
 - MIT
@@ -239,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3769472040999822905
+      hash: 768299270690559200
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,12 +250,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3769472040999822905
+      hash: 768299270690559200
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: chefspec-1.2.0
+summary: chefspec-1.3.0
 test_files: []
 has_rdoc: