cox - npm Package Compare versions

Comparing version 1.0.3 to 1.0.4

lib/commands/add.js

@@ -1,6 +0,4 @@
-var Q = require('q');
 var repeater = require('../repeater');
 
 module.exports = function(args){
-    var deferred = Q.defer();
 
@@ -14,6 +12,5 @@ var command = function(moduleName, moduleRepo, done){
 
-    repeater(command, 'goToModuleDir').then(deferred.resolve);
-    return deferred.promise;
+    return repeater(command, 'goToModuleDir');
 };
 
 

lib/commands/checkout.js

 var path = require('path');
-
-var Q = require('q');
 var repeater = require('../repeater');
 
 module.exports = function(args){
-    var deferred = Q.defer();
     var branch = typeof args === 'string'? args : (args.b || args._[1]);
@@ -18,7 +15,5 @@ var isNew = !!args.b;
 
-    repeater(command, 'goToModuleDir').then(deferred.resolve);
-
-    return deferred.promise;
+    return repeater(command, 'goToModuleDir');
 };
 
 

lib/commands/commit.js

@@ -1,7 +0,4 @@
-var Q = require('q');
-
 var repeater = require('../repeater');
 
 module.exports = function(args){
-    var deferred = Q.defer();
     var message = args._[1];
@@ -16,4 +13,3 @@
 
-    repeater(command, 'goToModuleDir').then(deferred.resolve);
-    return deferred.promise;
+    return repeater(command, 'goToModuleDir');
 };

lib/commands/diff.js

 var path = require('path');
-
-var Q = require('q');
 var repeater = require('../repeater');
 
 module.exports = function(args){
-    var deferred = Q.defer();
 
@@ -15,5 +12,3 @@ var command = function(moduleName, moduleRepo, done){
 
-    repeater(command, 'goToModuleDir').then(deferred.resolve);
-
-    return deferred.promise;
+    return repeater(command, 'goToModuleDir');
 };

lib/commands/install.js

@@ -1,3 +0,1 @@
-var Q = require('q');
-
 var installModulesCmd = require('./tasks/install-modules');
@@ -7,9 +5,5 @@ var npmCmd = require('./tasks/npm');
 module.exports = function(args){
-    var deferred = Q.defer();
     
-    installModulesCmd(args)
-        .then( npmCmd.bind(null, 'install') )
-        .then(deferred.resolve);
-
-    return deferred.promise;
+    return installModulesCmd(args)
+        .then( npmCmd.bind(null, 'install') );
 };

lib/commands/kill.js

@@ -14,19 +14,13 @@ var path = require('path');
 
-    prompt.yesNo( ("this will void all the uncommited changes in the current branch and delete the branch " + ticket).warning)
-        .then(function(yes){
-            if(!yes){
-                console.info('thank you for using cox'.success);
-                process.exit(0);
-            }
+    var command = function(){
+        return resetCmd(args, 'force')
+            .then( checkoutCmd.bind(null, 'develop') )
+            .then( deleteBranchCmd.bind(null, ticket) )
+            .then( killRemoteBranchCmd.bind(null, ticket) );
+    }
 
-            resetCmd(args, 'force')
-                .then( checkoutCmd.bind(null, 'develop') )
-                .then( deleteBranchCmd.bind(null, ticket) )
-                .then( killRemoteBranchCmd.bind(null, ticket) )
-                .then( deferred.resolve );
-        });
-
-    return deferred.promise;
+    return prompt.yesNo(("this will void all the uncommited changes in the current branch and delete the branch " + ticket).warning)
+        .then(command, prompt.yesNo);
 };
 
 

lib/commands/pull.js

@@ -1,7 +0,4 @@
-var Q = require('q');
-
 var repeater = require('../repeater');
 
 module.exports = function(args){
-    var deferred = Q.defer();
 
@@ -15,6 +12,5 @@ var command = function(moduleName, moduleRepo, done){
 
-    repeater(command, 'goToModuleDir').then(deferred.resolve);
-    return deferred.promise;
+    return repeater(command, 'goToModuleDir');
 };
 
 

lib/commands/push.js

@@ -1,7 +0,4 @@
-var Q = require('q');
-
 var repeater = require('../repeater');
 
 module.exports = function(args){
-    var deferred = Q.defer();
     var branch = args._[1]; console.log(branch);
@@ -16,4 +13,3 @@
 
-    repeater(command, 'goToModuleDir').then(deferred.resolve);
-    return deferred.promise;
+    return repeater(command, 'goToModuleDir');
 };

lib/commands/reset.js

 var path = require('path');
-
-var Q = require('q');
 var repeater = require('../repeater');
@@ -19,17 +17,7 @@ var prompt = require('../prompt-utils');
     if(force){
-        repeater(command, 'goToModuleDir').then(deferred.resolve);
+        return repeater(command, 'goToModuleDir');
     }
 
-    force || prompt.yesNo("this will void all the uncommited changes in this project and every module".warning)
-        .then(function(yes){
-            if(!yes){
-                console.info('thank you for using cox'.success);
-                process.exit(0);
-            }
-            repeater(command, 'goToModuleDir').then(deferred.resolve);
-        });
-
-    return deferred.promise;
+    return prompt.yesNo("this will void all the uncommited changes in this project and every module".warning)
+        .then(repeater.bind(null, command, 'goToModuleDir'), prompt.thankYou);
 };
-
-

lib/commands/start.js

@@ -1,2 +0,1 @@
-var Q = require('q');
 var _ = require('lodash');
@@ -9,13 +8,9 @@
 module.exports = function(args){
-    var deferred = Q.defer();
     var ticket = args._[1];
     console.info( ("You are about to start development for new ticket " + ticket).warning );
 
-    cmdReset(args)
+    return cmdReset(args)
         .then( cmdCheckout.bind(null, 'develop') )
         .then( cmdPull.bind(null, args) )
-        .then( cmdCheckout.bind(null, _.merge(args, {b: ticket})) )
-        .then( deferred.resolve );
-
-    return deferred.promise;
+        .then( cmdCheckout.bind(null, _.merge(args, {b: ticket})) );
 };

lib/commands/status.js

 var path = require('path');
-var Q = require('q');
-
 var repeater = require('../repeater');
 
 module.exports = function(args){
-    var deferred = Q.defer();
 
@@ -15,5 +12,3 @@ var command = function(moduleName, moduleRepo, done){
 
-    repeater(command, 'goToModuleDir').then(deferred.resolve);
-
-    return deferred.promise;
+    return repeater(command, 'goToModuleDir');
 };

lib/commands/tasks/delete-branch.js

@@ -1,7 +0,4 @@
-var Q = require('q');
-
 var repeater = require('../../repeater');
 
 module.exports = function(ticket){
-    var deferred = Q.defer();
 
@@ -15,4 +12,3 @@ var command = function(moduleName, moduleRepo, done){
 
-    repeater(command, 'goToModuleDir').then(deferred.resolve);
-    return deferred.promise;
+    return repeater(command, 'goToModuleDir');
 };

lib/commands/tasks/install-modules.js

 var fs = require('fs');
 var path = require('path');
-var Q = require('q');
 var repeater = require('../../repeater');
@@ -8,3 +7,2 @@
 module.exports = function(args){
-    var deferred = Q.defer();
     //[TODO] check args for different module folder 
@@ -35,5 +33,3 @@ var modulesDir = 'modules';
 
-    repeater(command, false, 'skipMainProject').then(deferred.resolve);
-
-    return deferred.promise;
+    return repeater(command, false, 'skipMainProject');
 };

lib/commands/tasks/kill-remote-branch.js

@@ -1,7 +0,4 @@
-var Q = require('q');
-
 var repeater = require('../../repeater');
 
 module.exports = function(ticket){
-    var deferred = Q.defer();
 
@@ -14,4 +11,3 @@ var command = function(moduleName, moduleRepo, done){
 
-    repeater(command, 'goToModuleDir').then(deferred.resolve);
-    return deferred.promise;
+    return repeater(command, 'goToModuleDir');
 };

lib/commands/tasks/npm.js

 var path = require('path');
-var Q = require('q');
 var _ = require('lodash');
@@ -7,3 +6,2 @@ var repeater = require('../../repeater');
 module.exports = function(subCommand){
-    var deferred = Q.defer();
 
@@ -25,5 +23,3 @@ var command = function(moduleName, moduleRepo, done){
 
-    repeater(command, 'goToModulesDir').then(deferred.resolve);
-
-    return deferred.promise;
+    return repeater(command, 'goToModulesDir');
 };

lib/commands/update.js

@@ -1,11 +0,5 @@
-var Q = require('q');
-
 var npmCmd = require('./tasks/npm');
 
 module.exports = function(args){
-    var deferred = Q.defer();
-    
-    npmCmd('update').then(deferred.resolve);
-
-    return deferred.promise;
-};
+    return npmCmd('update');
+};

lib/prompt-utils.js

@@ -11,3 +11,7 @@ var Q = require('q');
         prompt.get(yesNo, function(err, result){
-            deferred.resolve(result.reset.match(/^y/i));
+            if(result.reset.match(/^y/i)){
+                deferred.resolve();
+            } else {
+                deferred.reject();
+            }
         });
@@ -18,2 +22,6 @@ return deferred.promise;
 
+module.exports.thankYou = function(){
+    console.info('thank you for using cox'.success);
+    process.exit(0);
+};
 
@@ -20,0 +28,0 @@ var yesNo = {

package.json

 {
   "name": "cox",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "preferGlobal": "true",
@@ -5,0 +5,0 @@ "description": "git commander for multi-repositories",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

15269

decreased by-9.53%

Lines of code

312

decreased by-13.33%

No dependency changes