require_env 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eb9728be43545f46faf31271e028c8fed316091
-  data.tar.gz: fb02df77efae3aef38a1e758fcf4afd2dc94b027
+  metadata.gz: d33a771e94b3d7d8c419e3a0e1c4158f43e54c4b
+  data.tar.gz: 617169569bb0aa0b01680df6cd80993c6c6857a9
 SHA512:
-  metadata.gz: 9e4cd887a4627c2b6aa4abfcc6d21757d5b0fa7430c169f465f0d2ed36d742b9c69b99b00d10c0283dd0b3f4cba94527f693bc38b496767e9a944163b511c273
-  data.tar.gz: 4f8a49ab4c57d2bb12dc1c2d2e3868f19902e3d4798456f11ca485dd1b8ecff3c8490c7d175c6ab8a0163ed5a7de3f40a2ec6d5aaaa43c3481c1ceec37e8fd7e
+  metadata.gz: 5b3504e430afae5c725a742800cf8eeec319056ce41e64e4548f0b791e7be7fbeed90b7b2cd0be0cc1cd2ca3f90eb6054a5609fd283665f01f998055d0ee1032
+  data.tar.gz: 58f0ef96ab00a6269b85c5dc8480072e6a1c93e97a550c535c5587e3137c1e34a62fb0196cb626b94d559d4459a572cbefddc5601e69eb54cfa51e349de2d241

data/lib/require_env.rb

@@ -5,11 +5,12 @@ require 'erb'
 module RequireEnv
   def self.check(*files)
     check_multiple_requirements(files.map do |file|
-      requirements = requirements_from_file(file)[application_environment]
-      if requirements.nil?
+      requirements = requirements_from_file(file)
+      env_requirements = requirements[application_environment] || requirements[fallback_environment]
+      if env_requirements.nil?
         raise ArgumentError.new("#{file} does not define anything for environment: #{application_environment}")
       end
-      [file, requirements]
+      [file, env_requirements]
     end)
   end
 
@@ -58,4 +59,11 @@ module RequireEnv
   def self.application_environment=(value)
     @application_environment = value
   end
+
+  def self.fallback_environment
+    @fallback_environment ||= nil
+  end
+  def self.fallback_environment=(value)
+    @fallback_environment = value
+  end
 end

data/lib/require_env/version.rb

@@ -1,3 +1,3 @@
 module RequireEnv
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/test/require_env_test.rb

@@ -10,6 +10,10 @@ class RequireEnvTest < ActiveSupport::TestCase
     ENV.delete('BAZ')
   end
 
+  teardown do
+    RequireEnv.fallback_environment = nil
+  end
+
   test 'truth' do
     assert_kind_of Module, RequireEnv
   end
@@ -42,6 +46,21 @@ class RequireEnvTest < ActiveSupport::TestCase
     assert_equal 'whatever', RequireEnv.application_environment
   end
 
+  test 'fallback_environment' do
+    file = File.expand_path('../test.yml', __FILE__)
+    ENV['FOO'] = 'bar'
+    RequireEnv.application_environment = 'check'
+
+    assert_raise(ArgumentError) do
+      RequireEnv.check(file, file)
+    end
+
+    RequireEnv.fallback_environment = 'test'
+    assert_nothing_raised do
+      RequireEnv.check(file, file)
+    end
+  end
+
   test 'requirements_from_file' do
     assert_raise(ArgumentError) do
       RequireEnv.requirements_from_file('foobar')
@@ -53,7 +72,7 @@ class RequireEnvTest < ActiveSupport::TestCase
     assert_kind_of Hash, result
     assert_equal 'foo', result.dig('test', 'VAR')
     assert_equal 2, result.dig('test', 'SUM')
-    assert_equal nil, result.dig('test', 'FOO')
+    assert_nil result.dig('test', 'FOO')
   end
 
   test 'check_requirements' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: require_env
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Geoffroy Planquart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -65,6 +65,7 @@ signing_key:
 specification_version: 4
 summary: Simple environment variable check
 test_files:
-- test/require_env_test.rb
-- test/test.yml
 - test/test_helper.rb
+- test/test.yml
+- test/require_env_test.rb
+has_rdoc: