cfhighlander 0.8.1.alpha.1550744133 → 0.8.1.alpha.1550752854

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccc4ffea77c8c6df1a0470b4abbe90301c6e9dc4135c4dba47cfc8d04180a262
-  data.tar.gz: 53b28fe8a437c6942bcc88995090efa8482751766be88aa6691c04b701bf6947
+  metadata.gz: 9abae95557c0b289f913b611ab307b8368ba1f42be75c1c9d97e97d6fb2cf1d5
+  data.tar.gz: 4bc02802a7f83175f165bd6d77fff16986864a94afdbea65ce2f79244e5c33e9
 SHA512:
-  metadata.gz: 3c86cd26b001318aa36732c04b5214c81cf5cbeda2d6da52ed9010a702d964612f4b8edeaf67eec44e17d5ff4d812bb61e0c1366243e83bee921394d3339cda2
-  data.tar.gz: 49391895bb907f1d8021dee707bd6e0e713d8f78637ca01e176a3a860c29827fcc4f55d26d9c9d2ec4a67f0544ea91ec3ebbf4a46b0fb1b0caded30f935487c8
+  metadata.gz: 9d68344d7af75908c23858ec2450c5d5c0c8c9e74bb76a9b0cbac297bd31772fc9fef8c4ea9ca57b98b6ac75cabc24297ca8a5e64b5428d91e86eb9295bc1bef
+  data.tar.gz: 554f5bd99753787cdddb64b73e5926a8082dec175d0c1e746428576c25197bfe6fefea2da7d2cfcddb1f702b88ca75732931a2ea850ea7562ff53d4449c648bc

data/lib/cfhighlander.tests.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'json'
+require 'util/hash.util'
 
 module CfHighlander
   class Tests
@@ -27,16 +28,10 @@ module CfHighlander
     def get_cases
       @test_files.each do |file|
         test_case = load_test_case(file)
-        default_config = load_defaut_config()
-        test_config = merge_recursively(test_case,default_config)
-        @cases << { metadata: test_case['test_metadata'], file: file, config: test_config }
+        @cases << { metadata: test_case['test_metadata'], file: file, config: test_case.deep_merge(load_defaut_config) }
       end
     end
 
-    def merge_recursively(a, b)
-      a.merge(b) {|key, a_item, b_item| merge_recursively(a_item, b_item) }
-    end
-
     def load_defaut_config()
       begin
         YAML.load(File.read("#{@component_name}.config.yaml"))

data/lib/util/hash.util.rb

@@ -0,0 +1,6 @@
+class ::Hash
+  def deep_merge(second)
+    merger = proc {|key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2}
+    self.merge(second.to_h, &merger)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.8.1.alpha.1550744133
+  version: 0.8.1.alpha.1550752854
 platform: ruby
 authors:
 - Nikola Tosic
@@ -278,6 +278,7 @@ files:
 - lib/cfhighlander.version.rb
 - lib/util/cloudformation.util.rb
 - lib/util/debug.util.rb
+- lib/util/hash.util.rb
 - lib/util/zip.util.rb
 - templates/cfndsl.component.template.erb
 homepage: https://github.com/theonestack/cfhighlander/blob/master/README.md