envvy 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8964d989a7f48c96aba90ab6bca1abbdd4b49ca2
-  data.tar.gz: 85d8c93540837b8251dda610e21106d8d136950d
+  metadata.gz: ac16142198bf160408763202786ef9c908e904e9
+  data.tar.gz: 3597049580d66c7a22ed6bb16647f0e7392c5598
 SHA512:
-  metadata.gz: 6605e9a35a4da1f83f8f7fe79444ead51c653e409851c1059b42c2e04c39c249269f37ebf5d467c76a331ea46cec8f40f564d361eb1264e41542910408ad2fd7
-  data.tar.gz: f0a22dcd8eb6e9e7f6b7a0ca5582a6f110ef579a2266e2db4c73af862e2a78d366cc0247cec17967b6e7bcbf33591e6041a013047fe39f7bc444fabe329fba12
+  metadata.gz: d897e363534cb8bad60c67753042d2a23367a638d4a9ada3180983f686b4438e42287415eca760227092ad1241adab4681b13d4228e4b9f7a5a266a844e201b8
+  data.tar.gz: ccc37405faec5c0d3aff2ce847997fa2ad9718826348270602e04b9d0afd1450b0fd3d8c1939a099c8ad2216a1a38800b694794752c87871529a896802f7cccc

data/lib/envvy/engine.rb

@@ -50,6 +50,10 @@ module Envvy
     def set_env file
       self.env = {"js_config" => {}, "config" => {}}
       self.env.merge! YAML.load(File.read(file)) if File.exist?(file)
+
+      if env[Rails.env]
+        self.env.deep_merge!(self.env[Rails.env])
+      end
     end
 
     def get(key, &block)
@@ -59,5 +63,21 @@ module Envvy
         return self.env[key]
       end
     end
+
+    private
+
+    def merge_current_env!(hash)
+      rails_envs.each do |rails_env|
+        if Rails.env == rails_env && hash[rails_env]
+          hash.merge! hash[rails_env]
+        end
+        hash.delete rails_env
+      end
+    end
+
+    def rails_envs
+      @rails_envs ||=  Dir.glob(Rails.root + "config/environments/*.rb")
+                          .map { |filename| File.basename(filename, ".rb") }
+    end
   end
 end

data/lib/envvy/version.rb

@@ -1,3 +1,3 @@
 module Envvy
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/test/dummy_app/config/env_vars.yml

@@ -1,5 +1,10 @@
 config:
   some_key: secret
   storage: "/mnt/storage"
+
 js_config:
   xx_api: http://localhost:3002
+
+test:
+  config:
+    some_key: test secret

data/test/dummy_app/config/environments/test.rb

@@ -27,4 +27,6 @@ Dummy::Application.configure do
   config.eager_load = true
 
   config.i18n.default_locale = :fr
+
+  config.active_support.test_order = :random
 end

data/test/engine/engine_test.rb

@@ -4,7 +4,10 @@ class EnvvyEngineTest < Minitest::Test
 
   # Based on test/dummy_app/config/env_vars.yml
   def test_env_variables_exist
-    assert ENV["SOME_KEY"] = "secret"
-    assert ENV["STORAGE"] = "/mnt/storage"
+    assert_equal "/mnt/storage", ENV["STORAGE"]
+  end
+
+  def test_env_specific_variable_exist
+    assert_equal "test secret", ENV["SOME_KEY"]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envvy
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Guillaume Balaine
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails