chefdore 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79845476129e6e9505dd331b1b948d01e0eb47d7
-  data.tar.gz: e2850c4a3a12fc2e16789736451096431e1f2bcc
+  metadata.gz: 043f019e2e36eecc7a5a66688ecdb800d80757ab
+  data.tar.gz: 472773df60feba1d4d279b5215d201ec17d51ade
 SHA512:
-  metadata.gz: 6c63c5377348ac1640279ae5f9044882c68db8a21aefc4863d2b35b27e9710720615b86f19de7023ce5b6c3695efd8464aaa0b0d0dedafc2bbd0640cc542342c
-  data.tar.gz: 16d3576ca5272a6a10095393ff2941a23b4f4a0a47c4bd74d25dcea462d04a37a4abafc29f7ecfd8569f7ffc811cd27a9a805636b8a3067a29ba563c683da1fd
+  metadata.gz: 5dac605397b012a1c74e4484f05059373f8c3f2f4135617aa14dea273355138d349f1ca741e4f6de810768b93030d8386876b56c9c271493470cb4d34559b2d9
+  data.tar.gz: bf6f58014a2f03953ace8473132e278a38bfae7195c1dee12add674c6b4a2fefc774ef6b50f3ae7f73280820e80c1a727e29f9a73443668067bdcf5c792287f4

data/README.md

@@ -106,7 +106,10 @@ All we have to do is pipe that output into our little command line client:
 
 ```bash
 $ knife role show example_role --format json | chefdore convert
+## Place the following in your cookbook in attributes/default.rb
 default["ntp"]["servers"] = ["0.pool.ntp.org", "1.pool.ntp.org", "2.pool.ntp.org", "3.pool.ntp.org"]
+
+## Place the following in your cookbook in attributes/overrides.rb (alternatively, you may place these in attributes/default.rb instead)
 override["developer_mode"] = false
 override["monitoring"]["metric_provider"] = "collectd"
 override["monitoring"]["procmon_provider"] = "monit"
@@ -133,6 +136,8 @@ override["osops_networks"]["nova"] = "192.168.1.0/24"
 override["osops_networks"]["public"] = "192.168.1.0/24"
 override["osops_networks"]["management"] = "192.168.1.0/24"
 override["package_component"] = "folsom"
+
+## Place the following in your cookbook in recipes/default.rb
 include_recipe "osops-utils::packages"
 include_recipe "osops-utils::nf_conntrack_max"
 include_recipe "osops-utils::vhost_net"

data/lib/chefdore/utils.rb

@@ -21,9 +21,14 @@ module Chefdore
       path   = opts[:path]   ? opts[:path]   : []
       cli    = opts[:cli]    ? opts[:cli]    : Chefdore::Cli.new
 
-      #puts "INFO :: #{value.inspect} (#{value.class}) -- #{prefix} -- #{path}"
+      #puts "DEBUG :: #{prefix} -- #{path} -- #{value.inspect} (#{value.class})"
+
+      if value.is_a?(Hash) and value.empty? and path.empty?
+        nil
+      elsif value.is_a?(Hash)
+        # This allows us to include empty hashes if one is found
+        puts "#{prefix}#{path.map{|p| "[#{p.inspect}]"}.join('')} = #{value.inspect}" if value.empty?
 
-      if value.is_a?(Hash)
         value.each do |subkey, subval|
           convert_attr(opts.merge(value: subval, path: path+[subkey]))
         end
@@ -47,9 +52,15 @@ module Chefdore
       da = klass.default_attributes
       oa = klass.override_attributes
 
+      puts "## Place the following in your cookbook in attributes/default.rb"
       convert_attr(cli: cli, value: da)
+      puts
+
+      puts "## Place the following in your cookbook in attributes/overrides.rb (alternatively, you may place these in attributes/default.rb instead)"
       convert_attr(cli: cli, value: oa, prefix: "override")
+      puts
 
+      puts "## Place the following in your cookbook in recipes/default.rb"
       convert_run_list(cli: cli, run_list: rl)
     end
 

data/lib/chefdore/version.rb

@@ -1,3 +1,3 @@
 module Chefdore
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chefdore
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jason Barnett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor