dotenv 0.2.0 → 0.3.0

data/Changelog.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## 0.3.0 - Oct 25, 2012
+
+* Avoid overriding existing ENV variables so values set before loading the app are maintained.

data/README.md

@@ -24,6 +24,7 @@ Install the gem:
 
 As early as possible in your application bootstrap process, load `.env`:
 
+    require 'dotenv'
     Dotenv.load
 
 To ensure `.env` is loaded in rake, load the tasks:

data/dotenv.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |gem|
-  gem.version       = '0.2.0'
+  gem.version       = '0.3.0'
   gem.authors       = ["Brandon Keepers"]
   gem.email         = ["brandon@opensoul.org"]
   gem.description   = %q{Loads environment variables from `.env`.}

data/lib/dotenv/environment.rb

@@ -16,7 +16,7 @@ module Dotenv
     end
 
     def apply
-      each { |k,v| ENV[k] = v }
+      each { |k,v| ENV[k] ||= v }
     end
   end
 end

data/lib/dotenv/railtie.rb

@@ -1,11 +1,16 @@
 module Dotenv
   class Railtie < Rails::Railtie
     rake_tasks do
-      load "dotenv/tasks.rb"
+      desc 'Load environment settings from .env'
+      task :dotenv do
+        Dotenv.load ".env.#{Rails.env}", '.env'
+      end
+
+      task :environment => :dotenv
     end
 
     initializer 'dotenv', :group => :all do
-      Dotenv.load '.env', ".env.#{Rails.env}"
+      Dotenv.load ".env.#{Rails.env}", '.env'
     end
   end
 end

data/spec/dotenv_spec.rb

@@ -59,6 +59,12 @@ describe Dotenv do
           subject.apply
           expect(ENV['OPTION_A']).to eq('1')
         end
+
+        it 'does not override defined variables' do
+          ENV['OPTION_A'] = 'predefined'
+          subject.apply
+          expect(ENV['OPTION_A']).to eq('predefined')
+        end
       end
     end
 

metadata

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