adding pull all

carsdotcom · Mar 10, 2017 · 1ffaa3b · 1ffaa3b
1 parent 6682f38
commit 1ffaa3b
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 6 deletions.
diff --git a/cli.js b/cli.js
@@ -18,7 +18,8 @@ function setSearchTerm(options) {
     let defaultToWild = _.pick(options, [
         'completions',
         'clone-all',
-        'force-latest'
+        'force-latest',
+        'pull-all'
     ]);
     if (options._ && options._[0]) {
         searchTerm = options._[0];
@@ -47,7 +48,7 @@ function mapToHandler(options) {
                 }
             ]).then((answers) => {
                 if (answers.confirm) {
-                    return Promise.resolve(repos).map(handler).then(() => {
+                    return Promise.resolve(repos).mapSeries(handler).then(() => {
                         return { repoDir: workspaceDir };
                     });
                 } else {
@@ -98,6 +99,13 @@ function cli(options) {
                         errorMessage: 'Force latest aborted',
                         handler: lib.forceLatest
                     });
+                } else if (results.length && options['pull-all']) {
+                    return mapToHandler({
+                        results,
+                        confirmMessage: 'Are you sure you want pull all of the above?',
+                        errorMessage: 'Pull all aborted',
+                        handler: (r) => lib.maybeClone(r).then(lib.maybePull)
+                    });
                 } else if (results.length > 1) {
                     resultPromise = inquirer.prompt([
                         {

diff --git a/lib/forceLatest.js b/lib/forceLatest.js
@@ -9,15 +9,15 @@ const output = require('./output');
 module.exports = forceLatest;
 
 function forceLatest(sourceResult) {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
         if (fs.existsSync(sourceResult.repoDir)) {
             let git = gitFactory.getInstance(sourceResult.repoDir);
             return git.fetch([ 'origin' ], (fetchErr) => {
                 if (fetchErr) output.log('Error trying to fetch ' + sourceResult.clone + '. Message: ' + fetchErr);
                 git.reset([ '--hard', 'origin/master' ], (resetErr) => {
                     if (resetErr) output.log('Error trying to reset hard to origin/master for ' + sourceResult.clone + '. Message: ' + resetErr);
                     return git.clean('f', [ '-d' ], (cleanErr) => {
-                        if (cleanErr) return reject(cleanErr);
+                        output.error(cleanErr);
                         git = null;
                         return resolve(sourceResult);
                     });

diff --git a/lib/index.js b/lib/index.js
@@ -4,6 +4,7 @@ exports.getPaths = require('./getPaths');
 exports.getSourceData = require('./getSourceData');
 exports.getSourceResult = require('./getSourceResult');
 exports.maybeClone = require('./maybeClone');
+exports.maybePull = require('./maybePull');
 exports.forceLatest = require('./forceLatest');
 exports.openInBrowser = require('./openInBrowser');
 exports.workspaceDir = require('./workspaceDir');

diff --git a/lib/maybeClone.js b/lib/maybeClone.js
@@ -3,6 +3,7 @@ const fs = require('fs');
 const path = require('path');
 const Promise = require('bluebird');
 const workspaceDir = require('./workspaceDir');
+const output = require('./output');
 const gitFactory = require('./gitFactory');
 let git;
 
@@ -12,10 +13,10 @@ function maybeClone(sourceResult) {
     if (!git) {
         git = gitFactory.getInstance(workspaceDir);
     }
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
         if (!fs.existsSync(sourceResult.repoDir)) {
             return git.clone(sourceResult.clone, sourceResult.repoDir, (err, data) => {
-                if (err) return reject(err);
+                output.error(err);
                 return resolve(sourceResult);
             });
         } else {

diff --git a/lib/maybePull.js b/lib/maybePull.js
@@ -0,0 +1,26 @@
+'use strict';
+const fs = require('fs');
+const path = require('path');
+const Promise = require('bluebird');
+const workspaceDir = require('./workspaceDir');
+const gitFactory = require('./gitFactory');
+const output = require('./output');
+
+module.exports = forceLatest;
+
+function forceLatest(sourceResult) {
+    return new Promise((resolve) => {
+        if (fs.existsSync(sourceResult.repoDir)) {
+            let git = gitFactory.getInstance(sourceResult.repoDir);
+            return git.checkout('master', (checkoutErr) => {
+                output.error(checkoutErr);
+                return git.pull('origin', 'master', { '--rebase': true }, (pullErr, data) => {
+                    output.error(pullErr);
+                    return resolve(sourceResult);
+                });
+            });
+        } else {
+            return resolve(sourceResult);
+        }
+    });
+}
diff --git a/lib/output.js b/lib/output.js
@@ -1,6 +1,14 @@
 'use strict';
+const chalk = require('chalk');
+const _ = require('lodash');
+
 module.exports = {
     log: (...args) => {
         console.log.apply(console, args);
+    },
+    error: (...args) => {
+        if (args[0] != null) {
+            console.error.apply(console, _.map(args, chalk.bold.red));
+        }
     }
 };