add --dev install option for devDependencies, cleaned up

README.md

@@ -117,7 +117,7 @@ You can create a `component.json` file in your project's root, specifying all of
 
 Put this under your project's root, listing all of your dependencies. When you run `bower install`, Bower will read this `component.json` file, resolve all the relevant dependencies and install them.
 
-For now, `name`, `version`, `main`, `dependencies`, and `ignore` are the only properties that are used by Bower. If you have several files you're distributing as part of your package, pass an array to `main` like this:
+For now, `name`, `version`, `main`, `dependencies`, `devDependencies`, and `ignore` are the only properties that are used by Bower. If you have several files you're distributing as part of your package, pass an array to `main` like this:
 
 ```json
 {
@@ -157,6 +157,16 @@ Chances are you have a bunch of extra stuff in the repo that are not needed in p
 }
 ```
 
+You may add non-essential packages in `devDependencies`. This is useful for packages aren't required to support the package, but that are used in your project, i.e. to build documentation, run a demo, or run tests.
+
+```json
+{
+  "devDependencies": [
+    "qunit": "~1"
+  ]
+}
+```
+
 ### Installing dependencies
 
 Dependencies are installed locally via the `bower install` command. First they’re resolved to find conflicts. Then they’re downloaded and unpacked in a local subdirectory called `./components`, for example:

lib/commands/install.js

@@ -17,16 +17,17 @@ var source  = require('../core/source');
 var save    = require('../util/save');
 var help    = require('./help');
 
-var optionTypes = { help: Boolean, save: Boolean, force: Boolean, 'force-latest': Boolean };
-var shorthand   = { 'h': ['--help'], 'S': ['--save'], 'f': ['--force'], 'F': ['--force-latest'] };
+var optionTypes = { help: Boolean, save: Boolean, force: Boolean, 'force-latest': Boolean, production: Boolean };
+var shorthand   = { 'h': ['--help'], 'S': ['--save'], 'f': ['--force'], 'F': ['--force-latest'], 'p': ['--production'] };
 
 module.exports = function (paths, options) {
   options = options || {};
 
   var emitter = new Emitter;
   var manager = new Manager(paths, {
     force: options.force,
-    forceLatest: options['force-latest']
+    forceLatest: options['force-latest'],
+    production: options.production
   });
 
   if (options.save) save(manager);

lib/core/manager.js

@@ -141,10 +141,15 @@ Manager.prototype.resolveEndpoints = function () {
 
 Manager.prototype.resolveFromJson = function () {
   this.once('loadJSON', function () {
-    if (!this.json.dependencies) return this.emit('error', new Error('Could not find any dependencies'));
+    var dependencies = this.json.dependencies;
+    // add devDependencies
+    if (!this.opts.production && this.json.devDependencies) {
+      dependencies = _.extend({}, dependencies, this.json.devDependencies)
+    }
+    if (!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];
+    async.forEach(Object.keys(dependencies), function (name, next) {
+      var endpoint = dependencies[name];
       var pkg      = new Package(name, endpoint, this);
       pkg.root = true;
       this.dependencies[name] = this.dependencies[name] || [];

templates/help-install.mustache

@@ -11,6 +11,7 @@ Options:
     {{#yellow}}--save{{/yellow}}         - Updates dependencies entries in the project's {{{json}}}
     {{#yellow}}--force{{/yellow}}        - Force fetching remote resources even if a local copy exists on disk
     {{#yellow}}--force-latest{{/yellow}} - Force latest version on conflict
+    {{#yellow}}--production{{/yellow}}   - Do not install project devDependencies
     {{#yellow}}--no-color{{/yellow}}     - Do not print colors
 
 Can specify one or more:

test/assets/package-dev-dep/component.json

@@ -0,0 +1,7 @@
+{
+  "name": "package-dev-dep",
+  "version": "1.0.0",
+  "devDependencies": {
+    "qunit": "latest"
+  }
+}

test/assets/project-dev-deps/component.json

@@ -0,0 +1,12 @@
+{
+  "name": "myproject",
+  "version": "1.0.0",
+  "dependencies": {
+    "jquery": "test/assets/package-jquery",
+    "package-dev-dep": "test/assets/package-dev-dep"
+  },
+  "devDependencies": {
+    "bootstrap": "test/assets/package-bootstrap",
+    "turtles": "test/assets/package-ignorables"
+  }
+}

test/manager.js

@@ -185,4 +185,43 @@ describe('manager', function () {
     });
   });
 
+  it('Should resolve devDependencies by default', function (next) {
+    var manager = new Manager([]);
+    manager.cwd = __dirname + '/assets/project-dev-deps';
+
+    manager.on('resolve', function () {
+      assert.ok(manager.dependencies.jquery);
+      assert.ok(manager.dependencies['package-dev-dep']);
+      assert.ok(manager.dependencies.bootstrap);
+      assert.ok(manager.dependencies.turtles);
+      // no devDependencies of dependencies
+      assert.ok(!manager.dependencies.qunit);
+      next();
+    });
+
+    manager.on('error', function (err) {
+      throw err;
+    });
+
+    manager.resolve();
+  });
+
+  it('Should not resolve devDependencies when specified', function (next) {
+    var manager = new Manager([], { production: true });
+    manager.cwd = __dirname + '/assets/project-dev-deps';
+
+    manager.on('resolve', function () {
+      assert.ok(manager.dependencies.jquery);
+      assert.ok(!manager.dependencies.bootstrap);
+      assert.ok(!manager.dependencies.turtles);
+      next();
+    });
+
+    manager.on('error', function (err) {
+      throw err;
+    });
+
+    manager.resolve();
+  });
+
 });