hieracles 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c192a57c0dd89751f2e3bfb54cbe618619a86899
-  data.tar.gz: c912bca31c59ade51a5406afd7a6d0694f0b14c3
+  metadata.gz: 979857ccc68e688d421a488ae1d7a46e43363208
+  data.tar.gz: 6ddb11e2037df811f6c209d8def3f0fc25805427
 SHA512:
-  metadata.gz: c04d028ce1dde5e210085724be74031dbe8792b55bf320fe172a93d01a5613c76599d76b36ad3b59efe7e2a7db6e6d98bd34b944f7bf3609c37d4af6f5fd5960
-  data.tar.gz: ba1cbd0281931e8ecd799d6f91334afde0cf0ead9e5e1ccb9cc4ca801a150aa43d2ebb2523295b9f14e74662e744b8c49ae03f24c0efcf02af1e0cc91213ab8c
+  metadata.gz: d30867447a99006f2a4a3d70b027e54c25630b04aabf65ec41a53801846b2f2e347a3fcc9ddf73859e05b25475da7e18b1428049b1e9abaedab6da9fdf6b4d54
+  data.tar.gz: d3556118c9d8230a9b472668a475c23c3a2ccd365365ed818cc86b94fca94b881091a1d52614c4e3466b1953739617d6a6d967667b2b859636e046b573b68a39

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Hieracles Changelog
 =======================
 
+### 0.1.2 - 2015-11-12
+- fix yaml more for case of nilclass in params
+- fix the case when a params file is empty
+
 ### 0.1.1 - 2015-11-11
 - add json format output
 - add an option to load facts files in json or yaml

data/lib/hieracles/formats/yaml.rb

@@ -66,6 +66,14 @@ module Hieracles
         added output, key, leaf, params
       end
 
+      def add_fixnum(output, key, leaf, params, indent)
+        added output, key, leaf, params
+      end
+
+      def add_float(output, key, leaf, params, indent)
+        added output, key, leaf, params
+      end
+
       def add_trueclass(output, key, leaf, params, indent)
         added output, key, 'true', params
       end
@@ -74,12 +82,8 @@ module Hieracles
         added output, key, 'false', params
       end
 
-      def add_fixnum(output, key, leaf, params, indent)
-        added output, key, leaf, params
-      end
-
-      def add_float(output, key, leaf, params, indent)
-        added output, key, leaf, params
+      def add_nilclass(output, key, leaf, params, indent)
+        added output, key, '', params
       end
 
       private

data/lib/hieracles/node.rb

@@ -47,10 +47,12 @@ module Hieracles
       params = {}
       files(without_common).each do |f|
         data = YAML.load_file(File.join(Config.basepath, f))
-        s = to_shallow_hash(data)
-        s.each do |k,v|
-          params[k] ||= []
-          params[k] << { value: v, file: f}
+        if data
+          s = to_shallow_hash(data)
+          s.each do |k,v|
+            params[k] ||= []
+            params[k] << { value: v, file: f}
+          end
         end
       end
       params.sort
@@ -60,7 +62,7 @@ module Hieracles
       params = {}
       paths(without_common).each do |f|
         data = YAML.load_file(f)
-        deep_merge!(params, data)
+        deep_merge!(params, data) if data
       end
       deep_sort(params)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hieracles
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - mose