dotenv 3.0.0.beta → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d7ea2bf102098cea8bc5db5886a82aa785d0ac6e562eb32c3d3ec520d76ccb7
-  data.tar.gz: bf7cb575727a86a963eeaf45f7e70e6a2c261cc410dca488b89463a64dc0c3aa
+  metadata.gz: e57f916c7fa013b9da143c732ce59d5e37a1707f4cbe9e3ddbb8282eb4a2e977
+  data.tar.gz: a53a753dffcd865f14d92ab7a3d531c2e0e5c9f5157fe29dd6489c767021db0b
 SHA512:
-  metadata.gz: de5756728ae8844f682425398405dac1564caec8d55bb21ec1ff2dd36ac8e9f13183624d4b426d95ba68fabbf0c1fee8e5da90acf98946b411c7192962d7c0ac
-  data.tar.gz: ab787a65cf7b939f5b400090a000b15ad7fea63203575cb3d04aa7547045a5bef828f3b1b807223ef7c396ad6be06f245efe18271a3eba7fea1d654dcd4b92fb
+  metadata.gz: 9ca0b269215814e535d5d8ac4480defa76f10a13438906b8211c16feef4b603d2f9085b0376d2612b3fa5c74d636a69f6987b121f2b1099b261c7ed7cf6519aa
+  data.tar.gz: f1c5569eedf88df8c1c62a611eedbc57f4bb6ab464ef3aed432efc902aca041ee74c956799271ae8dda78793085c32c3c8626bf303c9bbf13146e12d19f87cad

data/README.md

@@ -56,9 +56,9 @@ Dotenv.load('file1.env', 'file2.env')
 
 ## Autorestore in tests
 
-Since 3.0, dotenv in a Rails app will automatically restore `ENV` to its original state before each test. This means you can modify `ENV` in your tests without fear of leaking state to other tests. It works with both `ActiveSupport::TestCase` and `Rspec`.
+Since 3.0, dotenv in a Rails app will automatically restore `ENV` after each test. This means you can modify `ENV` in your tests without fear of leaking state to other tests. It works with both `ActiveSupport::TestCase` and `Rspec`.
 
-To disable this behavior, set `config.dotenv.autorestore = false` in `config/application.rb` or `config/environments/test.rb`.
+To disable this behavior, set `config.dotenv.autorestore = false` in `config/application.rb` or `config/environments/test.rb`. It is disabled by default if your app uses [climate_control](https://github.com/thoughtbot/climate_control) or [ice_age](https://github.com/dpep/ice_age_rb).
 
 To use this behavior outside of a Rails app, just `require "dotenv/autorestore"` in your test suite.
 
@@ -107,11 +107,59 @@ gem 'gem-that-requires-env-variables'
 
 ### Customizing Rails
 
-Dotenv will load the following files depending on `RAILS_ENV`, with the last file listed having the highest precedence:
+Dotenv will load the following files depending on `RAILS_ENV`, with the first file having the highest precedence, and `.env` having the lowest precedence:
+
+<table>
+  <thead>
+    <tr>
+      <th>Priority</th>
+      <th colspan="3">Environment</th>
+      <th><code>.gitignore</code>it?</th>
+      <th>Notes</th>
+    </tr>
+    <tr>
+      <th></th>
+      <th>development</th>
+      <th>test</th>
+      <th>production</th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tr>
+    <td>highest</td>
+    <td><code>.env.development.local</code></td>
+    <td><code>.env.test.local</code></td>
+    <td><code>.env.production.local</code></td>
+    <td>Yes</td>
+    <td>Environment-specific local overrides</td>
+  </tr>
+  <tr>
+    <td>2nd</td>
+    <td><code>.env.local</code></td>
+    <td><strong>N/A</strong></td>
+    <td><code>.env.local</code></td>
+    <td>Yes</td>
+    <td>Local overrides</td>
+  </tr>
+  <tr>
+    <td>3rd</td>
+    <td><code>.env.development</code></td>
+    <td><code>.env.test</code></td>
+    <td><code>.env.production</code></td>
+    <td>No</td>
+    <td>Shared environment-specific variables</td>
+  </tr>
+  <tr>
+    <td>last</td>
+    <td><code>.env</code></td>
+    <td><code>.env</code></td>
+    <td><code>.env</code></td>
+    <td><a href="#should-i-commit-my-env-file">Maybe</a></td>
+    <td>Shared for all environments</td>
+  </tr>
+</table>
 
-* **development**: `.env`, `.env.development`, `.env.local`, `.env.development.local`
-* **test**: `.env`, `.env.test`, `.env.test.local` - Note that it will **not** load `.env.local`.
-* **development**: `.env`, `.env.production`, `.env.local`, `.env.production.local`
 
 These files are loaded during the `before_configuration` callback, which is fired when the `Application` constant is defined in `config/application.rb` with `class Application < Rails::Application`. If you need it to be initialized sooner, or need to customize the loading process, you can do so at the top of `application.rb`
 

data/lib/dotenv/rails.rb

@@ -1,3 +1,9 @@
+# Since rubygems doesn't support optional dependencies, we have to manually check
+unless Gem::Requirement.new(">= 6.1").satisfied_by?(Gem::Version.new(Rails.version))
+  warn "dotenv 3.0 only supports Rails 6.1 or later. Use dotenv ~> 2.0."
+  return
+end
+
 require "dotenv"
 require "dotenv/replay_logger"
 require "dotenv/log_subscriber"
@@ -18,7 +24,7 @@ end
 module Dotenv
   # Rails integration for using Dotenv to load ENV variables from a file
   class Rails < ::Rails::Railtie
-    delegate :files, :files=, :overwrite, :overwrite=, :autorestore, :autorestore=, :logger, :logger=, to: "config.dotenv"
+    delegate :files=, :overwrite, :overwrite=, :autorestore, :autorestore=, :logger, :logger=, to: "config.dotenv"
 
     def initialize
       super()
@@ -27,15 +33,20 @@ module Dotenv
         logger: Dotenv::ReplayLogger.new,
         overwrite: false,
         files: [
-          root.join(".env.#{env}.local"),
-          (root.join(".env.local") unless env.test?),
-          root.join(".env.#{env}"),
-          root.join(".env")
+          ".env.#{env}.local",
+          (".env.local" unless env.test?),
+          ".env.#{env}",
+          ".env"
         ].compact,
-        autorestore: env.test?
+        autorestore: env.test? && !defined?(ClimateControl) && !defined?(IceAge)
       )
     end
 
+    # The list of files to load, joined with Rails.root
+    def files
+      config.dotenv.files.map { |file| root.join(file) }
+    end
+
     # Public: Load dotenv
     #
     # This will get called during the `before_configuration` callback, but you

data/lib/dotenv/version.rb

@@ -1,3 +1,3 @@
 module Dotenv
-  VERSION = "3.0.0.beta".freeze
+  VERSION = "3.0.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta
+  version: 3.0.1
 platform: ruby
 authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-25 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake