motdotla · Mar 26, 2018 · Jun 2, 2018 · Jun 2, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # Coverage directory used by tools like istanbul
 coverage
+.nyc_output
 
 # Dependency directory
 # Commenting this out is preferred by some people, see

diff --git a/.npmignore b/.npmignore
@@ -1,5 +1,5 @@
 coverage/
-examples/
+.nyc_output/
 test/
 .editorconfig
 .npmignore

diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,7 @@
 language: node_js
-
+sudo: false
 node_js:
-  - 4
   - 6
   - 8
   - 9
-
-jobs:
-  include:
-    - stage: coverage
-      node_js: 8
-      script: npm run ci:coverage
+  - 10
diff --git a/README.md b/README.md
@@ -13,7 +13,11 @@ Dotenv is a zero-dependency module that loads environment variables from a `.env
 ## Install
 
 ```bash
-npm install dotenv --save
+# with npm
+npm install dotenv
+
+# or with Yarn
+yarn add dotenv
 ```
 
 ## Usage
@@ -113,7 +117,7 @@ an Object with the parsed keys and values.
 
 ```js
 const dotenv = require('dotenv')
-const buf = new Buffer('BASIC=basic')
+const buf = Buffer.from('BASIC=basic')
 const config = dotenv.parse(buf) // will return an object
 console.log(typeof config, config) // object { BASIC : 'basic' }
 ```
@@ -209,9 +213,9 @@ export const client = new Client(process.env.BEST_API_KEY)
 
 ```js
 import dotenv from 'dotenv'
-dotenv.config()
-
 import errorReporter from './errorReporter'
+
+dotenv.config()
 errorReporter.client.report(new Error('faq example'))
 ```
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,10 +2,10 @@ version: "{build}"
 build: off
 environment:
   matrix:
-    - nodejs_version: "4"
     - nodejs_version: "6"
     - nodejs_version: "8"
     - nodejs_version: "9"
+    - nodejs_version: "10"
 install:
   - ps: Install-Product node $env:nodejs_version
   - npm install

diff --git a/config.js b/config.js
@@ -1,11 +1,5 @@
 (function () {
-  var options = {}
-  process.argv.forEach(function (val, idx, arr) {
-    var matches = val.match(/^dotenv_config_(.+)=(.+)/)
-    if (matches) {
-      options[matches[1]] = matches[2]
-    }
-  })
-
-  require('./lib/main').config(options)
+  require('./lib/main').config(
+    require('./lib/cli-options')(process.argv)
+  )
 })()
diff --git a/examples/basic/.env b/examples/basic/.env
diff --git a/examples/basic/index.js b/examples/basic/index.js
diff --git a/examples/es6-preload/.env b/examples/es6-preload/.env
diff --git a/examples/es6-preload/index.js b/examples/es6-preload/index.js
diff --git a/examples/es6-preload/run_me b/examples/es6-preload/run_me
diff --git a/examples/es6/.env b/examples/es6/.env
diff --git a/examples/es6/index.js b/examples/es6/index.js
diff --git a/examples/es6/run_me b/examples/es6/run_me
diff --git a/examples/preload/.env b/examples/preload/.env
diff --git a/examples/preload/index.js b/examples/preload/index.js
diff --git a/examples/preload/run_me b/examples/preload/run_me
diff --git a/lib/cli-options.js b/lib/cli-options.js
@@ -0,0 +1,11 @@
+const re = /^dotenv_config_(.+)=(.+)/
+
+module.exports = function optionMatcher (args) {
+  return args.reduce(function (acc, cur) {
+    const matches = cur.match(re)
+    if (matches) {
+      acc[matches[1]] = matches[2]
+    }
+    return acc
+  }, {})
+}
diff --git a/lib/main.js b/lib/main.js
@@ -1,5 +1,3 @@
-'use strict'
-
 const fs = require('fs')
 const path = require('path')
 
@@ -14,7 +12,7 @@ function parse (src) {
   // convert Buffers before splitting into lines and processing
   src.toString().split('\n').forEach(function (line) {
     // matching "KEY' and 'VAL' in 'KEY=VAL'
-    const keyValueArr = line.match(/^\s*([\w\.\-]+)\s*=\s*(.*)?\s*$/)
+    const keyValueArr = line.match(/^\s*([\w.-]+)\s*=\s*(.*)?\s*$/)
     // matched?
     if (keyValueArr != null) {
       const key = keyValueArr[1]