chefspec 0.1.0 → 0.2.0

data/lib/chefspec.rb

@@ -1,6 +1,7 @@
 require 'chef'
 require 'rspec'
 require 'chefspec/chef_runner'
+require 'chefspec/version'
 require 'chefspec/matchers/execute'
 require 'chefspec/matchers/file'
 require 'chefspec/matchers/log'
@@ -8,3 +9,4 @@ require 'chefspec/matchers/package'
 require 'chefspec/matchers/service'
 require 'chefspec/matchers/shared'
 require 'chefspec/monkey_patches/hash'
+require 'chefspec/monkey_patches/provider'

data/lib/chefspec/chef_runner.rb

@@ -18,10 +18,18 @@ module ChefSpec
 
     # Instantiate a new runner to run examples with.
     #
-    # @param [string] cookbook_path The path to the chef cookbook(s) to be tested
-    def initialize(cookbook_path=default_cookbook_path)
+    # @param [Hash] options The options for the new runner
+    # @option options [String] :cookbook_path The path to the chef cookbook(s) to be tested.
+    # @option options [Symbol] :log_level The log level to use (default is :warn)
+    # @yield [node] Configuration block for Chef::Node
+    def initialize(options={})
+      defaults = {:cookbook_path => default_cookbook_path, :log_level => :warn, :dry_run => false}
+      options = {:cookbook_path => options} unless options.respond_to(:to_hash) # backwards-compatibility
+      options = defaults.merge(options)
+
       the_runner = self
       @resources = []
+      @do_dry_run = options[:dry_run]
 
       Chef::Resource.class_eval do
         alias :old_run_action :run_action
@@ -43,21 +51,27 @@ module ChefSpec
       end
 
       Chef::Config[:solo] = true
-      Chef::Config[:cookbook_path] = cookbook_path
+      Chef::Config[:cookbook_path] = options[:cookbook_path]
       Chef::Log.verbose = true if Chef::Log.respond_to?(:verbose)
-      Chef::Log.level(:debug)
+      Chef::Log.level(options[:log_level])
       @client = Chef::Client.new
-      @client.run_ohai
+      fake_ohai(@client.ohai)
       @node = @client.build_node
+      if block_given?
+        yield @node
+      end
     end
 
     # Run the specified recipes, but without actually converging the node.
     #
     # @param [array] recipe_names The names of the recipes to execute
+    # @return ChefSpec::ChefRunner The runner itself
     def converge(*recipe_names)
+      @node.run_list.reset!
       recipe_names.each do |recipe_name|
         @node.run_list << recipe_name
       end
+      return self if @do_dry_run
 
       @client.instance_eval do
         if defined?(@expanded_run_list_with_versions) # 0.10.x
@@ -67,7 +81,6 @@ module ChefSpec
       end
 
       @resources = []
-
       if @client.respond_to?(:setup_run_context) # 0.10.x
         run_context = @client.setup_run_context
       else
@@ -75,6 +88,7 @@ module ChefSpec
       end
       runner = Chef::Runner.new(run_context)
       runner.converge
+      self
     end
 
     # Find any directory declared with the given path
@@ -93,8 +107,29 @@ module ChefSpec
       find_resource('file', 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.
+    def to_s
+      return "chef_run: #{@node.run_list.to_s}" unless @node.run_list.empty?
+      'chef_run'
+    end
+
     private
 
+    # Populate basic OHAI attributes required to get recipes working. This is a minimal set - if your recipe example
+    # does conditional execution based on these values or additional attributes you can set these via
+    # node.automatic_attrs.
+    #
+    # @param [Ohai::System] ohai The ohai instance to set fake attributes on
+    def fake_ohai(ohai)
+      {:os => 'chefspec', :os_version => ChefSpec::VERSION, :fqdn => 'chefspec.local', :domain => 'local',
+       :ipaddress => '127.0.0.1', :hostname => 'chefspec',
+       :kernel => Mash.new({:machine => 'i386'})}.each_pair do |attribute,value|
+        ohai[attribute] = value
+      end
+    end
+
     # Infer the default cookbook path from the location of the calling spec.
     #
     # @return [String] The path to the cookbooks directory

data/lib/chefspec/monkey_patches/provider.rb

@@ -0,0 +1,27 @@
+# Override Chef LWRP creation to remove existing class to avoid redefinition warnings.
+class Chef
+  class Provider
+    class << self
+      alias :old_build_from_file :build_from_file
+
+      def build_from_file(cookbook_name, filename, run_context)
+        remove_existing_lwrp(convert_to_class_name(filename_to_qualified_string(cookbook_name, filename)))
+        old_build_from_file(cookbook_name, filename, run_context)
+      end
+
+      # Remove any existing Chef provider or resource with the specified name.
+      #
+      # @param [String] class_name The class name. Must be a valid constant name.
+      def remove_existing_lwrp(class_name)
+        [Chef::Resource, Chef::Provider].each do |resource_holder|
+          if resource_holder.const_defined? class_name
+            resource_holder.send(:remove_const, class_name)
+          end
+        end
+      end
+
+    end
+  end
+end
+
+

data/lib/chefspec/version.rb

@@ -0,0 +1,3 @@
+module ChefSpec
+  VERSION = '0.2.0'
+end

metadata

@@ -1,70 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chefspec
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Andrew Crump
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2011-09-21 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: &2156420500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 0
-        - 9
-        - 12
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.12
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
-        version: "0.10"
-  name: chef
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :runtime
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156420500
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156417840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.6.0
-  name: rspec
   type: :runtime
   prerelease: false
-  requirement: *id002
+  version_requirements: *2156417840
 description: Write RSpec examples for Opscode Chef recipes
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/chefspec/chef_runner.rb
 - lib/chefspec/matchers/execute.rb
 - lib/chefspec/matchers/file.rb
@@ -73,39 +50,38 @@ files:
 - lib/chefspec/matchers/service.rb
 - lib/chefspec/matchers/shared.rb
 - lib/chefspec/monkey_patches/hash.rb
+- lib/chefspec/monkey_patches/provider.rb
+- 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2232582329296012492
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2232582329296012492
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: chefspec-0.1.0
+summary: chefspec-0.2.0
 test_files: []
-