dotenv 0.1.1 → 0.2.0

data/.env

@@ -0,0 +1 @@
+DOTENV=true

data/README.md

@@ -41,6 +41,11 @@ Add your application configuration to `.env`.
     S3_BUCKET=dotenv
     SECRET_KEY=sssshhh!
 
+You can also create files per environment, such as `.env.test`:
+
+    S3_BUCKET=test
+    SECRET_KEY=test
+
 Whenever your application loads, these variables will be available in `ENV`:
 
     config.fog_directory  = ENV['S3_BUCKET']

data/dotenv.gemspec

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |gem|
+  gem.version       = '0.2.0'
   gem.authors       = ["Brandon Keepers"]
   gem.email         = ["brandon@opensoul.org"]
   gem.description   = %q{Loads environment variables from `.env`.}
@@ -12,7 +13,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "dotenv"
   gem.require_paths = ["lib"]
-  gem.version       = '0.1.1'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/lib/dotenv.rb

@@ -1,8 +1,11 @@
 require 'dotenv/environment'
 
 module Dotenv
-  def self.load(filename = '.env')
-    Dotenv::Environment.new(filename).apply
+  def self.load(*filenames)
+    filenames << '.env' if filenames.empty?
+    filenames.inject({}) do |hash, filename|
+      hash.merge Dotenv::Environment.new(filename).apply
+    end
   end
 end
 

data/lib/dotenv/railtie.rb

@@ -5,7 +5,7 @@ module Dotenv
     end
 
     initializer 'dotenv', :group => :all do
-      Dotenv.load
+      Dotenv.load '.env', ".env.#{Rails.env}"
     end
   end
 end

data/spec/dotenv_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Dotenv::Environment do
-  let(:dotenv)   { Dotenv::Environment.new(env_path) }
+describe Dotenv do
+  let(:env_path) { fixture_path('plain.env') }
 
   before do
     @env_keys = ENV.keys
@@ -11,39 +11,74 @@ describe Dotenv::Environment do
     ENV.delete_if { |k,v| !@env_keys.include?(k) }
   end
 
-  context 'with a plain env file' do
-    let(:env_path) { fixture_path('plain.env') }
-
-    describe 'initialize' do
-      it 'reads environment config' do
-        expect(dotenv['OPTION_A']).to eq('1')
-        expect(dotenv['OPTION_B']).to eq('2')
+  describe 'load' do
+    context 'with no args' do
+      it 'defaults to .env' do
+        Dotenv::Environment.should_receive(:new).with('.env').
+          and_return(mock(:apply => {}))
+        Dotenv.load
       end
     end
 
-    describe 'apply' do
-      it 'sets variables in ENV' do
-        dotenv.apply
-        expect(ENV['OPTION_A']).to eq('1')
+    context 'with multiple files' do
+      let(:expected) do
+        {'OPTION_A' => '1', 'OPTION_B' => '2', 'DOTENV' => 'true'}
+      end
+
+      subject do
+        Dotenv.load('.env', env_path)
+      end
+
+      it 'loads all files' do
+        subject
+        expected.each do |key, value|
+          expect(ENV[key]).to eq(value)
+        end
+      end
+
+      it 'returns hash of loaded environments' do
+        expect(subject).to eq(expected)
       end
     end
   end
 
-  context 'when the file does not exist' do
-    let(:env_path) { fixture_path('.env_does_not_exist') }
+  describe Dotenv::Environment do
+    subject { Dotenv::Environment.new(env_path) }
 
-    describe 'initialize' do
-      it 'fails silently' do
-        lambda { Dotenv::Environment.new('.env_does_not_exist') }.should_not raise_error
+    context 'with a plain env file' do
+
+      describe 'initialize' do
+        it 'reads environment config' do
+          expect(subject['OPTION_A']).to eq('1')
+          expect(subject['OPTION_B']).to eq('2')
+        end
+      end
+
+      describe 'apply' do
+        it 'sets variables in ENV' do
+          subject.apply
+          expect(ENV['OPTION_A']).to eq('1')
+        end
       end
     end
 
-    describe 'apply' do
-      it 'does not effect env' do
-        dotenv.apply
-        expect(ENV.keys).to eq(@env_keys)
+    context 'when the file does not exist' do
+      let(:env_path) { fixture_path('.env_does_not_exist') }
+
+      describe 'initialize' do
+        it 'fails silently' do
+          expect { Dotenv::Environment.new('.env_does_not_exist') }.not_to raise_error
+        end
+      end
+
+      describe 'apply' do
+        it 'does not effect env' do
+          subject.apply
+          expect(ENV.keys).to eq(@env_keys)
+        end
       end
     end
+
   end
 
   def fixture_path(name)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dotenv
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-08 00:00:00 Z
+date: 2012-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -55,6 +55,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .env
 - .gitignore
 - Gemfile
 - LICENSE