tcfg 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e368269e17db9f30e5ad5728fc6e0eb1afabe45f
-  data.tar.gz: 003aee3a3d1d314dcc06f6c1b467d0913fa46066
+  metadata.gz: bbfdbdd6c15939ee12601567c3a500533152d5ab
+  data.tar.gz: 7f6357741984ab34df388bef696b75e81d605628
 SHA512:
-  metadata.gz: 8eb4303d7ff7c8699ed09bd1da6944deaa633a7f6a815a1b6d1f5f41cc37016d6951b70d52e7b89dd402cd80bd8113880cf57cea71d6be2025392d2e13237bc5
-  data.tar.gz: cbe3425379a81470249a86f3bc621fb4f3b9295051a5ac896bc7feca9a5cb1ac0043a32e7042176f2c06720eece514104cf3d5e5731aee7c4adf09d3dce5c0eb
+  metadata.gz: 310f1ef7283cd174f008a7d6b32eae4bbc9b7df4e85b1dca450a0398b625f42cb0c92c1c62224adcf14c56d0e547526487824f9e34e90e284fe594fcc2efc72d
+  data.tar.gz: 9b4420e6f2a72d4ea544e5dacca1fdb5d0ed71a0c76a1a1aba27a2871cf3489dcb6397aa548b457c10751761b5628cb68b907dd7871892912784af89e74564ab

data/Gemfile

@@ -1,11 +1,13 @@
 source 'http://rubygems.org'
 
 # activesupport used for HashWithIndifferentAccess
+# and also some utility methods (deep_dup, deep_merge)
 gem 'activesupport'
 
 group :development do
   gem 'jeweler'
   gem 'rspec'
   gem 'rubocop'
+  gem 'simplecov'
   gem 'yard'
 end

data/Gemfile.lock

@@ -14,6 +14,7 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
+    docile (1.1.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     git (1.3.0)
@@ -39,6 +40,7 @@ GEM
       rake
       rdoc
       semver2
+    json (2.1.0)
     jwt (1.5.6)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
@@ -84,6 +86,11 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     semver2 (3.4.2)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
@@ -98,6 +105,7 @@ DEPENDENCIES
   jeweler
   rspec
   rubocop
+  simplecov
   yard
 
 BUNDLED WITH

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/tcfg/tcfg_helper.rb

@@ -5,7 +5,7 @@ require 'yaml'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/hash/slice'
-# active_support 5 moved deep_dup, 
+# active_support 5 moved deep_dup,
 # so this trick is in place to support all activesupport versions
 begin
   # deep_dup is here in active_support 5
@@ -16,7 +16,8 @@ rescue LoadError
 end
 
 module TCFG
-  # TCFG::Helper does all the "heavy lifting".  Essentially all the logic within TCFG is defined by this module.
+  # TCFG::Helper does all the "heavy lifting".
+  # Essentially all the logic within TCFG is defined by this module.
   # The intended ways to use this module are:
   #
   # - use the TCFG module methods whenever a single instance of configuration will do
@@ -60,8 +61,8 @@ module TCFG
     # @return [ActiveSupport::HashWithIndifferentAccess] a copy of the resolved configuration
     def tcfg
       @tcfg_resolved_config ||= resolve_config
-      # return a deep copy of the configuration object to prevent mutations
-      @tcfg_resolved_config.deep_dup
+      # return a frozen deep copy of the configuration object to prevent mutations
+      @tcfg_resolved_config.deep_dup.freeze
     end
 
     # change the name of the public configuration file
@@ -174,22 +175,11 @@ module TCFG
     end
 
     def tier_config_file
-      @tcfg_config_filename ||= DEFAULT_CONFIG_FILE
-      tcfg_load_optional_config_file @tcfg_config_filename
+      tcfg_load_optional_config_file possible_config_file_name
     end
 
     def tier_secret_config_file
-      if @tcfg_secret_config_filename
-        tcfg_load_optional_config_file @tcfg_secret_config_filename
-      elsif @tcfg_config_filename
-        ext = File.extname @tcfg_config_filename
-        base = File.basename @tcfg_config_filename, ext
-        dir = File.dirname @tcfg_config_filename
-        possible_secret_filename = dir + '/' + base + '.secret' + ext
-        tcfg_load_optional_config_file possible_secret_filename
-      else
-        {}
-      end
+      tcfg_load_optional_config_file possible_secret_config_file_name
     end
 
     def tier_environment_overrides
@@ -283,6 +273,31 @@ module TCFG
 
       resolved_config
     end
+
+
+    def possible_config_file_name
+      possible_file_name = if @tcfg_config_filename
+                             @tcfg_config_filename
+                           else
+                             DEFAULT_CONFIG_FILE
+                           end
+      possible_file_name
+    end
+
+    def possible_secret_config_file_name
+      possible_file_name = if @tcfg_secret_config_filename
+                             @tcfg_secret_config_filename
+                           else
+                             # turn 'somedir/tcfg.yml' into 'somedir/tcfg.secret.yml'
+                             non_secret_config_file = possible_config_file_name
+                             ext = File.extname non_secret_config_file
+                             base = File.basename non_secret_config_file, ext
+                             dir = File.dirname non_secret_config_file
+                             possible_secret_filename = dir + '/' + base + '.secret' + ext
+                             possible_secret_filename
+                           end
+      possible_file_name
+    end
   end
 
   # raised when the requested environment is not available

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcfg
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - robert schultheis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement