cox - npm Package Compare versions

Comparing version 0.4.12 to 0.5.0

lib/commands/checkout.js

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

lib/commands/diff.js

 var path = require('path');
 var shell = require('../shell-utils');
+var Q = require('q');
 var repeater = require('../repeater');
 
-module.exports = function(args, callback){
-    callback = callback || function(){};
+module.exports = function(args){
+    var deferred = Q.defer();
 
@@ -24,3 +25,5 @@ var command = function(moduleName, moduleRepo, done){
 
-    repeater(command, callback);
+    repeater(command).then(deferred.resolve);
+
+    return deferred.promise;
 };

lib/commands/install.js

@@ -5,2 +5,3 @@ var fs = require('fs');
 var shell = require('../shell-utils');
+var Q = require('q');
 var npmCommand = require('./npm');
@@ -11,2 +12,3 @@
 module.exports = function(args){
+    var deferred = Q.defer();
     //[TODO] check args for different module folder 
@@ -36,7 +38,7 @@ var modulesPresent = ls(process.cwd()).indexOf(modulesDir) > -1;
 
-    repeater(command, function(){
-        console.log('cox has successfully run the task install'.success);
-        npmCommand('install');
-    });
+    repeater(command)
+        .then( npmCommand.bind(null, 'install') )
+        .then(deferred.resolve);
 
+    return deferred.promise;
 };

lib/commands/npm.js

 var path = require('path');
 var shell = require('../shell-utils');
+var Q = require('q');
 var repeater = require('../repeater');
@@ -7,2 +8,3 @@ var _ = require('lodash');
 module.exports = function(args){
+    var deferred = Q.defer();
     var subCommand = typeof args === 'string'? args : args._[1];
@@ -34,6 +36,5 @@
 
-    console.info('starting task npm ' + subCommand);
-    repeater(command, function(){
-        console.log( ('cox has successfully run the task npm ' + subCommand).success);
-    });
+    repeater(command).then(deferred.resolve);
+
+    return deferred.promise;
 };

lib/commands/pull.js

 var path = require('path');
+var Q = require('q');
 var shell = require('../shell-utils');
 var repeater = require('../repeater');
 
-module.exports = function(args, callback){
-    callback = callback || function(){};
+module.exports = function(args){
+    var deferred = Q.defer();
 
@@ -29,5 +30,6 @@ var command = function(moduleName, moduleRepo, done){
 
-    repeater(command, callback);
+    repeater(command).then(deferred.resolve);
+    return deferred.promise;
 };
 
 

lib/commands/reset.js

 var path = require('path');
 var shell = require('../shell-utils');
+var Q = require('q');
 var repeater = require('../repeater');
 var prompt = require('../prompt-utils');
 
-module.exports = function(args, callback){
+module.exports = function(args){
     var ticket = args._[1];
-    callback = callback || function(){};
-
-    var question = "this will void all the uncommited changes in this project and every module";
-    prompt.yesNo(question.warning, function(yes){
-        if(yes){
-            repeater(command, callback);
-        } else {
-            console.info('thank you for using cox'.success);
-            process.exit(0);
-        }
-    });
+    var deferred = Q.defer();
     
-    
     var command = function(moduleName, moduleRepo, done){
@@ -41,4 +31,16 @@ var isModule = !!moduleName;
     };
+
+    var question = "this will void all the uncommited changes in this project and every module";
+
+    prompt.yesNo(question.warning).then(function(yes){
+        if(!yes){
+            console.info('thank you for using cox'.success);
+            process.exit(0);
+        }
+        repeater(command).then(deferred.resolve);
+    });
+
+    return deferred.promise;
 };
 
 

lib/commands/start.js

 var path = require('path');
 var shell = require('../shell-utils');
+var Q = require('q');
+var _ = require('lodash');
 var repeater = require('../repeater');
 var prompt = require('../prompt-utils');
 
+var cmdReset = require('./reset');
+var cmdCheckout = require('./checkout');
+var cmdPull = require('./pull');
+
 module.exports = function(args){
+    var deferred = Q.defer();
     var ticket = args._[1];
     console.info( ("You are about to start development for a new ticket " + ticket).warning );
-    
-    var command = function(moduleName, moduleRepo, done){
-        var isModule = !!moduleName;
-        moduleName = moduleName || 'main';
-        var moduleLocation = isModule? path.join('modules/', moduleName) : '.';
-        console.info(('preparing ' + moduleName).action);
 
-        isModule && cd('modules/'+moduleName);
+    cmdReset(args)
+        .then( cmdCheckout.bind(null, 'develop') )
+        .then( cmdPull.bind(null, args) )
+        .then( cmdCheckout.bind(null, _.merge(args, {b: ticket})) )
+        .then( deferred.resolve );
 
-        var errors = shell.run([
-            'git checkout -b' + ticket
-        ]);
-
-        if(errors.legth > 0){
-            console.error('somethint nasty went wrong here'.error);
-            process.exit(1);
-        }
-
-        isModule && cd('../..');
-        console.info((moduleName + ' is now working with branch ' + ticket + ' checked out').success);
-        done();
-    };
-
-    //[TODO]: PROMISES!!!
-    require('./reset')(args, function(){
-        require('./checkout')('develop', function(){
-            require('./pull')(args, function(){
-                args.b = ticket;
-                require('./checkout')(args, function(){
-                    console.info(('\n---------------------------------------------').success);
-                    console.info(('you can now start working on ticket ' + ticket).success);
-                    console.info(('---------------------------------------------\n').success);
-                });
-            });
-        });
-    });
+    return deferred.promise;
 };

lib/commands/status.js

 var path = require('path');
+var Q = require('q');
 var shell = require('../shell-utils');
 var repeater = require('../repeater');
 
-module.exports = function(args, callback){
-    callback = callback || function(){};
+module.exports = function(args){
+    var deferred = Q.defer();
 
@@ -13,9 +14,8 @@ var command = function(moduleName, moduleRepo, done){
 
-        console.info(('Status of module: ' + moduleName).success);
+        console.info(('Status of module: ' + moduleName).warning);
 
         isModule && cd('modules/'+moduleName);
 
-        var response = exec('git status');
+        exec('git status');
 
-
         isModule && cd('../..');
@@ -25,3 +25,5 @@ done();
 
-    repeater(command, callback);
+    repeater(command).then(deferred.resolve);
+
+    return deferred.promise;
 };

lib/cox.js

@@ -17,4 +17,7 @@ var shelljs = require('shelljs/global');
 
-command(args);
+command(args).then(function(){
+	console.info(('\n-------------------------------------------').success);
+	console.info(('cox has run the requested task successfully').success);
+	console.info(('-------------------------------------------\n').success);
+});
 
-

lib/prompt-utils.js

@@ -0,1 +1,2 @@
+var Q = require('q');
 var prompt = require('prompt');
@@ -7,6 +8,8 @@ prompt.message = prompt.delimiter = '';
     yesNo: function(question, callback){
+        var deferred = Q.defer();
         console.info(question);
-        prompt.get(yesNo, function(err, result){console.log(result);
-            callback(result.reset.match(/^y/i));
+        prompt.get(yesNo, function(err, result){
+            deferred.resolve(result.reset.match(/^y/i));
         });
+        return deferred.promise;
     }
@@ -13,0 +16,0 @@ };

lib/repeater.js

 var fs = require('fs');
 var path = require('path');
+var Q = require('q');
 
@@ -18,2 +19,3 @@ try{
 var repeater = module.exports = function(command, callback){
+    var deferred = Q.defer();
     var modules = Object.keys(dependencies);
@@ -26,3 +28,3 @@
         if(!moduleName){
-            return callback();
+            return deferred.resolve();
         }
@@ -33,3 +35,4 @@ var moduleRepo = dependencies[moduleName];
 
+    return deferred.promise;
 };
 

lib/shell-utils.js

 module.exports = {
-    run: function(commands){
+    run: function(commands, isSilent){
+        if(typeof isSilent === 'boolean'){
+            silent.silent = isSilent;
+        }
         commands = Array.isArray(commands)? commands : [commands];
@@ -4,0 +7,0 @@ var results = [];

package.json

 {
   "name": "cox",
-  "version": "0.4.12",
+  "version": "0.5.0",
   "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

13189

decreased by-3.85%

Number of package files

19

decreased by-5%

Lines of code

305

decreased by-1.93%

No dependency changes