dotenv 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd2cbf743caa9a52aa0be269a6d85623a429e63f
-  data.tar.gz: 8dbb6133dbb68670820f783469d680052b7ad6b9
+  metadata.gz: 085d6d9b5a7558d0579157fa916768f6155185da
+  data.tar.gz: 6c7dcb253bdb822bb487bfd2fc549dbc1c0f1eb2
 SHA512:
-  metadata.gz: e214586a73a311cf7544a1e2141f2653fba3bcead5a43b5dadd865732a16d9aaed54c0f063f5bade068971191c915fe8917d8da7bcf16eaaf8c8b843642e404c
-  data.tar.gz: 4b689ee34f098e79858a84ec03944d1a365905e9d896ccabbe41bb4181b6272466d97dded85ff58b4ddbdc86412090170ac853a6529ead2088a03ae4fa1e9ab0
+  metadata.gz: 1b32c2962340f412985bd1eb0641b32bbd587e701439a767957c7c004583e744c2120a7fb222e1b432093b19b91348543ad8a93a52b8ee954f98576272b1d7d5
+  data.tar.gz: 376591ef2ad8da7dd026aa57df5f257c831d3e737431ff1ed280429f12f96eb96045ea30bafed20d24104e279fd2fc0785995c88712171f276a6da5a35d1e970

data/Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.11.0 - Apr 21, 2014
+
+* Extract dotenv-deployment gem. https://github.com/bkeepers/dotenv-deployment
+
 ## 0.10.0 - Feb 22, 2014
 
 * Add support for executing interpolated commands. (Ruby >= 1.9 only)

data/Gemfile

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 gemspec :name => 'dotenv'
 
+gem 'dotenv-deployment', :github => 'bkeepers/dotenv-deployment'
+
 group :guard do
   gem 'guard-rspec'
   gem 'guard-bundler'
@@ -9,4 +11,4 @@ end
 
 platforms :rbx do
   gem 'rubysl', '~> 2.0'         # if using anything in the ruby standard library
-end
+end

data/Guardfile

@@ -2,7 +2,7 @@ guard 'bundler' do
   watch('Gemfile')
 end
 
-guard 'rspec', :cli => '--color' do
+guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^spec/spec_helper.rb$})    { "spec" }
   watch(%r{^lib/(.+)\.rb$})           { |m| "spec/#{m[1]}_spec.rb" }

data/README.md

@@ -1,10 +1,13 @@
 # dotenv [![Build Status](https://secure.travis-ci.org/bkeepers/dotenv.png?branch=master)](https://travis-ci.org/bkeepers/dotenv)
 
-Dotenv loads environment variables from `.env` into `ENV`.
+Shim to load environment variables from `.env` into `ENV` in *development*.
 
 Storing [configuration in the environment](http://www.12factor.net/config) is one of the tenets of a [twelve-factor app](http://www.12factor.net/). Anything that is likely to change between deployment environments–such as resource handles for databases or credentials for external services–should be extracted from the code into environment variables.
 
-But it is not always practical to set environment variables on development machines or continuous integration servers where multiple projects are run. Dotenv load variables from a `.env` file into `ENV` when the environment is bootstrapped.
+But it is not always practical to set environment variables on development machines or continuous integration servers where multiple projects are run. dotenv loads variables from a `.env` file into `ENV` when the environment is bootstrapped.
+
+dotenv is intended to be used in development. If you would like to use it in production or other environments, see [dotenv-deployment](https://github.com/bkeepers/dotenv-deployment)
+
 
 ## Installation
 
@@ -64,13 +67,6 @@ S3_BUCKET=YOURS3BUCKET
 SECRET_KEY=YOURSECRETKEYGOESHERE
 ```
 
-You can also create files per environment, such as `.env.test`.
-
-```shell
-S3_BUCKET=tests3bucket
-SECRET_KEY=testsecretkey
-```
-
 An alternate yaml-like syntax is supported:
 
 ```yaml
@@ -84,29 +80,6 @@ Whenever your application loads, these variables will be available in `ENV`:
 config.fog_directory  = ENV['S3_BUCKET']
 ```
 
-## Capistrano integration
-
-If you want to use Dotenv with Capistrano in your production environment, make sure the dotenv gem is included in your Gemfile `:production` group.
-
-### Capistrano version 2.x.x
-
-Add the gem to your `config/deploy.rb` file:
-
-```ruby
-require "dotenv/capistrano"
-```
-
-It will symlink the `.env` located in `/path/to/shared` in the new release. 
-
-
-### Capistrano version 3.x.x
-
-Just add `.env` to the list of linked files, for example:
-
-```ruby
-set :linked_files, %w{config/database.yml .env}
-```
-
 ## Should I commit my .env file?
 
 It is recommended that you store development-only settings in your `.env` file, and commit it to your repository. Make sure that all your credentials for your development environment are different from your other deployments. This makes it easy for other developers to get started on your project, without compromising your credentials for other environments.

data/dotenv.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |gem|
   gem.name          = "dotenv"
   gem.require_paths = ["lib"]
 
+  gem.add_dependency "dotenv-deployment", "0.0.1"
+
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
 end

data/lib/dotenv-rails.rb

@@ -1 +1,11 @@
 require 'dotenv/railtie'
+
+env_file = ".env.#{Rails.env}"
+if File.exists?(env_file) && !defined?(Dotenv::Deployment)
+  warn "Auto-loading of `#{env_file}` will be removed in 1.0. See " +
+    "https://github.com/bkeepers/dotenv-deployment if you would like to " +
+    "continue using this feature."
+  Dotenv.load ".env.#{Rails.env}"
+end
+
+Dotenv.load '.env'

data/lib/dotenv.rb

@@ -1,33 +1,29 @@
+require 'dotenv/parser'
 require 'dotenv/environment'
 
 module Dotenv
   def self.load(*filenames)
-    default_if_empty(filenames).inject({}) do |hash, filename|
-      filename = File.expand_path filename
-      hash.merge(File.exists?(filename) ? Environment.new(filename).apply : {})
-    end
-  end
-
-  # same as `load`, but will override existing values in `ENV`
-  def self.overload(*filenames)
-    default_if_empty(filenames).inject({}) do |hash, filename|
-      filename = File.expand_path filename
-      hash.merge(File.exists?(filename) ? Environment.new(filename).apply! : {})
-    end
+    with(*filenames) { |f| Environment.new(f).apply if File.exists?(f) }
   end
 
   # same as `load`, but raises Errno::ENOENT if any files don't exist
   def self.load!(*filenames)
-    load(
-      *default_if_empty(filenames).each do |filename|
-        filename = File.expand_path filename
-        raise(Errno::ENOENT.new(filename)) unless File.exists?(filename)
-      end
-    )
+    with(*filenames) { |f| Environment.new(f).apply }
+  end
+
+  # same as `load`, but will override existing values in `ENV`
+  def self.overload(*filenames)
+    with(*filenames) { |f| Environment.new(f).apply! if File.exists?(f) }
   end
 
 protected
-  def self.default_if_empty(filenames)
-    filenames.empty? ? (filenames << '.env') : filenames
+
+  def self.with(*filenames, &block)
+    filenames << '.env' if filenames.empty?
+
+    filenames.inject({}) do |hash, filename|
+      filename = File.expand_path filename
+      hash.merge(block.call(filename) || {})
+    end
   end
 end

data/lib/dotenv/capistrano.rb

@@ -1,11 +1,6 @@
-require 'capistrano/version'
+warn "Capistrano support has been moved to the dotenv-deployment gem. Add it " +
+  "to your Gemfile and change the require to 'dotenv/deployment/capistrano'. " +
+  "See https://github.com/bkeepers/dotenv-deployment#capistrano."
 
-if defined?(Capistrano::VERSION) && Capistrano::VERSION >= '3.0'
-  raise 'Please read https://github.com/bkeepers/dotenv#capistrano-integration to update your dotenv configuration for new Capistrano version'
-else
-  require 'dotenv/capistrano/recipes'
-
-  Capistrano::Configuration.instance(:must_exist).load do
-    before "deploy:finalize_update", "dotenv:symlink"
-  end
-end
+# This will be removed in 1.0
+require 'dotenv/deployment/capistrano'

data/lib/dotenv/environment.rb

@@ -1,28 +1,5 @@
-require 'dotenv/format_error'
-require 'dotenv/substitutions/variable'
-if RUBY_VERSION > '1.8.7'
-  require 'dotenv/substitutions/command'
-end
-
 module Dotenv
   class Environment < Hash
-    @@substitutions = Substitutions.constants.map { |const| Substitutions.const_get(const) }
-
-    LINE = /
-      \A
-      (?:export\s+)?    # optional export
-      ([\w\.]+)         # key
-      (?:\s*=\s*|:\s+?) # separator
-      (                 # optional value begin
-        '(?:\'|[^'])*'  #   single quoted value
-        |               #   or
-        "(?:\"|[^"])*"  #   double quoted value
-        |               #   or
-        [^#\n]+         #   unquoted value
-      )?                # value end
-      (?:\s*\#.*)?      # optional comment
-      \z
-    /x
 
     def initialize(filename)
       @filename = filename
@@ -30,33 +7,11 @@ module Dotenv
     end
 
     def load
-      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')
-
-          if $1 == '"'
-            value = value.gsub('\n', "\n")
-            # Unescape all characters except $ so variables can be escaped properly
-            value = value.gsub(/\\([^$])/, '\1')
-          end
-
-          @@substitutions.each do |proc|
-            value = proc.call(value, self)
-          end
-
-          self[key] = value
-        elsif line !~ /\A\s*(?:#.*)?\z/ # not comment or blank line
-          raise FormatError, "Line #{line.inspect} doesn't match format"
-        end
-      end
+      update Parser.call(read)
     end
 
     def read
-      File.read(@filename).split("\n")
+      File.read(@filename)
     end
 
     def apply

data/lib/dotenv/parser.rb

@@ -0,0 +1,63 @@
+require 'dotenv/substitutions/variable'
+if RUBY_VERSION > '1.8.7'
+  require 'dotenv/substitutions/command'
+end
+
+module Dotenv
+  class FormatError < SyntaxError; end
+
+  class Parser
+    @@substitutions = Substitutions.constants.map { |const| Substitutions.const_get(const) }
+
+    LINE = /
+      \A
+      (?:export\s+)?    # optional export
+      ([\w\.]+)         # key
+      (?:\s*=\s*|:\s+?) # separator
+      (                 # optional value begin
+        '(?:\'|[^'])*'  #   single quoted value
+        |               #   or
+        "(?:\"|[^"])*"  #   double quoted value
+        |               #   or
+        [^#\n]+         #   unquoted value
+      )?                # value end
+      (?:\s*\#.*)?      # optional comment
+      \z
+    /x
+
+    def self.call(string)
+      new(string).call
+    end
+
+    def initialize(string)
+      @string = string
+    end
+
+    def call
+      @string.split("\n").inject({}) do |hash, line|
+        if match = line.match(LINE)
+          key, value = match.captures
+
+          value ||= ''
+          # Remove surrounding quotes
+          value = value.strip.sub(/\A(['"])(.*)\1\z/, '\2')
+
+          if $1 == '"'
+            value = value.gsub('\n', "\n")
+            # Unescape all characters except $ so variables can be escaped properly
+            value = value.gsub(/\\([^$])/, '\1')
+          end
+
+          @@substitutions.each do |proc|
+            value = proc.call(value, hash)
+          end
+
+          hash[key] = value
+        elsif line !~ /\A\s*(?:#.*)?\z/ # not comment or blank line
+          raise FormatError, "Line #{line.inspect} doesn't match format"
+        end
+        hash
+      end
+    end
+  end
+end

data/lib/dotenv/railtie.rb

@@ -3,12 +3,10 @@ require 'dotenv'
 module Dotenv
   class Railtie < Rails::Railtie
     rake_tasks do
-      desc 'Load environment settings from .env'
       task :dotenv do
-        Dotenv.load ".env.#{Rails.env}", '.env'
+        # If the dotenv task is defined, then dotenv has already been loaded.
+        warn "The `dotenv` task is no longer needed and will be removed in 1.0."
       end
     end
   end
 end
-
-Dotenv.load ".env.#{Rails.env}", '.env'

data/lib/dotenv/version.rb

@@ -1,3 +1,3 @@
 module Dotenv
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/spec/dotenv/environment_spec.rb

@@ -42,127 +42,6 @@ describe Dotenv::Environment do
     end
   end
 
-  it 'parses unquoted values' do
-    expect(env('FOO=bar')).to eql('FOO' => 'bar')
-  end
-
-  it 'parses values with spaces around equal sign' do
-    expect(env("FOO =bar")).to eql('FOO' => 'bar')
-    expect(env("FOO= bar")).to eql('FOO' => 'bar')
-  end
-
-  it 'parses double quoted values' do
-    expect(env('FOO="bar"')).to eql('FOO' => 'bar')
-  end
-
-  it 'parses single quoted values' do
-    expect(env("FOO='bar'")).to eql('FOO' => 'bar')
-  end
-
-  it 'parses escaped double quotes' 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
-
-  it 'parses export keyword' do
-    expect(env('export OPTION_A=2')).to eql('OPTION_A' => '2')
-  end
-
-  it 'expands newlines in quoted strings' do
-    expect(env('FOO="bar\nbaz"')).to eql('FOO' => "bar\nbaz")
-  end
-
-  it 'parses variables with "." in the name' do
-    expect(env('FOO.BAR=foobar')).to eql('FOO.BAR' => 'foobar')
-  end
-
-  it 'strips unquoted values' do
-    expect(env('foo=bar ')).to eql('foo' => 'bar') # not 'bar '
-  end
-
-  it 'throws an error if line format is incorrect' do
-    expect{env('lol$wut')}.to raise_error(Dotenv::FormatError)
-  end
-
-  it 'ignores empty lines' do
-    expect(env("\n \t  \nfoo=bar\n \nfizz=buzz")).to eql('foo' => 'bar', 'fizz' => 'buzz')
-  end
-
-  it 'ignores inline comments' do
-    expect(env("foo=bar # this is foo")).to eql('foo' => 'bar')
-  end
-
-  it 'allows # in quoted value' do
-    expect(env('foo="bar#baz" # comment')).to eql('foo' => 'bar#baz')
-  end
-
-  it 'ignores comment lines' do
-    expect(env("\n\n\n # HERE GOES FOO \nfoo=bar")).to eql('foo' => 'bar')
-  end
-
-  it 'parses # in quoted values' do
-    expect(env('foo="ba#r"')).to eql('foo' => 'ba#r')
-    expect(env("foo='ba#r'")).to eql('foo' => 'ba#r')
-  end
-
-  if RUBY_VERSION > '1.8.7'
-    it 'parses shell commands interpolated in $()' do
-      expect(env('ruby_v=$(ruby -v)')).to eql('ruby_v' => RUBY_DESCRIPTION)
-    end
-
-    it 'allows balanced parentheses within interpolated shell commands' do
-      expect(env('ruby_v=$(echo "$(echo "$(echo "$(ruby -v)")")")')).to eql('ruby_v' => RUBY_DESCRIPTION)
-    end
-
-    it "doesn't interpolate shell commands when escape says not to" do
-      expect(env('ruby_v=escaped-\$(ruby -v)')).to eql('ruby_v' => 'escaped-$(ruby -v)')
-    end
-
-    it 'is not thrown off by quotes in interpolated shell commands' do
-      expect(env('interp=$(echo "Quotes won\'t be a problem")')['interp']).to eql("Quotes won't be a problem")
-    end
-
-    # This functionality is not supported on JRuby or Rubinius
-    if (!defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby') && !defined?(Rubinius)
-      it 'substitutes shell variables within interpolated shell commands' do
-        expect(env(%(VAR1=var1\ninterp=$(echo "VAR1 is $VAR1")))['interp']).to eql("VAR1 is var1")
-      end
-    end
-  end
-
   require 'tempfile'
   def env(text)
     file = Tempfile.new('dotenv')

data/spec/dotenv/parser_spec.rb

@@ -0,0 +1,129 @@
+require 'spec_helper'
+
+describe Dotenv::Parser do
+  def env(string)
+    Dotenv::Parser.call(string)
+  end
+
+  it 'parses unquoted values' do
+    expect(env('FOO=bar')).to eql('FOO' => 'bar')
+  end
+
+  it 'parses values with spaces around equal sign' do
+    expect(env("FOO =bar")).to eql('FOO' => 'bar')
+    expect(env("FOO= bar")).to eql('FOO' => 'bar')
+  end
+
+  it 'parses double quoted values' do
+    expect(env('FOO="bar"')).to eql('FOO' => 'bar')
+  end
+
+  it 'parses single quoted values' do
+    expect(env("FOO='bar'")).to eql('FOO' => 'bar')
+  end
+
+  it 'parses escaped double quotes' 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
+
+  it 'parses export keyword' do
+    expect(env('export OPTION_A=2')).to eql('OPTION_A' => '2')
+  end
+
+  it 'expands newlines in quoted strings' do
+    expect(env('FOO="bar\nbaz"')).to eql('FOO' => "bar\nbaz")
+  end
+
+  it 'parses variables with "." in the name' do
+    expect(env('FOO.BAR=foobar')).to eql('FOO.BAR' => 'foobar')
+  end
+
+  it 'strips unquoted values' do
+    expect(env('foo=bar ')).to eql('foo' => 'bar') # not 'bar '
+  end
+
+  it 'throws an error if line format is incorrect' do
+    expect{env('lol$wut')}.to raise_error(Dotenv::FormatError)
+  end
+
+  it 'ignores empty lines' do
+    expect(env("\n \t  \nfoo=bar\n \nfizz=buzz")).to eql('foo' => 'bar', 'fizz' => 'buzz')
+  end
+
+  it 'ignores inline comments' do
+    expect(env("foo=bar # this is foo")).to eql('foo' => 'bar')
+  end
+
+  it 'allows # in quoted value' do
+    expect(env('foo="bar#baz" # comment')).to eql('foo' => 'bar#baz')
+  end
+
+  it 'ignores comment lines' do
+    expect(env("\n\n\n # HERE GOES FOO \nfoo=bar")).to eql('foo' => 'bar')
+  end
+
+  it 'parses # in quoted values' do
+    expect(env('foo="ba#r"')).to eql('foo' => 'ba#r')
+    expect(env("foo='ba#r'")).to eql('foo' => 'ba#r')
+  end
+
+  if RUBY_VERSION > '1.8.7'
+    it 'parses shell commands interpolated in $()' do
+      expect(env('ruby_v=$(ruby -v)')).to eql('ruby_v' => RUBY_DESCRIPTION)
+    end
+
+    it 'allows balanced parentheses within interpolated shell commands' do
+      expect(env('ruby_v=$(echo "$(echo "$(echo "$(ruby -v)")")")')).to eql('ruby_v' => RUBY_DESCRIPTION)
+    end
+
+    it "doesn't interpolate shell commands when escape says not to" do
+      expect(env('ruby_v=escaped-\$(ruby -v)')).to eql('ruby_v' => 'escaped-$(ruby -v)')
+    end
+
+    it 'is not thrown off by quotes in interpolated shell commands' do
+      expect(env('interp=$(echo "Quotes won\'t be a problem")')['interp']).to eql("Quotes won't be a problem")
+    end
+
+    # This functionality is not supported on JRuby or Rubinius
+    if (!defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby') && !defined?(Rubinius)
+      it 'substitutes shell variables within interpolated shell commands' do
+        expect(env(%(VAR1=var1\ninterp=$(echo "VAR1 is $VAR1")))['interp']).to eql("VAR1 is var1")
+      end
+    end
+  end
+
+end

data/spec/dotenv_spec.rb

@@ -7,7 +7,7 @@ describe Dotenv do
 
       it 'defaults to .env' do
         expect(Dotenv::Environment).to receive(:new).with(expand('.env')).
-          and_return(double(:apply => {}))
+          and_return(double(:apply => {}, :apply! => {}))
         subject
       end
     end
@@ -19,7 +19,7 @@ describe Dotenv do
         expected = expand("~/.env")
         allow(File).to receive(:exists?){ |arg| arg == expected }
         expect(Dotenv::Environment).to receive(:new).with(expected).
-          and_return(double(:apply => {}))
+          and_return(double(:apply => {}, :apply! => {}))
         subject
       end
     end
@@ -72,22 +72,21 @@ describe Dotenv do
     context 'when one file exists and one does not' do
       let(:env_files) { ['.env', '.env_does_not_exist'] }
 
-      it 'raises an Errno::ENOENT error and does not load any files' do
-        expect do
-          expect do
-            subject
-          end.to raise_error(Errno::ENOENT)
-        end.to_not change { ENV.keys }
+      it 'raises an Errno::ENOENT error' do
+        expect { subject }.to raise_error(Errno::ENOENT)
       end
     end
   end
 
   describe 'overload' do
+    let(:env_files) { [fixture_path('plain.env')] }
+    subject { Dotenv.overload(*env_files) }
+    it_behaves_like 'load'
+
     it 'overrides any existing ENV variables' do
       ENV['OPTION_A'] = 'predefined'
-      path = fixture_path 'plain.env'
 
-      Dotenv.overload(path)
+      subject
 
       expect(ENV['OPTION_A']).to eq('1')
     end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dotenv-deployment
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -61,15 +75,15 @@ files:
 - lib/dotenv-rails.rb
 - lib/dotenv.rb
 - lib/dotenv/capistrano.rb
-- lib/dotenv/capistrano/recipes.rb
 - lib/dotenv/environment.rb
-- lib/dotenv/format_error.rb
+- lib/dotenv/parser.rb
 - lib/dotenv/railtie.rb
 - lib/dotenv/substitutions/command.rb
 - lib/dotenv/substitutions/variable.rb
 - lib/dotenv/tasks.rb
 - lib/dotenv/version.rb
 - spec/dotenv/environment_spec.rb
+- spec/dotenv/parser_spec.rb
 - spec/dotenv_spec.rb
 - spec/fixtures/exported.env
 - spec/fixtures/plain.env
@@ -102,9 +116,11 @@ specification_version: 4
 summary: Loads environment variables from `.env`.
 test_files:
 - spec/dotenv/environment_spec.rb
+- spec/dotenv/parser_spec.rb
 - spec/dotenv_spec.rb
 - spec/fixtures/exported.env
 - spec/fixtures/plain.env
 - spec/fixtures/quoted.env
 - spec/fixtures/yaml.env
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/dotenv/capistrano/recipes.rb

@@ -1,12 +0,0 @@
-Capistrano::Configuration.instance(:must_exist).load do
-  _cset(:dotenv_path){ "#{shared_path}/.env" }
-
-  symlink_args = (role = fetch(:dotenv_role, nil) ? {:roles => role} : {})
-
-  namespace :dotenv do
-    desc "Symlink shared .env to current release"
-    task :symlink, symlink_args do
-      run "ln -nfs #{dotenv_path} #{release_path}/.env"
-    end
-  end
-end

data/lib/dotenv/format_error.rb

@@ -1,4 +0,0 @@
-module Dotenv
-  class FormatError < SyntaxError
-  end
-end