yml_merger 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53bab445865ad2f7414909d6d5d06c94b077de30
-  data.tar.gz: bbde43c5fe4e037f2711e18c652a2b27823fa4dc
+  metadata.gz: 49e76145d789966d34bccbca72e2e6a7dc1a5e03
+  data.tar.gz: b31dac2229ba5d425c31c66f958337446bd7fbdd
 SHA512:
-  metadata.gz: b9177063653202da7147bf8068f19ff1b3d6f063de2e0392bba467b1e3abe9796047d643abff33c1f9cea7b9d56cb2c34494d9013e7d602fa1bc88dbb3238d9a
-  data.tar.gz: 7e8936d1301086d2cb9b0396a79a4a60e8036f2ba66e6ee8b056f9f2a11b9c3decdf7b75cb0e024996d9d05cd96b1a1bf1236eafb940c6aa8431fad7c18837da
+  metadata.gz: b95b020415c2f0e2a4f95ae4d9aa002aaa1c0a180a84f2741d6e47df9496da78164dbc90c34766a8c9e9fa553cf107012832f60e62381cbc67f6d5be4707d712
+  data.tar.gz: 1b7ab34abc0f7090f5083b545cae32a321b99ff646e44b0875945e208c107bddb194531fb0363d055ff7985a64316b04c9184a41e992e6d8c8595b1de0bf6be5

data/lib/yml_merger.rb

@@ -4,6 +4,7 @@ require "deep_merge"
 require 'fileutils'
 require 'open-uri'
 require 'uri'
+require 'logger'
 
 
 # implement of deep merge for nested hash and array of hash
@@ -14,7 +15,12 @@ class YML_Merger
     # Params:
     # - filepath: the entry file name
     # - seatch_paths: rootpath to search all the needed YML files 
-    def initialize(filename, search_paths)
+    def initialize(filename, search_paths, logger: nil)
+        @logger = logger 
+        unless (logger)
+            @logger = Logger.new(STDOUT)
+            @logger.level = Logger::INFO
+        end
         @ENTRY_YML           = search_paths + '/' + filename
         @search_paths       = search_paths
         @filestructure = Hash.new()
@@ -49,14 +55,14 @@ class YML_Merger
           if struct.key?("mode") and struct["mode"] == "post-process-lib"
             if struct[key].has_key?("attribute")
               if struct[key]["attribute"] == "required"
-                 #puts "keep #{key}"
+                 @logger.debug "keep #{key}"
               else
                  struct.delete(key)
-                 #puts "deletes #{key}"
+                 @logger.debug "deletes #{key}"
                  next
               end
             else
-              #puts "delete #{key}"
+              @logger.debug "delete #{key}"
               struct.delete(key)
               next
             end
@@ -64,21 +70,21 @@ class YML_Merger
           if struct[key].key?("mode") and struct[key]["mode"] == "post-process-app"
             if struct[key].has_key?("attribute")
               if struct[key]["attribute"] == "required"
-                #puts "keep #{key}"
+                @logger.debug "keep #{key}"
               else
                 struct.delete(key)
-                #puts "deletes #{key}"
+                @logger.debug "deletes #{key}"
                 next
               end
             else
-              #puts "delete #{key}"
+              @logger.debug "delete #{key}"
               struct.delete(key)
               next
             end
           end
           if struct[key].key?("mode") and struct[key]["mode"] == "pre-process-merge"
               struct.delete(key)
-              #puts "deletes #{key}"
+              @logger.debug "deletes #{key}"
               next
           end
           post_process(struct[key])
@@ -97,7 +103,7 @@ class YML_Merger
         #if not loaded,push to stack
         @filestack.push(file)
         #add globals.yml before load file
-        #puts file
+        @logger.info file
         content = open(file.gsub("\\","/")){|f| f.read}
         content = YAML::load(content)
         return if  content.class == FalseClass
@@ -134,7 +140,7 @@ class YML_Merger
              if struct[key]['attribute'] == "required"
                 struct[key].each_key do |subkey|
                     if struct.has_key?(subkey) and struct[subkey].class == Hash
-                        #puts "pre process #{key} -> #{subkey}"
+                        @logger.debug "pre process #{key} -> #{subkey}"
                         struct[subkey] = struct[subkey].deep_merge(deep_copy(struct[key][subkey]))
                        #struct[subkey] = struct[subkey].deep_merge(struct[key][subkey])
                        #puts struct[subkey].to_yaml
@@ -204,6 +210,7 @@ class YML_Merger
     # - addon: the key that idetify the addon module
     def deep_add_merge(struct, subnode, addon)
       return if Hash != struct.class
+      return if struct[addon].nil?
       if struct[addon]['__add__'].nil?
         #we do not want the addon module to change the status
         struct[addon]['attribute'] = ""
@@ -232,6 +239,7 @@ class YML_Merger
         return if Hash != struct.class
         struct.each_key do |subnode|
           next if @KEY_LIST.include?(subnode)
+          next if struct[subnode].nil?
           if struct[subnode]['__add__'] != nil
             struct[subnode]['__add__'].each do |addon|
               next if struct[addon].class != Hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yml_merger
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Hake Huang