chef_handler_foreman 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecef7de2520fb70bd3f7d4b579c7a953db128417
-  data.tar.gz: 3cacd14b60b411734c1a6d49fa77626d0c96b6a0
+  metadata.gz: 49c01dca38d7420f316e78ade7faa9e20fc9425b
+  data.tar.gz: 8531d0ada4f9a736f388818a31f5f53d75769660
 SHA512:
-  metadata.gz: b4b9e301496e3e0a361dbf031615cc7d47ddac35504c8d3eb8cfffbe9d8eb9a3b5d11208e5ce8bbe8b3f1c001dce42327281af2c2b9077bb889e1cf912fe6c9b
-  data.tar.gz: ab96a0a8bbad7f0afdfd5cc080f7ca0a6adf0534c7fb9243f12d8d24ff6d97d1806ebac491dd9d3fc51ef476dd70a3de4fe67a52bb0973a18e6ecafb6813ccc1
+  metadata.gz: a2ff1df5aaa5210bc607972e421079ee63e54bc7a48c93955be664760278bf73514fe7596e52dd2ebb1bc042e54daad17b4165d1b3efbea32a81676dd0d0fc54
+  data.tar.gz: c7210bcc5041df77a33258892df8cb024dd00539dc0abb7780244f5d8a579fabec525a059b5823df491fd76ed8505b9d9d15ddf35e79a140ced49a5cedf3bbc7

data/README.md

@@ -31,3 +31,13 @@ reports_log_level       "notice"
 You can also specify a second argument to foreman_reports_upload which is a number:
 - 1 (default) for reporter based on more detailed ResourceReporter
 - 2 not so verbose based just on run_status, actually just counts applied resources
+
+## Chef 10 support
+
+Chef 10 is generally supported from version 0.0.6 and above. However you must set
+foreman_reports_upload mode to 2 manually. We can't get detailed reports in old 
+chef. The configuration line will look like this:
+
+```ruby
+foreman_reports_upload  true, 2
+```

data/lib/chef_handler_foreman/foreman_facts.rb

@@ -35,7 +35,9 @@ module ChefHandlerForeman
     end
 
     def plain_attributes
-      plainify(node.attributes.to_hash).flatten.inject(&:merge)
+      # chef 10 attributes can be access by to_hash directly, chef 11 uses attributes method
+      attributes = node.respond_to?(:attributes) ? node.attributes : node.to_hash
+      plainify(attributes.to_hash).flatten.inject(&:merge)
     end
 
     def plainify(hash, prefix = nil)

data/lib/chef_handler_foreman/foreman_hooks.rb

@@ -1,6 +1,11 @@
 require 'chef_handler_foreman/foreman_facts'
 require 'chef_handler_foreman/foreman_reporting'
-require 'chef_handler_foreman/foreman_resource_reporter'
+
+# this reporter is supported in chef 11 or later
+unless Gem::Version.new(Chef::VERSION) < Gem::Version.new('11.0.0')
+  require 'chef_handler_foreman/foreman_resource_reporter'
+end
+
 require 'chef_handler_foreman/foreman_uploader'
 
 module ChefHandlerForeman
@@ -38,7 +43,7 @@ module ChefHandlerForeman
             end
           when 2
             @foreman_report_handler          = ForemanReporting.new
-            @foreman_report_handler.uploader = uploader
+            @foreman_report_handler.uploader = @foreman_uploader
             report_handlers << @foreman_report_handler
             exception_handlers << @foreman_report_handler
           else

data/lib/chef_handler_foreman/version.rb

@@ -1,3 +1,3 @@
 module ChefHandlerForeman
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef_handler_foreman
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler