snappconfig 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fdb18518b031de8fc2fa843b78f05db17f31098
-  data.tar.gz: 9b859473c81ad042143f05f3ae2b65033e270d5d
+  metadata.gz: 6254cbdf4db21d11be05d39c04457b3ad2a00f72
+  data.tar.gz: 1abc5b054d7e691fe533340f878c09faf05784c7
 SHA512:
-  metadata.gz: 01a6858ea79834175afc7b4bf2944404c6244d024671c4494a17523a7cc448eadd48fc1e7478368bc06885a552ca4a3537d2843144a7c35796e2ce4138dd99e3
-  data.tar.gz: 5cfe591a7709e900c1d1141ed4bc055ed7f92d03782403ecc9ff97c846ab54a018b799abae84bec70b9dedffb1fb1dcc61887989c4364ea1b2546e10f12fe3ef
+  metadata.gz: 79793ae19f9bb70b9b9f3c3657d90cde13af1ae7a43cb7a5a9cf0434e07156eb4345dcb457ac3676ea3202690840d5a282716c44ee895c24999da22ebbc7d1a8
+  data.tar.gz: 4718a54bb541408560e26ca6ea38028314cac7a50eee6666ab6207fe7c68cfa18eba901ffe67b8800c6878281c58e6ad04035c33ed1ff637b571c14dfe8f6677

data/lib/snappconfig/railtie.rb

@@ -6,31 +6,33 @@ module Snappconfig
   class Railtie < ::Rails::Railtie
   
     config.before_configuration do
+      
+      is_rake_task = defined? Rake
+      if !is_rake_task
+        
+        # Look for CONFIG file in ENV (For Heroku) or else load from file system:
+        appconfig = ENV['CONFIG'] ? YAML.load(ENV['CONFIG']) : Snappconfig.merged_raw.clone
 
-      # Look for CONFIG file in ENV (For Heroku) or else load from file system:
-      appconfig = ENV['CONFIG'] ? YAML.load(ENV['CONFIG']) : Snappconfig.merged_raw.clone
-    
-      appconfig.deep_merge! appconfig.fetch('defaults', {})
-      appconfig.deep_merge! appconfig.fetch(Rails.env, {})
+        appconfig.deep_merge! appconfig.fetch('defaults', {})
+        appconfig.deep_merge! appconfig.fetch(Rails.env, {})
 
-      Snappconfig.environments.each do |environment|
-        appconfig.delete(environment)
-      end
+        Snappconfig.environments.each { |environment| appconfig.delete(environment) }
 
-      check_required(appconfig)
+        check_required(appconfig)
 
-      # Assign ENV values...
-      if appconfig.has_key?('ENV')
-        appconfig['ENV'].each do |key, value|
-          ENV[key] = value.to_s unless value.kind_of? Hash
+        # Assign ENV values and then delete them from CONFIG so we don't have duplicate data:
+        if appconfig.has_key?('ENV')
+          appconfig['ENV'].each do |key, value|
+            ENV[key] = value.to_s unless value.kind_of? Hash
+          end
+          appconfig.delete('ENV')
         end
-        # ... and clear ENV values from CONFIG so we don't have duplicate data:
-        appconfig.delete('ENV')
+
+        appconfig = recursively_symbolize_keys(appconfig)
+        CONFIG.merge! appconfig
+        
       end
 
-      appconfig = recursively_symbolize_keys(appconfig)
-      CONFIG.merge! appconfig
-      
     end
 
     rake_tasks do
@@ -43,7 +45,7 @@ module Snappconfig
       
       hash.each_pair do |key,value|
         if value == '_REQUIRED'
-          raise "The configuration value #{key} is required but was not supplied. Check your application.yml file(s)."
+          raise "The configuration value '#{key}' is required but was not supplied. Check your application.yml file(s)."
         elsif value.is_a?(Hash)
           check_required(value) 
         end

data/snappconfig.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "snappconfig"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["Yarin Kessler"]
   spec.email         = "ykessler@appgrinders.com"
   spec.summary       = %q{Smarter Rails configuration with YAML}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snappconfig
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Yarin Kessler