really-confy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4a5653e5cc890738cf6afce11f7da262f814e78
-  data.tar.gz: 38f63ff32abbff0de095ebe6335d909ad8d935a1
+  metadata.gz: c302d38b29348f70a6e2246add5eb28fb4d25b58
+  data.tar.gz: b7cf55ba7d1bc753a253a38c5d952405189d8c72
 SHA512:
-  metadata.gz: 5af1c19f0ca561a5fe9dcd52fe019ad5e2bc5a20611934156f60ccc3b078daf3e8f5af37cc451b85b9d11c5d93e762f1d899c9f1ce012e78b736ee72856baa50
-  data.tar.gz: 99c36e189f874ede4a7226943a7fcd1530cc3235d3b08ac1234b8a81644fdca1af16d4766e7b987c61c7bc31d7b41febad54c3f9cef8560525a77f8a6ba5160c
+  metadata.gz: 26538073af0b6b3089785ca7eab1d97d4b3601dd7d32b55d2c5aa1305c2531890d5c9fbddea68ae64f42d6733962932cf256c076f03513849390ac8007d9ff02
+  data.tar.gz: fad912633f37944bca950a92800c5b66f0f5386fdd539cf93f6d7583f45b09fcb5d85c2f9a5e7504cfc3b9c7b70a7713287f6ef1feefe32d7ede7b8467165539

data/lib/really_confy.rb

@@ -1,6 +1,8 @@
 require 'yaml'
+require 'hashie/mash'
+require 'hashie/extensions/parsers/yaml_erb_parser'
+require 'hashie/extensions/deep_fetch'
 require 'rainbow'
-require 'active_support/core_ext/hash/deep_merge'
 
 class ReallyConfy
 
@@ -30,10 +32,6 @@ class ReallyConfy
     ],
     # the environment key will be selected based on this ENV variable
     env_var_name: 'CONFY_ENV',
-    # use Symbols instead of Strings for all keys in the config Hash
-    symbol_keys: false,
-    # load will return an ActiveSupport::HashWithIndifferentAccess instead of a Hash
-    indifferent_keys: false,
     # suppress output to stdout/stderr
     quiet: false,
     # enable colorized output; nil means 'auto', which enables color by default unless the
@@ -41,7 +39,9 @@ class ReallyConfy
     color: nil,
     # force the ruby interpreter to exit if ReallyConfy encounters an error during load
     # ... not a good idea to use this with quiet:true unless you know exactly what you're doing
-    exit_on_error: false
+    exit_on_error: false,
+    # Don't allow (inadvertent) modification of the config once it's been loaded
+    read_only: false
   }
 
   attr_accessor :config_files
@@ -67,14 +67,6 @@ class ReallyConfy
     ensure_required_config_files_exist
     check_suggested_config_files_exist
     ensure_local_config_files_are_not_in_git
-
-    if @symbol_keys && @indifferent_keys
-      fail ArgumentError,
-        ":symbol_keys and :indifferent_keys options cannot be used together!"
-    end
-
-    require 'active_support/core_ext/hash/keys' if @symbol_keys
-    require 'active_support/core_ext/hash/indifferent_access' if @indifferent_keys
   end
 
   def load
@@ -87,7 +79,7 @@ class ReallyConfy
     multi_env_configs =
       existing_config_files.map{|file| load_config_file(file) }
 
-    unless multi_env_configs.any?{|config| config.is_a?(Hash) && config.has_key?(env) }
+    unless multi_env_configs.any?{|config| config.has_key?(env) }
       fail ConfigError, "#{env.inspect} is not a valid environment! None of the loaded configs"+
         " had a top-level #{env.inspect} key. All configurations should be nested under top"+
         " level keys corresponding to environment names (e.g. 'test', 'development', ...)"
@@ -100,8 +92,9 @@ class ReallyConfy
 
     merged_config['env'] ||= env
 
-    merged_config.deep_symbolize_keys! if @symbol_keys
-    merged_config = merged_config.with_indifferent_access if @indifferent_keys
+    if @read_only
+      merged_config.freeze
+    end
 
     merged_config
   rescue => e
@@ -113,6 +106,9 @@ class ReallyConfy
     print_error ""
     print_error "#{e}"
     print_error ""
+    print_error "BACKTRACE:"
+    print_error "  #{e.backtrace.join("\n  ")}"
+    print_error ""
     print_error "!"*header.length
     print_error ""
     if @exit_on_error
@@ -124,14 +120,11 @@ class ReallyConfy
 
   def load_config_file(file)
     full_path = full_path_to_config_file(file)
-    multi_env_config = (YAML.load_file full_path)
-
-    # YAML.load_file will return false if given an empty file to load
-    return {} if multi_env_config == false
 
-    unless multi_env_config.is_a? Hash
-      fail ConfigError, "Config file #{file.inspect} must contain a YAML-encoded Hash, but"+
-        " it seems to contain a #{multi_env_config.class}"
+    if File.exists? full_path
+      multi_env_config = (ReallyConfy::Config.load full_path)
+    else
+      multi_env_config = ReallyConfy::Config.new {}
     end
 
     multi_env_config
@@ -229,6 +222,18 @@ class ReallyConfy
     end
   end
 
+  class Config < Hashie::Mash
+    include Hashie::Extensions::DeepFetch
+
+    def freeze
+      super
+      self.values.each do |v|
+        v.freeze
+      end
+      self
+    end
+  end
+
   class ConfigError < StandardError
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: really-confy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Zukowski
@@ -11,33 +11,33 @@ cert_chain: []
 date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.4'
 description: 
 email: mzukowski@adknowledge.com
 executables: []