env-conf 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c00969bbe2528704fd3247dcf352c9daf44acd0
-  data.tar.gz: 588806c188226ce34693aaf2bf629687b023cdf6
+  metadata.gz: 58250c277c52d0684b972ee12a313a9eab33616e
+  data.tar.gz: 1ca6d546f1b641923f7bb668ab54f151c13c2063
 SHA512:
-  metadata.gz: 10c18faff50a64c766d84c56f9bdfe37d757b20c42106606683edd775efbf9381a164aaacfea7490ea64e638920780f3f2f5e6d8529987df626f3776d6147287
-  data.tar.gz: ce4c1e12d0b7b4134ff83df500c386417e2ec55ed099386cc3630f3c707d2917c35ee254bfa9a86ba4eaac75fea81123e5ca2a9bd6af40aa22c66ed43fd46eea
+  metadata.gz: 401a87ec96c25822767ef11af6b9133c782d2533b8bd244d983b17d611fe6941f83c4bb221462a348a094581f9d96d9bf4d43399f6e7cef838a26f4d4dc370b3
+  data.tar.gz: 673bccc57ac6aa66b0fdb113c4682fbae897e469d89148a63cdc3054d4ff215db07ad531eb6e63bd187615f8014177baae7f4f83d2cc11678e9c8bb6561b4648

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in env-conf.gemspec
 gemspec
+
+group :test do
+  gem "fakefs"
+end

data/env-conf.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "dotenv", "~> 1.0"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"

data/lib/env-conf.rb

@@ -2,6 +2,7 @@ require_relative './env-conf/version'
 
 module Config
   @@defaults = {}
+  @@dotenv   = {}
 
   # Get a Config value
   #
@@ -28,12 +29,13 @@ module Config
   def self.[](name)
     var_name = name.to_s.upcase
     default_name = name.to_s.downcase.to_sym
-    ENV[var_name] || @@defaults[default_name]
+    ENV[var_name] || @@dotenv[var_name] || @@defaults[default_name]
   end
 
   # Reset defaults values
   def self.reset!
     @@defaults = {}
+    @@dotenv   = {}
   end
 
   # An environment variable.
@@ -178,4 +180,15 @@ module Config
   def self.uri(name)
     self[name] && URI.parse(self[name])
   end
+
+  # Loads a ".env" file, using Dotenv to parse but not fuck up the ENV
+  def self.dotenv!
+    return if Config.production? 
+    require 'dotenv'
+    ['.env','.env.local',".env.#{Config[:rack_env]}"].each do |filename|
+      if File.exists?(filename)
+        @@dotenv.update(Dotenv::Parser.call(File.read(filename)))
+      end
+    end
+  end
 end

data/lib/env-conf/version.rb

@@ -2,5 +2,5 @@
 Object.send(:remove_const, :Config) if defined?(Config)
 
 module Config
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/test/config_test.rb

@@ -1,40 +1,6 @@
-# note: this would all go in a test/helper if we had 
-# more than one test file
-require 'minitest'
-require 'minitest/autorun'
-require 'minitest/pride'
-
-require 'env-conf'
-
-module EnvironmentHelpers
-  # Override an environment variable in the current test.
-  def set_env(key, value)
-    @overrides[key] = ENV[key] unless @overrides.has_key?(key)
-    ENV[key] = value
-  end
-
-  def setup
-    super
-    @overrides = {}
-  end
-
-  # Restore the environment back to its state before tests ran.
-  def teardown
-    @overrides.each { |key, value| ENV[key] = value }
-    super
-  end
-end
-
-# end note
-
-class ConfigTest < Minitest::Test
-  include EnvironmentHelpers
-
-  def teardown
-    super
-    Config.reset!
-  end
+require 'helper'
 
+class ConfigTest < Test 
   # Config.env returns the value matching the specified environment
   # variable name.
   def test_env

data/test/dotenv_test.rb

@@ -0,0 +1,51 @@
+require 'helper'
+
+class DotenvTest < Test 
+  def setup
+    super
+    FakeFS.activate!
+  end
+
+  def teardown
+    super
+    %w{.env .env.local .env.test}.each do |f|
+      File.unlink(f) if File.exists?(f)
+    end
+    FakeFS.deactivate!
+  end
+
+  def test_one_var
+    File.open(".env",'w') { |f| f << "FOO=bar" }
+    assert_equal(nil, Config[:foo])
+    Config.dotenv!
+    assert_equal('bar', Config[:foo])
+  end
+  
+  def test_two_files
+    File.open(".env",'w') { |f| f << "FOO=bar" }
+    File.open(".env.local",'w') { |f| f << "FOO=zzz" }
+    assert_equal(nil, Config[:foo])
+    Config.dotenv!
+    assert_equal('zzz', Config[:foo])
+  end
+
+  def test_env_specific
+    File.open(".env",'w') { |f| f << "FOO=bar" }
+    File.open(".env.local",'w') { |f| f << "FOO=zzz" }
+    File.open(".env.test",'w') { |f| f << "FOO=test" }
+    assert_equal(nil, Config[:foo])
+    set_env('RACK_ENV', 'test')
+    Config.dotenv!
+    assert_equal('test', Config[:foo])
+  end
+
+  def test_noop_in_prod
+    File.open(".env",'w') { |f| f << "FOO=bar" }
+    File.open(".env.local",'w') { |f| f << "FOO=zzz" }
+    File.open(".env.test",'w') { |f| f << "FOO=test" }
+    assert_equal(nil, Config[:foo])
+    set_env('RACK_ENV', 'production')
+    Config.dotenv!
+    assert_equal(nil, Config[:foo])
+  end
+end

data/test/helper.rb

@@ -0,0 +1,35 @@
+require 'minitest'
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'fakefs/safe'
+
+require 'env-conf'
+
+module EnvironmentHelpers
+  # Override an environment variable in the current test.
+  def set_env(key, value)
+    @overrides[key] = ENV[key] unless @overrides.has_key?(key)
+    ENV[key] = value
+  end
+
+  def setup
+    super
+    @overrides = {}
+  end
+
+  # Restore the environment back to its state before tests ran.
+  def teardown
+    @overrides.each { |key, value| ENV[key] = value }
+    super
+  end
+end
+
+class Test < Minitest::Test
+  include EnvironmentHelpers
+
+  def teardown
+    super
+    Config.reset!
+  end
+end
+

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: env-conf
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Chris Continanza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +82,8 @@ files:
 - lib/env-conf.rb
 - lib/env-conf/version.rb
 - test/config_test.rb
+- test/dotenv_test.rb
+- test/helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -88,9 +104,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Use ENV vars for Configuration
 test_files:
 - test/config_test.rb
+- test/dotenv_test.rb
+- test/helper.rb