Merge remote-tracking branch 'upstream/master' into rename_fix

lib/commands/help.js

@@ -11,7 +11,7 @@ var hogan  = require('hogan.js');
 var nopt   = require('nopt');
 var path   = require('path');
 var fs     = require('fs');
-var _      = require('underscore');
+var _      = require('lodash');
 
 var template  = require('../util/template');
 var config    = require('../core/config');

lib/commands/list.js

@@ -12,7 +12,7 @@ var archy   = require('archy');
 var async   = require('async');
 var nopt    = require('nopt');
 var path    = require('path');
-var _       = require('underscore');
+var _       = require('lodash');
 
 var template = require('../util/template');
 var Manager  = require('../core/manager');

lib/commands/uninstall.js

@@ -9,7 +9,7 @@
 var Emitter  = require('events').EventEmitter;
 var async    = require('async');
 var nopt     = require('nopt');
-var _        = require('underscore');
+var _        = require('lodash');
 
 var template = require('../util/template');
 var Manager  = require('../core/manager');

lib/commands/update.js

@@ -9,7 +9,7 @@
 var Emitter = require('events').EventEmitter;
 var async   = require('async');
 var nopt    = require('nopt');
-var _       = require('underscore');
+var _       = require('lodash');
 
 var Manager = require('../core/manager');
 var install = require('./install');

lib/core/manager.js

@@ -103,6 +103,8 @@ Manager.prototype.resolveFromJson = function () {
 
   this.once('loadJSON', function () {
 
+    if (!this.json.dependencies) return this.emit('error', new Error('Could not find any dependencies'));
+
     async.forEach(Object.keys(this.json.dependencies), function (name, next) {
       var endpoint = this.json.dependencies[name];
       var pkg      = new Package(name, endpoint, this);

lib/core/package.js

@@ -13,7 +13,7 @@
 // ==========================================
 
 var spawn    = require('child_process').spawn;
-var _        = require('underscore');
+var _        = require('lodash');
 var fstream  = require('fstream');
 var mkdirp   = require('mkdirp');
 var events   = require('events');

lib/core/source.js

@@ -7,7 +7,7 @@
 // ==========================================
 
 var request  = require('request');
-var _        = require('underscore');
+var _        = require('lodash');
 
 var endpoint = 'https://bower.herokuapp.com/packages';
 

lib/util/hogan-colors.js

@@ -8,7 +8,7 @@
 
 var colors = require('colors');
 var hogan  = require('hogan.js');
-var _      = require('underscore');
+var _      = require('lodash');
 
 module.exports = hogan.Template.prototype.renderWithColors = function (context, partials, indent) {
   context = _.extend({

lib/util/prune.js

@@ -7,7 +7,7 @@
 // ==========================================
 
 var semver  = require('semver');
-var _       = require('underscore');
+var _       = require('lodash');
 
 var versionRequirements = function (dependencyMap) {
   var result = []

lib/util/save.js

@@ -8,7 +8,7 @@
 
 var path   = require('path');
 var fs     = require('fs');
-var _      = require('underscore');
+var _      = require('lodash');
 
 var config = require('../core/config');
 

package.json

@@ -21,7 +21,7 @@
     "request"           : "latest",
     "fstream"           : "latest",
     "hogan.js"          : "latest",
-    "underscore"        : "latest",
+    "lodash"            : "latest",
     "read-package-json" : "latest"
   },
   "scripts": {

test/info.js

@@ -12,6 +12,13 @@ describe('info', function () {
     assert(info() instanceof events.EventEmitter);
   });
 
+  it('Should emit error event', function (next) {
+    info('no-package-found').on('error', function (error) {
+      assert(!!error);
+      next();
+    });
+  });
+
   it('Should emit end event', function (next) {
     info('jquery').on('end', function (data) {
       assert(!!data);
@@ -33,4 +40,4 @@ describe('info', function () {
     });
   });
 
-});
+});

test/package.js

@@ -1,7 +1,7 @@
 var assert  = require('assert');
 var path    = require('path');
 var fs      = require('fs');
-var _       = require('underscore');
+var _       = require('lodash');
 var Package = require('../lib/core/package');
 
 describe('package', function () {