chefspec 1.0.0 → 1.1.0

data/lib/chef/formatters/chefspec.rb

@@ -0,0 +1,198 @@
+if defined?(Chef::Formatters::Base)
+  class Chef
+    module Formatters
+      # A specific formatter for Chef 11. This base for this formatter was
+      # taken from Chef::Formatters:Min and all the output was then removed.
+      #
+      # @author Seth Vargo <sethvargo@gmail.com>
+      class ChefSpec < Formatters::Base
+        cli_name(:chefspec)
+
+        attr_reader :updated_resources
+        attr_reader :updates_by_resource
+
+        def initialize(out, err)
+          super
+          @updated_resources = []
+          @updates_by_resource = Hash.new {|h, k| h[k] = []}
+        end
+
+        # Called at the very start of a Chef Run
+        def run_start(version)
+          puts "Starting Chef Client, version #{version}"
+        end
+
+        # Called at the end of the Chef run.
+        def run_completed(node)
+        end
+
+        # called at the end of a failed run
+        def run_failed(exception)
+          puts "chef client failed. #{@updated_resources.size} resources updated"
+        end
+
+        # Called right after ohai runs.
+        def ohai_completed(node)
+        end
+
+        # Already have a client key, assuming this node has registered.
+        def skipping_registration(node_name, config)
+        end
+
+        # About to attempt to register as +node_name+
+        def registration_start(node_name, config)
+        end
+
+        def registration_completed
+        end
+
+        # Failed to register this client with the server.
+        def registration_failed(node_name, exception, config)
+          super
+        end
+
+        def node_load_start(node_name, config)
+        end
+
+        # Failed to load node data from the server
+        def node_load_failed(node_name, exception, config)
+        end
+
+        # Default and override attrs from roles have been computed, but not yet applied.
+        # Normal attrs from JSON have been added to the node.
+        def node_load_completed(node, expanded_run_list, config)
+        end
+
+        # Called before the cookbook collection is fetched from the server.
+        def cookbook_resolution_start(expanded_run_list)
+        end
+
+        # Called when there is an error getting the cookbook collection from the
+        # server.
+        def cookbook_resolution_failed(expanded_run_list, exception)
+        end
+
+        # Called when the cookbook collection is returned from the server.
+        def cookbook_resolution_complete(cookbook_collection)
+        end
+
+        # Called before unneeded cookbooks are removed
+        #--
+        # TODO: Should be called in CookbookVersion.sync_cookbooks
+        def cookbook_clean_start
+        end
+
+        # Called after the file at +path+ is removed. It may be removed if the
+        # cookbook containing it was removed from the run list, or if the file was
+        # removed from the cookbook.
+        def removed_cookbook_file(path)
+        end
+
+        # Called when cookbook cleaning is finished.
+        def cookbook_clean_complete
+        end
+
+        # Called before cookbook sync starts
+        def cookbook_sync_start(cookbook_count)
+        end
+
+        # Called when cookbook +cookbook_name+ has been sync'd
+        def synchronized_cookbook(cookbook_name)
+        end
+
+        # Called when an individual file in a cookbook has been updated
+        def updated_cookbook_file(cookbook_name, path)
+        end
+
+        # Called after all cookbooks have been sync'd.
+        def cookbook_sync_complete
+        end
+
+        # Called when cookbook loading starts.
+        def library_load_start(file_count)
+        end
+
+        # Called after a file in a cookbook is loaded.
+        def file_loaded(path)
+        end
+
+        def file_load_failed(path, exception)
+          super
+        end
+
+        # Called when recipes have been loaded.
+        def recipe_load_complete
+        end
+
+        # Called before convergence starts
+        def converge_start(run_context)
+        end
+
+        # Called when the converge phase is finished.
+        def converge_complete
+        end
+
+        # Called before action is executed on a resource.
+        def resource_action_start(resource, action, notification_type=nil, notifier=nil)
+        end
+
+        # Called when a resource fails, but will retry.
+        def resource_failed_retriable(resource, action, retry_count, exception)
+        end
+
+        # Called when a resource fails and will not be retried.
+        def resource_failed(resource, action, exception)
+        end
+
+        # Called when a resource action has been skipped b/c of a conditional
+        def resource_skipped(resource, action, conditional)
+        end
+
+        # Called after #load_current_resource has run.
+        def resource_current_state_loaded(resource, action, current_resource)
+        end
+
+        # Called when a resource has no converge actions, e.g., it was already correct.
+        def resource_up_to_date(resource, action)
+        end
+
+        ## TODO: callback for assertion failures
+
+        ## TODO: callback for assertion fallback in why run
+
+        # Called when a change has been made to a resource. May be called multiple
+        # times per resource, e.g., a file may have its content updated, and then
+        # its permissions updated.
+        def resource_update_applied(resource, action, update)
+          @updates_by_resource[resource.name] << Array(update)[0]
+        end
+
+        # Called after a resource has been completely converged.
+        def resource_updated(resource, action)
+          updated_resources << resource
+        end
+
+        # Called before handlers run
+        def handlers_start(handler_count)
+        end
+
+        # Called after an individual handler has run
+        def handler_executed(handler)
+        end
+
+        # Called after all handlers have executed
+        def handlers_completed
+        end
+
+        # An uncategorized message. This supports the case that a user needs to
+        # pass output that doesn't fit into one of the callbacks above. Note that
+        # there's no semantic information about the content or importance of the
+        # message. That means that if you're using this too often, you should add a
+        # callback for it.
+        def msg(message)
+        end
+
+      end
+    end
+  end
+end

