chef-handler-s3 0.1.0 → 0.1.1

data/lib/chef/handler/s3.rb

@@ -13,7 +13,7 @@ require 'aws-sdk'
 class Chef
   class Handler
     class S3 < ::Chef::Handler
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
 
       attr_reader :config
 
@@ -53,8 +53,8 @@ class Chef
         run_data = Hash.new
         if run_status.failed?
           Chef::Log.error("Creating JSON exception report")
-          run_data[:formatted_exception] = run_status.formatted_exception
-          run_data[:exception] = run_status.exception
+          run_data[:formatted_exception] = run_status.formatted_exception.split("\n")
+          run_data[:exception] = run_status.exception.split("\n")
           run_data[:backtrace] = run_status.backtrace
         else
           Chef::Log.info("Creating JSON run report")
@@ -62,7 +62,11 @@ class Chef
 
         build_report_dir
 
-        savetime = Time.now.strftime("%Y%m%d%H%M%S")
+        if node.include? :cloud
+          run_data[:ipaddress] = node.cloud.public_ipv4
+        else
+          run_data[:ipaddress] = node.ipaddress
+        end
         run_data[:name] = node.name
         run_data[:fqdn] = node.fqdn
         run_data[:success] = run_status.success?
@@ -79,12 +83,22 @@ class Chef
           }
         end
 
-        if node.include? :cloud
-          run_data[:ipaddress] = node.cloud.public_ipv4
-        else
-          run_data[:ipaddress] = node.ipaddress
+        # This need to be used carefully. The values of the passed has will be evaluated
+        # It is mean to be used at the resource as following example:
+        # chef_handler "Chef::Handler::S3" do
+        #   source 'chef/handler/s3'
+        #   arguments :extra_data => {
+        #     'iptables' => %{`iptables -L -n`.split("\n")},
+        #     'route'    => %{`route -n`.split("\n")}
+        #     }
+        # end
+        if @config.include? :extra_data and @config[:extra_data].is_a? Hash
+          @config[:extra_data].each do |k,v|
+            run_data[k] = eval v
+          end
         end
 
+        savetime = Time.now.strftime("%Y%m%d%H%M%S")
         file_path = File.join(config[:path], "#{node.name}-#{savetime}.json")
         File.open(file_path, "w") do |file|
           file.puts Chef::JSONCompat.to_json_pretty(run_data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-handler-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &87386120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *87386120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allows storing reports of Chef Exceptions to S3.
 email: juanje.ojeda@gmail.com
 executables: []
@@ -51,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Chef Exception & Reporting Handler for storing reports at S3