Merge pull request #6 from scf2k/interactive

Use prompt asking user to resolve a conflict. Use --non-interactive to disable interactive mode.

Author: Sergej Tatarincev

lib/coa.js

@@ -43,13 +43,20 @@ module.exports = require('coa').Cmd()
         .long('force-latest')
         .flag()
         .end()
+    .opt()
+        .name('non-interactive')
+        .title('Do not use interactive mode when executing ' + C.blueBright('bower install'))
+        .long('non-interactive')
+        .flag()
+        .end()
     .completable()
     .act(function(opts) {
         var defer = Q.defer(),
             config = {
                 verbose: false,
                 cwd: process.cwd(),
-                color: true
+                color: true,
+                interactive: !opts['non-interactive']
             },
             renderer = new StandardRenderer('install', config);
 

lib/install.js

@@ -7,7 +7,8 @@ var PATH = require('path'),
     L = require('lodash'),
     QFS = require('q-io/fs'),
     Logger = require('bower/node_modules/bower-logger'),
-    byline = require('byline');
+    byline = require('byline'),
+    inquirer =  require('inquirer');
 
 module.exports = function(paths, options, config) {
     options = L.extend({}, options || {});
@@ -51,6 +52,9 @@ function bowerInstall(paths, options, config) {
         })
         .on('end', function(installed) {
             d.resolve(installed);
+        })
+        .on('prompt', function (prompts, callback) {
+             inquirer.prompt(prompts, callback);
         });
 
     return d.promise;

package.json

@@ -23,7 +23,8 @@
     "lodash": "~1.3.1",
     "cli-color": "~0.2.2",
     "update-notifier": "~0.1.3",
-    "byline": "git://github.com/SevInf/node-byline.git#2c546e682d503667ead0001090ecb9f27f62d928"
+    "byline": "git://github.com/SevInf/node-byline.git#2c546e682d503667ead0001090ecb9f27f62d928",
+    "inquirer": "~0.3.0"
   },
   "peerDependencies": {
     "bower": "~1.2.7"