Merge pull request #1 from heroku/jshint-refactor

refactored to make jshint happy

Author: Jeff Dickey

packages/heroku-redis-jsplugin/.jshintrc

@@ -13,6 +13,7 @@
   "maxdepth": 5,
   "maxparams": 5,
   "maxstatements": 25,
+  "multistr": true,
   "newcap": true,
   "noarg": true,
   "node": true,

packages/heroku-redis-jsplugin/lib/commands/redis/cli.js

@@ -3,12 +3,7 @@ var Heroku = require('heroku-client');
 var readline = require('readline');
 var net = require('net');
 
-var api = require('./shared.js')
-
-// TODO: print using this protocol http://redis.io/topics/protocol
-function startsWith (a, b) {
-  return a.indexOf(b) === -1;
-}
+var api = require('./shared.js');
 
 function cli (url) {
   var io = readline.createInterface(process.stdin, process.stdout);
@@ -43,24 +38,24 @@ module.exports = {
   args: [{name: 'database', optional: true}],
   run: function(context) {
     var heroku = new Heroku({token: context.auth.password});
-    var filter = api.make_config_var_filter(context.args.database)
+    var filter = api.make_config_var_filter(context.args.database);
     heroku.apps(context.app).configVars().info()
     .then(filter)
     .then(function (servers) {
-      if (servers.length == 0) {
-        console.error('No redis servers found')
+      if (servers.length === 0) {
+        console.error('No redis servers found');
         process.exit(1);
       } else if (servers.length > 1) {
-        var names = []
+        var names = [];
         for (var i=0; i<servers.length; i++) {
           names.push(servers[i].name);
         }
-        console.error('Please specify a single server. Found: '+names.join(', '))
+        console.error('Please specify a single server. Found: '+names.join(', '));
         process.exit(1);
       }
       var name = servers[0].name;
-      var url = servers[0].url
-      console.log('Connecting to: '+name)
+      var url = servers[0].url;
+      console.log('Connecting to: '+name);
       return url;
     })
     .then(url.parse)

packages/heroku-redis-jsplugin/lib/commands/redis/info.js

@@ -1,23 +1,15 @@
+var columnify = require('columnify');
 var Heroku = require('heroku-client');
 var Q = require('q');
 
-var api = require('./shared.js')
+var api = require('./shared.js');
 
-function format_addon(addon, info) {
-  var width = 0;
-  for (var i=0; i < info.length; i++) {
-    width = Math.max(width, info[i].name.length)
-  }
-
-  var out = []
-  out.push("=== "+addon.config_vars[0])
-
-  for (var i=0; i < info.length; i++) {
-    padding = ": "+Array(width-info[i].name.length+1).join(" ");
-    out.push(info[i].name+padding+info[i].values.join(" "));
-  }
-  
-  return out;
+function getAddonInfo (context, addon) {
+  var deferred = Q.defer();
+  api.request(context, addon.name).then(function (info) {
+    deferred.resolve({addon: addon, info: info});
+  });
+  return deferred.promise;
 }
 
 module.exports = {
@@ -30,22 +22,20 @@ module.exports = {
   run: function(context) {
     var filter = api.make_addons_filter(context.args.database);
     var heroku = new Heroku({token: context.auth.password});
-    
+
     heroku.apps(context.app).addons().list()
     .then(filter)
     .then(function(addons) {
-      var out = []
-      for(var i=0; i<addons.length; i++) {
-        var r = api.request(context, addons[i].name).then(function (addon, result) {
-          var text = format_addon(addon, result.info);
-          console.log(text.join("\n"));
-            
-          }.bind(this, addons[i])
-        );
-        out.push(r);
-      }
-      return Q.allSettled(out)
-    }).done();
+      return Q.all(addons.map(function (addon) {
+        return getAddonInfo(context, addon);
+      }));
+    })
+    .then(function (addons) {
+      addons.forEach(function (addon) {
+        console.log("=== " + addon.addon.config_vars[0]);
+        console.log(columnify(addon.info.info, { showHeaders: false }));
+      });
+    })
+    .done();
   }
 };
-

packages/heroku-redis-jsplugin/lib/commands/redis/shared.js

@@ -1,9 +1,8 @@
 var Heroku = require('heroku-client');
 
 var HOST = "redis-api.heroku.com";
-var PATH=  "/redis/v0/databases";
-var PREFIX = "HEROKU_REDIS"
-var ADDON = "heroku-redis"
+var PATH =  "/redis/v0/databases";
+var ADDON = "heroku-redis";
 
 function request(context, path, method) {
   return Heroku.request( {
@@ -14,7 +13,7 @@ function request(context, path, method) {
     headers: {
       'Accept': 'application/json',
     },
-  })
+  });
 }
 
 function make_addons_filter(filter) {
@@ -24,28 +23,28 @@ function make_addons_filter(filter) {
 
   function matches (addon) {
     for (var i=0; i<addon.config_vars.length; i++) {
-      var cfg_name = addon.config_vars[i].toUpperCase()
+      var cfg_name = addon.config_vars[i].toUpperCase();
       if (cfg_name.indexOf(filter) >= 0) {
         return true;
       }
     }
     return false;
   }
-    
+
   function on_response(addons) {
     var redis_addons = [];
     for (var i=0; i < addons.length; i++) {
       var addon = addons[i];
-      var service = addon.addon_service.name
+      var service = addon.addon_service.name;
 
-      if (service.indexOf(ADDON) == 0 && (!filter || matches(addon))) {
-        redis_addons.push(addon)
+      if (service.indexOf(ADDON) === 0 && (!filter || matches(addon))) {
+        redis_addons.push(addon);
       }
     }
-    return redis_addons
+    return redis_addons;
   }
 
-  return on_response
+  return on_response;
 }
 
 function make_config_var_filter(filter) {
@@ -57,21 +56,21 @@ function make_config_var_filter(filter) {
     var servers = [];
 
     for (var name in config_vars) {
-      var url = config_vars[name] 
-      if ((url.indexOf('redis:') == 0) && (!filter || name.indexOf(filter) >= 0)) {
-        servers.push({url: url, name: name}) 
+      if (config_vars.hasOwnProperty(name)) {
+        var url = config_vars[name];
+        if ((url.indexOf('redis:') === 0) && (!filter || name.indexOf(filter) >= 0)) {
+          servers.push({url: url, name: name});
+        }
       }
     }
-    return servers
+    return servers;
   }
 
-  return on_response
+  return on_response;
 }
 
 module.exports = {
   request: request,
   make_addons_filter: make_addons_filter,
   make_config_var_filter: make_config_var_filter,
-}
-
-
+};

packages/heroku-redis-jsplugin/package.json

@@ -19,14 +19,15 @@
     "test": "jshint . && mocha"
   },
   "dependencies": {
+    "columnify": "^1.4.1",
     "heroku-cli-util": "^1.4.0",
-    "heroku-client": "^1.9.0",
-    "q": "^1.1.2",
-    "redis": "^0.12.1",
-    "spade": "^0.50.4"
+    "heroku-client": "^1.9.1",
+    "q": "^1.1.2"
   },
   "devDependencies": {
+    "chai": "*",
     "jshint": "*",
+    "mocha": "*",
     "netrc": "*"
   }
 }