simplygenius-atmos 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9f69449d48427430bc31762edb6359ac810e1fc32cf94d8ce051df7a6cb92b4
-  data.tar.gz: 1dcb2ed97a319a93f5f87462c1553c898132f23f04dc90cf43807a87cc196ae3
+  metadata.gz: e52d0f9fe95219722359232e6a8895b0cdbf23f99fbeda7ad8a48fdfe8a21397
+  data.tar.gz: bb3c2e1d01fd2071ecc41e10b7622cb320e10dcd65ee90d254cc68465ee923db
 SHA512:
-  metadata.gz: ef543813c52188072ddf10a179174fb6aee0b19fbcc6787fe0d10c928875481606554b18b43d782724624f1f3d61ee8d500dd9bb89cb1ac21bb3d61663541933
-  data.tar.gz: 9a020c0a2b66a38e0a2f2145e03fdedede9792c18c83906c1b7191de1c7affa06d58e2fba573ebf751db58dbacea0be9d9b0abd26593cdf40f5dad82a2ca43b3
+  metadata.gz: 0da4f8dc5d90d23b6f5f7bbc348c4b5c1a431924e7763d369a5bbfd3528bae260a7e627294ad9aebc2e67e88cc3f7a5843a5b269b3c90fba88d7af37cf981bf5
+  data.tar.gz: c8e92569daec346d3c9e2a963374fcefd9e04c23a3a6d298fc9b3474871e8edc2f899c0903a5bc19a032993ec53588d4683e2c08ad3c8471d1f8b45a64eed1fc

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.9.2 (12/01/2018)
+------------------
+
+* add more useful display of type mismatches during config merges [b751a82](https://github.com/simplygenius/atmos/commit/b751a82)
+* ensure all config files are hash like [5ad14fb](https://github.com/simplygenius/atmos/commit/5ad14fb)
+
 0.9.1 (11/30/2018)
 ------------------
 

data/lib/simplygenius/atmos/config.rb

@@ -104,40 +104,48 @@ module SimplyGenius
 
       INTERP_PATTERN = /(\#\{([^\}]+)\})/
 
-      def config_merge(lhs, rhs)
+      def config_merge(lhs, rhs, debug_state=[])
         result = nil
 
         return rhs if lhs.nil?
         return lhs if rhs.nil?
 
         # Warn if user fat fingered config
-        unless lhs.is_a?(rhs.class) || rhs.is_a?(lhs.class)
-          logger.warn("Different types in deep merge: #{lhs.class}, #{rhs.class}")
-        end
+        if lhs.is_a?(rhs.class) || rhs.is_a?(lhs.class)
 
-        case rhs
-        when Hash
-          result = lhs.deep_dup
+          case rhs
+          when Hash
+            result = lhs.deep_dup
 
-          lhs.each do |k, v|
-            if k =~ /^\^(.*)/
-              key = k.is_a?(Symbol) ? $1.to_sym : $1
-              result[key] = result.delete(k)
+            lhs.each do |k, v|
+              if k =~ /^\^(.*)/
+                key = k.is_a?(Symbol) ? $1.to_sym : $1
+                result[key] = result.delete(k)
+              end
             end
-          end
 
-          rhs.each do |k, v|
-            if k =~ /^\^(.*)/
-              key = k.is_a?(Symbol) ? $1.to_sym : $1
-              result[key] = v
-            else
-              result[k] = config_merge(result[k], v)
+            rhs.each do |k, v|
+              if k =~ /^\^(.*)/
+                key = k.is_a?(Symbol) ? $1.to_sym : $1
+                result[key] = v
+              else
+                result[k] = config_merge(result[k], v, debug_state + [k])
+              end
             end
+          when Enumerable
+            result = lhs + rhs
+          else
+            result = rhs
           end
-        when Enumerable
-          result = lhs + rhs
+
         else
+
+          logger.warn("Type mismatch while merging in: #{debug_state.delete_at(0)}")
+          logger.warn("Deep merge path: #{debug_state.join(" -> ")}")
+          logger.warn("Deep merge LHS (#{lhs.class}): #{lhs.inspect}")
+          logger.warn("Deep merge RHS (#{rhs.class}): #{rhs.inspect}")
           result = rhs
+
         end
 
         return result
@@ -158,11 +166,11 @@ module SimplyGenius
           Dir[pattern].each do |f|
             logger.debug("Loading atmos config file: #{f}")
             data = YAML.load_file(f)
-            if data == false
-              logger.debug("Skipping empty config file: #{f}")
+            if ! data.is_a?(Hash)
+              logger.debug("Skipping non-hash config file: #{f}")
             else
               h = SettingsHash.new(data)
-              config = config_merge(config, h)
+              config = config_merge(config, h, [f])
               @included_configs << f
             end
           end
@@ -177,18 +185,18 @@ module SimplyGenius
         if File.exist?(submap_file)
           logger.debug("Loading atmos #{group} config file: #{submap_file}")
           data  = YAML.load_file(submap_file)
-          if data == false
-            logger.debug("Skipping empty config file: #{submap_file}")
+          if ! data.is_a?(Hash)
+            logger.debug("Skipping non-hash config file: #{submap_file}")
           else
             h = SettingsHash.new({group => {name => data}})
-            config = config_merge(config, h)
+            config = config_merge(config, h, [submap_file])
             @included_configs << submap_file
           end
         end
 
         begin
           submap = config.deep_fetch(group, name)
-          config = config_merge(config, submap)
+          config = config_merge(config, submap, ["#{submap_file} submap(#{group}.#{name})"])
         rescue
           logger.debug("No #{group} config found for '#{name}'")
         end
@@ -206,7 +214,9 @@ module SimplyGenius
             @full_config = SettingsHash.new
           else
             logger.debug("Loading atmos config file #{config_file}")
-            @full_config = SettingsHash.new(YAML.load_file(config_file))
+            data = YAML.load_file(config_file)
+            raise ArgumentError.new("Invalid main config file (not hash-like): #{config_file}") if ! data.is_a?(Hash)
+            @full_config = SettingsHash.new(data)
             @included_configs << config_file
           end
 
@@ -222,7 +232,7 @@ module SimplyGenius
               atmos_env: atmos_env,
               atmos_working_group: working_group,
               atmos_version: VERSION
-          })
+          }, ["builtins"])
           expand(conf, conf)
         end
       end

data/lib/simplygenius/atmos/version.rb

@@ -1,5 +1,5 @@
 module SimplyGenius
   module Atmos
-    VERSION = "0.9.1"
+    VERSION = "0.9.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplygenius-atmos
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler