Use bower@1.0.0

Author: arikon

lib/coa.js

@@ -2,7 +2,8 @@
 
 var PATH = require('path'),
     Q = require('q'),
-    C = require('cli-color');
+    C = require('cli-color'),
+    StandardRenderer = require('bower/lib/renderers').Standard;
 
 module.exports = require('coa').Cmd()
     .name(PATH.basename(process.argv[1]))
@@ -44,20 +45,26 @@ module.exports = require('coa').Cmd()
         .end()
     .completable()
     .act(function(opts) {
-        var defer = Q.defer();
+        var defer = Q.defer(),
+            config = {
+                verbose: false,
+                cwd: process.cwd(),
+                color: true
+            },
+            renderer = new StandardRenderer('install', config);
 
-        require('./install')(null, opts)
-            .on('error', defer.reject.bind(defer))
-            .on('data', function(data) {
-                process.stdout.write(data);
+        require('./install')(null, opts, config)
+            .on('error', function(err) {
+                renderer.error(err);
+                defer.reject(err);
             })
-            .on('warn', function(data) {
-                process.stderr.write(data);
+            .on('log', function(data) {
+                renderer.log(data);
             })
-            .on('paths', function(paths) {
-                console.log(JSON.stringify(paths, null, 4));
-            })
-            .on('end', defer.resolve.bind(defer));
+            .on('end', function(data) {
+                renderer.end(data);
+                defer.resolve();
+            });
 
         return defer.promise;
     });

lib/install.js

@@ -6,60 +6,78 @@ var PATH = require('path'),
     Q = require('q'),
     L = require('lodash'),
     QFS = require('q-io/fs'),
-    Emitter = require('events').EventEmitter;
+    Logger = require('bower/node_modules/bower-logger'),
+    byline = require('byline');
 
-module.exports = function(paths, options) {
+module.exports = function(paths, options, config) {
     options = L.extend({}, options || {});
     options.production = !!options['bower-production'];
 
-    var emitter = new Emitter();
+    var logger = new Logger(),
+        emitLog = logger.emit.bind(logger, 'log'),
+        emitError = logger.emit.bind(logger, 'error');
 
-    B.commands.install(paths, options)
-        .on('data', emitter.emit.bind(emitter, 'data'))
-        .on('warn', emitter.emit.bind(emitter, 'warn'))
-        .on('error', emitter.emit.bind(emitter, 'error'))
-        .on('end', function() {
-            B.commands.list({ paths: true })
-                .on('error', emitter.emit.bind(emitter, 'error'))
-                .on('data', function(packages) {
-                    emitter.emit('packages', packages);
+    B.commands.install(paths, options, config)
+        .on('log', emitLog)
+        .on('error', emitError)
+        .on('end', function(installed) {
+            B.commands.list({ offline: true }, config)
+                .on('error', emitError)
+                .on('log', emitLog)
+                .on('end', function(list) {
 
-                    var cwd = process.cwd(),
-                        paths = Object.keys(packages)
+                    var deps = list.dependencies,
+                        paths = Object.keys(deps)
                             .map(function(key) {
-                                return packages[key];
+                                return {
+                                    name: deps[key].pkgMeta.name,
+                                    version: deps[key].pkgMeta.version,
+                                    path: deps[key].canonicalDir
+                                };
                             }),
                         npmBin = process.env.NPM || 'npm',
                         npmArgs = ['install', options['npm-development'] ? '--development' : '--production'],
                         promise = Q.resolve();
 
-                    emitter.emit('paths', paths);
-
-                    paths.forEach(function(p) {
+                    paths.forEach(function(dep) {
+                        var path = dep.path;
                         promise = promise
                             .then(function() {
-                                var path = PATH.join(cwd, p);
                                 return QFS.exists(PATH.join(path, 'package.json'))
                                     .then(function(isPackage) {
                                         if (!isPackage) return;
 
-                                        var cmd = [npmBin].concat(npmArgs).join(' '),
+                                        var p = PATH.relative(config.cwd, path),
+                                            cmd = [npmBin].concat(npmArgs).join(' '),
                                             npm = CP.spawn(npmBin, npmArgs, {
                                                 env: process.env,
                                                 cwd: path
                                             }),
-                                            defer = Q.defer();
+                                            defer = Q.defer(),
+
+                                            npmStdout = new byline.LineStream(),
+                                            npmStderr = new byline.LineStream();
+
+                                        npm.stdout.pipe(npmStdout);
+                                        npm.stderr.pipe(npmStderr);
 
-                                        emitter.emit('data', 'Running ' + cmd + ' in ' + p + '\n');
+                                        logger.info('npm install', cmd + ' in ' + p, dep);
 
-                                        npm.stdout.on('data', emitter.emit.bind(emitter, 'data'));
-                                        npm.stderr.on('data', emitter.emit.bind(emitter, 'warn'));
+                                        // forward output
+                                        npmStdout.on('data', function(data) {
+                                            logger.info('npm install', data, dep);
+                                        });
+
+                                        // forward warnings
+                                        npmStderr.on('data', function(data) {
+                                            logger.warn('npm install', data, dep);
+                                        });
 
                                         npm.on('close', function(code) {
                                             if (code) {
                                                 return defer.reject(new Error('Error (' + code + '): ' + cmd + ' in ' + p));
                                             } else {
-                                                defer.resolve();
+                                                defer.resolve(installed);
                                             }
                                         });
 
@@ -69,11 +87,11 @@ module.exports = function(paths, options) {
                     });
 
                     promise
-                        .then(emitter.emit.bind(emitter, 'end'))
-                        .fail(emitter.emit.bind(emitter, 'error'));
+                        .then(logger.emit.bind(logger, 'end'))
+                        .fail(logger.emit.bind(logger, 'error'));
 
                 });
         });
 
-    return emitter;
+    return logger;
 };

package.json

@@ -22,10 +22,11 @@
     "q-io": "~1.9.1",
     "lodash": "~1.3.1",
     "cli-color": "~0.2.2",
-    "update-notifier": "~0.1.3"
+    "update-notifier": "~0.1.3",
+    "byline": "~3.1.1"
   },
   "peerDependencies": {
-    "bower": "~0.10.0"
+    "bower": "~1.0.0"
   },
   "optionalDependencies": {},
   "main": "lib/index.js",