Merge 37dade6 into 825c1b2

lib/main.js

@@ -58,12 +58,16 @@ function config (options) {
   try {
     // specifying an encoding returns a string instead of a buffer
     var parsedObj = parse(fs.readFileSync(path, { encoding: encoding }))
+    var insertedObj = {}
 
     Object.keys(parsedObj).forEach(function (key) {
-      process.env[key] = process.env[key] || parsedObj[key]
+      var value = process.env[key] || parsedObj[key]
+
+      insertedObj[key] = value
+      process.env[key] = value
     })
 
-    return { parsed: parsedObj }
+    return { parsed: parsedObj, inserted: insertedObj }
   } catch (e) {
     return { error: e }
   }

test/main.js

@@ -30,6 +30,8 @@ describe('dotenv', function () {
     beforeEach(function (done) {
       readFileSyncStub = s.stub(fs, 'readFileSync').returns('test=val')
       parseStub = s.stub(dotenv, 'parse').returns({test: 'val'})
+      delete process.env.test // clean up
+
       done()
     })
 
@@ -82,6 +84,24 @@ describe('dotenv', function () {
       done()
     })
 
+    it('returns inserted object', function (done) {
+      var env = dotenv.config()
+
+      env.should.not.have.property('error')
+      env.inserted.should.eql({ test: 'val' })
+      done()
+    })
+
+    it('returns inserted values and parsed values (which can be different if already preset)', function (done) {
+      process.env.test = 'test'
+
+      var env = dotenv.config()
+
+      env.parsed.should.eql({ test: 'val' })
+      env.inserted.should.eql({ test: 'test' })
+      done()
+    })
+
     it('returns any errors thrown from reading file or parsing', function (done) {
       readFileSyncStub.throws()