dotenv 3.0.3 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2ff4f17537b901cd35363188bcf31b756e7eab87039d76a43ffcf4196c474e2
-  data.tar.gz: a7703a4ccf3f72491896e8ded3289b457e610323ce0b8276bdd96eb2af15be18
+  metadata.gz: d3fca48323763736621b7583f5966beedfbb8554f9b63d8f4f7373cc7b7dd0d6
+  data.tar.gz: 5941e3b3db44e1e0ab920032ab3a42f372fbd92d3ab71513927993b9e5a931fd
 SHA512:
-  metadata.gz: 1fdb56b5a23015afb5e86de500a0a14e57fb07332317d552052f200aa4a86e57e6f452b24f6195dc910258d78d467f98748cefbfb225cc3a8c1ddbbf0c145795
-  data.tar.gz: c7cce79b3636e16388a4e1573865933c0f12a111316404d475d87cd1c06dc4f27565a6e1ffa34b34483aa577f57c42ea614cf75b33752fcc8985fe540a421488
+  metadata.gz: 7e8adbe4289687b34576e9f4907e8a87b68696cb2f6a9126e897716acd1bb0ccc483844bba3619b3a0097569e6da92922d2a3d0062dc228088839e52977ecb3a
+  data.tar.gz: 1398646f0512ea95134323e44058c3997c7b5943408ff81d4d218c8b0f399e1414284e0d9edcc47b785eb470533daba065cf210aa5f150f2359996d5b15618c1

data/README.md

@@ -54,7 +54,7 @@ require 'dotenv'
 Dotenv.load('file1.env', 'file2.env')
 ```
 
-## Autorestore in tests
+### Autorestore in tests
 
 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`.
 
@@ -181,6 +181,8 @@ Available options:
 
 * `Dotenv::Rails.files` - list of files to be loaded, in order of precedence.
 * `Dotenv::Rails.overwrite` - Overwrite exiting `ENV` variables with contents of `.env*` files
+* `Dotenv::Rails.logger` - The logger to use for dotenv's logging. Defaults to `Rails.logger`
+* `Dotenv::Rails.autorestore` - Enable or disable [autorestore](#autorestore-in-tests)
 
 ### Multi-line values
 

data/lib/dotenv/rails.rb

@@ -23,7 +23,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, :files=, :overwrite, :overwrite=, :autorestore, :autorestore=, :logger, to: "config.dotenv"
 
     def initialize
       super()
@@ -61,6 +61,12 @@ module Dotenv
       ::Rails.root || Pathname.new(ENV["RAILS_ROOT"] || Dir.pwd)
     end
 
+    # Set a new logger and replay logs
+    def logger=(new_logger)
+      logger.replay new_logger if logger.is_a?(ReplayLogger)
+      config.dotenv.logger = new_logger
+    end
+
     # The current environment that the app is running in.
     #
     # When running `rake`, the Rails application is initialized in development, so we have to
@@ -88,11 +94,9 @@ module Dotenv
     end
 
     initializer "dotenv", after: :initialize_logger do |app|
-      # Set up a new logger once Rails has initialized the logger and replay logs
-      new_logger = ::Rails.logger
-      new_logger = new_logger.tagged("dotenv") if new_logger.respond_to?(:tagged)
-      logger.replay new_logger if logger.respond_to?(:replay)
-      self.logger = new_logger
+      if logger.is_a?(ReplayLogger)
+        self.logger = ActiveSupport::TaggedLogging.new(::Rails.logger).tagged("dotenv")
+      end
     end
 
     initializer "dotenv.deprecator" do |app|

data/lib/dotenv/template.rb

@@ -10,17 +10,35 @@ module Dotenv
       File.open(@env_file, "r") do |env_file|
         File.open("#{@env_file}.template", "w") do |env_template|
           env_file.each do |line|
-            env_template.puts template_line(line)
+            if is_comment?(line)
+              env_template.puts line
+            elsif (var = var_defined?(line))
+              if line.match(EXPORT_COMMAND)
+                env_template.puts "export #{var}=#{var}"
+              else
+                env_template.puts "#{var}=#{var}"
+              end
+            elsif line_blank?(line)
+              env_template.puts
+            end
           end
         end
       end
     end
 
-    def template_line(line)
-      var, value = line.split("=")
-      template = var.gsub(EXPORT_COMMAND, "")
-      is_a_comment = var.strip[0].eql?("#")
-      (value.nil? || is_a_comment) ? line : "#{var}=#{template}"
+    private
+
+    def is_comment?(line)
+      line.strip.start_with?("#")
+    end
+
+    def var_defined?(line)
+      match = Dotenv::Parser::LINE.match(line)
+      match && match[1]
+    end
+
+    def line_blank?(line)
+      line.strip.length.zero?
     end
   end
 end

data/lib/dotenv/version.rb

@@ -1,3 +1,3 @@
 module Dotenv
-  VERSION = "3.0.3".freeze
+  VERSION = "3.1.1".freeze
 end

data/lib/dotenv.rb

@@ -1,3 +1,4 @@
+require "dotenv/version"
 require "dotenv/parser"
 require "dotenv/environment"
 require "dotenv/missing_keys"
@@ -74,6 +75,9 @@ module Dotenv
   # @param env [Hash] Hash of keys and values to restore, defaults to the last saved state
   # @param safe [Boolean] Is it safe to modify `ENV`? Defaults to `true` in the main thread, otherwise raises an error.
   def restore(env = @diff&.a, safe: Thread.current == Thread.main)
+    # No previously saved or provided state to restore
+    return unless env
+
     diff = Dotenv::Diff.new(b: env)
     return unless diff.any?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.1
 platform: ruby
 authors:
 - Brandon Keepers
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-26 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,7 +84,7 @@ homepage: https://github.com/bkeepers/dotenv
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -99,8 +99,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: Loads environment variables from `.env`.
 test_files: []