Another round of cleanup/refactor. Tests should pass now

Author: alexbain

.travis.yml

@@ -1,4 +1,4 @@
 language: node_js
 node_js:
-  - "4.1"
-  - "0.10"
+  - "5.5"
+  - "4.2"

lib/lirc_node.js

@@ -29,70 +29,55 @@ exports.init = function() {
     });
 };
 
-// Private
-exports._populateRemotes = function (result) {
-  console.log("_populateRemotes", result);
+// Parse the list of remotes that irsend knows about
+exports._populateRemotes = function (irsendResult) {
   var remotes = {};
 
-  // list comes back with newlines, so split into an array
-  var results = result[1].split('\n');
-
-  results.forEach(function (remote) {
+  irsendResult[1].split('\n').forEach(function (remote) {
     var remoteName = remote.match(/\s(.*)$/);
     if (remoteName) remotes[remoteName[1]] = [];
   });
 
-  console.log("_populateRemotes", remotes);
   return remotes;
 };
 
-exports._populateCommands = function (remotes) {
-  console.log("_populateCommands", remotes);
-
+// Given object whose keys represent remotes, get commands for each remote
+// Returns promise that will resolve when all irsend invocations complete
+exports._populateCommands = function (remotesObject) {
   var commandPromises = [];
-  var remotes = Object.keys(remotes);
+  var remoteNames = Object.keys(remotesObject);
 
-  // Get the list of all commands for each remote
-  remotes.forEach(function (remote) {
+  remoteNames.forEach(function (remote) {
     commandPromises.push(exports.irsend.list(remote, '')
-      .then(function (result) {
-        var ret = {};
-        ret[remote] = exports._parseCommands(result);
-        return ret;
+      .then(function (irsendResult) {
+        return { [remote]: exports._parseCommands(irsendResult) }
       })
     );
   })
 
-  // commandPromises should look like this:
-  // [{ TV: ['Power', 'VolUp', 'VolDown'] }, { Yamaha: ['Power', 'Xbox360'] }]
-  //
-  // Final response should look like this:
-  // { TV: ['Power', 'VolUp', 'VolDown'], Yamaha: ['Power', 'Xbox360'] }
   return Promise.all(commandPromises)
-    .then(function(commands) {
-      var ret = {};
+    .then(exports._joinRemoteCommands);
+};
 
-      commands.forEach(function(command) {
-        ret = Object.assign(ret, command);
-      });
+// Merges an array of remoteCommands into a single object
+exports._joinRemoteCommands = function(remoteCommands) {
+    var remotes = {};
 
-      console.log("_populateCommands", ret);
-      return ret;
+    remoteCommands.forEach(function(remote) {
+      remotes = Object.assign(remotes, remote);
     });
+
+    return remotes;
 };
 
-exports._parseCommands = function (result) {
-  console.log("_parseCommands", result);
+// Parses the results of irsend for a specifif remote
+exports._parseCommands = function (irsendResult) {
   var commands = [];
 
-  // Change multiline string into array to parse
-  var results = result[1].split('\n');
-
-  results.forEach(function (command) {
+  irsendResult[1].split('\n').forEach(function (command) {
     var commandName = command.match(/\s.*\s(.*)$/);
     if (commandName && commandName[1]) commands.push(commandName[1]);
   });
 
-  console.log("_parseCommands", commands);
   return commands;
 };

test/lirc_node.js

@@ -1,28 +1,27 @@
-var lirc_node = require('../'),
+var lircNode = require('../'),
     assert = require('assert'),
     sinon = require('sinon'),
     q = require('q');
 
-describe('lirc_node', function() {
+describe('lircNode', function() {
   describe('init', function() {
     it('should exist', function() {
-      assert(lirc_node.init instanceof Function);
+      assert(lircNode.init instanceof Function);
     });
   });
 
   describe("Setting an internal list of Remotes", function() {
     describe('#_populateRemotes', function() {
       beforeEach(function() {
-        lirc_node.remotes = {};
+        lircNode.remotes = {};
       });
 
       it('should exist', function() {
-        assert(lirc_node._populateRemotes instanceof Function);
+        assert(lircNode._populateRemotes instanceof Function);
       });
 
       it('should return an object of remote names', function () {
         var remotes = lircNode._populateRemotes(['', '']);
-        console.log("remotes:", remotes);
         assert(remotes instanceof Object);
       });
 
@@ -47,16 +46,16 @@ describe('lirc_node', function() {
 
     describe('#_populateCommands', function() {
       beforeEach(function() {
-        sinon.stub(lirc_node.irsend, 'list', function() {});
+        sinon.stub(lircNode.irsend, 'list', function() {});
       });
 
       afterEach(function() {
-        lirc_node.remotes = {};
-        lirc_node.irsend.list.restore();
+        lircNode.remotes = {};
+        lircNode.irsend.list.restore();
       });
 
       it('should exist', function() {
-        assert(lirc_node._populateCommands instanceof Function);
+        assert(lircNode._populateCommands instanceof Function);
       });
     });