successfully pulled!

Author: xavdid

README.md

@@ -0,0 +1,7 @@
+# heroku-config
+
+Push and pull your [Heroku](https://www.heroku.com) configs to your local environment.
+
+Heavily inspired by [ddollar's version](https://github.com/ddollar/heroku-config), but using the new Heroku [cli](https://github.com/heroku/cli).
+
+After cloning, follow [these](https://devcenter.heroku.com/articles/developing-cli-plug-ins#installing-the-plugin) instructions to run locally! 

commands/pull.js

@@ -3,11 +3,12 @@
 const cli = require('heroku-cli-util')
 const co = require('co')
 const merge = require('../util/merge')
+const file = require('../util/file')
 
 function * pull (context, heroku) {
   let config = yield heroku.get(`/apps/${context.app}/config-vars`)
-  cli.debug(config)
-  cli.debug(merge({a: 1}, {b: 2}, context.flags))
+  let fname = context.flags.env || '.env'
+  file.write(merge(config, file.read(fname), context.flags), fname)
 }
 
 module.exports = {

commands/push.js

@@ -3,6 +3,7 @@
 const cli = require('heroku-cli-util')
 const co = require('co')
 const merge = require('../util/merge')
+const file = require('../util/file')
 
 function * push (context, heroku) {
   let config = yield heroku.get(`/apps/${context.app}/config-vars`)

package.json

@@ -4,7 +4,7 @@
   "description": "Push and pull environment variables from a Heroku instance",
   "main": "index.js",
   "scripts": {
-    "test": "./node_modules/tape/bin/tape test.js | tap-dot",
+    "test": "./node_modules/tape/bin/tape test.js | tap-spec",
     "preversion": "npm test",
     "postversion": "npm publish && git push && git push --tags"
   },
@@ -26,7 +26,7 @@
     "lodash.assign": "^4.0.8"
   },
   "devDependencies": {
-    "tap-dot": "^1.0.5",
+    "tap-spec": "^4.1.1",
     "tape": "^4.5.1"
   }
 }

pushable.txt

@@ -0,0 +1,15 @@
+NAME=david
+SQ_NAME='david'
+DQ_NAME="david"
+
+RAND_ID=6be-42c0
+SQ_RAND_ID='6be4-2c0'
+DQ_RAND_ID="6be4-2c0"
+
+MONGO_URL=mongodb://un:pass@ds08.mongolab.com:53428/kinect
+SQ_MONGO_URL='mongodb://un:pass@ds08.mongolab.com:53428/kinect'
+DQ_MONGO_URL="mongodb://un:pass@ds08.mongolab.com:53428/kinect"
+
+WEIRD_PASS=9v\$tQnv&7crj
+SQ_WEIRD_PASS='9v\$tQnv&7crj'
+DQ_WEIRD_PASS="9v\$tQnv&7crj"

test.js

@@ -11,17 +11,31 @@ let remote = {
 }
 
 let local = {
-  NODE_ENV: 'production',
+  NODE_ENV: 'test',
   SOURCE: 'local',
   DB_STRING: 'mongo://blah@thing.mongo.thing.com:4567'
 }
 
+let remote_win = {
+  NODE_ENV: 'production',
+  SOURCE: 'remote',
+  DB_STRING: 'mongo://blah@thing.mongo.thing.com:4567',
+  NAME: 'david'
+}
+
+let local_win = {
+  NODE_ENV: 'test',
+  SOURCE: 'local',
+  DB_STRING: 'mongo://blah@thing.mongo.thing.com:4567',
+  NAME: 'david'
+}
+
 test('Merging', (t) => {
-  t.equal({
-    NODE_ENV: 'production',
-    SOURCE: 'local',
-    DB_STRING: 'mongo://blah@thing.mongo.thing.com:4567',
-    NAME: 'david'
-  }, merge(remote, local, {}))
+  t.deepEqual(remote_win, merge(local, remote, {}), 'Expect remote to overwrite local')
+  t.deepEqual(local_win, merge(remote, local, {}), 'Expect local to overwrite remote')
+
+  t.deepEqual(remote_win, merge(remote, local, {overwrite: true}), 'Expect remote to overwrite local w/ overwrite')
+  t.deepEqual(local_win, merge(local, remote, {overwrite: true}), 'Expect local to overwrite remote w/overwrite')
+
   t.end()
 })

util/filer.js util/file.js

@@ -1,11 +1,13 @@
 // interface for reading/writing to .env file
+'use strict'
 
 const fs = require('fs')
 
 function obj_to_file_format (obj) {
   let res = ''
   for (let key in obj) {
-    res += (`${key}="${obj[key]}"`)
+    // standard removes the \n char in the ` string?
+    res += (`${key}="${obj[key]}"` + '\n')
   }
   return res
 }
@@ -32,16 +34,18 @@ module.exports = {
   read: (fname) => {
     fs.readFile(fname, (err, data) => {
       if (err) {
-        console.error(`Unable to read from ${fname}`)
+        console.warn(`WARN - Unable to read from ${fname}`)
+        return {}
       } else {
+        if (data) {
+          data = data.toString()
+        }
         return obj_from_file_format(data)
       }
     })
   },
-  write: (fname, obj) => {
-    let res = {}
-
-    fs.writeFile(fname, obj_to_file_format(res), (err) => {
+  write: (obj, fname) => {
+    fs.writeFile(fname, obj_to_file_format(obj).toString(), (err) => {
       if (err) {
         console.error(`Error writing to file ${fname}: ${err.message}`)
       } else {

util/merge.js

@@ -3,12 +3,14 @@
 
 const assign = require('lodash.assign')
 
-module.exports = function (src, dest, flags) {
-  console.log(`overwrite is ${flags.overwrite}`)
+module.exports = function (sub, dom, flags) {
+  // console.log(`overwrite is ${flags.overwrite}`)
   // check interactive and overwrite
+
+  // blank object is so sources aren't modified
   if (flags.overwrite) {
-    return assign({}, src, dest)
+    return assign({}, dom, sub)
   } else {
-    return assign({}, dest, src)
+    return assign({}, sub, dom)
   }
 }