simplygenius-atmos 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a43cd732a3f97e0fc2884f1b284b8f389db9b1845879a1e8cd5b23a657b9dab6
-  data.tar.gz: 0b84e5d5026b849bac355875bc4759b8cfc21abc4ad51627d2e35626f928f2e4
+  metadata.gz: 184052156c0ecd551e93ad3a1cc212bc2132f5b77409348f1c0cedcb4740b353
+  data.tar.gz: 67b48fb4bb4f84a922ac2879bcd38273c552fa213983f2f2d461669f6eb06587
 SHA512:
-  metadata.gz: 84bfe472a2bef731c2cd3dc715ca2b0d214a343cef6491f09bc4762445d7faf340b704366a5b0e099c3e9a42cb6f4e23fecf918671cdeb6a51b4a1a7e15a993e
-  data.tar.gz: 2a3f7167cd23068e9e8ea810810ed3e896b36d6c803b8f844b38bfa11e8127dd37505fcf91995321d9a53af4d851236eebebfc8d6421a6c03109aa8e90267596
+  metadata.gz: 3f3a38df1a9759746af1999bd3e8e0fe542ddb89092a557b81720f470e7e12b3ea13eb814aa64b36f906a7534a0a96537c421bdd707cd45513e363a2c8bf8388
+  data.tar.gz: e68a88d3b25b8f307fec0ada80eb5f6eb9f97fdb6da550dec70db58483001b769e86873410d0328677f53ee32e9f910b0521b55a1f0ccf327668af6ad22f7546

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.12.1 (10/14/2020)
+-------------------
+
+* fix bug with deeply nested overrides [60cb84a](https://github.com/simplygenius/atmos/commit/60cb84a)
+
 0.12.0 (10/12/2020)
 -------------------
 

data/lib/simplygenius/atmos/config.rb

@@ -114,13 +114,14 @@ module SimplyGenius
 
         if merge_to_existing
           existing = load_file(user_config_file, SettingsHash.new)
-          data = config_merge(existing, data, ["saving #{user_config_file}"], finalize: true)
+          data = config_merge(existing, data, ["saving #{user_config_file}"])
+          data = finalize_merge(data)
         end
         File.write(user_config_file, YAML.dump(data.to_hash))
         File.chmod(0600, user_config_file)
       end
 
-      def config_merge(lhs, rhs, debug_state=[], finalize: true)
+      def config_merge(lhs, rhs, debug_state=[])
         result = nil
 
         return rhs if lhs.nil?
@@ -136,30 +137,22 @@ module SimplyGenius
             rhs.each do |k, v|
               new_state = debug_state + [k]
 
+              # The load sequence could have multiple overrides and its not
+              # obvious to the user which are lhs vs rhs, so rather than having
+              # one seem to win arbitrarily, we collect them all additively
+              # under their key, then at the end of the load process we push the
+              # override back as a replacement for its base key in the
+              # finalize_merge method. This means that if one has multiple
+              # overrides for the same key (not usually what one wants), those
+              # overrides get merged together additively before replacing the
+              # base.  Thus the need for the log messages below.
+              #
               if k =~ /^\^/
                 logger.debug { "Override seen at #{new_state.join(" -> ")}" }
                 logger.warn { "Multiple overrides on a single key seen at #{new_state.join(" -> ")}" } if result.has_key?(k)
               end
 
-              result[k] = config_merge(result[k], v, new_state, finalize: finalize)
-            end
-
-            # The load sequence could have multiple overrides and its not
-            # obvious to the user which are lhs vs rhs, so rather than having
-            # one seem to win arbitrarily, we collect them all additively under
-            # their key, then at the end of the load process we push the
-            # override back as a replacement for its base key.
-            # This means that if one has multiple overrides for the same key
-            # (not usually what one wants), those overrides get merged together
-            # additively before replacing the base.  Thus the need for the debug
-            # log message above.
-            if finalize
-              result.each do |k, v|
-                if k =~ /^\^(.*)/
-                  key = k.is_a?(Symbol) ? $1.to_sym : $1
-                  result[key] = result.delete(k)
-                end
-              end
+              result[k] = config_merge(result[k], v, new_state)
             end
 
           when Enumerable
@@ -183,6 +176,27 @@ module SimplyGenius
 
       private
 
+      def finalize_merge(config)
+        result = config.deep_dup
+
+        config.each do |k, v|
+
+          key = k
+
+          if k =~ /^\^(.*)/
+            key = k.is_a?(Symbol) ? $1.to_sym : $1
+            result[key] = result.delete(k)
+          end
+
+          if v.is_a?(Hash)
+            result[key] = finalize_merge(v)
+          end
+
+        end
+
+        return result
+      end
+
       def load_remote_config_sources(config, *remote_sources)
         remote_sources.each do |remote_source|
           logger.debug("Loading remote atmos config file: #{remote_source}")
@@ -222,7 +236,7 @@ module SimplyGenius
 
         begin
           submap = config.deep_fetch(group, name)
-          config = config_merge(config, submap, ["#{submap_file} submap(#{group}.#{name})"], finalize: false)
+          config = config_merge(config, submap, ["#{submap_file} submap(#{group}.#{name})"])
         rescue
           logger.debug("No #{group} config found for '#{name}'")
         end
@@ -245,7 +259,7 @@ module SimplyGenius
           @user_config_file = @full_config.notation_get("atmos.user_config") || @user_config_file
           @user_config_file = File.expand_path(@user_config_file)
           user_config_file_data = load_file(@user_config_file)
-          temp_settings = create_settings(config_merge(@full_config, user_config_file_data, [@user_config_file], finalize: false), finalize: false)
+          temp_settings = create_settings(config_merge(@full_config, user_config_file_data, [@user_config_file]), finalize: true)
 
           @full_config = load_config_sources(File.dirname(config_file), @full_config, *Array(temp_settings.notation_get("atmos.config_sources")))
           @full_config = load_remote_config_sources(@full_config, *Array(temp_settings.notation_get("atmos.remote_config_sources")))
@@ -255,7 +269,7 @@ module SimplyGenius
           @full_config = load_submap(File.dirname(config_file), 'providers', provider_name, @full_config)
           @full_config = load_submap(File.dirname(config_file), 'environments', atmos_env, @full_config)
 
-          @full_config = config_merge(@full_config, user_config_file_data, [@user_config_file], finalize: false)
+          @full_config = config_merge(@full_config, user_config_file_data, [@user_config_file])
 
           conf = create_settings(@full_config, finalize: true)
 
@@ -288,7 +302,7 @@ module SimplyGenius
           data = SettingsHash.new(data)
           data = block.call(data) if block
           # if lhs has a override ^, then it loses it when rhs gets merged in, which breaks things for subsequent merges
-          config = config_merge(config, data, [location], finalize: false)
+          config = config_merge(config, data, [location])
           @included_configs[location] = yml_string
         end
 
@@ -303,7 +317,8 @@ module SimplyGenius
         }
 
         global = SettingsHash.new(config.reject {|k, v| ['providers', 'environments'].include?(k) })
-        conf = config_merge(global, builtins, ["builtins"], finalize: finalize)
+        conf = config_merge(global, builtins, ["builtins"])
+        conf = finalize_merge(conf) if finalize
 
         conf.error_resolver = ->(statement) { find_config_error(statement) }
         conf.enable_expansion = true

data/lib/simplygenius/atmos/version.rb

@@ -1,5 +1,5 @@
 module SimplyGenius
   module Atmos
-    VERSION = "0.12.0"
+    VERSION = "0.12.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplygenius-atmos
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Matt Conway
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler