Merge pull request #281 from bkeepers/allow-local-per-env

Allow local per env
bkeepers · Jan 25, 2017 · bc88d66 · bc88d66
2 parents c195b46 + 7bc3431
commit bc88d66
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/lib/dotenv/rails.rb b/lib/dotenv/rails.rb
@@ -23,6 +23,7 @@ class Railtie < Rails::Railtie
     # can manually call `Dotenv::Railtie.load` if you needed it sooner.
     def load
       Dotenv.load(
+        root.join(".env.#{Rails.env}.local"),
         root.join(".env.local"),
         root.join(".env.#{Rails.env}"),
         root.join(".env")

diff --git a/spec/dotenv/rails_spec.rb b/spec/dotenv/rails_spec.rb
@@ -53,6 +53,7 @@ def add(*items)
     it "loads .env, .env.local, and .env.#{Rails.env}" do
       expect(Spring.watcher.items).to eql(
         [
+          Rails.root.join(".env.test.local").to_s,
           Rails.root.join(".env.local").to_s,
           Rails.root.join(".env.test").to_s,
           Rails.root.join(".env").to_s

diff --git a/spec/fixtures/.env.test.local b/spec/fixtures/.env.test.local
@@ -0,0 +1,3 @@
+FROM_RAILS_ENV=.env.test
+FROM_LOCAL=true
+DOTENV=local