Merge 91d4b57 into 825c1b2

lib/main.js

@@ -45,10 +45,14 @@ function parse (src) {
 function config (options) {
   var path = '.env'
   var encoding = 'utf8'
+  var parseFunc = parse
 
   if (options) {
     if (options.path) {
       path = options.path
+      if (options.path.toLowerCase().endsWith('json')) {
+        parseFunc = JSON.parse
+      }
     }
     if (options.encoding) {
       encoding = options.encoding
@@ -57,7 +61,7 @@ function config (options) {
 
   try {
     // specifying an encoding returns a string instead of a buffer
-    var parsedObj = parse(fs.readFileSync(path, { encoding: encoding }))
+    var parsedObj = parseFunc(fs.readFileSync(path, { encoding: encoding }))
 
     Object.keys(parsedObj).forEach(function (key) {
       process.env[key] = process.env[key] || parsedObj[key]

test/.env.json

@@ -0,0 +1,15 @@
+{
+    "NODE_ENV":"development",
+    "BASIC":"basic",
+    "AFTER_LINE":"after_line",
+    "UNDEFINED_EXPAND":"$TOTALLY_UNDEFINED_ENV_KEY",
+    "EMPTY":"",
+    "SINGLE_QUOTES":"single_quotes",
+    "DOUBLE_QUOTES":"double_quotes",
+    "EXPAND_NEWLINES":"expand\nnewlines",
+    "DONT_EXPAND_NEWLINES_1":"dontexpand\nnewlines",
+    "DONT_EXPAND_NEWLINES_2":"dontexpand\nnewlines",
+    "EQUAL_SIGNS":"equals==",
+    "INCLUDE_SPACE":"some spaced out string",
+    "USERNAME":"therealnerdybeast@example.tld"
+}

test/main.js

@@ -41,6 +41,14 @@ describe('dotenv', function () {
       done()
     })
 
+    it('takes option for json file path', function (done) {
+      var testPath = 'test/.env.json'
+      dotenv.config({path: testPath})
+
+      readFileSyncStub.args[0][0].should.eql(testPath)
+      done()
+    })
+
     it('takes option for encoding', function (done) {
       var testEncoding = 'base64'
       dotenv.config({encoding: testEncoding})