dotenv 3.1.5 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0538a4a253670835a8677a2aedfd452bf30ddd8518eef0ca6a0ba448bf7ddebf'
-  data.tar.gz: 6070c643cedccf246d9e24304a42da54736a573f1c15da6343a061f1f525e1be
+  metadata.gz: a4ad122f937755147ff0cc52552f17b1e1cf8f9a290ff791ac5ba2f8ef8b43c7
+  data.tar.gz: 3116d767ea5dc67adca867395ea7effbc1b4ee30769223961f8d041d5c34482d
 SHA512:
-  metadata.gz: f5206862c11d4ee45343f1d1d9a66570f82df8fdf16fb403bd354d20de56de6958d49b1061688a18fbf2cbd5f06f5aabd7d3b073bfa7f3469523b8fff2495e33
-  data.tar.gz: d25a177df394c9050b9d0c10d06f929bf652ef24f2b7599841734ae92d7e1ebbe388400aec5adfb36eb14e33088a723af969792a966b8cffa48b11da63596bbd
+  metadata.gz: 86436a8b6d193590befeb48a29882b9bd5523f8b80fff961faf1feda91cc720b8b44c1e2705bfbebb73836b99684273d49f78b94c09d05a3077e62996473a47c
+  data.tar.gz: bb6f98a159c821e0f1cb98ab6c3f0b54a109acc3c934770fd6603f7497c047f031c7124f839963f0f5132a12bd2736e25ab2e4c648cfa56589a30b328d03de61

data/lib/dotenv/parser.rb

@@ -43,7 +43,7 @@ module Dotenv
 
     def initialize(string, overwrite: false)
       # Convert line breaks to same format
-      @string = string.gsub(/[\n\r]+/, "\n")
+      @string = string.gsub(/\r\n?/, "\n")
       @hash = {}
       @overwrite = overwrite
     end
@@ -52,11 +52,11 @@ module Dotenv
       @string.scan(LINE) do
         match = $LAST_MATCH_INFO
 
-        # Skip parsing values that will be ignored
-        next if ignore?(match[:key])
-
-        # Check for exported variable with no value
-        if match[:export] && !match[:value]
+        if existing?(match[:key])
+          # Use value from already defined variable
+          @hash[match[:key]] = ENV[match[:key]]
+        elsif match[:export] && !match[:value]
+          # Check for exported variable with no value
           if !@hash.member?(match[:key])
             raise FormatError, "Line #{match.to_s.inspect} has an unset variable"
           end
@@ -70,8 +70,8 @@ module Dotenv
 
     private
 
-    # Determine if the key can be ignored.
-    def ignore?(key)
+    # Determine if a variable is already defined and should not be overwritten.
+    def existing?(key)
       !@overwrite && key != "DOTENV_LINEBREAK_MODE" && ENV.key?(key)
     end
 

data/lib/dotenv/version.rb

@@ -1,3 +1,3 @@
 module Dotenv
-  VERSION = "3.1.5".freeze
+  VERSION = "3.1.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.7
 platform: ruby
 authors:
 - Brandon Keepers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -85,7 +85,7 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/bkeepers/dotenv/releases
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Loads environment variables from `.env`.
 test_files: []