hierarchical_config 0.2 → 0.3

data/README.markdown

@@ -12,7 +12,9 @@ HierarchicalConfig is a library that implements a strategy for configuring an ap
    without repeating yourself.
 4. You should be able to change configuration per box based on deploy
    that does not affect the defaults or requirements that are checked in
-   to source control.
+   to source control. This can be accomplished with a deploy time file
+   or environment variables that are also highly configurable and
+   validated.
 
 ## Usage
 
@@ -64,6 +66,11 @@ doesn't know about.
       root:
         child_b: 8
 
+    env_vars:
+      super_secret_password: SUPER_SECRET
+    env_vars[production]:
+      super_secret_password: SUPER_DUPER_SECRET
+
 ### config/app-overrides.yml
 
     production:
@@ -79,7 +86,7 @@ doesn't know about.
       :child_c:
         :grandchild_a: 3
         :grandchild_b: 4
-    :super_secret_password: not_that_secret
+    :super_secret_password: <%= ENV['SUPER_SECRET'] || 'not_that_secret' %>
     :check: true
 
 ### test
@@ -90,7 +97,7 @@ doesn't know about.
       :child_c:
         :grandchild_a: 3
         :grandchild_b: 4
-    :super_secret_password: not_that_secret
+    :super_secret_password: <%= ENV['SUPER_SECRET'] || 'not_that_secret' %>
     :check: true
 
 ### production
@@ -101,7 +108,7 @@ doesn't know about.
       :child_c:
         :grandchild_a: 3
         :grandchild_b: 4
-    :super_secret_password: cant_trust_dev_with_this_we_symlink_this_file
+    :super_secret_password: <%= ENV['SUPER_DUPER_SECRET'] || 'cant_trust_dev_with_this_we_symlink_this_file' %>
     :check: true
 
 ### staging

data/lib/hierarchical_config.rb

@@ -65,9 +65,16 @@ module HierarchicalConfig
       ordered_stanza_labels += yaml_config.keys.grep(/^defaults\[.*#{environment}/).sort_by{ |a| a.count(',') }
       ordered_stanza_labels << environment if yaml_config.key? environment
 
-      config = ordered_stanza_labels.inject({}) do |acc, label|
-        deep_merge( acc, yaml_config[label] )
-      end
+      config = deep_merge_hashes_in_keys(ordered_stanza_labels, yaml_config)
+
+      env_config_labels = []
+      env_config_labels << 'env_vars' if yaml_config.key? 'env_vars'
+      env_config_labels += yaml_config.keys.grep(/^env_vars\[.*#{environment}/).sort_by{ |a| a.count(',') }
+
+      env_config = deep_merge_hashes_in_keys(env_config_labels, yaml_config)
+      env_config = fill_in_env_vars(env_config)
+
+      deep_merge(config, env_config)
 
     rescue StandardError => e
       raise <<-ERROR
@@ -79,6 +86,25 @@ module HierarchicalConfig
 
     private
 
+    def deep_merge_hashes_in_keys(keys, root_hash)
+      keys.inject({}) do |acc, label|
+        deep_merge( acc, root_hash[label] )
+      end
+    end
+
+    def fill_in_env_vars(hash)
+      r = {}
+      hash.each do |key,value|
+        if !value.nil? && ENV.key?(value)
+          r[key]=ENV[value]
+        elsif value.is_a? Hash
+          leaf_hash = fill_in_env_vars(value)
+          r[key]=leaf_hash unless leaf_hash.keys.empty?
+        end
+      end
+      r
+    end
+
     # merges two hashes with nested hashes if present
     def deep_merge( hash1, hash2 )
       hash1 = hash1.dup

metadata

@@ -1,50 +1,68 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: hierarchical_config
-version: !ruby/object:Gem::Version
-  version: '0.2'
+version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  version: "0.3"
 platform: ruby
-authors:
+authors: 
 - timgaleckas
 - tjbladez
 - jdfrens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+
+date: 2012-07-19 00:00:00 Z
 dependencies: []
-description: Robust strategy for defining the configuration accross environements,
-  machines, clusters
+
+description: Robust strategy for defining the configuration accross environements, machines, clusters
 email: tim@galeckas.com, nick@tjbladez.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/hierarchical_config.rb
 - README.markdown
 homepage: http://github.com/timgaleckas/hierarchical_config
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Robust strategy for defining the configuration accross environements, machines,
-  clusters
+summary: Robust strategy for defining the configuration accross environements, machines, clusters
 test_files: []
+
+has_rdoc: false