yml_merger 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee8fc229ad3ece250642e1723e3897d1494bf70c
-  data.tar.gz: 4e7d8ee189c605791c86130f7d2562dc7ef3b03b
+  metadata.gz: 4ec9c56347fd8ab5c728f052a0d43e5824758f20
+  data.tar.gz: 3db4861372aa21f35674c3d6c837a0f8d70dd6fb
 SHA512:
-  metadata.gz: 943f1609f38ae057f30539d1be50a01fac1b5c7a0608553ba2cde890760fd21daab4a6e7da035b96461a967210644093ae7ec30e7e5bf5fd53b717cdc916f547
-  data.tar.gz: e4b408e75ca07309ddb8a6c968f72cf65b6ca021e51a3ab38eb6960d79b90a4baaaacf25c413c9027948cf9ae8fe6313dc0ed41c026925316306cdb06559d625
+  metadata.gz: eb0e8c080d2c9401945734ce7d5e3e14f8056414bbdedc000c45b89568b74e6ba16cbaa1ade1d4ba8c1fe5ebe3d47288d1f038088d9bc04acc74889c7d69a0e4
+  data.tar.gz: 1fa5b0956da2e1b61b4782b54e62865c29e19acf84b65265fc7ec6153782ec5edebc1f850637bcfdb125cc86c7c7fd1144bdbbf81fe322c93ec90826bf207197

data/lib/yml_merger.rb

@@ -25,7 +25,8 @@ class YML_Merger
         @search_paths       = search_paths
         @filestructure = Hash.new()
         @filestack = Array.new()
-        @KEY_LIST = ['__remove__','__load__', '__common__', '__hierarchy__', '__replace__', '__add__']
+        # @KEY_LIST = ['__remove__','__load__', '__common__', '__hierarchy__', '__replace__', '__add__']
+        @KEY_LIST = %w('__remove__', '__load__', '__common__', '__hierarchy__', '__replace__', '__add__')
     end
 
     # process the YMLs
@@ -51,44 +52,43 @@ class YML_Merger
       merge_by_replace!(struct)
       merge_by_remove!(struct)
       struct.each_key do |key|
-        if Hash == struct[key].class
-          if struct.key?("mode") and struct["mode"] == "post-process-lib"
-            if struct[key].has_key?("attribute")
-              if struct[key]["attribute"] == "required"
-                 @logger.debug "keep #{key}"
-              else
-                 struct.delete(key)
-                 @logger.debug "deletes #{key}"
-                 next
-              end
+        next if Hash != struct[key].class
+        if struct.key?('mode') and struct['mode'] == 'post-process-lib'
+          if struct[key].has_key?('attribute')
+            if struct[key]['attribute'] == 'required'
+               @logger.debug "keep #{key}"
             else
-              @logger.debug "delete #{key}"
-              struct.delete(key)
-              next
+               struct.delete(key)
+               @logger.debug "deletes #{key}"
+               next
             end
+          else
+            @logger.debug "delete #{key}"
+            struct.delete(key)
+            next
           end
-          if struct[key].key?("mode") and struct[key]["mode"] == "post-process-app"
-            if struct[key].has_key?("attribute")
-              if struct[key]["attribute"] == "required"
-                @logger.debug "keep #{key}"
-              else
-                struct.delete(key)
-                @logger.debug "deletes #{key}"
-                next
-              end
+        end
+        if struct[key].key?('mode') and struct[key]['mode'] == 'post-process-app'
+          if struct[key].has_key?('attribute')
+            if struct[key]['attribute'] == 'required'
+              @logger.debug "keep #{key}"
             else
-              @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)
               @logger.debug "deletes #{key}"
               next
+            end
+          else
+            @logger.debug "delete #{key}"
+            struct.delete(key)
+            next
           end
-          post_process(struct[key])
         end
+        if struct[key].key?('mode') and struct[key]['mode'] == 'pre-process-merge'
+            struct.delete(key)
+            @logger.debug "deletes #{key}"
+            next
+        end
+        post_process(struct[key])
       end
     end
 
@@ -96,7 +96,7 @@ class YML_Merger
         if path =~ URI::regexp
           structure = process_file(path)
         else
-          structure = process_file(@search_paths + path.gsub("\\","/"))
+          structure = process_file(@search_paths + path.tr('\\','/'))
         end
         return structure
     end
@@ -112,7 +112,7 @@ class YML_Merger
         @filestack.push(file)
         #add globals.yml before load file
         @logger.info file
-        content = open(file.gsub("\\","/")){|f| f.read}
+        content = open(file.tr('\\','/')){|f| f.read}
         content = YAML::load(content)
         return if  content.class == FalseClass
         #if has file dependence load it
@@ -136,7 +136,7 @@ class YML_Merger
                 if loadfile =~ URI::regexp
                   structure = process_file(loadfile)
                 else
-                  structure = process_file(@search_paths + loadfile.gsub("\\","/"))
+                  structure = process_file(@search_paths + loadfile.gsub('\\','/'))
                 end
               end
               content = content.deep_merge(deep_copy(structure))
@@ -159,8 +159,8 @@ class YML_Merger
         return if struct.class != Hash
         struct.each_key do |key|
           next if struct[key].class != Hash
-          if struct[key].has_key?('mode') and struct[key]['mode'] == "pre-process-merge"
-             if struct[key]['attribute'] == "required"
+          if struct[key].has_key?('mode') and struct[key]['mode'] == 'pre-process-merge'
+             if struct[key]['attribute'] == 'required'
                 struct[key].each_key do |subkey|
                     if struct.has_key?(subkey) and struct[subkey].class == Hash
                         @logger.debug "pre process #{key} -> #{subkey}"
@@ -243,7 +243,11 @@ class YML_Merger
       end
       #if has more addon
       if struct[addon]['__add__'].count != 0
-         struct[addon]['__add__'].each do |submodule|
+         #puts "add #{addon}"
+         struct[addon]['attribute'] = ""
+         #struct[subnode] = struct[subnode].deep_merge(deep_copy(struct[addon]))
+         struct[addon]['attribute'] = 'required'  
+         struct[addon]['__add__'].each do |submodule|         
            deep_add_merge(struct, addon, submodule)
          end
       else
@@ -268,8 +272,8 @@ class YML_Merger
             struct[subnode]['__add__'].each do |addon|
               next if struct[addon].class != Hash
             begin
-              next if struct[subnode]['configuration']['section-type'] != "application"
-              if struct[addon]['configuration']['section-type'] != "component"
+              next if struct[subnode]['configuration']['section-type'] != 'application'
+              if struct[addon]['configuration']['section-type'] != 'component'
                 @logger.warn "WARNING #{addon} is required as component but has not a component attribute"
               end
             rescue
@@ -288,9 +292,9 @@ class YML_Merger
     def merge_by_replace!(struct)
         return if Hash != struct.class
         #get the replace hash
-        return if ! struct.has_key?("__replace__")
+        return if ! struct.has_key?('__replace__')
         temp = Hash.new
-        temp = temp.deep_merge(deep_copy(struct["__replace__"]))
+        temp = temp.deep_merge(deep_copy(struct['__replace__']))
         temp.each_key do |key|
            next if ! struct.has_key?(key)
            delete_node(struct, key)
@@ -305,24 +309,24 @@ class YML_Merger
     def merge_by_remove!(struct)
         return if Hash != struct.class
         #get the replace hash
-        return if ! struct.has_key?("__remove__")
+        return if ! struct.has_key?('__remove__')
         temp = Hash.new
-        temp = temp.deep_merge(deep_copy(struct["__remove__"]))
+        temp = temp.deep_merge(deep_copy(struct['__remove__']))
         temp.each_key do |key|
           next if ! struct.has_key?(key)
-          if struct["__remove__"][key] == nil
+          if struct['__remove__'][key] == nil
             delete_node(struct, key)
           else
-            if struct["__remove__"][key].class == Array
+            if struct['__remove__'][key].class == Array
               arr = Array.new
-              arr = deep_copy(struct["__remove__"][key])
+              arr = deep_copy(struct['__remove__'][key])
               arr.each do |item|
                 next if ! struct[key].include?(item)
                 struct[key].delete(item)
               end
-            elsif struct["__remove__"][key].class == Hash
+            elsif struct['__remove__'][key].class == Hash
               hash = Hash.new
-              hash = hash.deep_merge(deep_copy(struct["__remove__"][key]))
+              hash = hash.deep_merge(deep_copy(struct['__remove__'][key]))
               hash.each_key do |subkey|
                 next if ! struct[key].has_key?(subkey)
                 delete_node(struct[key], subkey)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yml_merger
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Hake Huang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies: []
 description: yaml extension for heiarchy merge
 email: hakehuang@gmail.com
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: yaml_merger