dotenv 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc708aad5fcaf487b064451b8f47d5b0e402a7c250385f234306ab3c77fcf20
-  data.tar.gz: e939eca5e64f2aef9aeb784bd9765e20a3201057d4ed69c1ea46b1405625920e
+  metadata.gz: 93520ca26942608e2d61ddae13f7b6d1cdd16e83e36d6cd9c770282149b2f441
+  data.tar.gz: bd58a9b3c59d7b6bad8327c1af4a69532ce5a4febb5a408f8a3a3874d3de6925
 SHA512:
-  metadata.gz: 3c7a9b929e7b419a1df9c07bd2dfa7959deea186bc6de9e0e8bdfdc671b7d4c183104715206ac956e81d4689b76d14907dd0a644eb995f4cd48437047e307ad1
-  data.tar.gz: de3d64ad2bf4fbec40e7c253c71de40cf1cab82875293f168c73a5098e7419554362014e6eb0c6339d485c41c12cccad82e0f854fee30f7fef18e7cc4afc26ef
+  metadata.gz: 178f4451234c97f3ad1d1601b62164d9f59fb52a35ad1393d3a924f541c2bc90e8732af795de3ea60acf0ade02ed81472127cebd0eac12d16648315806c58b95
+  data.tar.gz: 6ac43f44496d94b52ca8f2d852fa4c7bb095996604ead12a81db9118fac756a9fc89a61191f46cafcd846e8617421f7bfac62304c058def1c9d8915b1af47943

data/lib/dotenv/diff.rb

@@ -50,7 +50,10 @@ module Dotenv
     private
 
     def snapshot
-      ENV.to_h.freeze
+      # `dup` should not be required here, but some people use `stub_const` to replace ENV with
+      # a `Hash`. This ensures that we get a frozen copy of that instead of freezing the original.
+      # https://github.com/bkeepers/dotenv/issues/482
+      ENV.to_h.dup.freeze
     end
   end
 end

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.1.0".freeze
+  VERSION = "3.1.2".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.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Loads environment variables from `.env`.