dotenv 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbd76e5c6ca084e248496b42e52b9108a0107e2d
-  data.tar.gz: d59561a4c5ece858dc36bf61194b8eda14064770
+  metadata.gz: 0e18e29270d6ef436918824cab86453fba5143c8
+  data.tar.gz: 2303f9975ba1738ebafc3d0baea4f4abd785e558
 SHA512:
-  metadata.gz: 1c2fa80964b37fb1dfefb578945b93f0b2bac3476ddfb8429ab72835db67bec5d8c197ec27949a84769bca3895fd9c51916a1bc78eb864d76ce172634ffff7b5
-  data.tar.gz: f8caadc5aec3fef268b085a99cc032d7e102deb2121239fe2cb5d721414a71d1b428de288d15b8cb51989559b9fac96de245489ba9f1f27c94a5534d8ecae78f
+  metadata.gz: ec8c2d505f5e77a9d9f638b3f4287c3fcf8de7e6d572d3d70102dea2638219f3184ab631f6c7ce0b1925633b239ddf91a9d788eff39bc90e62e546fcb894210a
+  data.tar.gz: ebeaa07575e7a0026bd17edbea7cf2b83773548cdff59c3b603eda1538b52e9228720ee2d94619d193c0a08b9cb7128bb81b46bda9bede7f30c857b47eef95f5

data/README.md

@@ -116,21 +116,9 @@ export SECRET_KEY=YOURSECRETKEYGOESHERE
 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"
+PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----\nHkVN9…\n-----END DSA PRIVATE KEY-----\n"
 ```
 
-Alternatively, multi-line values with line breaks are now supported for quoted values.
-
-```shell
-PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----
-...
-HkVN9...
-...
------END DSA PRIVATE KEY-----"
-```
-
-This is particularly helpful when using the Heroku command line plugin [`heroku-config`](https://github.com/xavdid/heroku-config) to pull configuration variables down that may have line breaks.
-
 ### Command Substitution
 
 You need to add the output of a command in one of your variables? Simply add it with `$(your_command)`:

data/lib/dotenv/parser.rb

@@ -12,42 +12,39 @@ module Dotenv
       [Dotenv::Substitutions::Variable, Dotenv::Substitutions::Command]
 
     LINE = /
+      \A
       \s*
       (?:export\s+)?    # optional export
       ([\w\.]+)         # key
       (?:\s*=\s*|:\s+?) # separator
       (                 # optional value begin
-        '(?:\\'|[^'])*'  #   single quoted value
+        '(?:\'|[^'])*'  #   single quoted value
         |               #   or
-        "(?:\\"|[^"])*"  #   double quoted value
+        "(?:\"|[^"])*"  #   double quoted value
         |               #   or
-        [^#\r\n]+         #   unquoted value
+        [^#\n]+         #   unquoted value
       )?                # value end
       \s*
       (?:\#.*)?         # optional comment
+      \z
     /x
 
     class << self
       attr_reader :substitutions
 
-      def call(string, is_load)
+      def call(string, is_load = false)
         new(string, is_load).call
       end
     end
 
-    def initialize(string, is_load)
+    def initialize(string, is_load = false)
       @string = string
       @hash = {}
       @is_load = is_load
     end
 
     def call
-      # Process matches
-      @string.scan(LINE).each do |key, value|
-        @hash[key] = parse_value(value || "")
-      end
-      # Process non-matches
-      @string.gsub(LINE, "").split(/[\n\r]+/).each do |line|
+      @string.split(/[\n\r]+/).each do |line|
         parse_line(line)
       end
       @hash
@@ -56,7 +53,10 @@ module Dotenv
     private
 
     def parse_line(line)
-      if line.split.first == "export"
+      if (match = line.match(LINE))
+        key, value = match.captures
+        @hash[key] = parse_value(value || "")
+      elsif line.split.first == "export"
         if variable_not_set?(line)
           raise FormatError, "Line #{line.inspect} has an unset variable"
         end
@@ -65,7 +65,7 @@ module Dotenv
 
     def parse_value(value)
       # Remove surrounding quotes
-      value = value.strip.sub(/\A(['"])(.*)\1\z/m, '\2')
+      value = value.strip.sub(/\A(['"])(.*)\1\z/, '\2')
 
       if Regexp.last_match(1) == '"'
         value = unescape_characters(expand_newlines(value))

data/lib/dotenv/version.rb

@@ -1,3 +1,3 @@
 module Dotenv
-  VERSION = "2.3.0".freeze
+  VERSION = "2.4.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenv
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Brandon Keepers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake