Don't do substitutions if the variable is single quoted.

bkeepers · Jul 11, 2014 · d573bfe · d573bfe
1 parent 8f1bc8c
commit d573bfe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib/dotenv/parser.rb b/lib/dotenv/parser.rb
@@ -48,8 +48,10 @@ def call
             value = value.gsub(/\\([^$])/, '\1')
           end
 
-          @@substitutions.each do |proc|
-            value = proc.call(value, hash)
+          if $1 != "'"
+            @@substitutions.each do |proc|
+              value = proc.call(value, hash)
+            end
           end
 
           hash[key] = value

diff --git a/spec/dotenv/parser_spec.rb b/spec/dotenv/parser_spec.rb
@@ -47,8 +47,12 @@ def env(string)
     expect(env('BAR=$FOO')).to eql('BAR' => '')
   end
 
-  it 'expands variables in quoted strings' do
-    expect(env("FOO=test\nBAR='quote $FOO'")).to eql('FOO' => 'test', 'BAR' => 'quote test')
+  it 'expands variables in double quoted strings' do
+    expect(env("FOO=test\nBAR=\"quote $FOO\"")).to eql('FOO' => 'test', 'BAR' => 'quote test')
+  end
+
+  it 'does not expand variables in single quoted strings' do
+    expect(env("BAR='quote $FOO'")).to eql('BAR' => 'quote $FOO')
   end
 
   it 'does not expand escaped variables' do