dotenv 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5508950dd1e5103013a6bfe56b9397e41c40f11e
-  data.tar.gz: ee3ccf9b9429d44b7ad9482159dc300407a52847
+  metadata.gz: 747efaacc729db2f028d90a94d8752f955c469cf
+  data.tar.gz: d61101393e7343ebbb02ed446737ff5ee21bb748
 SHA512:
-  metadata.gz: 6550d4890592e8cb8afb5cda664cb07fb89477784ea112887716f81d8f4a5020e46e222648dbc7b4c034254eb230d4185b577a0897a34cfa5e0220bd70ce891e
-  data.tar.gz: 083105855f61a20b42f1f2423dfa8fd8dc30efcd6760a2789d5cd0b7c0d85beb759bb574016bf2833c71055191cba6ccb70bcc55e5f525513618b6f359b612ad
+  metadata.gz: 4fbbb669ca8e6db0e9b0214af93ada154503829efb43c71ada203a752e3ccfda446a848e9520947b6912dd186572fd795a711910e9769fa3a311ecc3e354b177
+  data.tar.gz: 02d85f84448a99277554a0bffaa07cc273956443c8f6f154f38e04e78a848ad1be3fdd16a72159f6560e5de392633ea4407140759093a3213ce274fd34b9e75d

data/README.md

@@ -55,10 +55,20 @@ $ gem install dotenv
 As early as possible in your application bootstrap process, load `.env`:
 
 ```ruby
+require 'dotenv/load'
+
+# or
 require 'dotenv'
 Dotenv.load
 ```
 
+By default, `load` will look for a file called `.env` in the current working directory. Pass in multiple files and they will be loaded in order. The first value set for a variable will win.
+
+```
+require 'dotenv'
+Dotenv.load('file1.env', 'file2.env')
+```
+
 Alternatively, you can use the `dotenv` executable to launch your application:
 
 ```shell
@@ -84,30 +94,51 @@ S3_BUCKET=YOURS3BUCKET
 SECRET_KEY=YOURSECRETKEYGOESHERE
 ```
 
+Whenever your application loads, these variables will be available in `ENV`:
+
+```ruby
+config.fog_directory  = ENV['S3_BUCKET']
+```
+
+You may also add `export` in front of each line so you can `source` the file in bash:
+
+```shell
+export S3_BUCKET=YOURS3BUCKET
+export SECRET_KEY=YOURSECRETKEYGOESHERE
+```
+
+### Multi-line values
+
 If you need multiline variables, for example private keys, you can double quote strings and use the `\n` character for newlines:
 
 ```shell
 PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----\nHkVN9…\n-----END DSA PRIVATE KEY-----\n"
 ```
 
+### Command Substitution
+
 You need to add the output of a command in one of your variables? Simply add it with `$(your_command)`:
+
 ```shell
 DATABASE_URL="postgres://$(whoami)@localhost/my_database"
 ```
 
-You may also add `export` in front of each line so you can `source` the file in bash:
+### Variable Substitution
+
+You need to add the value of another variable in one of your variables? You can reference the variable with `${VAR}` or often just `$VAR` in unqoted or double-quoted values.
 
 ```shell
-export S3_BUCKET=YOURS3BUCKET
-export SECRET_KEY=YOURSECRETKEYGOESHERE
+DATABASE_URL="postgres://${USER}@localhost/my_database"
 ```
 
-Whenever your application loads, these variables will be available in `ENV`:
+If a value contains a `$` and it is not intended to be a variable, wrap it in single quotes.
 
-```ruby
-config.fog_directory  = ENV['S3_BUCKET']
+```shell
+PASSWORD='pas$word'
 ```
 
+### Comments
+
 Comments may be added to your file as such:
 
 ```shell
@@ -116,8 +147,6 @@ SECRET_KEY=YOURSECRETKEYGOESHERE # comment
 SECRET_HASH="something-with-a-#-hash"
 ```
 
-Variable names may not contain the `#` symbol. Values can use the `#` if they are enclosed in quotes.
-
 ## Multiple Rails Environments
 
 dotenv was originally created to load configuration variables into `ENV` in *development*. There are typically better ways to manage configuration in production environments - such as `/etc/environment` managed by [Puppet](https://github.com/puppetlabs/puppet) or [Chef](https://github.com/chef/chef), `heroku config`, etc.

data/lib/dotenv/load.rb

@@ -0,0 +1,2 @@
+require "dotenv"
+Dotenv.load

data/lib/dotenv/parser.rb

@@ -9,10 +9,11 @@ module Dotenv
   # exporting of variables.
   class Parser
     @substitutions =
-      Substitutions.constants.map { |const| Substitutions.const_get(const) }
+      [Dotenv::Substitutions::Variable, Dotenv::Substitutions::Command]
 
     LINE = /
       \A
+      \s*
       (?:export\s+)?    # optional export
       ([\w\.]+)         # key
       (?:\s*=\s*|:\s+?) # separator

data/lib/dotenv/version.rb

@@ -1,3 +1,3 @@
 module Dotenv
-  VERSION = "2.1.1".freeze
+  VERSION = "2.1.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.37.2
+        version: 0.40.0
 description: Loads environment variables from `.env`.
 email:
 - brandon@opensoul.org
@@ -66,6 +66,7 @@ files:
 - lib/dotenv.rb
 - lib/dotenv/cli.rb
 - lib/dotenv/environment.rb
+- lib/dotenv/load.rb
 - lib/dotenv/parser.rb
 - lib/dotenv/substitutions/command.rb
 - lib/dotenv/substitutions/variable.rb
@@ -91,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Loads environment variables from `.env`.