chef-reporting 0.1.2 → 0.1.3

data/README.md

@@ -53,7 +53,7 @@ handler.  Copy the following block to the top of your `client.rb`.
 
 ```ruby
 begin
-  require chef_reporting
+  require 'chef_reporting'
   start_handlers << Chef::Reporting::StartHandler.new()
 rescue LoadError
   Chef::Log.warn "Failed to load #{lib}. This should be resolved after a chef run."

data/lib/chef_reporting/resource_reporter.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Daniel DeLeo (<dan@opscode.com>)
 # Author:: Prajakta Purohit (prajakta@opscode.com>)
-# Auther:: Tyler Cloke (<tyler@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 #
 # Copyright:: Copyright (c) 2012-13 Opscode, Inc.
 # License:: Apache License, Version 2.0
@@ -49,10 +49,10 @@ class Chef
         def for_json
           as_hash = {}
           as_hash["type"]   = new_resource.class.dsl_name
-          as_hash["name"]   = new_resource.name
-          as_hash["id"]     = new_resource.identity
-          as_hash["after"]  = new_resource.state
-          as_hash["before"] = current_resource ? current_resource.state : {}
+          as_hash["name"]   = new_resource.name.to_s
+          as_hash["id"]     = new_resource.identity.to_s
+          as_hash["after"]  = state(new_resource)
+          as_hash["before"] = current_resource ? state(current_resource) : {}
           as_hash["duration"] = (elapsed_time * 1000).to_i.to_s
           as_hash["delta"]  = new_resource.diff if new_resource.respond_to?("diff")
           as_hash["delta"]  = "" if as_hash["delta"].nil?
@@ -63,8 +63,11 @@ class Chef
           else
             #as_hash["result"] = "failed"
           end
-          as_hash["cookbook_name"] = new_resource.cookbook_name
-          as_hash["cookbook_version"] = new_resource.cookbook_version ? new_resource.cookbook_version.version : "0.0.0"
+          if new_resource.cookbook_name
+            as_hash["cookbook_name"] = new_resource.cookbook_name
+            as_hash["cookbook_version"] = new_resource.cookbook_version.version
+          end
+
           as_hash
         end
 
@@ -76,6 +79,12 @@ class Chef
           !self.exception
         end
 
+         def state(r)
+          r.class.state_attrs.inject({}) do |state_attrs, attr_name|
+            state_attrs[attr_name] = r.send(attr_name)
+            state_attrs
+          end
+        end
       end # End class ResouceReport
 
       attr_reader :updated_resources

data/lib/chef_reporting/version.rb

@@ -17,7 +17,7 @@
 
 module Chef
   module Reporting
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-reporting
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -69,4 +69,3 @@ signing_key:
 specification_version: 3
 summary: Backport of Chef Reporting handler for Chef < 11.6.0
 test_files: []
-has_rdoc: