Small syntax fix and process.exit for list cmd

deefour · Dec 18, 2012 · 1ef8ae3 · 1ef8ae3
1 parent 8bc97e4
commit 1ef8ae3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/lib/app.js b/lib/app.js
@@ -117,5 +117,7 @@ app.exec = function (command, callback) {
     if (!_.isUndefined(callback)) {
       callback(err);
     }
+
+    process.exit(1);
   });
 };
diff --git a/lib/commands/list.js b/lib/commands/list.js
@@ -38,8 +38,8 @@ var list = module.exports = function(name, options, callback) {
         app.log.info(util.format('%s%s', ('Entry Group: ' + groupName.blue.bold).underline, (app.config.get('currentGroup') === groupName) ? ' (active)'.yellow.bold : ''));
         app.log.info('');
 
-        entries = entries.sort(support.sortEntries);    
-        
+        entries = entries.sort(support.sortEntries);
+
         if (_.isEmpty(entries)) {
           app.log.info('[No entries have been set]'.grey);
         } else {
@@ -68,8 +68,9 @@ var list = module.exports = function(name, options, callback) {
 
   // Allow for arbitrary number of arguments; in this case where no args are passed
   if (_.isPlainObject(name)) {
-    options = name;
-    name    = undefined;
+    callback = options;
+    options  = name;
+    name     = undefined;
   }
 
   // Set defautl --... options
@@ -136,7 +137,7 @@ var list = module.exports = function(name, options, callback) {
         _.each(data.groups, function(entries, groupName) {
           listGroup(entries, groupName);
         });
-        
+
         listListings(data.listings);
       }
 

diff --git a/lib/commands/remove.js b/lib/commands/remove.js
@@ -15,15 +15,15 @@ var support     = require('../support'),
  */
 var remove = module.exports = function(callback) {
   "use strict";
-  
+
   // Initialize
   var key  = 'Entry/Listing ID',
       notifyDeletion = function(deleteObj, options) {
         options = _.extend({ dryRun: true }, options || {});
         var confirmation = 'You are about to delete ID ';
 
         if (!options.dryRun) {
-          confirmation = 'ID ';          
+          confirmation = 'ID ';
         }
 
         confirmation += deleteObj.id.toString().yellow.bold + ', the';
@@ -54,11 +54,11 @@ var remove = module.exports = function(callback) {
 
 
   // List the entries/listing with single index
-  list({ 
+  list({
     'exit-if-empty': true,
     'empty-message': 'there is nothing to delete',
     'single-listing': true
-  });
+  }, callback);
 
 
 
@@ -71,7 +71,7 @@ var remove = module.exports = function(callback) {
     conform: function(id){
       return support.hasEntry(id);
     }
-  }], function(err, result) { 
+  }], function(err, result) {
     if (err) {
       throw err;
     }