dotenv 0.8.0 → 0.9.0

data/Changelog.md

@@ -1,12 +1,30 @@
 # Changelog
 
+## 0.9.0 - Aug 29, 2013
+
+* Add support for variable expansion.
+
+        HOST="example.com"
+        URL="http://${USER}@${HOST}"
+        ESCAPED_VARIABLE="this is \$NOT replaced"
+
+* Allow setting variables without a value.
+
+        BLANK=
+
+* Add `dotenv` executable to load `.env` for other scripts.
+
+        $ dotenv ./script.py
+
+[Full Changelog](https://github.com/bkeepers/dotenv/compare/v0.8.0...v0.9.0)
+
 ## 0.8.0 - June 12, 2013
 
 * Added a capistrano recipe to symlink in `.env` on deploy.
 
 * Allow inline comments
 
-    VARIABLE=value # this is a comment
+        VARIABLE=value # this is a comment
 
 * Raises Dotenv::FormatError when parsing fails
 

data/bin/dotenv

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require "dotenv"
+
+begin
+  Dotenv.load!
+rescue Errno::ENOENT => e
+  warn e.message
+  exit 1
+else
+  exec *ARGV
+end

data/lib/dotenv/environment.rb

@@ -7,16 +7,25 @@ module Dotenv
       (?:export\s+)?    # optional export
       ([\w\.]+)         # key
       (?:\s*=\s*|:\s+?) # separator
-      (                 # value begin
+      (                 # optional value begin
         '(?:\'|[^'])*'  #   single quoted value
         |               #   or
         "(?:\"|[^"])*"  #   double quoted value
         |               #   or
         [^#\n]+         #   unquoted value
-      )                 # value end
+      )?                # value end
       (?:\s*\#.*)?      # optional comment
       \z
     /x
+    VARIABLE = /
+      (\\)?
+      (\$)
+      (              # collect braces with var for sub
+        \{?          # allow brace wrapping
+        ([A-Z0-9_]+) # match the variable
+        \}?          # closing brace
+      )
+    /xi
 
     def initialize(filename)
       @filename = filename
@@ -27,8 +36,28 @@ module Dotenv
       read.each do |line|
         if match = line.match(LINE)
           key, value = match.captures
+
+          value ||= ''
+          # Remove surrounding quotes
           value = value.strip.sub(/\A(['"])(.*)\1\z/, '\2')
-          value = value.gsub('\n', "\n").gsub(/\\(.)/, '\1') if $1 == '"'
+
+          if $1 == '"'
+            value = value.gsub('\n', "\n")
+            # Unescape all characters except $ so variables can be escaped properly
+            value = value.gsub(/\\([^$])/, '\1')
+          end
+
+          # Process embedded variables
+          value.scan(VARIABLE).each do |parts|
+            if parts.first == '\\'
+              replace = parts[1...-1].join('')
+            else
+              replace = self.fetch(parts.last) { ENV[parts.last] }
+            end
+
+            value = value.sub(parts[0...-1].join(''), replace || '')
+          end
+
           self[key] = value
         elsif line !~ /\A\s*(?:#.*)?\z/ # not comment or blank line
           raise FormatError, "Line #{line.inspect} doesn't match format"

data/lib/dotenv/version.rb

@@ -1,3 +1,3 @@
 module Dotenv
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/spec/dotenv/environment_spec.rb

@@ -50,6 +50,36 @@ describe Dotenv::Environment do
     expect(env('FOO="escaped\"bar"')).to eql('FOO' => 'escaped"bar')
   end
 
+  it 'parses empty values' do
+    expect(env('FOO=')).to eql('FOO' => '')
+  end
+
+  it 'expands variables found in values' do
+    expect(env("FOO=test\nBAR=$FOO")).to eql('FOO' => 'test', 'BAR' => 'test')
+  end
+
+  it 'parses variables wrapped in brackets' do
+    expect(env("FOO=test\nBAR=${FOO}bar")).to eql('FOO' => 'test', 'BAR' => 'testbar')
+  end
+
+  it 'reads variables from ENV when expanding if not found in local env' do
+    ENV['FOO'] = 'test'
+    expect(env('BAR=$FOO')).to eql('BAR' => 'test')
+  end
+
+  it 'expands undefined variables to an empty string' do
+    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')
+  end
+
+  it 'does not expand escaped variables' do
+    expect(env('FOO="foo\$BAR"')).to eql('FOO' => 'foo$BAR')
+    expect(env('FOO="foo\${BAR}"')).to eql('FOO' => 'foo${BAR}')
+  end
+
   it 'parses yaml style options' do
     expect(env('OPTION_A: 1')).to eql('OPTION_A' => '1')
   end

data/spec/dotenv_spec.rb

@@ -7,7 +7,7 @@ describe Dotenv do
 
       it 'defaults to .env' do
         Dotenv::Environment.should_receive(:new).with(expand('.env')).
-          and_return(mock(:apply => {}))
+          and_return(double(:apply => {}))
         subject
       end
     end
@@ -19,7 +19,7 @@ describe Dotenv do
         expected = expand("~/.env")
         File.stub(:exists?){ |arg| arg == expected }
         Dotenv::Environment.should_receive(:new).with(expected).
-          and_return(mock(:apply => {}))
+          and_return(double(:apply => {}))
         subject
       end
     end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
+  prerelease: 
 platform: ruby
 authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,7 +46,8 @@ dependencies:
 description: Loads environment variables from `.env`.
 email:
 - brandon@opensoul.org
-executables: []
+executables:
+- dotenv
 extensions: []
 extra_rdoc_files: []
 files:
@@ -54,6 +60,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/dotenv
 - dotenv-rails.gemspec
 - dotenv.gemspec
 - lib/dotenv-rails.rb
@@ -74,26 +81,27 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/bkeepers/dotenv
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Loads environment variables from `.env`.
 test_files:
 - spec/dotenv/environment_spec.rb
@@ -103,4 +111,3 @@ test_files:
 - spec/fixtures/quoted.env
 - spec/fixtures/yaml.env
 - spec/spec_helper.rb
-has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGMzMjQ2MDFjM2IyMDFiOGVmYzU3ZmJjNWZhYmRlNTFlYWU1MTVjYg==
-  data.tar.gz: !binary |-
-    MzIwNjhlMGQ3NGFlNWQxMTQzMDM1MDRiNjAwMTQ4Y2UzOTFhMDBjNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZDQ1MzM1YTlhMGVmYjgyYTc3ZDY1ZDExMjY3NTRkNzhjMmNhMmY0OWViNTVj
-    YmRkMWZlNTJlMDMyOGEwMDdkNjg2OTJjZTA2MmFlMzRjMzY5ZmQ5M2QwMjdj
-    MGQ5NDdlMDNmY2M4ZWZhMGNjNGYxZDc3YmUzYTMwOWRmZWMzYzE=
-  data.tar.gz: !binary |-
-    ZDVjZGMyMWJmYmNkZmYyZDE0YWZiNTc2YzllMzc4OTcyZDk5MjM2ZDE4YWJh
-    YjhiZTZlZDJlYzAwMGEzYzMzMDhkZmMzZDMzMDkwNzNkN2E3OGEyMjMxZDE0
-    MzUzZjRjMDlmZGY0MTlhMWY5MDJmOTE3ZDVmNGI4NDJiZjI0NzA=