data/lib/chefspec.rb

@@ -1,4 +1,5 @@
 require 'chef'
+require 'chef/formatters/chefspec'
 require 'chefspec/chef_runner'
 require 'chefspec/version'
 

data/lib/chefspec/chef_runner.rb

@@ -26,6 +26,7 @@ module ChefSpec
     # @option options [Symbol] :log_level The log level to use (default is :warn)
     # @option options [String] :platform The platform to load Ohai attributes from (must be present in fauxhai)
     # @option options [String] :version The version of the platform to load Ohai attributes from (must be present in fauxhai)
+    # @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 => []}
@@ -72,9 +73,15 @@ module ChefSpec
 
       Chef::Config[:solo] = true
       Chef::Config[:cache_type] = "Memory"
+      Chef::Config[:cache_options] = { :path => File.join(File.expand_path('~'), '.chef', 'checksums') }
       Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest) }
       Chef::Config[:cookbook_path] = @options[:cookbook_path]
       Chef::Config[:client_key] = nil
+
+      # 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)
+
       Chef::Log.verbose = true if Chef::Log.respond_to?(:verbose)
       Chef::Log.level(@options[:log_level])
       @client = Chef::Client.new
@@ -133,7 +140,16 @@ module ChefSpec
       return "chef_run: #{@node.run_list.to_s}" unless @node.run_list.empty?
       'chef_run'
     end
-
+    
+    # Find the resource with the declared type and name
+    #
+    # @param [String] type The type of resource - e.g. 'file' or 'directory'
+    # @param [String] name The resource name
+    # @return [Chef::Resource] The matching resource, or Nil
+    def find_resource(type, name)
+      resources.find{|resource| resource_type(resource) == type and resource.name == name}
+    end
+    
     private
 
     # Populate basic OHAI attributes required to get recipes working. This is a minimal set - if your recipe example
@@ -144,7 +160,12 @@ module ChefSpec
     #
     # @param [Ohai::System] ohai The ohai instance to set fake attributes on
     def fake_ohai(ohai)
-      ::Fauxhai::Mocker.new(:platform => @options[:platform], :version => @options[:version]).data.each_pair do |attribute, value|
+      data = if @options.has_key?(:ohai_data_path)
+              Fauxhai::Mocker.new(:path => @options[:ohai_data_path]).data
+             else
+              Fauxhai::Mocker.new(:platform => @options[:platform], :version => @options[:version]).data
+             end
+      data.each_pair do |attribute, value|
         ohai[attribute] = value
       end
     end
@@ -156,14 +177,6 @@ module ChefSpec
       Pathname.new(File.join(caller(2).first.split(':').slice(0..-3).join(':'), '..', '..', '..')).cleanpath.to_s
     end
 
-    # Find the resource with the declared type and name
-    #
-    # @param [String] type The type of resource - e.g. 'file' or 'directory'
-    # @param [String] name The resource name
-    # @return [Chef::Resource] The matching resource, or Nil
-    def find_resource(type, name)
-      resources.find{|resource| resource_type(resource) == type and resource.name == name}
-    end
   end
 
 end

data/lib/chefspec/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -48,17 +48,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest-chef-handler
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +199,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/chef/formatters/chefspec.rb
 - lib/chef/knife/cookbook_create_specs.rb
 - lib/chefspec/chef_runner.rb
 - lib/chefspec/matchers/cron.rb
@@ -232,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3276455735612635198
+      hash: -3143489054534407734
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -241,12 +248,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3276455735612635198
+      hash: -3143489054534407734
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: chefspec-1.0.0
+summary: chefspec-1.1.0
 test_files: []
 has_rdoc: