dotenv 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39a2b727e06c9a55620194609c240d04c7e94649
-  data.tar.gz: f1e22eac1b800ed26cb8f3c02afbe3fb54c73bdc
+  metadata.gz: 97b35237fb293817afb2b3fb79b08b21a5425b65
+  data.tar.gz: f1ec39284e95bcf5a9b96e5cf3cd4aaa1e4d9e67
 SHA512:
-  metadata.gz: eb5f26934458e39686244acc86cdc47ad3549a8c47527cb5382a4177225e9995decd0d7930c459a4cc48bc63150e3667cc069578a4205b5d8ea150739599008a
-  data.tar.gz: 7076bf1cd763d703c291de86a01919826df5c73d5c6ddf79d248f29c392f994e25586f6276ea73fc89c52f2c4cccfd441579bd3613229fee20dc60d181711bce
+  metadata.gz: aab63b855e90cb05ceedcc3877f425e2af3cdb94327423f3ce8f253b5da5e392a64f5b00b9114480ed83b42ad72a3ffdc1ec2bfaa0f3d94fed1c5d0858c0d459
+  data.tar.gz: 4e097555c5daa7e2bcb800d771da52936298906ba5e3affa6b5835c50921690191d2610ceae5a1de329fa51ed64f494ea66ff5d80cc917fd34e5065019c73d4c

data/README.md

@@ -4,7 +4,7 @@
 
 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.
+Storing [configuration in the environment](http://12factor.net/config) is one of the tenets of a [twelve-factor app](http://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 loads variables from a `.env` file into `ENV` when the environment is bootstrapped.
 
@@ -90,6 +90,11 @@ If you need multiline variables, for example private keys, you can double quote
 PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----\nHkVN9…\n-----END DSA PRIVATE KEY-----\n"
 ```
 
+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:
 
 ```shell
@@ -115,7 +120,7 @@ Variable names may not contain the `#` symbol. Values can use the `#` if they ar
 
 ## 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/opscode/chef), `heroku config`, etc.
+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.
 
 However, some find dotenv to be a convenient way to configure Rails applications in staging and production environments, and you can do that by defining environment-specific files like `.env.production` or `.env.test`.
 

data/lib/dotenv/environment.rb

@@ -1,5 +1,5 @@
 module Dotenv
-  # This class inherits from Hash and represents the environemnt into which
+  # This class inherits from Hash and represents the environment into which
   # Dotenv will load key value pairs from a file.
   class Environment < Hash
     attr_reader :filename
@@ -14,7 +14,7 @@ module Dotenv
     end
 
     def read
-      File.read(@filename)
+      File.open(@filename, "rb:bom|utf-8") { |file| file.read }
     end
 
     def apply

data/lib/dotenv/substitutions/variable.rb

@@ -10,11 +10,12 @@ module Dotenv
     module Variable
       class << self
         VARIABLE = /
-          (\\)?        # is it escaped with a backslash?
-          (\$)         # literal $
-          \{?          # allow brace wrapping
-          ([A-Z0-9_]+) # match the variable
-          \}?          # closing brace
+          (\\)?         # is it escaped with a backslash?
+          (\$)          # literal $
+          (?!\()        # shouldnt be followed by paranthesis
+          \{?           # allow brace wrapping
+          ([A-Z0-9_]+)? # optional alpha nums
+          \}?           # closing brace
         /xi
 
         def call(value, env)
@@ -23,8 +24,10 @@ module Dotenv
 
             if match[1] == '\\'
               variable[1..-1]
-            else
+            elsif match[3]
               env.fetch(match[3]) { ENV[match[3]] }
+            else
+              variable
             end
           end
         end

data/lib/dotenv/version.rb

@@ -1,3 +1,3 @@
 module Dotenv
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Loads environment variables from `.env`.