Try to fix the tests

This is needed for the build process to work correctly

.jscsrc

@@ -1,27 +0,0 @@
-{
- 'validateIndentation': 4,
- 'requireCamelCaseOrUpperCaseIdentifiers': true,
- 'requireParenthesesAroundIIFE': true,
- 'requireCapitalizedConstructors': true,
- 'disallowEmptyBlocks': false,
- 'validateQuoteMarks': "'",
- 'requireOperatorBeforeLineBreak': false,
- 'requireCommaBeforeLineBreak': true,
- 'disallowMultipleLineStrings': true,
- 'requireDotNotation': true,
- 'disallowTabs': true,
- 'disallowNewlineBeforeBlockStatements': true,
- 'disallowTrailingWhitespace': true,
- 'disallowMixedSpacesAndTabs': true,
- 'requireSpaceBeforeBinaryOperators': true,
- 'requireSpaceBeforeBlockStatements': true,
- 'requireSpaceBeforeObjectValues': true,
- 'requireSpaceBetweenArguments': true,
- 'requireSpacesInFunctionDeclaration': {
-   'beforeOpeningCurlyBrace': true
- },
- 'requireSpacesInNamedFunctionExpression': {
-   'beforeOpeningCurlyBrace': true,
-   'beforeOpeningRoundBrace': true
- }
-}

.jshintrc

@@ -9,6 +9,7 @@
         "beforeEach"
     ],
 
+    "indent": 4,
     "node": true,
     "devel": true,
 
@@ -16,19 +17,26 @@
     "curly": false,
     "eqeqeq": true,
     "forin": false,
+    "immed": true,
     "latedef": false,
+    "newcap": true,
     "noarg": true,
+    "noempty": false,
     "nonew": true,
     "plusplus": false,
     "regexp": false,
     "undef": true,
     "unused": "vars",
+    "quotmark": "single",
     "strict": false,
+    "trailing": true,
+    "camelcase": true,
 
     "asi": false,
     "boss": true,
     "debug": false,
     "eqnull": true,
+    "es5": false,
     "esnext": false,
     "evil": false,
     "expr": false,
@@ -36,12 +44,16 @@
     "globalstrict": false,
     "iterator": false,
     "lastsemic": false,
+    "laxbreak": true,
+    "laxcomma": false,
     "loopfunc": true,
+    "multistr": false,
     "onecase": true,
     "regexdash": false,
     "scripturl": false,
     "smarttabs": false,
     "shadow": false,
+    "sub": false,
     "supernew": true,
     "validthis": false,
 

.travis.yml

@@ -1,31 +1,9 @@
-sudo: false
-
-env:
-  - NODE_VERSION=0.10
-  - NODE_VERSION=0.11
-  - NODE_VERSION=0.12
-  - NODE_VERSION=4.0
-  - NODE_VERSION=5.0
-
-install:
-  - test $TRAVIS_OS_NAME = "osx" && brew install nvm && source $(brew --prefix nvm)/nvm.sh || test $TRAVIS_OS_NAME = "linux"
-  - nvm install $NODE_VERSION
-  - npm install -g npm@^2.0.0
-  - node --version
-  - npm --version
-  - git --version
-  - svn --version | head -n 1
-  - npm install -g grunt-cli
-  - npm install
-
-os:
-  - osx
-  - linux
-
+language: node_js
+node_js:
+  - '0.10'
+  - '0.11'
 matrix:
   allow_failures:
-    - os: osx
-    - env: "NODE_VERSION=0.11"
-
+    - node_js: '0.11'
 script:
   - grunt travis

CHANGELOG.md

@@ -1,118 +1,5 @@
 # Changelog
 
-## 1.6.8 - 2015-11-27
-
-- Use fs-write-stream-atomic for downloads
-- Improved downloader that properly cleans after itself
-- Fix shallow host detection ([#2040](https://github.com/bower/bower/pull/2040))
-- Upgrade to ([bower-config#1.2.3](https://github.com/bower/config/releases/tag/1.2.3))
-  - Properly restore env variables if they are undefined at the beginning
-  - Properly handle `default` setting for config.ca
-  - Display proper error if .bowerrc is a directory instead of file
-
-## 1.6.7 - 2015-11-26
-
-- Bundless all the dependencies again
-
-## 1.6.6 - 2015-11-25
-
-- Fixes regression with the published npm version
-
-## 1.6.5 - 2015-10-24
-
-- Updates to tests and documentation
-- Fixes passing options when requesting downloads
-
-## 1.6.4 - 2015-10-24
-
-- Fix ignoring dependencies on multiple install run ([#1970](https://github.com/bower/bower/pull/1970))
-- Use --non-interactive when running svn client ([#1969](https://github.com/bower/bower/pull/1969))
-- Fix downloading of URLs ending with slash ([#1956](https://github.com/bower/bower/pull/1956))
-- Add user-agent field for downloads by Bower ([#1960](https://github.com/bower/bower/pull/1960))
-
-## 1.6.3 - 2015-10-16
-
-Fixes regression issues introduced with 1.6.2, specifically:
-
-- Allow for bower_components to be a symlink
-- Allow setting custom registry in .bowerrc
-
-## 1.6.2 - 2015-10-15
-
-Fix dependency issues of 1.6.1. First published release of 1.6.x.
-
-## 1.6.1 - 2015-10-15
-
-Fix dependency issues of 1.6.0. Reverted release.
-
-## 1.6.0 - 2015-10-15
-
-- Shrinkwrap all dependencies and add them to bundledDependencies ([#1948](https://github.com/bower/bower/pull/1948))
-- Allow for ignoring of child dependencies ([#1394](https://github.com/bower/bower/pull/1394))
-- Allow passing `--config.resolvers` through CLI ([#1922](https://github.com/bower/bower/pull/1922))
-- Use defaults values from package.json if it exists (bower init) ([#1731](https://github.com/bower/bower/issues/1731))
-- Properly use cerificates set in .bowerrc ([#1869](https://github.com/bower/bower/pull/1869))
-- Include package name when version conflict occurs ([#1917](https://github.com/bower/bower/pull/1917))
-- Add timeout for permission check ([yeoman/insight#35](https://github.com/yeoman/insight/pull/35))
-- Close file-handles when possible. Prevents all sorts of permission issues on Windows ([0bb1536](https://github.com/bower/bower/commit/0bb1536c9972e13f3be06bea9a8619632966c664))
-- Prevent ENOENT error on Windows when in VM environment ([isaacs/chmodr#8](https://github.com/isaacs/chmodr/pull/8))
-
-Reverted release.
-
-## 1.5.4 - 2015-11-24
-
-- [fix] Lock lru-cache dependency to 2.7.0
-
-## 1.5.3 - 2015-09-24
-
-- Revert auto sorting of bower dependencies, fixes ([#1897](https://github.com/bower/bower/issues/1897))
-- Fix --save-exact feature for github endpoints, fixes ([#1925](https://github.com/bower/bower/issues/1925))
-- Fix `bower init` to support private flag again ([#1819](https://github.com/bower/bower/pull/1819))
-- Bump insight dependency to support prompt timeout ([#1102](https://github.com/bower/bower/issues/1102))
-
-## 1.5.2 - 2015-08-25
-
-- Revert update semver version from 2.x to 5.x, fixes ([#1896](https://github.com/bower/bower/issues/1896))
-- Make bower commands work from subdirectories, fixes ([#1893](https://github.com/bower/bower/issues/1893))
-- Put auto shallow cloning for git behind a flag, fixes ([#1764](https://github.com/bower/bower/issues/1764))
-
-## 1.5.1 - 2015-08-24
-
-- If cwd provided explicitly, force using it, fixes #1866
-
-## 1.5.0 - 2015-08-24
-
-- Pluggable Resolvers! http://bower.io/docs/pluggable-resolvers/
-- Update semver version from 2.x to 5.x ([#1852](https://github.com/bower/bower/issues/1852))
-- Auto-sort dependencies alphabetically ([#1381](https://github.com/bower/bower/issues/1381))
-- Make bower commands work from subdirectories ([#1866](https://github.com/bower/bower/issues/1866))
-- No longer prefer installing bower as global module ([#1865](https://github.com/bower/bower/issues/1865))
-
-## 1.4.2 - 2015-11-24
-
-- [fix] Lock lru-cache dependency to 2.7.0
-
-## 1.4.1 - 2015-04-01
-
-- [fix] Reading .bowerrc upwards directory tree ([#1763](https://github.com/bower/bower/issues/1763))
-- [fix] Update bower-registry-client so it uses the same bower-config as bower
-
-## 1.4.0 - 2015-03-30
-
-- Add login and unregister commands ([#1719](https://github.com/bower/bower/issues/1719))
-- Automatically detecting smart Git hosts ([#1628](https://github.com/bower/bower/issues/1628))
-- [bower/config#23] Allow npm config variables ([#1711](https://github.com/bower/bower/issues/1711))
-- [bower/config#24] Merge .bowerrc files upwards directory tree ([#1689](https://github.com/bower/bower/issues/1689))
-- Better homedir detection (514eb8f)
-- Add --save-exact flag ([#1654](https://github.com/bower/bower/issues/1654))
-- Ensure extracted files are readable (tar-fs) ([#1548](https://github.com/bower/bower/issues/1548))
-- The version command in the programmatic API now returns the new version ([#1755](https://github.com/bower/bower/issues/1755))
-- Some minor fixes: #1639, #1620, #1576, #1557, 962a565, a464f5a
-- Improved Windows support (AppVeyor CI, tests actually passing on Windows)
-- OSX testing enabled on TravisCI
-
-It also includes improved test coverage (~60% -> ~85%) and many refactors.
-
 ## 1.3.12 - 2014-09-28
 
 - [stability] Fix versions for unstable dependencies ([#1532](https://github.com/bower/bower/pull/1532))

CONTRIBUTING.md

@@ -1,23 +1,35 @@
 # Contributing to Bower
 
-Bower is a large community project with many different developers contributing at all levels to the project. We're **actively** looking for more contributors right now. If you're interested in becoming Bower maintainer or supporting in in any way, please full the following form: http://goo.gl/forms/P1ndzCNoiG. There is more information about [contributing](https://github.com/bower/bower/wiki/Contributor-Guidelines) in the Wiki.
+Bower is a large community project with many different developers contributing at all levels to the project. We're **actively** looking for more contributors right now.  (Jan 2014)
 
 ## Casual Involvement
-
 * Improve the bower.io site ([tickets](https://github.com/bower/bower.github.io/issues))
+* Move forward [bower.io redesign](https://github.com/bower/bower.github.io/issues/7)
+* Attend team meetings
 * Comment on issues and drive to resolution
 
 ## High-impact Involvement
 
 * Maintaining the bower client. 
+  * [Authoring client tests](https://github.com/bower/bower/issues/801)
   * Read [Architecture doc](https://github.com/bower/bower/wiki/Rewrite-architecture)
   * Triage, close, fix and resolve [issues](https://github.com/bower/bower/issues)
+* Developing the [new registry server](https://github.com/bower/registry/tree/node_rewrite)
+  * Hooking in to Elastic Search rather than the in-memory search
+  * Getting bower/registry-client to talk to the new server without breaking backwards compatibility
+  * DevOps for the server
 
 ## Team Meetings
 
-We communicate through a channel on slack: https://gitter.im/bower
+We meet on Monday at 1:00pm PST, 9:00pm UTC in #bower on Freenode. [The meeting notes](http://goo.gl/NJZ1o2).
+
+<hr>
+
+Following these guidelines helps to communicate that you respect the time of
+the developers managing and developing this open source project. In return,
+they should reciprocate that respect in addressing your issue, assessing
+changes, and helping you finalize your pull requests.
 
-If you'd like to attend the meetings, please fill the [support form](http://goo.gl/forms/P1ndzCNoiG), and you'll get an invite.
 
 ## Using the issue tracker
 
@@ -26,8 +38,7 @@ The issue tracker is the preferred channel for [bug reports](#bugs),
 requests](#pull-requests), but please respect the following restrictions:
 
 * Please **do not** use the issue tracker for personal support requests. Use
-  [Stack Overflow](http://stackoverflow.com/questions/tagged/bower)
-  [Gitter Channel](https://gitter.im/bower/bower)
+  [Stack Overflow](http://stackoverflow.com/questions/tagged/bower), our
   [Mailing List](http://groups.google.com/group/twitter-bower)
   (twitter-bower@googlegroups.com), or
   [#bower](http://webchat.freenode.net/?channels=bower) on Freenode.
@@ -35,6 +46,7 @@ requests](#pull-requests), but please respect the following restrictions:
 * Please **do not** derail or troll issues. Keep the discussion on topic and
   respect the opinions of others.
 
+
 <a name="bugs"></a>
 ## Bug reports
 

Gruntfile.js

@@ -17,25 +17,10 @@ module.exports = function (grunt) {
                 '!test/tmp/**/*'
             ]
         },
-        jscs: {
-            options: {
-                config: '.jscsrc',
-                fix: true
-            },
-            files: [
-                'Gruntfile.js',
-                'bin/*',
-                'lib/**/*.js',
-                'test/**/*.js',
-                '!test/assets/**/*',
-                '!test/reports/**/*',
-                '!test/tmp/**/*'
-            ]
-        },
         simplemocha: {
             options: {
                 reporter: 'spec',
-                timeout: '15000'
+                timeout: '5000'
             },
             full: {
                 src: ['test/test.js']
@@ -55,7 +40,7 @@ module.exports = function (grunt) {
                 command: 'node test/packages.js --force && node test/packages-svn.js --force'
             },
             cover: {
-                command: 'STRICT_REQUIRE=1 node node_modules/istanbul/lib/cli.js cover --dir ./test/reports node_modules/mocha/bin/_mocha -- --timeout 30000 -R dot test/test.js'
+                command: 'STRICT_REQUIRE=1 node node_modules/istanbul/lib/cli.js cover --dir ./test/reports node_modules/mocha/bin/_mocha -- -R dot test/test.js'
             },
             coveralls: {
                 command: 'node node_modules/.bin/coveralls < test/reports/lcov.info'
@@ -68,7 +53,7 @@ module.exports = function (grunt) {
     });
 
     grunt.registerTask('assets', ['exec:assets-force']);
-    grunt.registerTask('test', ['jshint', 'jscs', 'exec:assets', 'simplemocha:full']);
+    grunt.registerTask('test', ['jshint', 'exec:assets', 'simplemocha:full']);
     grunt.registerTask('cover', 'exec:cover');
     grunt.registerTask('travis', ['jshint', 'exec:assets', 'exec:cover', 'exec:coveralls']);
     grunt.registerTask('default', 'test');

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Twitter and other contributors
+Copyright (c) 2014 Twitter and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -1,17 +1,10 @@
-# Bower - A package manager for the web
+# Bower
 
-> Bower needs resources for its maintenance. Please fill [<strong>Support Declaration</strong>](http://goo.gl/forms/P1ndzCNoiG) if you think you can help.
-
-[![Build Status](https://travis-ci.org/bower/bower.svg?branch=master)](https://travis-ci.org/bower/bower)
-[![Windows Build](https://ci.appveyor.com/api/projects/status/jr6vfra8w84plh2g/branch/master?svg=true)](https://ci.appveyor.com/project/sheerun/bower/history)
-[![Coverage Status](https://img.shields.io/coveralls/bower/bower.svg)](https://coveralls.io/r/bower/bower?branch=master)
-[![Join the chat at https://gitter.im/bower/bower](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bower/bower?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Issue Stats](http://issuestats.com/github/bower/bower/badge/pr?style=flat)](http://issuestats.com/github/bower/bower)
-[![Issue Stats](http://issuestats.com/github/bower/bower/badge/issue?style=flat)](http://issuestats.com/github/bower/bower)
+[![Build Status](https://travis-ci.org/bower/bower.svg?branch=master)](https://travis-ci.org/bower/bower) [![Coverage Status](https://coveralls.io/repos/bower/bower/badge.png?branch=master)](https://coveralls.io/r/bower/bower?branch=master)
 
 <img align="right" height="300" src="http://bower.io/img/bower-logo.png">
 
----
+> A package manager for the web
 
 Bower offers a generic, unopinionated solution to the problem of **front-end package management**, while exposing the package dependency model via an API that can be consumed by a more opinionated build stack. There are no system wide dependencies, no dependencies are shared between different apps, and the dependency tree is flat.
 
@@ -66,37 +59,43 @@ $ bower uninstall <package-name>
 
 On `prezto` or `oh-my-zsh`, do not forget to `alias bower='noglob bower'` or `bower install jquery\#1.9.1`
 
-### Never run Bower with sudo
+### Running commands with sudo
 
 Bower is a user command, there is no need to execute it with superuser permissions.
+However, if you still want to run commands with sudo, use `--allow-root` option.
 
 ### Windows users
 
 To use Bower on Windows, you must install
-[Git for Windows](http://git-for-windows.github.io/) correctly. Be sure to check the
-options shown below:
+[msysgit](http://msysgit.github.io/) correctly. Be sure to check the
+option shown below:
 
-<img src="https://cloud.githubusercontent.com/assets/10702007/10532690/d2e8991a-7386-11e5-9a57-613c7f92e84e.png" width="534" height="418" alt="Git for Windows" />
-
-<img src="https://cloud.githubusercontent.com/assets/10702007/10532694/dbe8857a-7386-11e5-9bd0-367e97644403.png" width="534" height="418" alt="Git for Windows" />
+![msysgit](http://f.cl.ly/items/2V2O3i1p3R2F1r2v0a12/mysgit.png)
 
 Note that if you use TortoiseGit and if Bower keeps asking for your SSH
 password, you should add the following environment variable: `GIT_SSH -
 C:\Program Files\TortoiseGit\bin\TortoisePlink.exe`. Adjust the `TortoisePlink`
 path if needed.
 
-### Ubuntu users
-
-To use Bower on Ubuntu, you might need to link `nodejs` executable to `node`:
-
-```
-sudo ln -s /usr/bin/nodejs /usr/bin/node
-```
-
 ## Configuration
 
 Bower can be configured using JSON in a `.bowerrc` file. Read over available options at [bower.io/docs/config](http://bower.io/docs/config).
 
+## Completion (experimental)
+
+_NOTE_: Completion is still not implemented for the 1.0.0 release
+
+Bower now has an experimental `completion` command that is based on, and works
+similarly to the [npm completion](https://npmjs.org/doc/completion.html). It is
+not available for Windows users.
+
+This command will output a Bash / ZSH script to put into your `~/.bashrc`,
+`~/.bash_profile`, or `~/.zshrc` file.
+
+```sh
+$ bower completion >> ~/.bash_profile
+```
+
 
 ## Support
 
@@ -107,22 +106,36 @@ Bower can be configured using JSON in a `.bowerrc` file. Read over available opt
 
 ## Contributing
 
-We welcome [contributions](https://github.com/bower/bower/graphs/contributors) of all kinds from anyone. Please take a moment to
+We welcome contributions of all kinds from anyone. Please take a moment to
 review the [guidelines for contributing](CONTRIBUTING.md).
 
-* [Bug reports](https://github.com/bower/bower/wiki/Report-a-Bug)
+* [Bug reports](CONTRIBUTING.md#bugs)
 * [Feature requests](CONTRIBUTING.md#features)
 * [Pull requests](CONTRIBUTING.md#pull-requests)
 
 
-Note that on Windows for tests to pass you need to configure Git before cloning:
+## Bower Team
+
+Bower is made by lots of people across the globe, contributions large and small. Our thanks to everyone who has played a part.
+
+### Core team
+
+* [@satazor](https://github.com/satazor)
+* [@wibblymat](https://github.com/wibblymat)
+* [@paulirish](https://github.com/paulirish)
+* [@benschwarz](https://github.com/benschwarz)
+* [@sindresorhus](https://github.com/sindresorhus)
+* [@svnlto](https://github.com/svnlto)
+* [@sheerun](https://github.com/sheerun)
+
+### Bower Alumni
+
+* [@fat](https://github.com/fat)
+* [@maccman](https://github.com/maccman)
 
-```
-git config --global core.autocrlf input
-```
 
 ## License
 
-Copyright (c) 2015 Twitter and [other contributors](https://github.com/bower/bower/graphs/contributors)
+Copyright (c) 2014 Twitter and other contributors
 
 Licensed under the MIT License

appveyor.yml

@@ -1,42 +0,0 @@
-# Thanks for Grunt for template of this file!
-
-# http://www.appveyor.com/docs/appveyor-yml
-
-# Fix line endings in Windows. (runs before repo cloning)
-init:
-  - git config --global core.autocrlf input
-
-# Test against these versions of Node.js.
-environment:
-  matrix:
-    - nodejs_version: "0.10"
-    - nodejs_version: "0.12"
-    - nodejs_version: "5"
-    - nodejs_version: "4"
-
-# Allow failing jobs for bleeding-edge Node.js versions.
-matrix:
-  allow_failures:
-    - nodejs_version: "0.10"
-
-# Install scripts. (runs after repo cloning)
-install:
-  # Get the latest stable version of Node 0.STABLE.latest
-  - ps: Install-Product node $env:nodejs_version
-  # Output useful info for debugging.
-  - node --version
-  - npm --version
-  - git --version
-  - svn --version
-  # Install all dependencies
-  - npm install
-
-# Post-install test scripts.
-test_script:
-  - cmd: npm test
-
-# Don't actually build.
-build: off
-
-# Set build version format here instead of in the admin panel.
-version: "{build}"

bin/bower

@@ -6,7 +6,7 @@ process.bin = process.title = 'bower';
 var Q = require('q');
 var mout = require('mout');
 var Logger = require('bower-logger');
-var userHome = require('user-home');
+var osenv = require('osenv');
 var bower = require('../lib');
 var pkg = require('../package.json');
 var cli = require('../lib/util/cli');
@@ -125,15 +125,18 @@ analytics.setup(bower.config).then(function () {
     });
 
     // Warn if HOME is not SET
-    if (!userHome) {
-        logger.warn('no-home', 'HOME environment variable not set. User config will not be loaded.');
+    if (!osenv.home()) {
+        logger.warn('no-home', 'HOME not set, user configuration will not be loaded');
     }
 
     if (bower.config.interactive) {
         var updateNotifier = require('update-notifier');
 
         // Check for newer version of Bower
-        var notifier = updateNotifier({pkg: pkg});
+        var notifier = updateNotifier({
+            packageName: pkg.name,
+            packageVersion: pkg.version
+        });
 
         if (notifier.update && levels.info >= loglevel) {
             notifier.notify();

lib/abbreviations.js

@@ -1,30 +0,0 @@
-var abbrev = require('abbrev');
-var mout = require('mout');
-
-function expandNames(obj, prefix, stack) {
-    prefix = prefix || '';
-    stack = stack || [];
-
-    mout.object.forOwn(obj, function (value, name) {
-        name = prefix + name;
-
-        stack.push(name);
-
-        if (typeof value === 'object' && !value.line) {
-            expandNames(value, name + ' ', stack);
-        }
-    });
-
-    return stack;
-}
-
-module.exports = function(commands) {
-    var abbreviations = abbrev(expandNames(commands));
-
-    abbreviations.i = 'install';
-    abbreviations.rm = 'uninstall';
-    abbreviations.unlink = 'uninstall';
-    abbreviations.ls = 'list';
-
-    return abbreviations;
-};

lib/commands/cache/clean.js

@@ -1,11 +1,12 @@
-var fs = require('../../util/fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var mout = require('mout');
 var Q = require('q');
-var rimraf = require('../../util/rimraf');
+var rimraf = require('rimraf');
 var endpointParser = require('bower-endpoint-parser');
 var PackageRepository = require('../../core/PackageRepository');
 var semver = require('../../util/semver');
+var cli = require('../../util/cli');
 var defaultConfig = require('../../config');
 
 function clean(logger, endpoints, options, config) {
@@ -32,7 +33,8 @@ function clean(logger, endpoints, options, config) {
 
     return Q.all([
         clearPackages(decEndpoints, config, logger),
-        clearLinks(names, config, logger)
+        clearLinks(names, config, logger),
+        !names ? clearCompletion(config, logger) : null
     ])
     .spread(function (entries) {
         return entries;
@@ -170,16 +172,34 @@ function clearLinks(names, config, logger) {
     });
 }
 
+function clearCompletion(config, logger) {
+    var dir = config.storage.completion;
+
+    return Q.nfcall(fs.stat, dir)
+    .then(function () {
+        return Q.nfcall(rimraf, dir)
+        .then(function () {
+            logger.info('deleted', 'Completion cache', {
+                file: dir
+            });
+        });
+    }, function (error) {
+        if (error.code !== 'ENOENT') {
+            throw error;
+        }
+    });
+}
+
 // -------------------
 
-clean.readOptions = function (argv) {
-    var cli = require('../../util/cli');
+clean.line = function (logger, argv) {
     var options = cli.readOptions(argv);
     var endpoints = options.argv.remain.slice(2);
+    return clean(logger, endpoints, options);
+};
 
-    delete options.argv;
-
-    return [endpoints, options];
+clean.completion = function () {
+    // TODO:
 };
 
 module.exports = clean;

lib/commands/cache/list.js

@@ -1,5 +1,6 @@
 var mout = require('mout');
 var PackageRepository = require('../../core/PackageRepository');
+var cli = require('../../util/cli');
 var defaultConfig = require('../../config');
 
 function list(logger, packages, options, config) {
@@ -30,14 +31,14 @@ function list(logger, packages, options, config) {
 
 // -------------------
 
-list.readOptions = function (argv) {
-    var cli = require('../../util/cli');
+list.line = function (logger, argv) {
     var options = cli.readOptions(argv);
     var packages = options.argv.remain.slice(2);
+    return list(logger, packages, options);
+};
 
-    delete options.argv;
-
-    return [packages, options];
+list.completion = function () {
+    // TODO:
 };
 
 module.exports = list;

lib/commands/completion.js

@@ -0,0 +1,21 @@
+var Q = require('q');
+var cli = require('../util/cli');
+
+function completion(config) {
+    return new Q();
+}
+
+// -------------------
+
+completion.line = function (logger, argv) {
+    var options = cli.readOptions(argv);
+    var name = options.argv.remain[1];
+
+    return completion(logger, name);
+};
+
+completion.completion = function () {
+    // TODO:
+};
+
+module.exports = completion;

lib/commands/help.js

@@ -1,9 +1,10 @@
 var Q = require('q');
 var path = require('path');
-var fs = require('../util/fs');
+var fs = require('graceful-fs');
+var cli = require('../util/cli');
 var createError = require('../util/createError');
 
-function help(logger, name, config) {
+function help(logger, name) {
     var json;
 
     if (name) {
@@ -17,7 +18,7 @@ function help(logger, name, config) {
     })
     .then(function (exists) {
         if (!exists) {
-            throw createError('Unknown command: ' + name, 'EUNKNOWNCMD', {
+            throw createError('Unknown command: ' + name, 'EUNKOWNCMD', {
                 command: name
             });
         }
@@ -28,12 +29,14 @@ function help(logger, name, config) {
 
 // -------------------
 
-help.readOptions = function (argv) {
-    var cli = require('../util/cli');
+help.line = function (logger, argv) {
     var options = cli.readOptions(argv);
     var name = options.argv.remain.slice(1).join(' ');
+    return help(logger, name);
+};
 
-    return [name];
+help.completion = function () {
+    // TODO
 };
 
 module.exports = help;

lib/commands/home.js

@@ -1,6 +1,7 @@
 var Project = require('../core/Project');
 var open = require('opn');
 var endpointParser = require('bower-endpoint-parser');
+var cli = require('../util/cli');
 var createError = require('../util/createError');
 var defaultConfig = require('../config');
 
@@ -47,12 +48,15 @@ function home(logger, name, config) {
 
 // -------------------
 
-home.readOptions = function (argv) {
-    var cli = require('../util/cli');
+home.line = function (logger, argv) {
     var options = cli.readOptions(argv);
     var name = options.argv.remain[1];
 
-    return [name];
+    return home(logger, name);
+};
+
+home.completion = function () {
+    // TODO:
 };
 
 module.exports = home;

lib/commands/index.js

@@ -1,6 +1,5 @@
 var Q = require('q');
 var Logger = require('bower-logger');
-var config = require('../config');
 
 /**
  * Require commands only when called.
@@ -25,12 +24,7 @@ function commandFactory(id) {
 
     function runFromArgv(argv) {
         return withLogger(function (logger) {
-            var command = require(id);
-
-            var commandArgs = command.readOptions(argv);
-            commandArgs.unshift(logger);
-
-            return command.apply(undefined, commandArgs);
+            return require(id).line.call(undefined, logger, argv);
         });
     }
 
@@ -39,12 +33,10 @@ function commandFactory(id) {
 
         Q.try(func, logger)
         .done(function () {
-            config.restore();
             var args = [].slice.call(arguments);
             args.unshift('end');
             logger.emit.apply(logger, args);
         }, function (error) {
-            config.restore();
             logger.emit('error', error);
         });
 
@@ -52,7 +44,6 @@ function commandFactory(id) {
     }
 
     command.line = runFromArgv;
-
     return command;
 }
 
@@ -62,6 +53,7 @@ module.exports = {
         clean: commandFactory('./cache/clean'),
         list: commandFactory('./cache/list'),
     },
+    completion: commandFactory('./completion'),
     help: commandFactory('./help'),
     home: commandFactory('./home'),
     info: commandFactory('./info'),
@@ -69,13 +61,11 @@ module.exports = {
     install: commandFactory('./install'),
     link: commandFactory('./link'),
     list: commandFactory('./list'),
-    login: commandFactory('./login'),
     lookup: commandFactory('./lookup'),
     prune: commandFactory('./prune'),
     register: commandFactory('./register'),
     search: commandFactory('./search'),
     update: commandFactory('./update'),
     uninstall: commandFactory('./uninstall'),
-    unregister: commandFactory('./unregister'),
     version: commandFactory('./version')
 };

lib/commands/info.js

@@ -2,14 +2,11 @@ var mout = require('mout');
 var Q = require('q');
 var endpointParser = require('bower-endpoint-parser');
 var PackageRepository = require('../core/PackageRepository');
+var cli = require('../util/cli');
 var Tracker = require('../util/analytics').Tracker;
 var defaultConfig = require('../config');
 
 function info(logger, endpoint, property, config) {
-    if (!endpoint) {
-        return;
-    }
-
     var repository;
     var decEndpoint;
     var tracker;
@@ -56,13 +53,20 @@ function getPkgMeta(repository, decEndpoint, property) {
 
 // -------------------
 
-info.readOptions = function (argv) {
-    var cli = require('../util/cli');
+info.line = function (logger, argv) {
     var options = cli.readOptions(argv);
     var pkg = options.argv.remain[1];
     var property = options.argv.remain[2];
 
-    return [pkg, property];
+    if (!pkg) {
+        return new Q();
+    }
+
+    return info(logger, pkg, property);
+};
+
+info.completion = function () {
+    // TODO:
 };
 
 module.exports = info;

lib/commands/init.js

@@ -1,30 +1,30 @@
 var mout = require('mout');
-var fs = require('../util/fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var Q = require('q');
 var endpointParser = require('bower-endpoint-parser');
 var Project = require('../core/Project');
 var defaultConfig = require('../config');
 var GitHubResolver = require('../core/resolvers/GitHubResolver');
+var BitBucketResolver = require('../core/resolvers/BitBucketResolver');
+var GitFsResolver = require('../core/resolvers/GitFsResolver');
+var cli = require('../util/cli');
 var cmd = require('../util/cmd');
 var createError = require('../util/createError');
 
 function init(logger, config) {
     var project;
 
-    config = config || {};
-
-    if (!config.cwd) {
-        config.cwd = process.cwd();
-    }
-
     config = defaultConfig(config);
 
     // This command requires interactive to be enabled
     if (!config.interactive) {
-        throw createError('Register requires an interactive shell', 'ENOINT', {
-            details: 'Note that you can manually force an interactive shell with --config.interactive'
+        process.nextTick(function () {
+            logger.emit('error', createError('Register requires an interactive shell', 'ENOINT', {
+                details: 'Note that you can manually force an interactive shell with --config.interactive'
+            }));
         });
+        return logger;
     }
 
     project = new Project(config, logger);
@@ -57,7 +57,7 @@ function readJson(project, logger) {
 function saveJson(project, logger, json) {
     // Cleanup empty props (null values, empty strings, objects and arrays)
     mout.object.forOwn(json, function (value, key) {
-        if (!validConfigValue(value)) {
+        if (value == null || mout.lang.isEmpty(value)) {
             delete json[key];
         }
     });
@@ -80,18 +80,6 @@ function saveJson(project, logger, json) {
     });
 }
 
-// Test if value is of a type supported by bower.json[0] - Object, Array, String, Boolean - or a Number
-// [0]: https://github.com/bower/bower.json-spec
-function validConfigValue(val) {
-    return (
-        mout.lang.isObject(val)  ||
-        mout.lang.isArray(val)   ||
-        mout.lang.isString(val)  ||
-        mout.lang.isBoolean(val) ||
-        mout.lang.isNumber(val)
-    );
-}
-
 function setDefaults(config, json) {
     var name;
     var promise = Q.resolve();
@@ -101,6 +89,19 @@ function setDefaults(config, json) {
         json.name = path.basename(config.cwd);
     }
 
+    // Version
+    if (!json.version) {
+        // Assume latest semver tag if it's a git repo
+        promise = promise.then(function () {
+            return GitFsResolver.versions(config.cwd)
+            .then(function (versions) {
+                json.version = versions[0] || '0.0.0';
+            }, function () {
+                json.version = '0.0.0';
+            });
+        });
+    }
+
     // Main
     if (!json.main) {
         // Remove '.js' from the end of the package name if it is there
@@ -115,7 +116,7 @@ function setDefaults(config, json) {
 
     // Homepage
     if (!json.homepage) {
-        // Set as GitHub homepage if it's a GitHub repository
+        // Set as GitHub/Bitbucket homepage if it's a GitHub/Bitbucket repository
         promise = promise.then(function () {
             return cmd('git', ['config', '--get', 'remote.origin.url'])
             .spread(function (stdout) {
@@ -130,6 +131,11 @@ function setDefaults(config, json) {
                 if (pair) {
                     json.homepage = 'https://github.com/' + pair.org + '/' + pair.repo;
                 }
+
+                pair = BitBucketResolver.getOrgRepoPair(stdout);
+                if (pair) {
+                    json.homepage = 'https://bitbucket.org/' + pair.org + '/' + pair.repo;
+                }
             })
             .fail(function () { });
         });
@@ -174,6 +180,12 @@ function promptUser(logger, json) {
             'default': json.name,
             'type': 'input'
         },
+        {
+            'name': 'version',
+            'message': 'version',
+            'default': json.version,
+            'type': 'input'
+        },
         {
             'name': 'description',
             'message': 'description',
@@ -239,6 +251,7 @@ function promptUser(logger, json) {
     return Q.nfcall(logger.prompt.bind(logger), questions)
     .then(function (answers) {
         json.name = answers.name;
+        json.version = answers.version;
         json.description = answers.description;
         json.main = answers.main;
         json.moduleType = answers.moduleType;
@@ -313,8 +326,13 @@ function setDependencies(project, json, answers) {
 
 // -------------------
 
-init.readOptions = function (argv) {
-    return [];
+init.line = function (logger, argv) {
+    var options = cli.readOptions(argv);
+    return init(logger, options);
+};
+
+init.completion = function () {
+    // TODO:
 };
 
 module.exports = init;

lib/commands/install.js

@@ -1,5 +1,6 @@
 var endpointParser = require('bower-endpoint-parser');
 var Project = require('../core/Project');
+var cli = require('../util/cli');
 var Tracker = require('../util/analytics').Tracker;
 var defaultConfig = require('../config');
 
@@ -28,22 +29,22 @@ function install(logger, endpoints, options, config) {
 
 // -------------------
 
-install.readOptions = function (argv) {
-    var cli = require('../util/cli');
+install.line = function (logger, argv) {
+    var options = install.options(argv);
+    return install(logger, options.argv.remain.slice(1), options);
+};
 
-    var options = cli.readOptions({
+install.options = function (argv) {
+    return cli.readOptions({
         'force-latest': { type: Boolean, shorthand: 'F'},
         'production': { type: Boolean, shorthand: 'p' },
         'save': { type: Boolean, shorthand: 'S' },
-        'save-dev': { type: Boolean, shorthand: 'D' },
-        'save-exact': { type: Boolean, shorthand: 'E' }
+        'save-dev': { type: Boolean, shorthand: 'D' }
     }, argv);
+};
 
-    var packages = options.argv.remain.slice(1);
-
-    delete options.argv;
-
-    return [packages, options];
+install.completion = function () {
+    // TODO:
 };
 
 module.exports = install;

lib/commands/link.js

@@ -1,15 +1,16 @@
 var path = require('path');
-var rimraf = require('../util/rimraf');
+var rimraf = require('rimraf');
 var Q = require('q');
 var Project = require('../core/Project');
 var createLink = require('../util/createLink');
+var cli = require('../util/cli');
 var defaultConfig = require('../config');
 
-function link(logger, name, localName, config) {
+function link(logger, name, localName) {
     if (name) {
-        return linkTo(logger, name, localName, config);
+        return linkTo(logger, name, localName);
     } else {
-        return linkSelf(logger, config);
+        return linkSelf(logger);
     }
 }
 
@@ -49,7 +50,7 @@ function linkTo(logger, name, localName, config) {
 
     localName = localName || name;
     src = path.join(config.storage.links, name);
-    dst = path.join(config.cwd, config.directory, localName);
+    dst = path.join(process.cwd(), config.directory, localName);
 
     // Delete destination folder if any
     return Q.nfcall(rimraf, dst)
@@ -72,13 +73,15 @@ function linkTo(logger, name, localName, config) {
 
 // -------------------
 
-link.readOptions = function (argv) {
-    var cli = require('../util/cli');
+link.line = function (logger, argv) {
     var options = cli.readOptions(argv);
     var name = options.argv.remain[1];
     var localName = options.argv.remain[2];
+    return link(logger, name, localName);
+};
 
-    return [name, localName];
+link.completion = function () {
+    // TODO:
 };
 
 module.exports = link;

lib/commands/list.js

@@ -3,6 +3,7 @@ var mout = require('mout');
 var Q = require('q');
 var Project = require('../core/Project');
 var semver = require('../util/semver');
+var cli = require('../util/cli');
 var defaultConfig = require('../config');
 
 function list(logger, options, config) {
@@ -81,7 +82,7 @@ function checkVersions(project, tree, logger) {
     }, true);
 
     if (nodes.length) {
-        logger.info('check-new', 'Checking for new versions of the project dependencies...');
+        logger.info('check-new', 'Checking for new versions of the project dependencies..');
     }
 
     // Check for new versions for each node
@@ -150,17 +151,20 @@ function normalize(src) {
 
 // -------------------
 
-list.readOptions = function (argv) {
-    var cli = require('../util/cli');
+list.line = function (logger, argv) {
+    var options = list.options(argv);
+    return list(logger, options);
+};
 
-    var options = cli.readOptions({
+list.options = function (argv) {
+    return cli.readOptions({
         'paths': { type: Boolean, shorthand: 'p' },
         'relative': { type: Boolean, shorthand: 'r' }
     }, argv);
+};
 
-    delete options.argv;
-
-    return [options];
+list.completion = function () {
+    // TODO:
 };
 
 module.exports = list;

lib/commands/login.js

@@ -1,123 +0,0 @@
-var Configstore = require('configstore');
-var GitHub = require('github');
-var Q = require('q');
-
-var createError = require('../util/createError');
-var defaultConfig = require('../config');
-
-function login(logger, options, config) {
-    var configstore = new Configstore('bower-github');
-
-    config = defaultConfig(config);
-
-    var promise;
-
-    options = options || {};
-
-    if (options.token) {
-        promise = Q.resolve({ token: options.token });
-    } else {
-        // This command requires interactive to be enabled
-        if (!config.interactive) {
-            logger.emit('error', createError('Login requires an interactive shell', 'ENOINT', {
-                details: 'Note that you can manually force an interactive shell with --config.interactive'
-            }));
-
-            return;
-        }
-
-        var questions = [
-            {
-                'name': 'username',
-                'message': 'Username',
-                'type': 'input',
-                'default': configstore.get('username')
-            },
-            {
-                'name': 'password',
-                'message': 'Password',
-                'type': 'password'
-            }
-        ];
-
-        var github = new GitHub({
-            version: '3.0.0'
-        });
-
-        promise = Q.nfcall(logger.prompt.bind(logger), questions)
-        .then(function (answers) {
-            configstore.set('username', answers.username);
-
-            github.authenticate({
-                type: 'basic',
-                username: answers.username,
-                password: answers.password
-            });
-
-            return Q.ninvoke(github.authorization, 'create', {
-                scopes: ['user', 'repo'],
-                note: 'Bower command line client (' + (new Date()).toISOString() + ')'
-            });
-        });
-    }
-
-    return promise.then(function (result) {
-        configstore.set('accessToken', result.token);
-
-        return result;
-    }, function (error) {
-        var message;
-
-        try {
-            message = JSON.parse(error.message).message;
-        } catch (e) {
-            message = 'Authorization failed';
-        }
-
-        var questions = [
-            {
-                'name': 'otpcode',
-                'message': 'Two-Factor Auth Code',
-                'type': 'input'
-            }
-        ];
-
-        if (message === 'Must specify two-factor authentication OTP code.') {
-            return Q.nfcall(logger.prompt.bind(logger), questions)
-            .then(function (answers) {
-                return Q.ninvoke(github.authorization, 'create', {
-                    scopes: ['user', 'repo'],
-                    note: 'Bower command line client (' + (new Date()).toISOString() + ')',
-                    headers: {
-                        'X-GitHub-OTP': answers.otpcode
-                    }
-                });
-            })
-            .then(function (result) {
-                configstore.set('accessToken', result.token);
-
-                return result;
-            }, function () {
-                logger.emit('error', createError(message, 'EAUTH'));
-            });
-        } else {
-            logger.emit('error', createError(message, 'EAUTH'));
-        }
-    });
-}
-
-// -------------------
-
-login.readOptions = function (argv) {
-    var cli = require('../util/cli');
-
-    var options = cli.readOptions({
-        token: { type: String, shorthand: 't' },
-    }, argv);
-
-    delete options.argv;
-
-    return [options];
-};
-
-module.exports = login;

lib/commands/lookup.js

@@ -1,12 +1,9 @@
 var Q = require('q');
 var RegistryClient = require('bower-registry-client');
+var cli = require('../util/cli');
 var defaultConfig = require('../config');
 
 function lookup(logger, name, config) {
-    if (!name) {
-        return new Q(null);
-    }
-
     var registryClient;
 
     config = defaultConfig(config);
@@ -27,12 +24,19 @@ function lookup(logger, name, config) {
 
 // -------------------
 
-lookup.readOptions = function (argv) {
-    var cli = require('../util/cli');
-    var options = cli.readOptions(argv);
+lookup.line = function (logger, argv) {
+    var options =  cli.readOptions(argv);
     var name = options.argv.remain[1];
 
-    return [name];
+    if (!name) {
+        return new Q();
+    } else {
+        return lookup(logger, name);
+    }
+};
+
+lookup.completion = function () {
+    // TODO:
 };
 
 module.exports = lookup;

lib/commands/prune.js

@@ -1,5 +1,6 @@
 var mout = require('mout');
 var Project = require('../core/Project');
+var cli = require('../util/cli');
 var defaultConfig = require('../config');
 
 function prune(logger, options, config) {
@@ -40,16 +41,19 @@ function clean(project, options, removed) {
 
 // -------------------
 
-prune.readOptions = function (argv) {
-    var cli = require('../util/cli');
+prune.line = function (logger, argv) {
+    var options = prune.options(argv);
+    return prune(logger, options);
+};
 
-    var options = cli.readOptions({
+prune.options = function (argv) {
+    return cli.readOptions({
         'production': { type: Boolean, shorthand: 'p' },
     }, argv);
+};
 
-    delete options.argv;
-
-    return [options];
+prune.completion = function () {
+    // TODO:
 };
 
 module.exports = prune;

lib/commands/register.js

@@ -1,9 +1,14 @@
+var mout = require('mout');
 var Q = require('q');
 var chalk = require('chalk');
 var PackageRepository = require('../core/PackageRepository');
+var Config = require('bower-config');
 var Tracker = require('../util/analytics').Tracker;
+var cli = require('../util/cli');
 var createError = require('../util/createError');
 var defaultConfig = require('../config');
+var GitHubResolver = require('../core/resolvers/GitHubResolver');
+var BitBucketResolver = require('../core/resolvers/BitBucketResolver');
 
 function register(logger, name, url, config) {
     var repository;
@@ -15,17 +20,28 @@ function register(logger, name, url, config) {
     force = config.force;
     tracker = new Tracker(config);
 
-    name = (name || '').trim();
-    url = (url || '').trim();
-
     // Bypass any cache
     config.offline = false;
     config.force = true;
 
+    // Trim name
+    name = name.trim();
+
     return Q.try(function () {
-        // Verify name and url
-        if (!name || !url) {
-            throw createError('Usage: bower register <name> <url>', 'EINVFORMAT');
+        // Verify name
+        // TODO: Verify with the new spec regexp?
+        if (!name) {
+            throw createError('Please type a name', 'EINVNAME');
+        }
+
+        // The public registry only allows git:// endpoints
+        // As such, we attempt to convert URLs as necessary
+        if (config.registry.register === Config.DEFAULT_REGISTRY) {
+            url = convertUrl(url, logger);
+
+            if (!mout.string.startsWith(url, 'git://')) {
+                throw createError('The registry only accepts URLs starting with git://', 'EINVFORMAT');
+            }
         }
 
         tracker.track('register');
@@ -71,16 +87,44 @@ function register(logger, name, url, config) {
     });
 }
 
+function convertUrl(url, logger) {
+    var pair;
+    var newUrl;
+
+    if (!mout.string.startsWith(url, 'git://')) {
+        // Convert GitHub/Bitbucket ssh & https to git://
+        pair = GitHubResolver.getOrgRepoPair(url);
+        if (pair) {
+            newUrl = 'git://github.com/' + pair.org + '/' + pair.repo + '.git';
+            logger.warn('convert', 'Converted ' + url + ' to ' + newUrl);
+        }
+
+        pair = BitBucketResolver.getOrgRepoPair(url);
+        if (pair) {
+            newUrl = 'git://bitbucket.org/' + pair.org + '/' + pair.repo + '.git';
+            logger.warn('convert', 'Converted ' + url + ' to ' + newUrl);
+        }
+    }
+
+    return newUrl || url;
+}
+
 // -------------------
 
-register.readOptions = function (argv) {
-    var cli = require('../util/cli');
-
+register.line = function (logger, argv) {
     var options = cli.readOptions(argv);
     var name = options.argv.remain[1];
     var url = options.argv.remain[2];
 
-    return [name, url];
+    if (!name || !url) {
+        return new Q();
+    } else {
+        return register(logger, name, url);
+    }
+};
+
+register.completion = function () {
+    // TODO:
 };
 
 module.exports = register;

lib/commands/search.js

@@ -1,5 +1,6 @@
 var Q = require('q');
 var RegistryClient = require('bower-registry-client');
+var cli = require('../util/cli');
 var Tracker = require('../util/analytics').Tracker;
 var defaultConfig = require('../config');
 
@@ -25,12 +26,14 @@ function search(logger, name, config) {
 
 // -------------------
 
-search.readOptions = function (argv) {
-    var cli = require('../util/cli');
+search.line = function (logger, argv) {
     var options = cli.readOptions(argv);
     var name = options.argv.remain.slice(1).join(' ');
+    return search(logger, name, options);
+};
 
-    return [name];
+search.completion = function () {
+    // TODO:
 };
 
 module.exports = search;

lib/commands/uninstall.js

@@ -1,14 +1,11 @@
 var mout = require('mout');
 var Q = require('q');
 var Project = require('../core/Project');
+var cli = require('../util/cli');
 var Tracker = require('../util/analytics').Tracker;
 var defaultConfig = require('../config');
 
 function uninstall(logger, names, options, config) {
-    if (!names.length) {
-        return new Q();
-    }
-
     var project;
     var tracker;
 
@@ -102,19 +99,26 @@ function clean(project, names, removed) {
 
 // -------------------
 
-uninstall.readOptions = function (argv) {
-    var cli = require('../util/cli');
+uninstall.line = function (logger, argv) {
+    var options = uninstall.options(argv);
+    var names = options.argv.remain.slice(1);
 
-    var options = cli.readOptions({
+    if (!names.length) {
+        return new Q();
+    } else {
+        return uninstall(logger, names, options);
+    }
+};
+
+uninstall.options = function (argv) {
+    return cli.readOptions({
         'save': { type: Boolean, shorthand: 'S' },
         'save-dev': { type: Boolean, shorthand: 'D' }
     }, argv);
+};
 
-    var names = options.argv.remain.slice(1);
-
-    delete options.argv;
-
-    return [names, options];
+uninstall.completion = function () {
+    // TODO:
 };
 
 module.exports = uninstall;

lib/commands/unregister.js

@@ -1,85 +0,0 @@
-var chalk = require('chalk');
-var Q = require('q');
-
-var defaultConfig = require('../config');
-var PackageRepository = require('../core/PackageRepository');
-var Tracker = require('../util/analytics').Tracker;
-var createError = require('../util/createError');
-
-function unregister(logger, name, config) {
-
-    if (!name) {
-        return;
-    }
-
-    var repository;
-    var registryClient;
-    var tracker;
-    var force;
-
-    config = defaultConfig(config);
-    force = config.force;
-    tracker = new Tracker(config);
-
-    // Bypass any cache
-    config.offline = false;
-    config.force = true;
-
-    // Trim name
-    name = name.trim();
-
-    repository = new PackageRepository(config, logger);
-
-    tracker.track('unregister');
-
-    if (!config.accessToken) {
-        return logger.emit('error',
-             createError('Use "bower login" with collaborator credentials', 'EFORBIDDEN')
-        );
-    }
-
-    return Q.resolve()
-    .then(function () {
-        // If non interactive or user forced, bypass confirmation
-        if (!config.interactive || force) {
-            return true;
-        }
-
-        return Q.nfcall(logger.prompt.bind(logger), {
-            type: 'confirm',
-            message: 'You are about to remove component "' + chalk.cyan.underline(name) + '" from the bower registry (' + chalk.cyan.underline(config.registry.register) + '). It is generally considered bad behavior to remove versions of a library that others are depending on. Are you really sure?',
-            default: false
-        });
-    })
-    .then(function (result) {
-        // If user response was negative, abort
-        if (!result) {
-            return;
-        }
-
-        registryClient = repository.getRegistryClient();
-
-        logger.action('unregister', name, { name: name });
-
-        return Q.nfcall(registryClient.unregister.bind(registryClient), name);
-    })
-    .then(function (result) {
-        tracker.track('unregistered');
-        logger.info('Package unregistered', name);
-
-        return result;
-    });
-}
-
-// -------------------
-
-unregister.readOptions = function (argv) {
-    var cli = require('../util/cli');
-
-    var options = cli.readOptions(argv);
-    var name = options.argv.remain[1];
-
-    return [name];
-};
-
-module.exports = unregister;

lib/commands/update.js

@@ -1,4 +1,5 @@
 var Project = require('../core/Project');
+var cli = require('../util/cli');
 var defaultConfig = require('../config');
 
 function update(logger, names, options, config) {
@@ -18,21 +19,21 @@ function update(logger, names, options, config) {
 
 // -------------------
 
-update.readOptions = function (argv) {
-    var cli = require('../util/cli');
-
-    var options = cli.readOptions({
-        'force-latest': { type: Boolean, shorthand: 'F' },
-        'production': { type: Boolean, shorthand: 'p' },
-        'save': { type: Boolean, shorthand: 'S' },
-        'save-dev': { type: Boolean, shorthand: 'D' }
-    }, argv);
-
+update.line = function (logger, argv) {
+    var options = update.options(argv);
     var names = options.argv.remain.slice(1);
+    return update(logger, names, options);
+};
 
-    delete options.argv;
+update.options = function (argv) {
+    return cli.readOptions({
+        'force-latest': { type: Boolean, shorthand: 'F' },
+        'production': { type: Boolean, shorthand: 'p' }
+    }, argv);
+};
 
-    return [names, options];
+update.completion = function () {
+    // TODO:
 };
 
 module.exports = update;

lib/commands/version.js

@@ -1,17 +1,17 @@
 var semver = require('semver');
 var which = require('which');
-var fs = require('../util/fs');
+var fs = require('fs');
 var path = require('path');
 var Q = require('q');
 var execFile = require('child_process').execFile;
 var Project = require('../core/Project');
+var cli = require('../util/cli');
 var defaultConfig = require('../config');
 var createError = require('../util/createError');
 
 function version(logger, versionArg, options, config) {
     var project;
 
-    options = options || {};
     config = defaultConfig(config);
     project = new Project(config, logger);
 
@@ -19,11 +19,10 @@ function version(logger, versionArg, options, config) {
 }
 
 function bump(project, versionArg, message) {
-    var cwd = project._config.cwd || process.cwd();
     var newVersion;
     var doGitCommit = false;
 
-    return checkGit(cwd)
+    return checkGit()
     .then(function (hasGit) {
         doGitCommit = hasGit;
     })
@@ -35,12 +34,11 @@ function bump(project, versionArg, message) {
     .then(project.saveJson.bind(project))
     .then(function () {
         if (doGitCommit) {
-            return gitCommitAndTag(cwd, newVersion, message);
+            return gitCommitAndTag(newVersion, message);
         }
     })
     .then(function () {
         console.log('v' + newVersion);
-        return newVersion;
     });
 }
 
@@ -58,12 +56,12 @@ function getNewVersion(currentVersion, versionArg) {
     return newVersion;
 }
 
-function checkGit(cwd) {
-    var gitDir = path.join(cwd, '.git');
+function checkGit() {
+    var gitDir = path.join(process.cwd(), '.git');
     return Q.nfcall(fs.stat, gitDir)
     .then(function (stat) {
         if (stat.isDirectory()) {
-            return checkGitStatus(cwd);
+            return checkGitStatus();
         }
         return false;
     }, function () {
@@ -72,14 +70,14 @@ function checkGit(cwd) {
     });
 }
 
-function checkGitStatus(cwd) {
+function checkGitStatus() {
     return Q.nfcall(which, 'git')
     .fail(function (err) {
         err.code = 'ENOGIT';
         throw err;
     })
     .then(function () {
-        return Q.nfcall(execFile, 'git', ['status', '--porcelain'], {env: process.env, cwd: cwd});
+        return Q.nfcall(execFile, 'git', ['status', '--porcelain'], {env: process.env});
     })
     .then(function (value) {
         var stdout = value[0];
@@ -100,29 +98,34 @@ function filterModifiedStatusLines(stdout) {
     });
 }
 
-function gitCommitAndTag(cwd, newVersion, message) {
+function gitCommitAndTag(newVersion, message) {
     var tag = 'v' + newVersion;
     message = message || tag;
     message = message.replace(/%s/g, newVersion);
-    return Q.nfcall(execFile, 'git', ['add', 'bower.json'], {env: process.env, cwd: cwd})
+    return Q.nfcall(execFile, 'git', ['add', 'bower.json'], {env: process.env})
     .then(function () {
-        return Q.nfcall(execFile, 'git', ['commit', '-m', message], {env: process.env, cwd: cwd});
+        return Q.nfcall(execFile, 'git', ['commit', '-m', message], {env: process.env});
     })
     .then(function () {
-        return Q.nfcall(execFile, 'git', ['tag', tag, '-am', message], {env: process.env, cwd: cwd});
+        return Q.nfcall(execFile, 'git', ['tag', tag, '-am', message], {env: process.env});
     });
 }
 
 // -------------------
 
-version.readOptions = function (argv) {
-    var cli = require('../util/cli');
+version.line = function (logger, argv) {
+    var options = version.options(argv);
+    return version(logger, options.argv.remain[1], options);
+};
 
-    var options = cli.readOptions({
+version.options = function (argv) {
+    return cli.readOptions({
         'message': { type: String, shorthand: 'm'}
     }, argv);
+};
 
-    return [options.argv.remain[1], options];
+version.completion = function () {
+    // TODO:
 };
 
 module.exports = version;

lib/config.js

@@ -1,24 +1,24 @@
 var tty = require('tty');
 var object = require('mout').object;
 var bowerConfig = require('bower-config');
-var Configstore = require('configstore');
+var cli = require('./util/cli');
 
-var current;
+var cachedConfigs = {};
 
 function defaultConfig(config) {
     config = config || {};
 
-    return readCachedConfig(config.cwd || process.cwd(), config);
+    var cachedConfig = readCachedConfig(config.cwd || process.cwd());
+
+    return object.merge(cachedConfig, config);
 }
 
-function readCachedConfig(cwd, overwrites) {
-    current = bowerConfig.create(cwd).load(overwrites);
+function readCachedConfig(cwd) {
+    if (cachedConfigs[cwd]) {
+        return cachedConfigs[cwd];
+    }
 
-    var config = current.toObject();
-
-    var configstore = new Configstore('bower-github').all;
-
-    object.mixIn(config, configstore);
+    var config = cachedConfigs[cwd] = bowerConfig.read(cwd);
 
     // Delete the json attribute because it is no longer supported
     // and conflicts with --json
@@ -34,34 +34,22 @@ function readCachedConfig(cwd, overwrites) {
     }
 
     // Merge common CLI options into the config
-    if (process.bin === 'bower') {
-        var cli = require('./util/cli');
-
-        object.mixIn(config, cli.readOptions({
-            force: { type: Boolean, shorthand: 'f' },
-            offline: { type: Boolean, shorthand: 'o' },
-            verbose: { type: Boolean, shorthand: 'V' },
-            quiet: { type: Boolean, shorthand: 'q' },
-            loglevel: { type: String, shorthand: 'l' },
-            json: { type: Boolean, shorthand: 'j' },
-            silent: { type: Boolean, shorthand: 's' }
-        }));
-    }
+    object.mixIn(config, cli.readOptions({
+        force: { type: Boolean, shorthand: 'f' },
+        offline: { type: Boolean, shorthand: 'o' },
+        verbose: { type: Boolean, shorthand: 'V' },
+        quiet: { type: Boolean, shorthand: 'q' },
+        loglevel: { type: String, shorthand: 'l' },
+        json: { type: Boolean, shorthand: 'j' },
+        silent: { type: Boolean, shorthand: 's' }
+    }));
 
     return config;
 }
 
-function restoreConfig () {
-    if (current) {
-        current.restore();
-    }
-}
-
 function resetCache () {
-    restoreConfig();
-    current = undefined;
+    cachedConfigs = {};
 }
 
 module.exports = defaultConfig;
-module.exports.restore = restoreConfig;
 module.exports.reset = resetCache;

lib/core/Manager.js

@@ -2,13 +2,14 @@ var Q = require('q');
 var mout = require('mout');
 var path = require('path');
 var mkdirp = require('mkdirp');
-var rimraf = require('../util/rimraf');
-var fs = require('../util/fs');
+var rimraf = require('rimraf');
+var fs = require('graceful-fs');
 var endpointParser = require('bower-endpoint-parser');
 var PackageRepository = require('./PackageRepository');
 var semver = require('../util/semver');
 var copy = require('../util/copy');
 var createError = require('../util/createError');
+var dependencyLinker = require('../util/dependencyLinker');
 var scripts = require('./scripts');
 
 function Manager(config, logger) {
@@ -23,13 +24,11 @@ function Manager(config, logger) {
 
 Manager.prototype.configure = function (setup) {
     var targetsHash = {};
+
     this._conflicted = {};
 
-    // Targets - ignore those specified in ignoredDependencies
-    this._targets = mout.array.reject(setup.targets || [], function(target) {
-        return mout.array.contains(this._config.ignoredDependencies, target.name );
-    }, this);
-
+    // Targets
+    this._targets = setup.targets || [];
     this._targets.forEach(function (decEndpoint) {
         decEndpoint.initialName = decEndpoint.name;
         decEndpoint.dependants = mout.object.values(decEndpoint.dependants);
@@ -82,17 +81,6 @@ Manager.prototype.configure = function (setup) {
     return this;
 };
 
-/**
- * It starts recursive fetching of targets. The flow is as follows:
- *
- * 1. this._fetch() that calls:
- * 2. this._onFetchError() or this._onFetchSuccess() that calls:
- * 3. this._parseDependencies() that calls for all dependencies:
- * 4. this._fetch() again.
- *
- * Fetching and parsing of dependencies continues until all dependencies are fetched.
- *
- */
 Manager.prototype.resolve = function () {
     // If already resolving, error out
     if (this._working) {
@@ -158,7 +146,6 @@ Manager.prototype.postinstall = function (json) {
 
 Manager.prototype.install = function (json) {
     var componentsDir;
-    var componentsDirContents;
     var that = this;
 
     // If already resolving, error out
@@ -175,25 +162,16 @@ Manager.prototype.install = function (json) {
     return Q.nfcall(mkdirp, componentsDir)
     .then(function () {
         var promises = [];
-        componentsDirContents = fs.readdirSync(componentsDir);
 
         mout.object.forOwn(that._dissected, function (decEndpoint, name) {
             var promise;
             var dst;
             var release = decEndpoint.pkgMeta._release;
-            var exists = mout.array.contains(componentsDirContents, name);
 
             that._logger.action('install', name + (release ? '#' + release : ''), that.toData(decEndpoint));
 
             dst = path.join(componentsDir, name);
 
-            if (exists && !that._installed[name] && !that._config.force) {
-                // There is a folder in the components directory that has
-                // this name, but it was not installed by bower.
-                that._logger.warn('skipped', name + ' was not installed because there is already a non-bower directory with that name in the components directory (' + path.relative(that._config.cwd, dst) + '). You can force installation with --force.');
-                return;
-            }
-
             // Remove existent and copy canonical dir
             promise = Q.nfcall(rimraf, dst)
             .then(copy.copyDir.bind(copy, decEndpoint.canonicalDir, dst))
@@ -241,7 +219,13 @@ Manager.prototype.install = function (json) {
                 return dissected;
             }, this);
         }, that);
-
+    })
+    .then(function () {
+        // Create symlinks for sub-dependencies
+        var flattened = mout.object.mixIn({}, that._installed, that._dissected);
+        return dependencyLinker.link(flattened, that._config, that._logger);
+    })
+    .then(function () {
         // Resolve with meaningful data
         return mout.object.map(that._dissected, function (decEndpoint) {
             return this.toData(decEndpoint);
@@ -360,7 +344,7 @@ Manager.prototype._onFetchSuccess = function (decEndpoint, canonicalDir, pkgMeta
     resolved.push(decEndpoint);
 
     // Parse dependencies
-    this._parseDependencies(decEndpoint, pkgMeta);
+    this._parseDependencies(decEndpoint, pkgMeta, 'dependencies');
 
     // Check if there are incompatibilities for this package name
     // If there are, we need to fetch them
@@ -437,32 +421,18 @@ Manager.prototype._failFast = function () {
     }.bind(this), 20000);
 };
 
-/**
- * Parses decEndpoint dependencies and fetches missing ones.
- *
- * It fetches all non-yet-fetching dependencies with _fetch.
- *
- *
- * @param {string} pkgMeta Metadata of package to resolve dependencies.
- */
-Manager.prototype._parseDependencies = function (decEndpoint, pkgMeta) {
+Manager.prototype._parseDependencies = function (decEndpoint, pkgMeta, jsonKey) {
     var pending = [];
 
     decEndpoint.dependencies = decEndpoint.dependencies || {};
 
     // Parse package dependencies
-    mout.object.forOwn(pkgMeta.dependencies, function (value, key) {
+    mout.object.forOwn(pkgMeta[jsonKey], function (value, key) {
         var resolved;
         var fetching;
         var compatible;
         var childDecEndpoint = endpointParser.json2decomposed(key, value);
 
-        // Check if this depdendency should be skipped.
-        if (mout.array.contains(this._config.ignoredDependencies, childDecEndpoint.name)) {
-            this._logger.action('skipped', childDecEndpoint.name, this.toData(decEndpoint));
-            return;
-        }
-
         // Check if a compatible one is already resolved
         // If there's one, we don't need to resolve it twice
         resolved = this._resolved[key];
@@ -526,24 +496,11 @@ Manager.prototype._parseDependencies = function (decEndpoint, pkgMeta) {
     if (pending.length > 0) {
         Q.all(pending)
         .then(function () {
-            this._parseDependencies(decEndpoint, pkgMeta);
+            this._parseDependencies(decEndpoint, pkgMeta, jsonKey);
         }.bind(this));
     }
 };
 
-/**
- * After batch of packages has been fetched, the results are stored in _resolved hash.
- *
- * {
- *   packageName: [array, of, decEndpoints]
- * }
- *
- * This method takes all possible decEndpoints and selects only one of them per packageName.
- *
- * It stores selected packages in the this._dissected array.
- *
- * The _dissected array is used later on by install method to move packages to config.directory.
- */
 Manager.prototype._dissect = function () {
     var err;
     var componentsDir;
@@ -621,11 +578,6 @@ Manager.prototype._dissect = function () {
                 return;
             }
 
-            // Packages that didn't have any conflicts in resolution yet have
-            // "resolution" entry in bower.json are deemed unnecessary
-            //
-            // Probably in future we want to use them for force given resolution, but for now...
-            // See: https://github.com/bower/bower/issues/1362
             this._logger.warn('extra-resolution', 'Unnecessary resolution: ' + name + '#' + resolution, {
                 name: name,
                 resolution: resolution,
@@ -645,16 +597,12 @@ Manager.prototype._dissect = function () {
             }
 
             // Skip if source is the same as dest
-            // FIXME: Shoudn't we force installation if force flag is used here?
             dst = path.join(componentsDir, name);
             if (dst === decEndpoint.canonicalDir) {
                 return false;
             }
 
-            // We skip installing decEndpoint, if:
-            //   1. We have installed package with the same name
-            //   2. Packages have matching meta fields (needs explanation)
-            //   3. We didn't force the installation
+            // Analyse a few props
             if (installedMeta &&
                 installedMeta._target === decEndpoint.target &&
                 installedMeta._originalSource === decEndpoint.source &&
@@ -834,7 +782,7 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
     choices = picks.map(function (pick, index) { return index + 1; });
     return Q.nfcall(this._logger.prompt.bind(this._logger), {
         type: 'input',
-        message: 'Answer',
+        message: 'Answer:',
         validate: function (choice) {
             choice = Number(mout.string.trim(choice.trim(), '!'));
 
@@ -886,7 +834,7 @@ Manager.prototype._storeResolution = function (pick) {
  *
  * It is used in two situations:
  *   * checks if resolved component matches dependency constraint
- *   * checks if not resolved component matches already fetched component
+ *   * checks if not resolved component matches alredy fetched component
  *
  * If candidate matches already resolved component, it won't be downloaded.
  *

lib/core/PackageRepository.js

@@ -38,14 +38,15 @@ PackageRepository.prototype.fetch = function (decEndpoint) {
         that._extendLog(log, info);
     });
 
-    return this._getResolver(decEndpoint, logger)
+    // Get the appropriate resolver
+    return resolverFactory(decEndpoint, this._config, logger, this._registryClient)
     // Decide if we retrieve from the cache or not
     // Also decide if we validate the cached entry or not
     .then(function (resolver) {
         info.resolver = resolver;
         isTargetable = resolver.constructor.isTargetable;
 
-        if (!resolver.isCacheable()) {
+        if (resolver.isNotCacheable()) {
             return that._resolve(resolver, logger);
         }
 
@@ -90,7 +91,7 @@ PackageRepository.prototype.fetch = function (decEndpoint) {
             logger.action('validate', (pkgMeta._release ? pkgMeta._release + ' against ': '') +
                                       resolver.getSource() + (resolver.getTarget() ? '#' + resolver.getTarget() : ''));
 
-            return resolver.hasNew(pkgMeta)
+            return resolver.hasNew(canonicalDir, pkgMeta)
             .then(function (hasNew) {
                 // If there are no new contents, resolve to
                 // the cached one
@@ -116,15 +117,15 @@ PackageRepository.prototype.fetch = function (decEndpoint) {
 PackageRepository.prototype.versions = function (source) {
     // Resolve the source using the factory because the
     // source can actually be a registry name
-    return this._getResolver({ source: source })
-    .then(function (resolver) {
+    return resolverFactory.getConstructor(source, this._config, this._registryClient)
+    .spread(function (ConcreteResolver, source) {
         // If offline, resolve using the cached versions
         if (this._config.offline) {
-            return this._resolveCache.versions(resolver.getSource());
+            return this._resolveCache.versions(source);
         }
 
         // Otherwise, fetch remotely
-        return resolver.constructor.versions(resolver.getSource());
+        return ConcreteResolver.versions(source);
     }.bind(this));
 };
 
@@ -167,13 +168,6 @@ PackageRepository.clearRuntimeCache = function () {
 
 // ---------------------
 
-PackageRepository.prototype._getResolver = function (decEndpoint, logger) {
-    logger = logger || this._logger;
-
-    // Get the appropriate resolver
-    return resolverFactory(decEndpoint, { config: this._config, logger: logger }, this._registryClient);
-};
-
 PackageRepository.prototype._resolve = function (resolver, logger) {
     var that = this;
 
@@ -181,7 +175,7 @@ PackageRepository.prototype._resolve = function (resolver, logger) {
     return resolver.resolve()
     // Store in the cache
     .then(function (canonicalDir) {
-        if (!resolver.isCacheable()) {
+        if (resolver.isNotCacheable()) {
             return canonicalDir;
         }
 

lib/core/Project.js

@@ -1,21 +1,26 @@
 var glob = require('glob');
 var path = require('path');
-var fs = require('../util/fs');
+var fs = require('graceful-fs');
 var Q = require('q');
 var mout = require('mout');
-var rimraf = require('../util/rimraf');
+var rimraf = require('rimraf');
 var endpointParser = require('bower-endpoint-parser');
 var Logger = require('bower-logger');
-var md5 = require('md5-hex');
 var Manager = require('./Manager');
+var defaultConfig = require('../config');
 var semver = require('../util/semver');
+var md5 = require('../util/md5');
 var createError = require('../util/createError');
 var readJson = require('../util/readJson');
 var validLink = require('../util/validLink');
 var scripts = require('./scripts');
 
 function Project(config, logger) {
-    this._config = config;
+    // This is the only architecture component that ensures defaults
+    // on config and logger
+    // The reason behind it is that users can likely use this component
+    // directly if commands do not fulfil their needs
+    this._config = defaultConfig(config);
     this._logger = logger || new Logger();
     this._manager = new Manager(this._config, this._logger);
 
@@ -81,25 +86,19 @@ Project.prototype.install = function (decEndpoints, options, config) {
     })
     .then(function (installed) {
         // Handle save and saveDev options
-        if (that._options.save || that._options.saveDev || that._options.saveExact) {
+        if (that._options.save || that._options.saveDev) {
             // Cycle through the specified endpoints
             decEndpoints.forEach(function (decEndpoint) {
                 var jsonEndpoint;
 
                 jsonEndpoint = endpointParser.decomposed2json(decEndpoint);
 
-                if (that._options.saveExact) {
-                    if (decEndpoint.name !== decEndpoint.source) {
-                        jsonEndpoint[decEndpoint.name] = decEndpoint.source + '#' + decEndpoint.pkgMeta.version;
-                    } else {
-                        jsonEndpoint[decEndpoint.name] = decEndpoint.pkgMeta.version;
-                    }
+                if (that._options.save) {
+                    that._json.dependencies = mout.object.mixIn(that._json.dependencies || {}, jsonEndpoint);
                 }
 
                 if (that._options.saveDev) {
                     that._json.devDependencies = mout.object.mixIn(that._json.devDependencies || {}, jsonEndpoint);
-                } else {
-                    that._json.dependencies = mout.object.mixIn(that._json.dependencies || {}, jsonEndpoint);
                 }
             });
         }
@@ -197,27 +196,6 @@ Project.prototype.update = function (names, options) {
             return that._manager.install(that._json);
         })
         .then(function (installed) {
-            if (that._options.save || that._options.saveDev) {
-                // Cycle through the specified endpoints
-                targets.forEach(function (target) {
-                    // Abort if current and new version are identical
-                    if (target.target === target.pkgMeta.version) {
-                        return false;
-                    }
-
-                    var jsonEndpoint = endpointParser.decomposed2json(target);
-                    // Bower uses the ~ range specifier for new installs
-                    jsonEndpoint[target.name] = '~' + target.pkgMeta.version;
-
-                    if (that._options.saveDev && mout.object.has(that._json, 'devDependencies.' + target.name)) {
-                        that._json.devDependencies = mout.object.mixIn(that._json.devDependencies || {}, jsonEndpoint);
-                    }
-
-                    if (that._options.save && mout.object.has(that._json, 'dependencies.' + target.name)) {
-                        that._json.dependencies = mout.object.mixIn(that._json.dependencies || {}, jsonEndpoint);
-                    }
-                });
-            }
             // Save JSON, might contain changes to resolutions
             return that.saveJson()
             .then(function () {
@@ -577,29 +555,9 @@ Project.prototype._readJson = function () {
         return Q.resolve(this._json);
     }
 
-    return Q.fcall(function() {
-        // This will throw if package.json does not exist
-        return fs.readFileSync(path.join(that._config.cwd, 'package.json'));
-    })
-    .then(function(buffer) {
-        // If package.json exists, use it's values as defaults
-        var defaults = {}, npm = JSON.parse(buffer.toString());
-
-        defaults.name        = npm.name || path.basename(that._config.cwd) || 'root';
-        defaults.description = npm.description;
-        defaults.main        = npm.main;
-        defaults.authors     = npm.contributors || npm.author;
-        defaults.license     = npm.license;
-        defaults.keywords    = npm.keywords;
-
-        return defaults;
-    })
-    .catch(function(err) {
-        // Most likely no package.json so just set default name
-        return { name: path.basename(that._config.cwd) || 'root' };
-    })
-    .then(function(defaults) {
-        return that._json = readJson(that._config.cwd, { assume: defaults });
+    // Read local json
+    return this._json = readJson(this._config.cwd, {
+        assume: { name: path.basename(this._config.cwd) || 'root' }
     })
     .spread(function (json, deprecated, assumed) {
         var jsonStr;

lib/core/ResolveCache.js

@@ -1,15 +1,15 @@
-var fs = require('../util/fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var mout = require('mout');
 var Q = require('q');
 var mkdirp = require('mkdirp');
-var rimraf = require('../util/rimraf');
+var rimraf = require('rimraf');
 var LRU = require('lru-cache');
 var lockFile = require('lockfile');
-var md5 = require('md5-hex');
 var semver = require('../util/semver');
 var readJson = require('../util/readJson');
 var copy = require('../util/copy');
+var md5 = require('../util/md5');
 
 function ResolveCache(config) {
     // TODO: Make some config entries, such as:

lib/core/resolverFactory.js

@@ -1,217 +1,171 @@
-/*jshint laxbreak:true*/
 var Q = require('q');
-var fs = require('../util/fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var mout = require('mout');
 var resolvers = require('./resolvers');
 var createError = require('../util/createError');
 
-var pluginResolverFactory = require('./resolvers/pluginResolverFactory');
+function createInstance(decEndpoint, config, logger, registryClient) {
+    return getConstructor(decEndpoint.source, config, registryClient)
+    .spread(function (ConcreteResolver, source, fromRegistry) {
+        var decEndpointCopy = mout.object.pick(decEndpoint, ['name', 'target']);
 
-function createInstance(decEndpoint, options, registryClient) {
-    decEndpoint = mout.object.pick(decEndpoint, ['name', 'target', 'source']);
+        decEndpointCopy.source = source;
 
-    options.version = require('../../package.json').version;
+        // Signal if it was fetched from the registry
+        if (fromRegistry) {
+            decEndpoint.registry = true;
+            // If no name was specified, assume the name from the registry
+            if (!decEndpointCopy.name) {
+                decEndpointCopy.name = decEndpoint.name = decEndpoint.source;
+            }
+        }
 
-    return getConstructor(decEndpoint, options, registryClient)
-    .spread(function (ConcreteResolver, decEndpoint) {
-        return new ConcreteResolver(decEndpoint, options.config, options.logger);
+        return new ConcreteResolver(decEndpointCopy, config, logger);
     });
 }
 
-function getConstructor(decEndpoint, options, registryClient) {
-    var source = decEndpoint.source;
-    var config = options.config;
-
-    // Below we try a series of async tests to guess the type of resolver to use
-    // If a step was unable to guess the resolver, it returns undefined
-    // If a step can guess the resolver, it returns with construcotor of resolver
-
-    var promise = Q.resolve();
-
-    var addResolver = function (resolverFactory) {
-        promise = promise.then(function (result) {
-            if (result === undefined) {
-                return resolverFactory(decEndpoint, options);
-            } else {
-                return result;
-            }
-        });
-    };
-
-    // Plugin resolvers.
-    //
-    // It requires each resolver defined in config.resolvers and calls
-    // its "match" to check if given resolves supports given decEndpoint
-    addResolver(function () {
-        var selectedResolver;
-        var resolverNames;
-
-        if (Array.isArray(config.resolvers)) {
-            resolverNames = config.resolvers;
-        } else if (!!config.resolvers) {
-            resolverNames = config.resolvers.split(',');
-        } else {
-            resolverNames = [];
-        }
-
-        var resolverPromises = resolverNames.map(function (resolverName) {
-            var resolver = resolvers[resolverName]
-                || pluginResolverFactory(require(resolverName), options);
-
-            return function () {
-                if (selectedResolver === undefined) {
-                    var match = resolver.match.bind(resolver);
-
-                    return Q.fcall(match, source).then(function (result) {
-                        if (result) {
-                            return selectedResolver = resolver;
-                        }
-                    });
-                } else {
-                    return selectedResolver;
-                }
-            };
-        });
-
-        return resolverPromises.reduce(Q.when, new Q(undefined)).then(function (resolver) {
-            if (resolver) {
-                return Q.fcall(resolver.locate.bind(resolver), decEndpoint.source).then(function (result) {
-                    if (result && result !== decEndpoint.source) {
-                        decEndpoint.source = result;
-                        decEndpoint.registry = true;
-                        return getConstructor(decEndpoint, options, registryClient);
-                    } else {
-                        return [resolver, decEndpoint];
-                    }
-                });
-            }
-        });
-    });
+function getConstructor(source, config, registryClient) {
+    var absolutePath,
+        promise;
 
     // Git case: git git+ssh, git+http, git+https
     //           .git at the end (probably ssh shorthand)
     //           git@ at the start
-    addResolver(function() {
-        if (/^git(\+(ssh|https?))?:\/\//i.test(source) || /\.git\/?$/i.test(source) || /^git@/i.test(source)) {
-            decEndpoint.source = source.replace(/^git\+/, '');
+    if (/^git(\+(ssh|https?))?:\/\//i.test(source) || /\.git\/?$/i.test(source) || /^git@/i.test(source)) {
+        source = source.replace(/^git\+/, '');
+        return Q.fcall(function () {
 
             // If it's a GitHub repository, return the specialized resolver
             if (resolvers.GitHub.getOrgRepoPair(source)) {
-                return [resolvers.GitHub, decEndpoint];
+                return [resolvers.GitHub, source];
             }
 
-            return [resolvers.GitRemote, decEndpoint];
-        }
-    });
+            // If it's a BitBucket repository, return the specialized resolver
+            if (resolvers.BitBucket.getOrgRepoPair(source)) {
+                return [resolvers.BitBucket, source];
+            }
+
+            return [resolvers.GitRemote, source];
+        });
+    }
 
     // SVN case: svn, svn+ssh, svn+http, svn+https, svn+file
-    addResolver(function () {
-        if (/^svn(\+(ssh|https?|file))?:\/\//i.test(source)) {
-            return [resolvers.Svn, decEndpoint];
-        }
-    });
+    if (/^svn(\+(ssh|https?|file))?:\/\//i.test(source)) {
+        return Q.fcall(function () {
+            return [resolvers.Svn, source];
+        });
+    }
 
     // URL case
-    addResolver(function () {
-        if (/^https?:\/\//i.exec(source)) {
-            return [resolvers.Url, decEndpoint];
-        }
-    });
+    if (/^https?:\/\//i.exec(source)) {
+        return Q.fcall(function () {
+            return [resolvers.Url, source];
+        });
+    }
 
+    // Below we try a series of async tests to guess the type of resolver to use
+    // If a step was unable to guess the resolver, it throws an error
+    // If a step was able to guess the resolver, it resolves with a function
+    // That function returns a promise that will resolve with the concrete type
 
     // If source is ./ or ../ or an absolute path
+    absolutePath = path.resolve(config.cwd, source);
 
-    addResolver(function () {
-        var absolutePath = path.resolve(config.cwd, source);
+    if (/^\.\.?[\/\\]/.test(source) || /^~\//.test(source) || path.normalize(source).replace(/[\/\\]+$/, '') === absolutePath) {
+        promise = Q.nfcall(fs.stat, path.join(absolutePath, '.git'))
+        .then(function (stats) {
+            if (stats.isDirectory()) {
+                return function () {
+                    return Q.resolve([resolvers.GitFs, absolutePath]);
+                };
+            }
 
-        if (/^\.\.?[\/\\]/.test(source) || /^~\//.test(source) ||
-            path.normalize(source).replace(/[\/\\]+$/, '') === absolutePath
-        ) {
-            return Q.nfcall(fs.stat, path.join(absolutePath, '.git'))
+            throw new Error('Not a Git repository');
+        })
+        // If not, check if source is a valid Subversion repository
+        .fail(function () {
+            return Q.nfcall(fs.stat, path.join(absolutePath, '.svn'))
             .then(function (stats) {
-                decEndpoint.source = absolutePath;
-
                 if (stats.isDirectory()) {
-                    return Q.resolve([resolvers.GitFs, decEndpoint]);
+                    return function () {
+                        return Q.resolve([resolvers.Svn, absolutePath]);
+                    };
                 }
 
-                throw new Error('Not a Git repository');
-            })
-            // If not, check if source is a valid Subversion repository
-            .fail(function () {
-                return Q.nfcall(fs.stat, path.join(absolutePath, '.svn'))
-                .then(function (stats) {
-                    decEndpoint.source = absolutePath;
-
-                    if (stats.isDirectory()) {
-                        return Q.resolve([resolvers.Svn, decEndpoint]);
-                    }
-
-                    throw new Error('Not a Subversion repository');
-                });
-            })
-            // If not, check if source is a valid file/folder
-            .fail(function () {
-                return Q.nfcall(fs.stat, absolutePath)
-                .then(function () {
-                    decEndpoint.source = absolutePath;
-
-                    return Q.resolve([resolvers.Fs, decEndpoint]);
-                });
+                throw new Error('Not a Subversion repository');
             });
-        }
-    });
+        })
+        // If not, check if source is a valid file/folder
+        .fail(function () {
+            return Q.nfcall(fs.stat, absolutePath)
+            .then(function () {
+                return function () {
+                    return Q.resolve([resolvers.Fs, absolutePath]);
+                };
+            });
+        });
+    } else {
+        promise = Q.reject(new Error('Not an absolute or relative file'));
+    }
 
+    return promise
     // Check if is a shorthand and expand it
-    addResolver(function () {
+    .fail(function (err) {
+        var parts;
+
         // Skip ssh and/or URL with auth
         if (/[:@]/.test(source)) {
-            return;
+            throw err;
         }
 
         // Ensure exactly only one "/"
-        var parts = source.split('/');
+        parts = source.split('/');
         if (parts.length === 2) {
-            decEndpoint.source = mout.string.interpolate(config.shorthandResolver, {
+            source = mout.string.interpolate(config.shorthandResolver, {
                 shorthand: source,
                 owner: parts[0],
                 package: parts[1]
             });
 
-            return getConstructor(decEndpoint, options, registryClient);
+            return function () {
+                return getConstructor(source, config, registryClient);
+            };
         }
-    });
 
+        throw err;
+    })
     // As last resort, we try the registry
-    addResolver(function () {
+    .fail(function (err) {
         if (!registryClient) {
-            return;
+            throw err;
         }
 
-        return Q.nfcall(registryClient.lookup.bind(registryClient), source)
-        .then(function (entry) {
-            if (!entry) {
-                throw createError('Package ' + source + ' not found', 'ENOTFOUND');
-            }
+        return function () {
+            return Q.nfcall(registryClient.lookup.bind(registryClient), source)
+            .then(function (entry) {
+                if (!entry) {
+                    throw createError('Package ' + source + ' not found', 'ENOTFOUND');
+                }
 
-            decEndpoint.registry = true;
+                // TODO: Handle entry.type.. for now it's only 'alias'
+                //       When we got published packages, this needs to be adjusted
+                source = entry.url;
 
-            if (!decEndpoint.name) {
-                decEndpoint.name = decEndpoint.source;
-            }
-
-            decEndpoint.source = entry.url;
-
-            return getConstructor(decEndpoint, options);
-        });
-    });
-
-    addResolver(function () {
+                return getConstructor(source, config, registryClient)
+                .spread(function (ConcreteResolver, source) {
+                    return [ConcreteResolver, source, true];
+                });
+            });
+        };
+    })
+    // If we got the function, simply call and return
+    .then(function (func) {
+        return func();
+    // Finally throw a meaningful error
+    }, function () {
         throw createError('Could not find appropriate resolver for ' + source, 'ENORESOLVER');
     });
-
-    return promise;
 }
 
 function clearRuntimeCache() {

lib/core/resolvers/BitBucketResolver.js

@@ -0,0 +1,150 @@
+var util = require('util');
+var path = require('path');
+var mout = require('mout');
+var GitRemoteResolver = require('./GitRemoteResolver');
+var download = require('../../util/download');
+var extract = require('../../util/extract');
+var createError = require('../../util/createError');
+
+function BitBucketResolver(decEndpoint, config, logger) {
+    var pair;
+
+    GitRemoteResolver.call(this, decEndpoint, config, logger);
+
+    // Grab the org/repo
+    // /xxxxx/yyyyy.git or :xxxxx/yyyyy.git (.git is optional)
+    pair = BitBucketResolver.getOrgRepoPair(this._source);
+    if (!pair) {
+        throw createError('Invalid BitBucket URL', 'EINVEND', {
+            details: this._source + ' does not seem to be a valid BitBucket URL'
+        });
+    }
+
+    this._org = pair.org;
+    this._repo = pair.repo;
+
+    // Ensure trailing for all protocols
+    if (!mout.string.endsWith(this._source, '.git')) {
+        this._source += '.git';
+    }
+
+    // Check if it's public
+    this._public = mout.string.startsWith(this._source, 'git://');
+
+    // Use https:// rather than git:// if on a proxy
+    if (this._config.proxy || this._config.httpsProxy) {
+        this._source = this._source.replace('git://', 'https://');
+    }
+
+    // Enable shallow clones for BitBucket repos
+    this._shallowClone = true;
+}
+
+util.inherits(BitBucketResolver, GitRemoteResolver);
+mout.object.mixIn(BitBucketResolver, GitRemoteResolver);
+
+// -----------------
+
+BitBucketResolver.prototype._checkout = function () {
+    // Only fully works with public repositories and tags
+    // Could work with https/ssh protocol but not with 100% certainty
+    if (!this._public || !this._resolution.tag) {
+        return GitRemoteResolver.prototype._checkout.call(this);
+    }
+
+    var msg;
+    var tarballUrl = 'https://bitbucket.org/' + this._org + '/' + this._repo + '/get/' + this._resolution.tag + '.tar.gz';
+    var file = path.join(this._tempDir, 'archive.tar.gz');
+    var reqHeaders = {};
+    var that = this;
+
+    if (this._config.userAgent) {
+        reqHeaders['User-Agent'] = this._config.userAgent;
+    }
+
+    this._logger.action('download', tarballUrl, {
+        url: that._source,
+        to: file
+    });
+
+    // Download tarball
+    return download(tarballUrl, file, {
+        proxy: this._config.httpsProxy,
+        strictSSL: this._config.strictSsl,
+        timeout: this._config.timeout,
+        headers: reqHeaders
+    })
+    .progress(function (state) {
+        // Retry?
+        if (state.retry) {
+            msg = 'Download of ' + tarballUrl + ' failed with ' + state.error.code + ', ';
+            msg += 'retrying in ' + (state.delay / 1000).toFixed(1) + 's';
+            that._logger.debug('error', state.error.message, { error: state.error });
+            return that._logger.warn('retry', msg);
+        }
+
+        // Progress
+        msg = 'received ' + (state.received / 1024 / 1024).toFixed(1) + 'MB';
+        if (state.total) {
+            msg += ' of ' + (state.total / 1024 / 1024).toFixed(1) + 'MB downloaded, ';
+            msg += state.percent + '%';
+        }
+        that._logger.info('progress', msg);
+    })
+    .then(function () {
+        // Extract archive
+        that._logger.action('extract', path.basename(file), {
+            archive: file,
+            to: that._tempDir
+        });
+
+        return extract(file, that._tempDir)
+        // Fallback to standard git clone if extraction failed
+        .fail(function (err) {
+            msg =  'Decompression of ' + path.basename(file) + ' failed' + (err.code ? ' with ' + err.code : '') + ', ';
+            msg += 'trying with git..';
+            that._logger.debug('error', err.message, { error: err });
+            that._logger.warn('retry', msg);
+
+            return that._cleanTempDir()
+            .then(GitRemoteResolver.prototype._checkout.bind(that));
+        });
+    // Fallback to standard git clone if download failed
+    }, function (err) {
+        msg = 'Download of ' + tarballUrl + ' failed' + (err.code ? ' with ' + err.code : '') + ', ';
+        msg += 'trying with git..';
+        that._logger.debug('error', err.message, { error: err });
+        that._logger.warn('retry', msg);
+
+        return that._cleanTempDir()
+        .then(GitRemoteResolver.prototype._checkout.bind(that));
+
+    });
+};
+
+BitBucketResolver.prototype._savePkgMeta = function (meta) {
+    // Set homepage if not defined
+    if (!meta.homepage) {
+        meta.homepage = 'https://bitbucket.org/' + this._org + '/' + this._repo;
+    }
+
+    return GitRemoteResolver.prototype._savePkgMeta.call(this, meta);
+};
+
+// ----------------
+
+BitBucketResolver.getOrgRepoPair = function (url) {
+    var match;
+
+    match = url.match(/(?:@|:\/\/)bitbucket.org[:\/]([^\/\s]+?)\/([^\/\s]+?)(?:\.git)?\/?$/i);
+    if (!match) {
+        return null;
+    }
+
+    return {
+        org: match[1],
+        repo: match[2]
+    };
+};
+
+module.exports = BitBucketResolver;

lib/core/resolvers/FsResolver.js

@@ -1,5 +1,5 @@
 var util = require('util');
-var fs = require('../../util/fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var mout = require('mout');
 var Q = require('q');

lib/core/resolvers/GitHubResolver.js

@@ -1,7 +1,6 @@
 var util = require('util');
 var path = require('path');
 var mout = require('mout');
-var Q = require('q');
 var GitRemoteResolver = require('./GitRemoteResolver');
 var download = require('../../util/download');
 var extract = require('../../util/extract');
@@ -38,9 +37,7 @@ function GitHubResolver(decEndpoint, config, logger) {
     }
 
     // Enable shallow clones for GitHub repos
-    this._shallowClone = function() {
-        return Q.resolve(true);
-    };
+    this._shallowClone = true;
 }
 
 util.inherits(GitHubResolver, GitRemoteResolver);
@@ -72,7 +69,7 @@ GitHubResolver.prototype._checkout = function () {
 
     // Download tarball
     return download(tarballUrl, file, {
-        ca: this._config.ca.default,
+        proxy: this._config.httpsProxy,
         strictSSL: this._config.strictSsl,
         timeout: this._config.timeout,
         headers: reqHeaders

lib/core/resolvers/GitRemoteResolver.js

@@ -1,4 +1,3 @@
-/*jshint laxbreak:true*/
 var util = require('util');
 var url = require('url');
 var Q = require('q');
@@ -27,10 +26,8 @@ function GitRemoteResolver(decEndpoint, config, logger) {
         this._host = url.parse(this._source).host;
     }
 
-    this._remote = url.parse(this._source);
-
-    // Verify whether the server supports shallow cloning
-    this._shallowClone = this._supportsShallowCloning;
+    // Disable shallow clones
+    this._shallowClone = false;
 }
 
 util.inherits(GitRemoteResolver, GitResolver);
@@ -118,36 +115,34 @@ GitRemoteResolver.prototype._fastClone = function (resolution) {
     branch = resolution.tag || resolution.branch;
     args = ['clone',  this._source, '-b', branch, '--progress', '.'];
 
-    return this._shallowClone().then(function (shallowCloningSupported) {
-        // If the host does not support shallow clones, we don't use --depth=1
-        if (shallowCloningSupported && !GitRemoteResolver._noShallow.get(that._host)) {
-            args.push('--depth', 1);
+    // If the host does not support shallow clones, we don't use --depth=1
+    if (this._shallowClone && !GitRemoteResolver._noShallow.get(this._host)) {
+        args.push('--depth', 1);
+    }
+
+    return cmd('git', args, { cwd: this._tempDir })
+    .spread(function (stdout, stderr) {
+        // Only after 1.7.10 --branch accepts tags
+        // Detect those cases and inform the user to update git otherwise it's
+        // a lot slower than newer versions
+        if (!/branch .+? not found/i.test(stderr)) {
+            return;
         }
 
-        return cmd('git', args, { cwd: that._tempDir })
-        .spread(function (stdout, stderr) {
-            // Only after 1.7.10 --branch accepts tags
-            // Detect those cases and inform the user to update git otherwise it's
-            // a lot slower than newer versions
-            if (!/branch .+? not found/i.test(stderr)) {
-                return;
-            }
+        that._logger.warn('old-git', 'It seems you are using an old version of git, it will be slower and propitious to errors!');
+        return cmd('git', ['checkout', resolution.commit], { cwd: that._tempDir });
+    }, function (err) {
+        // Some git servers do not support shallow clones
+        // When that happens, we mark this host and try again
+        if (!GitRemoteResolver._noShallow.has(that._source) &&
+            err.details &&
+            /(rpc failed|shallow|--depth)/i.test(err.details)
+        ) {
+            GitRemoteResolver._noShallow.set(that._host, true);
+            return that._fastClone(resolution);
+        }
 
-            that._logger.warn('old-git', 'It seems you are using an old version of git, it will be slower and propitious to errors!');
-            return cmd('git', ['checkout', resolution.commit], { cwd: that._tempDir });
-        }, function (err) {
-            // Some git servers do not support shallow clones
-            // When that happens, we mark this host and try again
-            if (!GitRemoteResolver._noShallow.has(that._source) &&
-                err.details &&
-                /(rpc failed|shallow|--depth)/i.test(err.details)
-                ) {
-                GitRemoteResolver._noShallow.set(that._host, true);
-                return that._fastClone(resolution);
-            }
-
-            throw err;
-        });
+        throw err;
     });
 };
 
@@ -165,79 +160,6 @@ GitRemoteResolver.prototype._suggestProxyWorkaround = function (err) {
     }
 };
 
-// Verifies whether the server supports shallow cloning.
-// This is done according to the rules found in the following links:
-// * https://github.com/dimitri/el-get/pull/1921/files
-// * http://stackoverflow.com/questions/9270488/is-it-possible-to-detect-whether-a-http-git-remote-is-smart-or-dumb
-//
-// Summary of the rules:
-// * Protocols like ssh or git always support shallow cloning
-// * HTTP-based protocols can be verified by sending a HEAD or GET request to the URI (appended to the URL of the Git repo):
-//       /info/refs?service=git-upload-pack
-// * If the server responds with a 'Content-Type' header of 'application/x-git-upload-pack-advertisement',
-//      the server supports shallow cloning ("smart server")
-// * If the server responds with a different content type, the server does not support shallow cloning ("dumb server")
-// * Instead of doing the HEAD or GET request using an HTTP client, we're letting Git and Curl do the heavy lifting.
-//      Calling Git with the GIT_CURL_VERBOSE=2 env variable will provide the Git and Curl output, which includes
-//      the content type. This has the advantage that Git will take care of using stored credentials and any additional
-//      negotiation that needs to take place.
-//
-// The above should cover most cases, including BitBucket.
-GitRemoteResolver.prototype._supportsShallowCloning = function () {
-    var value = true;
-
-    // Verify that the remote could be parsed and that a protocol is set
-    // This case is unlikely, but let's still cover it.
-    if (this._remote == null || this._remote.protocol == null) {
-        return Q.resolve(false);
-    }
-
-
-    if (!this._host || !this._config.shallowCloneHosts || this._config.shallowCloneHosts.indexOf(this._host) === -1) {
-        return Q.resolve(false);
-    }
-
-    // Check for protocol - the remote check for hosts supporting shallow cloning is only required for
-    // HTTP or HTTPS, not for Git or SSH.
-    // Also check for hosts that have been checked in a previous request and have been found to support
-    // shallow cloning.
-    if (mout.string.startsWith(this._remote.protocol, 'http')
-            && !GitRemoteResolver._canShallow.get(this._host)) {
-        // Provide GIT_CURL_VERBOSE=2 environment variable to capture curl output.
-        // Calling ls-remote includes a call to the git-upload-pack service, which returns the content type in the response.
-        var processEnv = mout.object.merge(process.env, { 'GIT_CURL_VERBOSE': '2' });
-
-        value = cmd('git', ['ls-remote', '--heads', this._source], {
-            env: processEnv
-        })
-        .spread(function (stdout, stderr) {
-            // Check stderr for content-type, ignore stdout
-            var isSmartServer;
-
-            // If the content type is 'x-git', then the server supports shallow cloning
-            isSmartServer = mout.string.contains(stderr,
-                'Content-Type: application/x-git-upload-pack-advertisement');
-
-            this._logger.debug('detect-smart-git', 'Smart Git host detected: ' + isSmartServer);
-
-            if (isSmartServer) {
-                // Cache this host
-                GitRemoteResolver._canShallow.set(this._host, true);
-            }
-
-            return isSmartServer;
-        }.bind(this));
-    }
-    else {
-        // One of the following cases:
-        // * A non-HTTP/HTTPS protocol
-        // * A host that has been checked before and that supports shallow cloning
-        return Q.resolve(true);
-    }
-
-    return value;
-};
-
 // ------------------------------
 
 // Grab refs remotely
@@ -276,7 +198,4 @@ GitRemoteResolver.refs = function (source) {
 // Store hosts that do not support shallow clones here
 GitRemoteResolver._noShallow = new LRU({ max: 50, maxAge: 5 * 60 * 1000 });
 
-// Store hosts that support shallow clones here
-GitRemoteResolver._canShallow = new LRU({ max: 50, maxAge: 5 * 60 * 1000 });
-
 module.exports = GitRemoteResolver;

lib/core/resolvers/GitResolver.js

@@ -1,7 +1,8 @@
 var util = require('util');
 var path = require('path');
 var Q = require('q');
-var rimraf = require('../../util/rimraf');
+var chmodr = require('chmodr');
+var rimraf = require('rimraf');
 var mkdirp = require('mkdirp');
 var which = require('which');
 var LRU = require('lru-cache');
@@ -39,7 +40,7 @@ mout.object.mixIn(GitResolver, Resolver);
 
 // -----------------
 
-GitResolver.prototype._hasNew = function (pkgMeta) {
+GitResolver.prototype._hasNew = function (canonicalDir, pkgMeta) {
     var oldResolution = pkgMeta._resolution || {};
 
     return this._findResolution()
@@ -143,7 +144,7 @@ GitResolver.prototype._findResolution = function (target) {
                 throw createError('No tag found that was able to satisfy ' + target, 'ENORESTARGET', {
                     details: !versions.length ?
                         'No versions found in ' + that._source :
-                        'Available versions in ' + that._source + ': ' + versions.map(function (version) { return version.version; }).join(', ')
+                        'Available versions: ' + versions.map(function (version) { return version.version; }).join(', ')
                 });
             });
         });
@@ -194,7 +195,23 @@ GitResolver.prototype._findResolution = function (target) {
 GitResolver.prototype._cleanup = function () {
     var gitFolder = path.join(this._tempDir, '.git');
 
-    return Q.nfcall(rimraf, gitFolder);
+    // Remove the .git folder
+    // Note that on windows, we need to chmod to 0777 before due to a bug in git
+    // See: https://github.com/isaacs/rimraf/issues/19
+    if (process.platform === 'win32') {
+        return Q.nfcall(chmodr, gitFolder, 0777)
+        .then(function () {
+            return Q.nfcall(rimraf, gitFolder);
+        }, function (err) {
+            // If .git does not exist, chmodr returns ENOENT
+            // so, we ignore that error code
+            if (err.code !== 'ENOENT') {
+                throw err;
+            }
+        });
+    } else {
+        return Q.nfcall(rimraf, gitFolder);
+    }
 };
 
 GitResolver.prototype._savePkgMeta = function (meta) {

lib/core/resolvers/Resolver.js

@@ -1,13 +1,12 @@
-var fs = require('../../util/fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var Q = require('q');
 var tmp = require('tmp');
 var mkdirp = require('mkdirp');
-var rimraf = require('../../util/rimraf');
+var rimraf = require('rimraf');
 var readJson = require('../../util/readJson');
 var createError = require('../../util/createError');
 var removeIgnores = require('../../util/removeIgnores');
-var md5 = require('md5-hex');
 
 tmp.setGracefulCleanup();
 
@@ -44,8 +43,9 @@ Resolver.prototype.getPkgMeta = function () {
     return this._pkgMeta;
 };
 
-Resolver.prototype.hasNew = function (pkgMeta) {
+Resolver.prototype.hasNew = function (canonicalDir, pkgMeta) {
     var promise;
+    var metaFile;
     var that = this;
 
     // If already working, error out
@@ -56,7 +56,24 @@ Resolver.prototype.hasNew = function (pkgMeta) {
     this._working = true;
 
     // Avoid reading the package meta if already given
-    promise = this._hasNew(pkgMeta);
+    if (pkgMeta) {
+        promise = this._hasNew(canonicalDir, pkgMeta);
+    // Otherwise call _hasNew with both the package meta and the canonical dir
+    } else {
+        metaFile = path.join(canonicalDir, '.bower.json');
+
+        promise = readJson(metaFile)
+        .spread(function (pkgMeta) {
+            return that._hasNew(canonicalDir, pkgMeta);
+        }, function (err) {
+            that._logger.debug('read-json', 'Failed to read ' + metaFile, {
+                filename: metaFile,
+                error: err
+            });
+
+            return true;  // Simply resolve to true if there was an error reading the file
+        });
+    }
 
     return promise.fin(function () {
         that._working = false;
@@ -97,22 +114,23 @@ Resolver.prototype.resolve = function () {
     });
 };
 
-Resolver.prototype.isCacheable = function () {
+Resolver.prototype.isNotCacheable = function () {
     // Bypass cache for local dependencies
     if (this._source &&
-        /^(?:file:[\/\\]{2}|[A-Z]:)?\.?\.?[\/\\]/.test(this._source)
+        /^(?:file:[\/\\]{2})?\.?\.?[\/\\]/.test(this._source)
     ) {
-        return false;
+        return true;
     }
 
     // We don't want to cache moving targets like branches
     if (this._pkgMeta &&
         this._pkgMeta._resolution &&
-        this._pkgMeta._resolution.type === 'branch') {
-        return false;
+        this._pkgMeta._resolution.type === 'branch')
+    {
+        return true;
     }
 
-    return true;
+    return false;
 };
 
 
@@ -125,7 +143,7 @@ Resolver.prototype._resolve = function () {
 
 // Abstract functions that can be re-implemented by concrete resolvers
 // as necessary
-Resolver.prototype._hasNew = function (pkgMeta) {
+Resolver.prototype._hasNew = function (canonicalDir, pkgMeta) {
     return Q.resolve(true);
 };
 
@@ -145,7 +163,7 @@ Resolver.prototype._createTempDir = function () {
     return Q.nfcall(mkdirp, this._config.tmp)
     .then(function () {
         return Q.nfcall(tmp.dir, {
-            template: path.join(this._config.tmp, md5(this._name) + '-' + process.pid + '-XXXXXX'),
+            template: path.join(this._config.tmp, this._name + '-' + process.pid + '-XXXXXX'),
             mode: 0777 & ~process.umask(),
             unsafeCleanup: true
         });

lib/core/resolvers/SvnResolver.js

@@ -40,7 +40,7 @@ SvnResolver.getSource = function (source) {
         .replace(/\/+$/, '');  // Remove trailing slashes
 };
 
-SvnResolver.prototype._hasNew = function (pkgMeta) {
+SvnResolver.prototype._hasNew = function (canonicalDir, pkgMeta) {
     var oldResolution = pkgMeta._resolution || {};
 
     return this._findResolution()
@@ -86,13 +86,13 @@ SvnResolver.prototype._export = function () {
     });
 
     if (resolution.type === 'commit') {
-        promise = cmd('svn', ['export', '--force', '--non-interactive', this._source + '/trunk', '-r' + resolution.commit, this._tempDir]);
+        promise = cmd('svn', ['export', '--force', this._source + '/trunk', '-r' + resolution.commit, this._tempDir]);
     } else if (resolution.type === 'branch' && resolution.branch === 'trunk') {
-        promise = cmd('svn', ['export', '--force', '--non-interactive', this._source + '/trunk', this._tempDir]);
+        promise = cmd('svn', ['export', '--force', this._source + '/trunk', this._tempDir]);
     } else if (resolution.type === 'branch') {
-        promise = cmd('svn', ['export', '--force', '--non-interactive', this._source + '/branches/' + resolution.branch, this._tempDir]);
+        promise = cmd('svn', ['export', '--force', this._source + '/branches/' + resolution.branch, this._tempDir]);
     } else {
-        promise = cmd('svn', ['export', '--force', '--non-interactive', this._source + '/tags/' + resolution.tag, this._tempDir]);
+        promise = cmd('svn', ['export', '--force', this._source + '/tags/' + resolution.tag, this._tempDir]);
     }
 
     // Throttle the progress reporter to 1 time each sec
@@ -188,7 +188,7 @@ SvnResolver.prototype._findResolution = function (target) {
                 throw createError('No tag found that was able to satisfy ' + target, 'ENORESTARGET', {
                     details: !versions.length ?
                         'No versions found in ' + that._source :
-                        'Available versions in ' + that._source + ': ' + versions.map(function (version) { return version.version; }).join(', ')
+                        'Available versions: ' + versions.map(function (version) { return version.version; }).join(', ')
                 });
             });
         });
@@ -324,7 +324,7 @@ SvnResolver.tags = function (source) {
         return Q.resolve(value);
     }
 
-    value = cmd('svn', ['list', source + '/tags', '--verbose', '--non-interactive'])
+    value = cmd('svn', ['list', source + '/tags', '--verbose'])
     .spread(function (stout) {
         var tags = SvnResolver.parseSubversionListOutput(stout.toString());
 
@@ -349,7 +349,7 @@ SvnResolver.branches = function (source) {
         return Q.resolve(value);
     }
 
-    value = cmd('svn', ['list', source + '/branches', '--verbose', '--non-interactive'])
+    value = cmd('svn', ['list', source + '/branches', '--verbose'])
     .spread(function (stout) {
         var branches = SvnResolver.parseSubversionListOutput(stout.toString());
 

lib/core/resolvers/UrlResolver.js

@@ -1,6 +1,6 @@
 var util = require('util');
 var path = require('path');
-var fs = require('../../util/fs');
+var fs = require('graceful-fs');
 var url = require('url');
 var request = require('request');
 var Q = require('q');
@@ -39,7 +39,7 @@ UrlResolver.isTargetable = function () {
     return false;
 };
 
-UrlResolver.prototype._hasNew = function (pkgMeta) {
+UrlResolver.prototype._hasNew = function (canonicalDir, pkgMeta) {
     var oldCacheHeaders = pkgMeta._cacheHeaders || {};
     var reqHeaders = {};
 
@@ -55,7 +55,7 @@ UrlResolver.prototype._hasNew = function (pkgMeta) {
 
     // Make an HEAD request to the source
     return Q.nfcall(request.head, this._source, {
-        ca: this._config.ca.default,
+        proxy: this._remote.protocol === 'https:' ? this._config.httpsProxy : this._config.proxy,
         strictSSL: this._config.strictSsl,
         timeout: this._config.timeout,
         headers: reqHeaders
@@ -104,18 +104,8 @@ UrlResolver.prototype._resolve = function () {
 
 // -----------------
 
-UrlResolver.prototype._parseSourceURL = function (_url) {
-    return url.parse(path.basename(_url)).pathname;
-};
-
 UrlResolver.prototype._download = function () {
-    var fileName = this._parseSourceURL(this._source);
-
-    if (!fileName) {
-        this._source = this._source.replace(/\/(?=\?|#)/, '');
-        fileName = this._parseSourceURL(this._source);
-    }
-
+    var fileName = url.parse(path.basename(this._source)).pathname;
     var file = path.join(this._tempDir, fileName);
     var reqHeaders = {};
     var that = this;
@@ -131,7 +121,7 @@ UrlResolver.prototype._download = function () {
 
     // Download the file
     return download(this._source, file, {
-        ca: this._config.ca.default,
+        proxy: this._remote.protocol === 'https:' ? this._config.httpsProxy : this._config.proxy,
         strictSSL: this._config.strictSsl,
         timeout: this._config.timeout,
         headers: reqHeaders

lib/core/resolvers/index.js

@@ -2,6 +2,7 @@ module.exports = {
     GitFs: require('./GitFsResolver'),
     GitRemote: require('./GitRemoteResolver'),
     GitHub: require('./GitHubResolver'),
+    BitBucket: require('./BitBucketResolver'),
     Svn: require('./SvnResolver'),
     Fs: require('./FsResolver'),
     Url: require('./UrlResolver')

lib/core/resolvers/pluginResolverFactory.js

@@ -1,322 +0,0 @@
-var Q = require('q');
-var path = require('path');
-var fs = require('../../util/fs');
-var object = require('mout/object');
-
-var semver = require('../../util/semver');
-var createError = require('../../util/createError');
-var readJson = require('../../util/readJson');
-var removeIgnores = require('../../util/removeIgnores');
-
-function pluginResolverFactory(resolverFactory, bower) {
-    bower = bower || {};
-
-    if (typeof resolverFactory !== 'function') {
-        throw createError('Resolver has "' + typeof resolverFactory + '" type instead of "function" type.', 'ERESOLERAPI');
-    }
-
-    var resolver = resolverFactory(bower);
-
-    function maxSatisfyingVersion(versions, target) {
-        var versionsArr, index;
-
-        versionsArr = versions.map(function (obj) { return obj.version; });
-
-        // Find a satisfying version, enabling strict match so that pre-releases
-        // have lower priority over normal ones when target is *
-        index = semver.maxSatisfyingIndex(versionsArr, target, true);
-
-        if (index !== -1) {
-            return versions[index];
-        }
-    }
-
-    function PluginResolver(decEndpoint) {
-        this._decEndpoint = decEndpoint;
-    }
-
-    // @private
-    PluginResolver.prototype.getEndpoint = function () {
-        return object.merge(this._decEndpoint, {
-            name: this.getName(),
-            source: this.getSource(),
-            target: this.getTarget()
-        });
-    };
-
-    PluginResolver.prototype.getSource = function () {
-        return this._decEndpoint.source;
-    };
-
-    PluginResolver.prototype.getTarget = function () {
-        return this._decEndpoint.target || '*';
-    };
-
-    PluginResolver.prototype.getName = function() {
-        if (!this._decEndpoint.name && typeof resolver.getName === 'function') {
-            return resolver.getName.call(resolver, this.getSource());
-        } else if (!this._decEndpoint.name) {
-            return path.basename(this.getSource());
-        } else {
-            return this._decEndpoint.name;
-        }
-    };
-
-    PluginResolver.prototype.getPkgMeta = function () {
-        return this._pkgMeta;
-    };
-
-    // -----------------
-
-    // Plugin Resolver is always considered potentially cacheable
-    // The "resolve" method decides whether to use cached or fetch new version.
-    PluginResolver.prototype.isCacheable = function() {
-        return true;
-    };
-
-    // Not only it's always potentially cacheable, but also always potenially new.
-    // The "resolve" handles logic of re-downloading target if needed.
-    PluginResolver.prototype.hasNew = function (pkgMeta) {
-        if (this.hasNewPromise) {
-            return this.hasNewPromise;
-        }
-
-        this._pkgMeta = pkgMeta;
-
-        return this.hasNewPromise = this.resolve().then(function (result) {
-            return result !== undefined;
-        });
-    };
-
-    PluginResolver.prototype.resolve = function () {
-        if (this.resolvePromise) {
-            return this.resolvePromise;
-        }
-
-        var that = this;
-
-        return this.resolvePromise = Q.fcall(function() {
-            var target = that.getTarget();
-
-            // It means that we can accept ranges as targets
-            if(that.constructor.isTargetable()) {
-                that._release = target;
-
-                if (semver.validRange(target)) {
-                    return Q.fcall(resolver.releases.bind(resolver), that.getSource())
-                    .then(function (result) {
-                        if (!result) {
-                            throw createError('Resolver did not provide releases of package.');
-                        }
-
-                        var releases = this._releases = result;
-
-                        var versions = releases.filter(function (target) {
-                            return semver.clean(target.version);
-                        });
-
-                        var maxRelease = maxSatisfyingVersion(versions, target);
-
-                        if (maxRelease) {
-                            that._version = maxRelease.version;
-                            that._release = that._decEndpoint.target = maxRelease.target;
-                        } else {
-                            throw createError('No version found that was able to satisfy ' + target, 'ENORESTARGET', {
-                                details: !versions.length ?
-                                    'No versions found in ' + that.getSource() :
-                                    'Available versions: ' + versions.map(function (version) { return version.version; }).join(', ')
-                            });
-                        }
-                    });
-                }
-            } else {
-                if (semver.validRange(target) && target !== '*') {
-                    return Q.reject(createError('Resolver does not accept version ranges (' + target + ')'));
-                }
-            }
-        })
-        .then(function () {
-
-            // We pass old _resolution (if hasNew has been called before contents).
-            // So resolver can decide wheter use cached version of contents new one.
-            if (typeof resolver.fetch !== 'function') {
-                throw createError('Resolver does not implement the "fetch" method.');
-            }
-
-            var cached = {};
-
-            if (that._releases) {
-                cached.releases = that._releases;
-            }
-
-            if (that._pkgMeta) {
-                cached.endpoint = {
-                    name: that._pkgMeta.name,
-                    source: that._pkgMeta._source,
-                    target: that._pkgMeta._target
-                };
-
-                cached.release = that._pkgMeta._release;
-
-                cached.version = that._pkgMeta.version;
-
-                cached.resolution = that._pkgMeta._resolution || {};
-            }
-
-            return Q.fcall(resolver.fetch.bind(resolver), that.getEndpoint(), cached);
-        })
-        .then(function (result) {
-            // Empty result means to re-use existing resolution
-            if (!result) {
-                return;
-            } else {
-                if (!result.tempPath) {
-                    throw createError('Resolver did not provide path to extracted contents of package.');
-                }
-
-                that._tempDir = result.tempPath;
-
-                return that._readJson(that._tempDir).then(function (meta) {
-                    return that._applyPkgMeta(meta, result)
-                    .then(that._savePkgMeta.bind(that, meta, result))
-                    .then(function () {
-                        return that._tempDir;
-                    });
-                });
-            }
-        });
-    };
-
-    PluginResolver.prototype._readJson = function (dir) {
-        var that = this;
-
-        return readJson(dir, {
-            assume: { name: that.getName() }
-        })
-        .spread(function (json, deprecated) {
-            if (deprecated) {
-                bower.logger.warn('deprecated', 'Package ' + that.getName() + ' is using the deprecated ' + deprecated);
-            }
-
-            return json;
-        });
-    };
-
-    PluginResolver.prototype._applyPkgMeta = function (meta, result) {
-        // Check if name defined in the json is different
-        // If so and if the name was "guessed", assume the json name
-        if (meta.name !== this._name) {
-            this._name = meta.name;
-        }
-
-        // Handle ignore property, deleting all files from the temporary directory
-        // If no ignores were specified, simply resolve
-        if (result.removeIgnores === false || !meta.ignore || !meta.ignore.length) {
-            return Q.resolve(meta);
-        }
-
-        // Otherwise remove them from the temp dir
-        return removeIgnores(this._tempDir, meta).then(function () {
-            return meta;
-        });
-    };
-
-    PluginResolver.prototype._savePkgMeta = function (meta, result) {
-        var that = this;
-
-        meta._source = that.getSource();
-        meta._target = that.getTarget();
-
-        if (result.resolution) {
-            meta._resolution = result.resolution;
-        }
-
-        if (that._release) {
-            meta._release = that._release;
-        }
-
-        if (that._version) {
-            meta.version = that._version;
-        } else {
-            delete meta.version;
-        }
-
-        // Stringify contents
-        var contents = JSON.stringify(meta, null, 2);
-
-        return Q.nfcall(fs.writeFile, path.join(this._tempDir, '.bower.json'), contents)
-        .then(function () {
-            return that._pkgMeta = meta;
-        });
-    };
-
-    // It is used only by "bower info". It returns all semver versions.
-    PluginResolver.versions = function (source) {
-        return Q.fcall(resolver.releases.bind(resolver), source).then(function (result) {
-            if (!result) {
-                throw createError('Resolver did not provide releases of package.');
-            }
-
-            var releases = this._releases = result;
-
-            var versions = releases.map(function (version) {
-                return semver.clean(version.version);
-            });
-
-            versions = versions.filter(function (version) {
-                return version;
-            });
-
-            versions.sort(function (a, b) {
-                return semver.rcompare(a, b);
-            });
-
-            return versions;
-        });
-    };
-
-    PluginResolver.isTargetable = function() {
-        // If resolver doesn't define versions function, it's not targetable..
-        return typeof resolver.releases === 'function';
-    };
-
-    PluginResolver.clearRuntimeCache = function () {
-        resolver = resolverFactory(bower);
-    };
-
-    PluginResolver.match = function (source) {
-        if (typeof resolver.match !== 'function') {
-            throw createError('Resolver is missing "match" method.', 'ERESOLVERAPI');
-        }
-
-        var match = resolver.match.bind(resolver);
-
-        return Q.fcall(match, source).then(function (result) {
-            if (typeof result !== 'boolean') {
-                throw createError('Resolver\'s "match" method should return a boolean', 'ERESOLVERAPI');
-            }
-
-            return result;
-        });
-    };
-
-    PluginResolver.locate = function (source) {
-        if (typeof resolver.locate !== 'function') {
-            return source;
-        }
-
-        return Q.fcall(resolver.locate.bind(resolver), source).then(function (result) {
-            if (typeof result !== 'string') {
-                throw createError('Resolver\'s "locate" method should return a string', 'ERESOLVERAPI');
-            }
-
-            return result;
-        });
-    };
-
-    return PluginResolver;
-}
-
-
-module.exports = pluginResolverFactory;
-

lib/core/scripts.js

@@ -93,4 +93,4 @@ module.exports = {
     postinstall: mout.function.partial(hook, 'postinstall', true),
     //only exposed for test
     _orderByDependencies: orderByDependencies
-};
+};

lib/index.js

@@ -1,6 +1,30 @@
+var abbrev = require('abbrev');
+var mout = require('mout');
 var commands = require('./commands');
 var pkg = require('../package.json');
-var abbreviations = require('./abbreviations')(commands);
+
+var abbreviations = abbrev(expandNames(commands));
+abbreviations.i = 'install';
+abbreviations.rm = 'uninstall';
+abbreviations.unlink = 'uninstall';
+abbreviations.ls = 'list';
+
+function expandNames(obj, prefix, stack) {
+    prefix = prefix || '';
+    stack = stack || [];
+
+    mout.object.forOwn(obj, function (value, name) {
+        name = prefix + name;
+
+        stack.push(name);
+
+        if (typeof value === 'object' && !value.line) {
+            expandNames(value, name + ' ', stack);
+        }
+    });
+
+    return stack;
+}
 
 function clearRuntimeCache() {
     // Note that in edge cases, some architecture components instance's

lib/renderers/JsonRenderer.js

@@ -31,10 +31,10 @@ JsonRenderer.prototype.error = function (err) {
     err.message = message;
 
     // Stack
-    // jscs:disable requireCamelCaseOrUpperCaseIdentifiers
+    /*jshint camelcase:false*/
     stack = err.fstream_stack || err.stack || 'N/A';
     err.stacktrace = (Array.isArray(stack) ? stack.join('\n') : stack);
-    // jscs:enable requireCamelCaseOrUpperCaseIdentifiers
+    /*jshint camelcase:true*/
 
     this.log(err);
     this.end();

lib/renderers/StandardRenderer.js

@@ -23,7 +23,7 @@ function StandardRenderer(command, config) {
     };
 
     this._command = command;
-    this._config = config || {};
+    this._config = config;
 
     if (this.constructor._wideCommands.indexOf(command) === -1) {
         this._compact = true;
@@ -71,15 +71,15 @@ StandardRenderer.prototype.error = function (err) {
     // Print trace if verbose, the error has no code
     // or if the error is a node error
     if (this._config.verbose || !err.code || err.errno) {
-        // jscs:disable requireCamelCaseOrUpperCaseIdentifiers
+        /*jshint camelcase:false*/
         stack = err.fstream_stack || err.stack || 'N/A';
         str = chalk.yellow('\nStack trace:\n');
         str += (Array.isArray(stack) ? stack.join('\n') : stack) + '\n';
         str += chalk.yellow('\nConsole trace:\n');
-        // jscs:enable requireCamelCaseOrUpperCaseIdentifiers
+        /*jshint camelcase:true*/
 
         this._write(process.stderr, str);
-        this._write(process.stderr, new Error().stack);
+        console.trace();
 
         // Print bower version, node version and system info.
         this._write(process.stderr, chalk.yellow('\nSystem info:\n'));

lib/util/analytics.js

@@ -19,27 +19,15 @@ var enableAnalytics = false;
 // because it takes time to read config and configstore has concurrency issues:
 //
 // https://github.com/yeoman/configstore/issues/20
-
 function ensureInsight () {
     if (!insight) {
         var Insight = require('insight');
-
-        if (process.env.NODE_ENV === 'test') {
-            insight = new Insight({
-                trackingCode: 'UA-00000000-0',
-                pkg: {
-                    name: 'bower-test',
-                    version: '1.0.0'
-                }
-            });
-
-            insight.config.clear();
-        } else {
-            insight = new Insight({
-                trackingCode: 'UA-43531210-1',
-                pkg: require('../../package.json')
-            });
-        }
+        var pkg = require('../../package.json');
+        insight = new Insight({
+            trackingCode: 'UA-43531210-1',
+            packageName: pkg.name,
+            packageVersion: pkg.version
+        });
     }
 }
 
@@ -82,7 +70,7 @@ analytics.setup = function setup (config) {
     });
 };
 
-var Tracker = analytics.Tracker = function Tracker (config) {
+var Tracker = analytics.Tracker = function Tracker(config) {
     function analyticsEnabled () {
         // Allow for overriding analytics default
         if (config && config.analytics !== undefined) {
@@ -103,24 +91,24 @@ var Tracker = analytics.Tracker = function Tracker (config) {
     }
 };
 
-Tracker.prototype.track = function track () {
+Tracker.prototype.track = function track() {
     insight.track.apply(insight, arguments);
 };
 
-Tracker.prototype.trackDecomposedEndpoints = function trackDecomposedEndpoints (command, endpoints) {
+Tracker.prototype.trackDecomposedEndpoints = function trackDecomposedEndpoints(command, endpoints) {
     endpoints.forEach(function (endpoint) {
         this.track(command, endpoint.source, endpoint.target);
     }.bind(this));
 };
 
-Tracker.prototype.trackPackages = function trackPackages (command, packages) {
-    mout.object.forOwn(packages, function (_package) {
-        var meta = _package.pkgMeta;
+Tracker.prototype.trackPackages = function trackPackages(command, packages) {
+    mout.object.forOwn(packages, function (package) {
+        var meta = package.pkgMeta;
         this.track(command, meta.name, meta.version);
     }.bind(this));
 };
 
-Tracker.prototype.trackNames = function trackNames (command, names) {
+Tracker.prototype.trackNames = function trackNames(command, names) {
     names.forEach(function (name) {
         this.track(command, name);
     }.bind(this));

lib/util/cmd.js

@@ -99,7 +99,7 @@ function executeCmd(command, args, options) {
             fullCommand += args.length ? ' ' + args.join(' ') : '';
 
             // Build the error instance
-            error = createError('Failed to execute "' + fullCommand + '", exit code of #' + code + '\n' + stderr, 'ECMDERR', {
+            error = createError('Failed to execute "' + fullCommand + '", exit code of #' + code, 'ECMDERR', {
                 details: stderr,
                 exitCode: code
             });

lib/util/copy.js

@@ -1,6 +1,6 @@
 var fstream = require('fstream');
 var fstreamIgnore = require('fstream-ignore');
-var fs = require('./fs');
+var fs = require('graceful-fs');
 var Q = require('q');
 
 function copy(reader, writer) {

lib/util/createLink.js

@@ -1,4 +1,4 @@
-var fs = require('./fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var Q = require('q');
 var mkdirp = require('mkdirp');
@@ -6,7 +6,9 @@ var createError = require('./createError');
 
 var isWin = process.platform === 'win32';
 
-function createLink(src, dst, type) {
+function createLink(src, dst, options) {
+    options = options || {};
+
     var dstDir = path.dirname(dst);
 
     // Create directory
@@ -26,7 +28,12 @@ function createLink(src, dst, type) {
     })
     // Create symlink
     .then(function (stat) {
-        type = type || (stat.isDirectory() ? 'dir' : 'file');
+        var type = options.type || (stat.isDirectory() ? 'dir' : 'file');
+        if (options.relative && !isWin) {
+            src = path.relative(path.dirname(dst), src);
+        } else {
+            src = path.resolve(src);
+        }
 
         return Q.nfcall(fs.symlink, src, dst, type)
         .fail(function (err) {

lib/util/dependencyLinker.js

@@ -0,0 +1,39 @@
+var Q = require('q');
+var Config = require('bower-config');
+var createLink = require('../util/createLink');
+var readJson = require('../util/readJson');
+var path = require('path');
+var fs = require('graceful-fs');
+
+module.exports.link = function (packages, config, logger) {
+    var rootComponentsDir = path.join(config.cwd, config.directory);
+
+    // create links for new packages and make sure that existing
+    // ones has all dependencies linked
+    var promises = Object.keys(packages).map(function (depName) {
+        var dep = packages[depName];
+        var depPath = dep.canonicalDir || path.join(rootComponentsDir, dep.name);
+        var conf = Config.read(depPath);
+        var componentsDir = path.join(conf.cwd, conf.directory);
+
+        return readJson(depPath)
+        .spread(function (json, deprecated, assumed) {
+            if (json.dependencies) {
+                return Q.all(Object.keys(json.dependencies || {}).map(function (d) {
+                    var dst = path.join(componentsDir, d);
+                    var src = path.join(rootComponentsDir, d);
+
+                    return Q.nfcall(fs.stat, dst)
+                    .fail(function () {
+                        logger.info('dep-link', d, {
+                            name: json.name + '#' + d
+                        });
+                        return createLink(src, dst, {relative: true});
+                    });
+                }));
+            }
+        });
+    });
+
+    return Q.all(promises);
+};

lib/util/download.js

@@ -3,20 +3,19 @@ var request = require('request');
 var Q = require('q');
 var mout = require('mout');
 var retry = require('retry');
+var fs = require('graceful-fs');
 var createError = require('./createError');
-var createWriteStream = require('fs-write-stream-atomic');
-var destroy = require('destroy');
 
 var errorCodes = [
     'EADDRINFO',
     'ETIMEDOUT',
     'ECONNRESET',
-    'ESOCKETTIMEDOUT',
-    'ENOTFOUND'
+    'ESOCKETTIMEDOUT'
 ];
 
 function download(url, file, options) {
     var operation;
+    var response;
     var deferred = Q.defer();
     var progressDelay = 8000;
 
@@ -25,23 +24,46 @@ function download(url, file, options) {
         factor: 2,
         minTimeout: 1000,
         maxTimeout: 35000,
-        randomize: true,
-        progressDelay: progressDelay
+        randomize: true
     }, options || {});
 
     // Retry on network errors
     operation = retry.operation(options);
-
     operation.attempt(function () {
-        Q.fcall(fetch, url, file, options)
-        .then(function(response) {
-            deferred.resolve(response);
+        var req;
+        var writeStream;
+        var contentLength;
+        var bytesDownloaded = 0;
+
+        req = progress(request(url, options), {
+            delay: progressDelay
         })
-        .progress(function (status) {
-            deferred.notify(status);
+        .on('response', function (res) {
+            var status = res.statusCode;
+
+            if (status < 200 || status >= 300) {
+                return deferred.reject(createError('Status code of ' + status, 'EHTTP'));
+            }
+
+            response = res;
+            contentLength = Number(res.headers['content-length']);
         })
-        .fail(function (error) {
-            // Save timeout before retrying to report
+        .on('data', function (data) {
+            bytesDownloaded += data.length;
+        })
+        .on('progress', function (state) {
+            deferred.notify(state);
+        })
+        .on('end', function () {
+            // Check if the whole file was downloaded
+            // In some unstable connections the ACK/FIN packet might be sent in the
+            // middle of the download
+            // See: https://github.com/joyent/node/issues/6143
+            if (contentLength && bytesDownloaded < contentLength) {
+                req.emit('error', createError('Transfer closed with ' + (contentLength - bytesDownloaded) + ' bytes remaining to read', 'EINCOMPLETE'));
+            }
+        })
+        .on('error', function (error) {
             var timeout = operation._timeouts[0];
 
             // Reject if error is not a network error
@@ -52,88 +74,33 @@ function download(url, file, options) {
             // Next attempt will start reporting download progress immediately
             progressDelay = 0;
 
-            // This will schedule next retry or return false
+            // Check if there are more retries
             if (operation.retry(error)) {
-                deferred.notify({
+                // Ensure that there are no more events from this request
+                req.removeAllListeners();
+                req.on('error', function () {});
+                // Ensure that there are no more events from the write stream
+                writeStream.removeAllListeners();
+                writeStream.on('error', function () {});
+
+                return deferred.notify({
                     retry: true,
                     delay: timeout,
                     error: error
                 });
-            } else {
-                deferred.reject(error);
             }
-        });
-    });
 
-    return deferred.promise;
-}
-
-function fetch(url, file, options) {
-    var deferred = Q.defer();
-
-    var contentLength;
-    var bytesDownloaded = 0;
-
-    var reject = function (error) {
-        deferred.reject(error);
-    };
-
-    var req = progress(request(url, options), {
-        delay: options.progressDelay
-    })
-    .on('response', function (response) {
-        contentLength = Number(response.headers['content-length']);
-
-        var status = response.statusCode;
-
-        if (status < 200 || status >= 300) {
-            return deferred.reject(createError('Status code of ' + status, 'EHTTP'));
-        }
-
-        var writeStream = createWriteStream(file);
-        var errored = false;
-
-        // Change error listener so it cleans up writeStream before exiting
-        req.removeListener('error', reject);
-        req.on('error', function (error) {
-            errored = true;
-            destroy(req);
-            destroy(writeStream);
-
-            // Wait for writeStream to cleanup after itself...
-            // TODO: Maybe there's a better way?
-            setTimeout(function () {
-                deferred.reject(error);
-            }, 50);
+            // No more retries, reject!
+            deferred.reject(error);
         });
 
-        writeStream.on('finish', function () {
-            if (!errored) {
-                destroy(req);
-                deferred.resolve(response);
-            }
+        // Pipe read stream to write stream
+        writeStream = req
+        .pipe(fs.createWriteStream(file))
+        .on('error', deferred.reject)
+        .on('close', function () {
+            deferred.resolve(response);
         });
-
-        req.pipe(writeStream);
-    })
-    .on('data', function (data) {
-        bytesDownloaded += data.length;
-    })
-    .on('progress', function (state) {
-        deferred.notify(state);
-    })
-    .on('error', reject)
-    .on('end', function () {
-        // Check if the whole file was downloaded
-        // In some unstable connections the ACK/FIN packet might be sent in the
-        // middle of the download
-        // See: https://github.com/joyent/node/issues/6143
-        if (contentLength && bytesDownloaded < contentLength) {
-            req.emit('error', createError(
-                'Transfer closed with ' + (contentLength - bytesDownloaded) + ' bytes remaining to read',
-                'EINCOMPLETE'
-            ));
-        }
     });
 
     return deferred.promise;

lib/util/extract.js

@@ -1,5 +1,5 @@
 var path = require('path');
-var fs = require('./fs');
+var fs = require('graceful-fs');
 var zlib = require('zlib');
 var DecompressZip = require('decompress-zip');
 var tar = require('tar-fs');
@@ -7,8 +7,6 @@ var Q = require('q');
 var mout = require('mout');
 var junk = require('junk');
 var createError = require('./createError');
-var createWriteStream = require('fs-write-stream-atomic');
-var destroy = require('destroy');
 
 // This forces the default chunk size to something small in an attempt
 // to avoid issue #314
@@ -51,24 +49,13 @@ function extractZip(archive, dst) {
 function extractTar(archive, dst) {
     var deferred = Q.defer();
 
-    var stream = fs.createReadStream(archive);
-
-    var reject = function (error) {
-        destroy(stream);
-        deferred.reject(error);
-    };
-
-    stream.on('error', reject)
+    fs.createReadStream(archive)
+    .on('error', deferred.reject)
     .pipe(tar.extract(dst, {
-        ignore: isSymlink, // Filter symlink files
-        dmode: 0555,       // Ensure dirs are readable
-        fmode: 0444        // Ensure files are readable
+        ignore: isSymlink  // Filter symlink files
     }))
-    .on('error', reject)
-    .on('finish', function (result) {
-        destroy(stream);
-        deferred.resolve(dst);
-    });
+    .on('error', deferred.reject)
+    .on('finish', deferred.resolve.bind(deferred, dst));
 
     return deferred.promise;
 }
@@ -76,26 +63,15 @@ function extractTar(archive, dst) {
 function extractTarGz(archive, dst) {
     var deferred = Q.defer();
 
-    var stream = fs.createReadStream(archive);
-
-    var reject = function (error) {
-        destroy(stream);
-        deferred.reject(error);
-    };
-
-    stream.on('error', reject)
+    fs.createReadStream(archive)
+    .on('error', deferred.reject)
     .pipe(zlib.createGunzip())
-    .on('error', reject)
+    .on('error', deferred.reject)
     .pipe(tar.extract(dst, {
-        ignore: isSymlink, // Filter symlink files
-        dmode: 0555,       // Ensure dirs are readable
-        fmode: 0444        // Ensure files are readable
+        ignore: isSymlink  // Filter symlink files
     }))
-    .on('error', reject)
-    .on('finish', function (result) {
-        destroy(stream);
-        deferred.resolve(dst);
-    });
+    .on('error', deferred.reject)
+    .on('finish', deferred.resolve.bind(deferred, dst));
 
     return deferred.promise;
 }
@@ -103,21 +79,13 @@ function extractTarGz(archive, dst) {
 function extractGz(archive, dst) {
     var deferred = Q.defer();
 
-    var stream = fs.createReadStream(archive);
-
-    var reject = function (error) {
-        destroy(stream);
-        deferred.reject(error);
-    };
-    stream.on('error', reject)
+    fs.createReadStream(archive)
+    .on('error', deferred.reject)
     .pipe(zlib.createGunzip())
-    .on('error', reject)
-    .pipe(createWriteStream(dst))
-    .on('error', reject)
-    .on('finish', function (result) {
-        destroy(stream);
-        deferred.resolve(dst);
-    });
+    .on('error', deferred.reject)
+    .pipe(fs.createWriteStream(dst))
+    .on('error', deferred.reject)
+    .on('close', deferred.resolve.bind(deferred, dst));
 
     return deferred.promise;
 }

lib/util/fs.js

@@ -1,34 +0,0 @@
-var fs = require('graceful-fs');
-
-var readdir = fs.readdir.bind(fs);
-var readdirSync = fs.readdirSync.bind(fs);
-
-module.exports = fs;
-
-module.exports.readdir = function (dir, callback) {
-    fs.stat(dir, function (err, stats) {
-        if (err) return callback(err);
-
-        if (stats.isDirectory()) {
-            return readdir(dir, callback);
-        } else {
-            var error = new Error('ENOTDIR, not a directory \'' + dir + '\'');
-            error.code = 'ENOTDIR';
-            error.path = dir;
-            error.errono = -20;
-            return callback(error);
-        }
-    });
-};
-
-module.exports.readdirSync = function (dir) {
-    var stats = fs.statSync(dir);
-
-    if (stats.isDirectory()) {
-        return readdirSync(dir);
-    } else {
-        var error = new Error();
-        error.code = 'ENOTDIR';
-        throw error;
-    }
-};

lib/util/md5.js

@@ -0,0 +1,7 @@
+var crypto = require('crypto');
+
+function md5(contents) {
+    return crypto.createHash('md5').update(contents).digest('hex');
+}
+
+module.exports = md5;

lib/util/removeIgnores.js

@@ -1,5 +1,5 @@
 var path = require('path');
-var rimraf = require('../util/rimraf');
+var rimraf = require('rimraf');
 var fstreamIgnore = require('fstream-ignore');
 var mout = require('mout');
 var Q = require('q');

lib/util/rimraf.js

@@ -1,46 +0,0 @@
-var rimraf = require('rimraf');
-var chmodr = require('chmodr');
-var fs = require('./fs');
-
-module.exports = function (dir, callback) {
-    var checkAndRetry = function (e) {
-        fs.lstat(dir, function (err, stats) {
-            if (err) {
-                if (err.code === 'ENOENT') return callback();
-                return callback(e);
-            }
-
-            chmodr(dir, 0777, function (err) {
-                if (err) return callback(e);
-                rimraf(dir, callback);
-            });
-        });
-    };
-
-    if (process.platform === 'win32') {
-        checkAndRetry();
-    } else {
-        rimraf(dir, checkAndRetry);
-    }
-};
-
-module.exports.sync = function (dir) {
-    var checkAndRetry = function () {
-        try {
-            fs.lstatSync(dir);
-            chmodr.sync(dir, 0777);
-            return rimraf.sync(dir);
-        } catch (e) {
-            if (e.code === 'ENOENT') return;
-            throw e;
-        }
-    };
-
-    try {
-        return rimraf.sync(dir);
-    } catch (e) {
-        return checkAndRetry();
-    } finally {
-        return checkAndRetry();
-    }
-};

lib/util/rootCheck.js

@@ -1,8 +1,8 @@
 /*jshint multistr:true*/
-// jscs:disable disallowMultipleLineStrings
 'use strict';
 var isRoot = require('is-root');
 var createError = require('./createError');
+var cli = require('./cli');
 
 var renderer;
 
@@ -23,7 +23,6 @@ https://gist.github.com/isaacs/579814\n\n\
 You can however run a command with sudo using --allow-root option';
 
     if (isRoot()) {
-        var cli = require('./cli');
         renderer = cli.getRenderer('', false, config);
         renderer.error(createError('Cannot be run with sudo', 'ESUDO', { details : errorMsg }));
         process.exit(1);

lib/util/template.js

@@ -1,5 +1,5 @@
 var path = require('path');
-var fs = require('./fs');
+var fs = require('graceful-fs');
 var Handlebars = require('handlebars');
 var mout = require('mout');
 var helpers = require('../../templates/helpers');

lib/util/userAgent.js

@@ -1,3 +0,0 @@
-var pkg = require('../../package.json');
-
-module.exports = 'node/' + process.version + ' ' + process.platform + ' ' + process.arch + ' ' + ';Bower ' + pkg.version;

lib/util/validLink.js

@@ -1,5 +1,5 @@
 var Q = require('q');
-var fs = require('./fs');
+var fs = require('graceful-fs');
 
 function validLink(file) {
     // Ensures that a file is a symlink that points

package.json

@@ -1,141 +1,84 @@
 {
   "name": "bower",
-  "version": "1.6.8",
+  "version": "1.3.12",
   "description": "The browser package manager",
   "author": "Twitter",
-  "license": "MIT",
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "https://github.com/bower/bower/blob/master/LICENSE"
+    }
+  ],
   "repository": "bower/bower",
   "main": "lib",
   "homepage": "http://bower.io",
   "engines": {
     "node": ">=0.10.0"
   },
-  "keywords": [
-    "bower"
-  ],
   "dependencies": {
-    "abbrev": "^1.0.5",
-    "archy": "1.0.0",
-    "bower-config": "^1.2.3",
-    "bower-endpoint-parser": "^0.2.2",
-    "bower-json": "^0.4.0",
-    "bower-logger": "^0.2.2",
-    "bower-registry-client": "^1.0.0",
-    "cardinal": "0.4.4",
-    "chalk": "^1.0.0",
-    "chmodr": "^1.0.2",
-    "configstore": "^0.3.2",
-    "decompress-zip": "^0.1.0",
-    "destroy": "^1.0.3",
-    "fs-write-stream-atomic": "^1.0.4",
-    "fstream": "^1.0.3",
-    "fstream-ignore": "^1.0.2",
-    "github": "^0.2.3",
-    "glob": "^4.3.2",
-    "graceful-fs": "^3.0.5",
-    "handlebars": "^2.0.0",
-    "inquirer": "0.10.0",
-    "insight": "^0.7.0",
-    "is-root": "^1.0.0",
-    "junk": "^1.0.0",
-    "lockfile": "^1.0.0",
-    "lru-cache": "^2.5.0",
-    "md5-hex": "^1.0.2",
+    "abbrev": "~1.0.4",
+    "archy": "0.0.2",
+    "bower-config": "~0.5.2",
+    "bower-endpoint-parser": "~0.2.2",
+    "bower-json": "~0.4.0",
+    "bower-logger": "~0.2.2",
+    "bower-registry-client": "~0.2.0",
+    "cardinal": "0.4.0",
+    "chalk": "0.5.0",
+    "chmodr": "0.1.0",
+    "decompress-zip": "0.0.8",
+    "fstream": "~1.0.2",
+    "fstream-ignore": "~1.0.1",
+    "glob": "~4.0.2",
+    "graceful-fs": "~3.0.1",
+    "handlebars": "~2.0.0",
+    "inquirer": "0.7.1",
+    "insight": "0.4.3",
+    "is-root": "~1.0.0",
+    "junk": "~1.0.0",
+    "lockfile": "~1.0.0",
+    "lru-cache": "~2.5.0",
     "mkdirp": "0.5.0",
-    "mout": "^0.11.0",
-    "nopt": "^3.0.1",
-    "opn": "^1.0.1",
-    "p-throttler": "0.1.1",
+    "mout": "~0.9.0",
+    "nopt": "~3.0.0",
+    "opn": "~1.0.0",
+    "osenv": "0.1.0",
+    "p-throttler": "0.1.0",
     "promptly": "0.2.0",
-    "q": "^1.1.2",
-    "request": "2.53.0",
-    "request-progress": "0.3.1",
-    "retry": "0.6.1",
-    "rimraf": "^2.2.8",
-    "semver": "^2.3.0",
-    "shell-quote": "^1.4.2",
-    "stringify-object": "^1.0.0",
-    "tar-fs": "^1.4.1",
-    "tmp": "0.0.24",
-    "update-notifier": "^0.3.0",
-    "user-home": "^1.1.0",
-    "which": "^1.0.8"
+    "q": "~1.0.1",
+    "request": "~2.42.0",
+    "request-progress": "0.3.0",
+    "retry": "0.6.0",
+    "rimraf": "~2.2.0",
+    "semver": "~2.3.0",
+    "shell-quote": "~1.4.1",
+    "stringify-object": "~1.0.0",
+    "tar-fs": "0.5.2",
+    "tmp": "0.0.23",
+    "update-notifier": "0.2.0",
+    "which": "~1.0.5"
   },
   "devDependencies": {
-    "chai": "^1.10.0",
-    "coveralls": "^2.11.2",
-    "expect.js": "^0.3.1",
-    "grunt": "^0.4.5",
+    "coveralls": "~2.11.0",
+    "expect.js": "~0.3.1",
+    "grunt": "~0.4.4",
     "grunt-cli": "^0.1.13",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-exec": "^0.4.6",
-    "grunt-jscs": "^2.3.0",
-    "grunt-simple-mocha": "^0.4.0",
-    "istanbul": "^0.3.5",
-    "load-grunt-tasks": "^2.0.0",
-    "mocha": "^2.1.0",
-    "multiline": "^1.0.2",
-    "nock": "^3.1.0",
-    "node-uuid": "^1.4.2",
-    "proxyquire": "^1.3.0",
-    "spawn-sync": "1.0.13"
+    "grunt-contrib-jshint": "~0.10.0",
+    "grunt-contrib-watch": "~0.6.1",
+    "grunt-exec": "~0.4.2",
+    "grunt-simple-mocha": "~0.4.0",
+    "istanbul": "~0.3.2",
+    "load-grunt-tasks": "~0.6.0",
+    "mocha": "~1.21.4",
+    "nock": "~0.46.0",
+    "node-uuid": "~1.4.1",
+    "proxyquire": "~1.0.1"
   },
-  "bundledDependencies": [
-    "abbrev",
-    "archy",
-    "bower-config",
-    "bower-endpoint-parser",
-    "bower-json",
-    "bower-logger",
-    "bower-registry-client",
-    "cardinal",
-    "chalk",
-    "chmodr",
-    "configstore",
-    "decompress-zip",
-    "destroy",
-    "fs-write-stream-atomic",
-    "fstream",
-    "fstream-ignore",
-    "github",
-    "glob",
-    "graceful-fs",
-    "handlebars",
-    "inquirer",
-    "insight",
-    "is-root",
-    "junk",
-    "lockfile",
-    "lru-cache",
-    "md5-hex",
-    "mkdirp",
-    "mout",
-    "nopt",
-    "opn",
-    "p-throttler",
-    "promptly",
-    "q",
-    "request",
-    "request-progress",
-    "retry",
-    "rimraf",
-    "semver",
-    "shell-quote",
-    "stringify-object",
-    "tar-fs",
-    "tmp",
-    "update-notifier",
-    "user-home",
-    "which"
-  ],
   "scripts": {
     "test": "grunt test"
   },
-  "bin": "bin/bower",
-  "files": [
-    "bin",
-    "lib",
-    "templates"
-  ]
+  "bin": {
+    "bower": "bin/bower"
+  },
+  "preferGlobal": true
 }

templates/json/help-cache/clean.json

@@ -1,5 +1,5 @@
 {
-    "command": "cache clean",
+    "command": "cache list",
     "description": "Cleans cached packages.",
     "usage": [
         "cache clean [<options>]",

templates/json/help-cache/list.json

@@ -1,5 +1,5 @@
 {
-    "command": "cache list",
+    "command": "cache clean",
     "description": "Lists cached packages.",
     "usage": [
         "cache list [<options>]",

templates/json/help-install.json

@@ -30,11 +30,6 @@
             "shorthand":   "-D",
             "flag":        "--save-dev",
             "description": "Save installed packages into the project's bower.json devDependencies"
-        },
-        {
-            "shorthand":   "-E",
-            "flag":        "--save-exact",
-            "description": "Configure installed packages with an exact version rather than semver"
         }
     ]
 }

templates/json/help-login.json

@@ -1,19 +0,0 @@
-{
-    "command": "login",
-    "description": "Authenticate with GitHub and store credentials to be used later.",
-    "usage": [
-        "login [<options>]"
-    ],
-    "options": [
-        {
-            "shorthand":   "-h",
-            "flag":        "--help",
-            "description": "Show this help message"
-        },
-        {
-            "shorthand":   "-t",
-            "flag":        "--token",
-            "description": "Pass an existing GitHub auth token rather than prompting for username and password."
-        }
-    ]
-}

templates/json/help-unregister.json

@@ -1,14 +0,0 @@
-{
-    "command": "unregister",
-    "description": "Unregisters a package.",
-    "usage": [
-        "unregister <name> [<options>]"
-    ],
-    "options": [
-        {
-            "shorthand":   "-h",
-            "flag":        "--help",
-            "description": "Show this help message"
-        }
-    ]
-}

templates/json/help.json

@@ -11,14 +11,12 @@
         "install":         "Install a package locally",
         "link":            "Symlink a package folder",
         "list":            "List local packages - and possible updates",
-        "login":           "Authenticate with GitHub and store credentials",
         "lookup":          "Look up a package URL by name",
         "prune":           "Removes local extraneous packages",
         "register":        "Register a package",
         "search":          "Search for a package by name",
         "update":          "Update a local package",
         "uninstall":       "Remove a local package",
-        "unregister":      "Remove a package from the registry",
         "version":         "Bump a package version"
     },
     "options": [
@@ -62,13 +60,8 @@
             "description": "Allows running commands as root"
         },
         {
-            "shorthand":   "-v",
             "flag":        "--version",
             "description": "Output Bower version"
-        },
-        {
-            "flag":        "--no-color",
-            "description": "Disable colors"
         }
     ]
 }

templates/std/conflict.std

@@ -1,11 +1,9 @@
 {{#yellow}}Unable to find a suitable version for {{name}}, please choose one:{{/yellow}}
 {{#condense}}
 {{#each picks}}
-    {{#magenta}}{{sum @index 1}}){{/magenta}} {{#cyan}}{{endpoint.name}}#{{endpoint.target}}{{/cyan}}{{#if pkgMeta._release}} which resolved to {{#green}}{{pkgMeta._release}}{{/green}}{{/if}}{{#if dependants}} and is required by {{#green}}{{dependants}}{{/green}}{{/if}}
+    {{#magenta}}{{sum @index 1}}){{/magenta}} {{#cyan}}{{endpoint.name}}#{{endpoint.target}}{{/cyan}}{{#if pkgMeta._release}} which resolved to {{#green}}{{pkgMeta._release}}{{/green}}{{/if}}{{#if dependants}} and is required by {{#green}}{{dependants}}{{/green}} {{/if}}
 {{/each}}
 {{/condense}}
-
 {{#unless saveResolutions}}
-
 Prefix the choice with ! to persist it to bower.json
 {{/unless}}

templates/std/help-cache.std

@@ -14,4 +14,3 @@ Commands:
     {{#rpad length="23"}}{{@key}}{{/rpad}} {{.}}
 {{/each}}
 {{/condense}}
-

test/assets/test-temp-dir/test-exception.js

@@ -1,4 +1,4 @@
-var fs = require('../../../lib/util/fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var Logger = require('bower-logger');
 var Resolver = require('../../../lib/core/resolvers/Resolver');

test/assets/test-temp-dir/test.js

@@ -1,4 +1,4 @@
-var fs = require('../../../lib/util/fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var Logger = require('bower-logger');
 var Resolver = require('../../../lib/core/resolvers/Resolver');

test/commands/bower.js

@@ -1,23 +0,0 @@
-var expect = require('expect.js');
-var runBin = require('../helpers').runBin;
-
-describe('bower', function () {
-    process.env.CI = '1';
-
-    it('runs bower installation', function () {
-        var result = runBin();
-        var text = result.stdout.toString();
-
-        expect(text).to.contain('Usage:');
-        expect(text).to.contain('Commands:');
-    });
-});
-
-describe('abbreviations', function () {
-    it('Returns same value than the full command', function() {
-        var abbr = runBin(['install']);
-        var full = runBin(['i']);
-
-        expect(abbr.stdout.toString()).to.be.equal(full.stdout.toString());
-    });
-});

test/commands/cache/clean.js

@@ -1,89 +0,0 @@
-var expect = require('expect.js');
-var md5 = require('md5-hex');
-var helpers = require('../../helpers');
-
-var cacheClean = helpers.command('cache/clean');
-var object = require('mout/object');
-
-describe('bower cache clean', function () {
-
-    // Because directory names are required to be md5 of _source
-    var cacheFilesFactory = function (spec) {
-        var files = {};
-
-        object.map(spec, function(bowerJson) {
-            bowerJson._source = bowerJson.name + '/' + bowerJson.version;
-            var path = md5(bowerJson._source) + '/' + bowerJson.version + '/.bower.json';
-            files[path] = bowerJson;
-        });
-
-        return files;
-    };
-
-
-    var cacheFiles = cacheFilesFactory([
-        {
-            name: 'angular',
-            version: '1.3.8'
-        },
-        {
-            name: 'angular',
-            version: '1.3.9'
-        },
-        {
-            name: 'jquery',
-            version: '1.0.0'
-        }
-    ]);
-
-    var cacheDir = new helpers.TempDir(cacheFiles);
-
-    it('correctly reads arguments', function() {
-        expect(cacheClean.readOptions(['jquery', 'angular']))
-        .to.eql([['jquery', 'angular'], {}]);
-    });
-
-    it('removes all cache', function () {
-        cacheDir.prepare();
-
-        return helpers.run(cacheClean, [undefined, {}, {
-            storage: {
-                packages: cacheDir.path
-            }
-        }]).spread(function(result) {
-            object.map(cacheFiles, function (_, cacheFile) {
-                expect(cacheDir.exists(cacheFile)).to.be(false);
-            });
-        });
-    });
-
-    it('removes single package', function () {
-        cacheDir.prepare();
-
-        return helpers.run(cacheClean, [['angular'], {}, {
-            storage: {
-                packages: cacheDir.path
-            }
-        }]).spread(function(result) {
-            var paths = Object.keys(cacheFiles);
-            expect(cacheDir.exists(paths[0])).to.be(false);
-            expect(cacheDir.exists(paths[1])).to.be(false);
-            expect(cacheDir.exists(paths[2])).to.be(true);
-        });
-    });
-
-    it('removes single package package version', function () {
-        cacheDir.prepare();
-
-        return helpers.run(cacheClean, [['angular#1.3.8'], {}, {
-            storage: {
-                packages: cacheDir.path
-            }
-        }]).spread(function(result) {
-            var paths = Object.keys(cacheFiles);
-            expect(cacheDir.exists(paths[0])).to.be(false);
-            expect(cacheDir.exists(paths[1])).to.be(true);
-            expect(cacheDir.exists(paths[2])).to.be(true);
-        });
-    });
-});

test/commands/cache/list.js

@@ -1,60 +0,0 @@
-var expect = require('expect.js');
-var helpers = require('../../helpers');
-
-var cacheList = helpers.command('cache/list');
-
-describe('bower cache list', function () {
-
-    var cacheDir = new helpers.TempDir({
-        '87323d6d4e48be291a9616a033d4cc6c/1.3.8/.bower.json': {
-            name: 'angular',
-            version: '1.3.8'
-        },
-        '87323d6d4e48be291a9616a033d4cc6c/1.3.9/.bower.json': {
-            name: 'angular',
-            version: '1.3.9'
-        },
-        '9eaed103d6a7e78d91f673cfad796850/1.0.0/.bower.json': {
-            name: 'jquery',
-            version: '1.0.0'
-        }
-    });
-
-    it('correctly reads arguments', function() {
-        expect(cacheList.readOptions(['jquery', 'angular']))
-        .to.eql([['jquery', 'angular'], {}]);
-    });
-
-    it('lists packages from cache', function () {
-        cacheDir.prepare();
-
-        return helpers.run(cacheList, [undefined, {}, {
-            storage: {
-                packages: cacheDir.path
-            }
-        }]).spread(function(result) {
-            expect(result[0].canonicalDir)
-            .to.be(cacheDir.getPath('87323d6d4e48be291a9616a033d4cc6c/1.3.8'));
-            expect(result[0].pkgMeta.version).to.be('1.3.8');
-            expect(result[1].pkgMeta.version).to.be('1.3.9');
-            expect(result[2].pkgMeta.version).to.be('1.0.0');
-        });
-
-    });
-
-    it('lists selected package names', function () {
-        cacheDir.prepare();
-
-        return helpers.run(cacheList, [['angular'], {}, {
-            storage: {
-                packages: cacheDir.path
-            }
-        }]).spread(function(result) {
-            expect(result[0].canonicalDir)
-            .to.be(cacheDir.getPath('87323d6d4e48be291a9616a033d4cc6c/1.3.8'));
-            expect(result[0].pkgMeta.version).to.be('1.3.8');
-            expect(result[1].pkgMeta.version).to.be('1.3.9');
-        });
-
-    });
-});

test/commands/help.js

@@ -1,43 +0,0 @@
-var expect = require('expect.js');
-var helpers = require('../helpers');
-var help = helpers.command('help');
-
-describe('bower help', function () {
-
-    it('correctly reads arguments', function() {
-        expect(help.readOptions(['foo'])).to.eql(['foo']);
-    });
-
-    it('shows general help', function () {
-        return helpers.run(help).spread(function(result) {
-            expect(result.usage[0]).to.be.a('string');
-            expect(result.commands).to.be.a('object');
-            expect(result.options).to.be.a('object');
-        });
-    });
-
-    var commands = [
-        'home', 'info', 'init', 'install',
-        'link', 'list', 'lookup', 'prune', 'register',
-        'search', 'update', 'uninstall', 'version',
-        'cache list', 'cache clean'
-    ];
-
-    commands.forEach(function(command) {
-        it('shows help for ' + command + ' command', function() {
-            return helpers.run(help, [command]).spread(function(result) {
-                expect(result.command).to.be(command);
-                expect(result.description).to.be.a('string');
-                expect(result.usage[0]).to.be.a('string');
-            });
-        });
-    });
-
-    it('displays error for non-existing command', function() {
-        return helpers.run(help, ['fuu']).fail(function(e) {
-            expect(e.message).to.be('Unknown command: fuu');
-            expect(e.command).to.be('fuu');
-            expect(e.code).to.be('EUNKNOWNCMD');
-        });
-    });
-});

test/commands/home.js

@@ -1,59 +0,0 @@
-var Q = require('q');
-var expect = require('expect.js');
-var helpers = require('../helpers');
-
-var home = helpers.command('home');
-
-describe('bower home', function () {
-
-    it('correctly reads arguments', function() {
-        expect(home.readOptions(['foo'])).to.eql(['foo']);
-    });
-
-    var mainPackage = new helpers.TempDir({
-        'bower.json': {
-            name: 'package',
-            homepage: 'http://bower.io'
-        }
-    });
-
-    var wrongPackage = new helpers.TempDir({
-        'bower.json': {
-            name: 'package'
-        }
-    });
-
-    it('opens repository home page in web browser', function () {
-        mainPackage.prepare();
-
-        return Q.Promise(function(resolve) {
-            var home = helpers.command('home', { opn: resolve });
-            helpers.run(home, [mainPackage.path]);
-        }).then(function(url) {
-            expect(url).to.be('http://bower.io');
-        });
-    });
-
-    it('opens home page of current repository', function () {
-        mainPackage.prepare();
-
-        return Q.Promise(function(resolve) {
-            var home = helpers.command('home', { opn: resolve });
-            helpers.run(home, [undefined, { cwd: mainPackage.path }]);
-        }).then(function(url) {
-            expect(url).to.be('http://bower.io');
-        });
-    });
-
-    it('errors if no homepage is set', function () {
-        wrongPackage.prepare();
-
-        return Q.Promise(function(resolve) {
-            var home = helpers.command('home', { opn: resolve });
-            helpers.run(home, [wrongPackage.path]).fail(resolve);
-        }).then(function(reason) {
-            expect(reason.message).to.be('No homepage set for package');
-            expect(reason.code).to.be('ENOHOME');
-        });
-    });
-});

test/commands/index.js

@@ -1,19 +1,6 @@
 describe('integration tests', function () {
-    require('./cache/list');
-    require('./cache/clean');
-    require('./help');
-    require('./home');
-    require('./info');
     require('./init');
     require('./install');
-    require('./list');
-    require('./link');
-    require('./lookup');
-    require('./prune');
-    require('./register');
-    require('./search');
     require('./uninstall');
     require('./update');
-    require('./version');
-    require('./bower');
 });

test/commands/info.js

@@ -1,52 +0,0 @@
-var expect = require('expect.js');
-
-var helpers = require('../helpers');
-var info = helpers.command('info');
-
-describe('bower info', function () {
-
-    it('correctly reads arguments', function() {
-        expect(info.readOptions(['pkg', 'property']))
-        .to.eql(['pkg', 'property']);
-    });
-
-    var meta = {
-        name: 'package',
-        version: '0.1.2',
-        homepage: 'http://bower.io',
-        description: 'Hello world!'
-    };
-
-    var meta2 = {
-        name: 'package',
-        version: '0.1.3',
-        homepage: 'http://bower.io',
-        description: 'Hello world! Hello!'
-    };
-
-    var mainPackage = new helpers.TempDir({
-        '0.1.2': { 'bower.json': meta },
-        '0.1.3': { 'bower.json': meta2 }
-    });
-
-    it('just returns if not package is specified', function () {
-        return helpers.run(info).spread(function(results) {
-            expect(results).to.be(undefined);
-        });
-    });
-
-    it('shows info about given package', function () {
-        mainPackage.prepareGit({});
-
-        return helpers.run(info, [mainPackage.path]).spread(function(results) {
-            expect(results).to.eql({
-                'latest': meta2,
-                'name': mainPackage.path,
-                'versions': [
-                    '0.1.3',
-                    '0.1.2'
-                ]
-            });
-        });
-    });
-});

test/commands/init.js

@@ -1,29 +1,30 @@
+var path = require('path');
 var expect = require('expect.js');
-var helpers = require('../helpers');
+var fs = require('fs');
 
-var init = helpers.command('init');
+var helpers = require('../helpers');
+var bower = helpers.require('lib/index');
 
 describe('bower init', function () {
 
-    var mainPackage = new helpers.TempDir();
+    var tempDir = new helpers.TempDir();
+    var bowerJsonPath = path.join(tempDir.path, 'bower.json');
 
-    it('correctly reads arguments', function() {
-        expect(init.readOptions([]))
-        .to.eql([]);
-    });
+    var config = {
+        cwd: tempDir.path,
+        interactive: true
+    };
 
     it('generates bower.json file', function () {
-        mainPackage.prepare();
+        tempDir.prepare();
 
-        var logger = init({
-            cwd: mainPackage.path,
-            interactive: true
-        });
+        var logger = bower.commands.init(config);
 
         return helpers.expectEvent(logger, 'prompt')
         .spread(function (prompt, answer) {
             answer({
                 name: 'test-name',
+                version: 'test-version',
                 description: 'test-description',
                 moduleType: 'test-moduleType',
                 keywords: 'test-keyword',
@@ -36,114 +37,14 @@ describe('bower init', function () {
             return helpers.expectEvent(logger, 'prompt');
         })
         .spread(function (prompt, answer) {
-            answer({ prompt: true });
-            return helpers.expectEvent(logger, 'end');
-        })
-        .then(function () {
-            expect(mainPackage.readJson('bower.json')).to.eql({
-                name: 'test-name',
-                homepage: 'test-homepage',
-                authors: [ 'test-author' ],
-                description: 'test-description',
-                moduleType: 'test-moduleType',
-                keywords: [ 'test-keyword' ],
-                license: 'test-license',
-                private: true
-            });
-        });
-    });
-
-    it('errors on non-interactive mode', function () {
-        mainPackage.prepare();
-
-        return helpers.run(init, { cwd: mainPackage.path }).then(
-            function () { throw 'should fail'; },
-            function (reason) {
-                expect(reason.message).to.be('Register requires an interactive shell');
-                expect(reason.code).to.be('ENOINT');
-            }
-        );
-    });
-
-    it('warns about existing bower.json', function () {
-        mainPackage.prepare({
-            'bower.json': {
-                name: 'foobar'
-            }
-        });
-
-        var logger = init({ cwd: mainPackage.path, interactive: true });
-
-        return helpers.expectEvent(logger, 'log').spread(function(event) {
-            expect(event.level).to.be('warn');
-            expect(event.message).to.be(
-                'The existing bower.json file will be used and filled in'
-            );
-        });
-    });
-
-    it('gets defaults from package.json', function () {
-        mainPackage.prepare({
-            'package.json': {
-                'name': 'name from npm',
-                'description': 'description from npm',
-                'main': 'index.js',
-                'keywords': [
-                    'foo',
-                    'bar'
-                ],
-                'author': 'JD Isaacks',
-                'license': 'ISC'
-            }
-        });
-
-        var logger = init({
-            cwd: mainPackage.path,
-            interactive: true
-        });
-
-        return helpers.expectEvent(logger, 'prompt')
-        .spread(function (prompt, answer) {
-
-            // Get defaults from prompt
-            var defaults = prompt.reduce(function(memo, obj) {
-                memo[obj.name] = obj['default'];
-                return memo;
-            }, {});
-
-            // Answer with defaults
             answer({
-                name: defaults.name,
-                description: defaults.description,
-                main: defaults.main,
-                moduleType: defaults.moduleType,
-                keywords: defaults.keywords,
-                authors: defaults.authors,
-                license: defaults.license,
-                homepage: 'test-homepage',
-                private: true
+                prompt: true
             });
 
-            return helpers.expectEvent(logger, 'prompt');
-        })
-        .spread(function (prompt, answer) {
-            answer({ prompt: true });
             return helpers.expectEvent(logger, 'end');
         })
         .then(function () {
-            expect(mainPackage.readJson('bower.json')).to.eql({
-                'name': 'name from npm',
-                'description': 'description from npm',
-                'main': 'index.js',
-                'keywords': [
-                    'foo',
-                    'bar'
-                ],
-                'authors': ['JD Isaacks'],
-                'license': 'ISC',
-                'private': true,
-                'homepage': 'test-homepage'
-            });
+            expect(fs.existsSync(bowerJsonPath)).to.be(true);
         });
     });
 });

test/commands/install.js

@@ -1,39 +1,14 @@
 var expect = require('expect.js');
+var object = require('mout').object;
+
 var helpers = require('../helpers');
-var nock = require('nock');
-var fs = require('../../lib/util/fs');
+var commands = helpers.require('lib/index').commands;
 
 describe('bower install', function () {
 
     var tempDir = new helpers.TempDir();
 
-    var install = helpers.command('install', { cwd: tempDir.path });
-
-    it('correctly reads arguments', function() {
-        expect(install.readOptions(['jquery', 'angular', '-F', '-p', '-S', '-D', '-E']))
-    .to.eql([['jquery', 'angular'], {
-        forceLatest: true,
-        production: true,
-        save: true,
-        saveDev: true,
-        saveExact: true
-    }]);
-    });
-
-    it('correctly reads long arguments', function() {
-        expect(install.readOptions([
-          'jquery', 'angular',
-          '--force-latest', '--production', '--save', '--save-dev', '--save-exact'
-    ])).to.eql([['jquery', 'angular'], {
-        forceLatest: true,
-        production: true,
-        save: true,
-        saveDev: true,
-        saveExact: true
-    }]);
-    });
-
-    var mainPackage = new helpers.TempDir({
+    var package = new helpers.TempDir({
         'bower.json': {
             name: 'package'
         }
@@ -41,8 +16,22 @@ describe('bower install', function () {
 
     var gitPackage = new helpers.TempDir();
 
+    var installLogger = function(packages, options, config) {
+        config = object.merge(config || {}, {
+            cwd: tempDir.path
+        });
+
+        return commands.install(packages, options, config);
+    };
+
+    var install = function(packages, options, config) {
+        var logger = installLogger(packages, options, config);
+
+        return helpers.expectEvent(logger, 'end');
+    };
+
     it('writes to bower.json if --save flag is used', function () {
-        mainPackage.prepare();
+        package.prepare();
 
         tempDir.prepare({
             'bower.json': {
@@ -50,113 +39,69 @@ describe('bower install', function () {
             }
         });
 
-        return helpers.run(install, [[mainPackage.path], { save: true }]).then(function() {
+        return install([package.path], { save: true }).then(function() {
             expect(tempDir.read('bower.json')).to.contain('dependencies');
         });
     });
 
-    it('writes an exact version number to dependencies in bower.json if --save --save-exact flags are used', function () {
-        mainPackage.prepare({
-            'bower.json': {
-                name: 'package',
-                version: '1.2.3'
-            }
-        });
-
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test'
-            }
-        });
-
-        return helpers.run(install, [
-          [mainPackage.path],
-          { saveExact: true, save: true }
-    ]).then(function() {
-        expect(tempDir.readJson('bower.json').dependencies.package).to.equal(mainPackage.path + '#1.2.3');
-    });
-    });
-
-    it('writes an exact version number to devDependencies in bower.json if --save-dev --save-exact flags are used', function () {
-        mainPackage.prepare({
-            'bower.json': {
-                name: 'package',
-                version: '0.1.0'
-            }
-        });
-
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test'
-            }
-        });
-
-        return helpers.run(install, [
-          [mainPackage.path],
-          { saveExact: true, saveDev: true }
-    ]).then(function() {
-        expect(tempDir.readJson('bower.json').devDependencies.package).to.equal(mainPackage.path + '#0.1.0');
-    });
-    });
-
     it('reads .bowerrc from cwd', function () {
-        mainPackage.prepare({ foo: 'bar' });
+        package.prepare({ foo: 'bar' });
 
         tempDir.prepare({
             '.bowerrc': { directory: 'assets' },
             'bower.json': {
                 name: 'test',
                 dependencies: {
-                    package: mainPackage.path
+                    package: package.path
                 }
             }
         });
 
-        return helpers.run(install).then(function() {
+        return install().then(function() {
             expect(tempDir.read('assets/package/foo')).to.be('bar');
         });
     });
 
     it('runs preinstall hook', function () {
-        mainPackage.prepare();
+        package.prepare();
 
         tempDir.prepare({
             'bower.json': {
                 name: 'test',
                 dependencies: {
-                    package: mainPackage.path
+                    package: package.path
                 }
             },
             '.bowerrc': {
                 scripts: {
-                    preinstall: 'node -e \'require("fs").writeFileSync("preinstall.txt", "%")\''
+                    preinstall: 'bash -c "echo -n % > preinstall.txt"'
                 }
             }
         });
 
-        return helpers.run(install).then(function() {
+        return install().then(function() {
             expect(tempDir.read('preinstall.txt')).to.be('package');
         });
     });
 
     it('runs preinstall hook', function () {
-        mainPackage.prepare();
+        package.prepare();
 
         tempDir.prepare({
             'bower.json': {
                 name: 'test',
                 dependencies: {
-                    package: mainPackage.path
+                    package: package.path
                 }
             },
             '.bowerrc': {
                 scripts: {
-                    postinstall: 'node -e \'require("fs").writeFileSync("postinstall.txt", "%")\''
+                    postinstall: 'bash -c "echo -n % > postinstall.txt"'
                 }
             }
         });
 
-        return helpers.run(install).then(function() {
+        return install().then(function() {
             expect(tempDir.read('postinstall.txt')).to.be('package');
         });
     });
@@ -169,19 +114,19 @@ describe('bower install', function () {
             },
             '.bowerrc': {
                 scripts: {
-                    postinstall: 'node -e \'require("fs").writeFileSync("hooks.txt", "%")\'',
-                    preinstall: 'node -e \'require("fs").writeFileSync("hooks.txt", "%")\''
+                    postinstall: 'bash -c "echo -n % > hooks.txt"',
+                    preinstall: 'bash -c "echo -n % > hooks.txt"'
                 }
             }
         });
 
-        return helpers.run(install).then(function() {
+        return install().then(function() {
             expect(tempDir.exists('hooks.txt')).to.be(false);
         });
     });
 
     it('runs postinstall after bower.json is written', function () {
-        mainPackage.prepare();
+        package.prepare();
 
         tempDir.prepare({
             'bower.json': {
@@ -189,35 +134,36 @@ describe('bower install', function () {
             },
             '.bowerrc': {
                 scripts: {
-                    postinstall: 'node -e \'var fs = require("fs"); fs.writeFileSync("hook.txt", fs.readFileSync("bower.json"));\''
+                    postinstall: 'bash -c "cat bower.json > hook.txt"',
                 }
             }
         });
 
-        return helpers.run(install, [[mainPackage.path], { save: true }]).then(function() {
+        return install([package.path], { save: true }).then(function() {
             expect(tempDir.read('hook.txt')).to.contain('dependencies');
         });
     });
 
     it('display the output of hook scripts', function (next) {
-        mainPackage.prepare();
+        package.prepare();
 
         tempDir.prepare({
             'bower.json': {
                 name: 'test',
                 dependencies: {
-                    package: mainPackage.path
+                    package: package.path
                 }
             },
             '.bowerrc': {
                 scripts: {
-                    postinstall: 'node -e \'process.stdout.write("foobar")\''
+                    postinstall: 'bash -c "echo foobar"'
                 }
             }
         });
+
         var lastAction = null;
 
-        helpers.run(install).logger.intercept(function (log) {
+        installLogger().intercept(function (log) {
             if (log.level === 'action') {
                 lastAction = log;
             }
@@ -227,30 +173,8 @@ describe('bower install', function () {
         });
     });
 
-    it('skips components not installed by bower', function () {
-      mainPackage.prepare({
-          '.git': {} //Make a dummy file instead of using slower gitPrepare()
-      });
-
-      tempDir.prepare({
-          'bower.json': {
-              name: 'test',
-              dependencies: {
-                  package: mainPackage.path
-              }
-          }
-      });
-
-      return helpers.run(install).then(function() {
-          var packageFiles = fs.readdirSync(mainPackage.path);
-          //presence of .git file implies folder was not overwritten
-          expect(packageFiles).to.contain('.git');
-      });
-
-  });
-
     it('works for git repositories', function () {
-        gitPackage.prepareGit({
+        return gitPackage.prepareGit({
             '1.0.0': {
                 'bower.json': {
                     name: 'package'
@@ -263,138 +187,19 @@ describe('bower install', function () {
                 },
                 'version.txt': '1.0.1'
             }
-        });
-
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test',
-                dependencies: {
-                    package: gitPackage.path + '#1.0.0'
+        }).then(function() {
+            tempDir.prepare({
+                'bower.json': {
+                    name: 'test',
+                    dependencies: {
+                        package: gitPackage.path + '#1.0.0'
+                    }
                 }
-            }
-        });
-
-        return helpers.run(install).then(function() {
-            expect(tempDir.read('bower_components/package/version.txt')).to.contain('1.0.0');
-        });
-    });
-
-    it('does not install ignored dependencies', function() {
-        mainPackage.prepare();
-        var package2 = new helpers.TempDir({
-            'bower.json': {
-                name: 'package2',
-            }
-        }).prepare();
-
-        var package3 = new helpers.TempDir({
-            'bower.json': {
-                name: 'package3',
-                dependencies: {
-                    package2: package2.path,
-                    package: mainPackage.path,
-                }
-            }
-        }).prepare();
-
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test_tw',
-                dependencies: {
-                    package3: package3.path
-                }
-            },
-            '.bowerrc': {
-                ignoredDependencies: ['package']
-            }
-        });
-
-        return helpers.run(install).then(function() {
-            expect(tempDir.exists('bower_components/package')).to.be(false);
-            expect(tempDir.exists('bower_components/package2')).to.be(true);
-        });
-
-    });
-
-    it('does not install ignored dependencies if run multiple times', function() {
-        mainPackage.prepare();
-        var package2 = new helpers.TempDir({
-            'bower.json': {
-                name: 'package2',
-            }
-        }).prepare();
-
-        var package3 = new helpers.TempDir({
-            'bower.json': {
-                name: 'package3',
-                dependencies: {
-                    package2: package2.path,
-                    package: mainPackage.path,
-                }
-            }
-        }).prepare();
-
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test_tw',
-                dependencies: {
-                    package3: package3.path
-                }
-            },
-            '.bowerrc': {
-                ignoredDependencies: ['package']
-            }
-        });
-        return helpers.run(install).then(function() {
-            return helpers.run(install).then(function() {
-                expect(tempDir.exists('bower_components/package')).to.be(false);
-                expect(tempDir.exists('bower_components/package2')).to.be(true);
             });
-        });
 
-    });
-
-    it('recognizes proxy option in config', function (done) {
-        this.timeout(10000);
-
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test_tw',
-                dependencies: {
-                    pure: 'http://github.com/yahoo/pure/archive/v0.6.0.tar.gz'
-                }
-            }
-        });
-
-        var install = helpers.command('install', {
-            cwd: tempDir.path
-        });
-
-        nock('http://dummy.local')
-          .get('http://github.com/yahoo/pure/archive/v0.6.0.tar.gz')
-          .reply(500);
-
-        return helpers.run(install, [
-          undefined,
-          undefined,
-          { proxy: 'http://dummy.local/' }
-        ])
-    .fail(function(error) {
-        expect(error.message).to.equal('Status code of 500');
-        done();
-    });
-    });
-
-
-    it('errors if the components directory is not a directory', function () {
-        tempDir.prepare({
-            '.bowerrc': {
-                directory: '.bowerrc'
-            }
-        });
-
-        return helpers.run(install).fail(function(error) {
-            expect(error.code).to.equal('ENOTDIR');
+            return install().then(function() {
+                expect(tempDir.read('bower_components/package/version.txt')).to.contain('1.0.0');
+            });
         });
     });
 });

test/commands/link.js

@@ -1,110 +0,0 @@
-var expect = require('expect.js');
-var helpers = require('../helpers');
-
-var link = helpers.command('link');
-
-describe('bower link', function () {
-
-    var mainPackage = new helpers.TempDir({
-        'bower.json': {
-            name: 'package',
-        },
-        'index.js': 'Hello World!'
-    });
-
-    var otherPackage = new helpers.TempDir({
-        'bower.json': {
-            name: 'package2',
-        },
-        'index.js': 'Welcome World!'
-    });
-
-    var linksDir = new helpers.TempDir();
-
-    beforeEach(function() {
-        mainPackage.prepare();
-        otherPackage.prepare();
-        linksDir.prepare();
-    });
-
-    it('correctly reads arguments', function() {
-        expect(link.readOptions(['jquery', 'angular']))
-        .to.eql(['jquery', 'angular']);
-    });
-
-    it('creates self link', function () {
-        return helpers.run(link, [undefined, undefined,
-            {
-                cwd: mainPackage.path,
-                storage: {
-                    links: linksDir.path
-                }
-            }
-        ]).then(function() {
-            expect(linksDir.read('package/index.js'))
-            .to.be('Hello World!');
-        });
-    });
-
-    it('creates inter-link', function () {
-        return helpers.run(link, [undefined, undefined,
-            {
-                cwd: mainPackage.path,
-                storage: {
-                    links: linksDir.path
-                }
-            }
-        ]).then(function () {
-            return helpers.run(link, ['package', undefined,
-                {
-                    cwd: otherPackage.path,
-                    storage: {
-                        links: linksDir.path
-                    }
-                }
-            ]);
-        }).then(function() {
-            expect(otherPackage.read('bower_components/package/index.js'))
-            .to.be('Hello World!');
-        });
-    });
-
-    it('creates inter-link with custom local name', function () {
-        return helpers.run(link, [undefined, undefined,
-            {
-                cwd: mainPackage.path,
-                storage: {
-                    links: linksDir.path
-                }
-            }
-        ]).then(function () {
-            return helpers.run(link, ['package', 'local',
-                {
-                    cwd: otherPackage.path,
-                    storage: {
-                        links: linksDir.path
-                    }
-                }
-            ]);
-        }).then(function() {
-            expect(otherPackage.read('bower_components/local/index.js'))
-            .to.be('Hello World!');
-        });
-    });
-
-    it('errors on unexising package', function () {
-        return helpers.run(link, ['package', 'local',
-            {
-                cwd: otherPackage.path,
-                storage: {
-                    links: linksDir.path
-                }
-            }
-        ]).then(function() {
-            throw 'Should fail creating a link!';
-        }).fail(function(reason) {
-            expect(reason.code).to.be('ENOENT');
-            expect(reason.message).to.be('Failed to create link to package');
-        });
-    });
-});

test/commands/list.js

@@ -1,256 +0,0 @@
-var expect = require('expect.js');
-var object = require('mout').object;
-var path = require('path');
-
-var helpers = require('../helpers');
-
-var commands = {
-    install: helpers.command('install'),
-    list: helpers.command('list')
-};
-
-describe('bower list', function () {
-
-    var tempDir = new helpers.TempDir();
-
-    var gitPackage = new helpers.TempDir();
-
-    var install = function(packages, options, config) {
-        config = object.merge(config || {}, {
-            cwd: tempDir.path
-        });
-
-        return helpers.run(commands.install, [packages, options, config]);
-    };
-
-    var list = function(options, config) {
-        config = object.merge(config || {}, {
-            cwd: tempDir.path
-        });
-
-        return helpers.run(commands.list, [options, config]);
-    };
-
-    it('correctly reads arguments', function() {
-        expect(commands.list.readOptions(['-p', '-r']))
-        .to.eql([{
-            paths: true,
-            relative: true
-        }]);
-    });
-
-    it('correctly reads long arguments', function() {
-        expect(commands.list.readOptions(['--paths', '--relative']))
-        .to.eql([{
-            paths: true,
-            relative: true
-        }]);
-    });
-
-    it('lists no packages when nothing installed', function () {
-        tempDir.prepare();
-
-        return list().spread(function(results) {
-            expect(results).to.be.an(Object);
-            expect(results.canonicalDir).to.equal(tempDir.path);
-            expect(results.pkgMeta.dependencies).to.eql({});
-            expect(results.pkgMeta.devDependencies).to.eql({});
-            expect(results.dependencies).to.eql({});
-            expect(results.nrDependants).to.eql(0);
-            expect(results.versions).to.eql([]);
-        });
-    });
-
-    it('lists 1 dependency when 1 local package installed', function () {
-
-        var mainPackage = new helpers.TempDir({
-            'bower.json': {
-                name: 'package',
-                main: 'test.txt'
-            }
-        }).prepare();
-        mainPackage.prepare();
-
-        return install([mainPackage.path]).then(function() {
-            return list().spread(function(results) {
-                expect(results).to.be.an(Object);
-                expect(results.canonicalDir).to.equal(tempDir.path);
-                expect(results.pkgMeta.dependencies).to.eql({
-                    package: mainPackage.path + '#*'
-                });
-                expect(results.pkgMeta.devDependencies).to.eql({});
-                expect(results.dependencies.package).to.be.an(Object);
-                expect(results.dependencies.package.pkgMeta).to.be.an(Object);
-                expect(results.dependencies.package.pkgMeta.main).to.equal('test.txt');
-                expect(results.dependencies.package.canonicalDir).to.equal(
-                    path.join(tempDir.path, 'bower_components/package')
-                );
-                expect(results.dependencies.package.dependencies).to.eql({});
-                expect(results.dependencies.package.nrDependants).to.equal(1);
-                expect(results.dependencies.package.versions).to.eql([]);
-                expect(results.nrDependants).to.equal(0);
-                expect(results.versions).to.eql([]);
-            });
-        });
-    });
-
-    it('lists 1 dependency with relative paths when 1 local package installed', function () {
-
-        var mainPackage = new helpers.TempDir({
-            'bower.json': {
-                name: 'package',
-                main: 'test.txt'
-            }
-        }).prepare();
-        mainPackage.prepare();
-
-        return install([mainPackage.path]).then(function() {
-            return list({relative: true}).spread(function(results) {
-                expect(results).to.be.an(Object);
-                expect(results.canonicalDir).to.equal(tempDir.path);
-                expect(results.dependencies).to.be.an(Object);
-                expect(results.dependencies.package).to.be.an(Object);
-                expect(results.dependencies.package.pkgMeta).to.be.an(Object);
-                expect(results.dependencies.package.pkgMeta.main).to.equal('test.txt');
-                expect(results.pkgMeta.dependencies).to.eql({
-                    package: mainPackage.path + '#*'
-                });
-                expect(results.dependencies.package.canonicalDir).to.equal(
-                    path.normalize('bower_components/package')
-                );
-            });
-        });
-    });
-
-    it('lists 1 dependency with 1 source relative source mapping when 1 local package installed', function () {
-
-        var mainPackage = new helpers.TempDir({
-            'bower.json': {
-                name: 'package',
-                main: 'test.txt'
-            }
-        }).prepare();
-        mainPackage.prepare();
-
-        return install([mainPackage.path]).then(function() {
-            return list({paths: true}).spread(function(results) {
-                expect(results).to.be.an(Object);
-                expect(results.package).to.equal(
-                    'bower_components/package/test.txt'
-                );
-            });
-        });
-    });
-
-    it('lists 1 dependency with 2 source relative source mapping when 1 local package installed', function () {
-
-        var mainPackage = new helpers.TempDir({
-            'bower.json': {
-                name: 'package',
-                main: ['test.txt', 'test2.txt']
-            }
-        }).prepare();
-        mainPackage.prepare();
-
-        return install([mainPackage.path]).then(function() {
-            return list({paths: true}).spread(function(results) {
-                expect(results).to.be.an(Object);
-                expect(results.package).to.be.an(Object);
-                expect(results.package).to.eql([
-                    'bower_components/package/test.txt',
-                    'bower_components/package/test2.txt'
-                ]);
-            });
-        });
-    });
-
-    it('lists 1 dependency when 1 git package installed', function () {
-        gitPackage.prepareGit({
-            '1.0.0': {
-                'bower.json': {
-                    name: 'package',
-                    main: 'test.txt'
-                },
-                'version.txt': '1.0.0'
-            },
-            '1.0.1': {
-                'bower.json': {
-                    name: 'package',
-                    main: 'test2.txt'
-                },
-                'version.txt': '1.0.1'
-            }
-        });
-
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test',
-                dependencies: {
-                    package: gitPackage.path + '#1.0.0'
-                }
-            }
-        });
-
-        return install().then(function() {
-            return list().spread(function(results) {
-                expect(results).to.be.an(Object);
-                expect(results.canonicalDir).to.equal(tempDir.path);
-                expect(results.pkgMeta.dependencies).to.eql({
-                    package: gitPackage.path + '#1.0.0'
-                });
-                expect(results.pkgMeta.devDependencies).to.eql({});
-                expect(results.dependencies.package).to.be.an(Object);
-                expect(results.dependencies.package.pkgMeta).to.be.an(Object);
-                expect(results.dependencies.package.pkgMeta.main).to.equal('test.txt');
-                expect(results.dependencies.package.canonicalDir).to.equal(
-                    path.join(tempDir.path, 'bower_components/package')
-                );
-                expect(results.dependencies.package.dependencies).to.eql({});
-                expect(results.dependencies.package.nrDependants).to.equal(1);
-                expect(results.dependencies.package.versions).to.eql(['1.0.1', '1.0.0']);
-                expect(results.nrDependants).to.equal(0);
-                expect(results.versions).to.eql([]);
-            });
-        });
-    });
-
-    it('lists 1 dependency with relative paths when 1 git package installed', function () {
-        gitPackage.prepareGit({
-            '1.0.0': {
-                'bower.json': {
-                    name: 'package',
-                    main: 'test.txt'
-                },
-                'version.txt': '1.0.0'
-            },
-            '1.0.1': {
-                'bower.json': {
-                    name: 'package',
-                    main: 'test2.txt'
-                },
-                'version.txt': '1.0.1'
-            }
-        });
-
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test',
-                dependencies: {
-                    package: gitPackage.path + '#1.0.0'
-                }
-            }
-        });
-
-        return install().then(function() {
-            return list({relative: true}).spread(function(results) {
-                expect(results.canonicalDir).to.equal(tempDir.path);
-                expect(results.pkgMeta.dependencies).to.eql({
-                    package: gitPackage.path + '#1.0.0'
-                });
-                expect(results.dependencies.package.canonicalDir).to.equal(
-                    path.normalize('bower_components/package')
-                );
-            });
-        });
-    });
-});

test/commands/login.js

@@ -1,187 +0,0 @@
-var expect = require('expect.js');
-var helpers = require('../helpers');
-
-var fakeGitHub = function (authenticate) {
-    function FakeGitHub() { }
-
-    var _creds;
-
-    FakeGitHub.prototype.authenticate = function (creds) {
-        _creds = creds;
-    };
-
-    FakeGitHub.prototype.authorization = {
-        create: function (options, cb) {
-            if (_creds.password === 'validpassword') {
-                cb(null, { token: 'faketoken' });
-            } else if (_creds.password === 'withtwofactor') {
-                if (options.headers && options.headers['X-GitHub-OTP'] === '123456') {
-                    cb(null, { token: 'faketwoauthtoken' });
-                } else {
-                    cb({ code: 401, message: '{ "message": "Must specify two-factor authentication OTP code." }' });
-                }
-            } else {
-                cb({ code: 401, message: 'Bad credentials' });
-            }
-        }
-    };
-
-    return FakeGitHub;
-};
-
-var fakeConfigstore = function (set, get) {
-    function FakeConfigstore() { }
-
-    FakeConfigstore.prototype.set = set;
-    FakeConfigstore.prototype.get = get;
-
-    return FakeConfigstore;
-};
-
-var login = helpers.command('login');
-
-var loginFactory = function (options) {
-    return helpers.command('login', {
-        'github': fakeGitHub(),
-        'configstore': fakeConfigstore(
-            options.set || function () { return true; },
-            options.get || function () { return true; }
-        )
-    });
-};
-
-describe('bower login', function () {
-
-    it('correctly reads arguments', function() {
-        expect(login.readOptions(['--token', 'foobar']))
-        .to.eql([{ token: 'foobar' }]);
-    });
-
-    it('fails if run in non-interactive shell without token passed', function () {
-        return helpers.run(login, []).fail(function(reason) {
-            expect(reason.message).to.be('Login requires an interactive shell');
-            expect(reason.code).to.be('ENOINT');
-        });
-    });
-
-    it('succeeds if run in non-interactive shell with token passed', function () {
-        return helpers.run(login, [{ token: 'foobar' }]);
-    });
-
-    it('succeeds if provided password is valid', function () {
-        var login = loginFactory({});
-
-        var logger = login({}, { interactive: true });
-
-        logger.once('prompt', function (prompt, answer) {
-            answer({
-                username: 'user',
-                password: 'validpassword'
-            });
-        });
-
-        return helpers.expectEvent(logger, 'end')
-        .spread(function(options) {
-            expect(options.token).to.be('faketoken');
-        });
-    });
-
-    it('supports two-factor authorization', function () {
-        var login = loginFactory({});
-
-        var logger = login({}, { interactive: true });
-
-        logger.once('prompt', function (prompt, answer) {
-            logger.once('prompt', function (prompt, answer) {
-                answer({
-                    otpcode: '123456'
-                });
-            });
-
-            answer({
-                username: 'user',
-                password: 'withtwofactor'
-            });
-        });
-
-        return helpers.expectEvent(logger, 'end')
-        .spread(function(options) {
-            expect(options.token).to.be('faketwoauthtoken');
-        });
-    });
-
-    it('fails if provided password is invalid', function () {
-        var login = loginFactory({});
-
-        var logger = login({}, { interactive: true });
-
-        logger.once('prompt', function (prompt, answer) {
-            answer({
-                username: 'user',
-                password: 'invalidpassword'
-            });
-        });
-
-        return helpers.expectEvent(logger, 'error').spread(function (error) {
-            expect(error.code).to.be('EAUTH');
-            expect(error.message).to.be('Authorization failed');
-        });
-    });
-
-    it('uses username stored in config as default username', function () {
-        var login = loginFactory({
-            get: function (key) {
-                if (key === 'username') {
-                    return 'savedusername';
-                }
-            }
-        });
-
-        var logger = login({}, { interactive: true });
-
-        return helpers.expectEvent(logger, 'prompt')
-        .spread(function (prompt, answer) {
-            expect(prompt[0].default).to.be('savedusername');
-        });
-    });
-
-    it('saves username in config', function (done) {
-        var login = loginFactory({
-            set: function (key, value) {
-                if(key === 'username') {
-                    expect(value).to.be('user');
-                    done();
-                }
-            }
-        });
-
-        var logger = login({}, { interactive: true });
-
-        logger.once('prompt', function (prompt, answer) {
-            answer({
-                username: 'user',
-                password: 'validpassword'
-            });
-        });
-    });
-
-    it('saves received token in accessToken config', function (done) {
-        var login = loginFactory({
-            set: function (key, value) {
-                if(key === 'accessToken') {
-                    expect(value).to.be('faketoken');
-                    done();
-                }
-            }
-        });
-
-        var logger = login({}, { interactive: true });
-
-        logger.once('prompt', function (prompt, answer) {
-            answer({
-                username: 'user',
-                password: 'validpassword'
-            });
-        });
-    });
-});

test/commands/lookup.js

@@ -1,55 +0,0 @@
-var expect = require('expect.js');
-var helpers = require('../helpers');
-
-var lookup = helpers.command('lookup');
-
-describe('bower lookup', function () {
-
-    var lookupWithResult = function (response) {
-        return helpers.command('lookup', {
-            'bower-registry-client': function() {
-                return {
-                    lookup: function(query, callback) {
-                        if (query in response) {
-                            callback(null, response[query]);
-                        } else {
-                            callback();
-                        }
-                    }
-                };
-            }
-        });
-    };
-
-    it('correctly reads arguments', function() {
-        expect(lookup.readOptions(['jquery']))
-        .to.eql(['jquery']);
-    });
-
-    it('lookups package by name', function () {
-        var lookup = lookupWithResult({ jquery: { url: 'http://jquery.org' } });
-
-        return helpers.run(lookup, ['jquery']).spread(function(result) {
-            expect(result).to.eql({
-                name: 'jquery',
-                url: 'http://jquery.org'
-            });
-        });
-    });
-
-    it('returns null if no package is found', function () {
-        var lookup = lookupWithResult({ jquery: { url: 'http://jquery.org' } });
-
-        return helpers.run(lookup, ['foobar']).spread(function(result) {
-            expect(result).to.eql(null);
-        });
-    });
-
-    it('returns null if called without argument', function () {
-        var lookup = lookupWithResult({ jquery: { url: 'http://jquery.org' } });
-
-        return helpers.run(lookup, []).spread(function(result) {
-            expect(result).to.eql(null);
-        });
-    });
-});

test/commands/prune.js

@@ -1,65 +0,0 @@
-var expect = require('expect.js');
-var helpers = require('../helpers');
-
-var prune = helpers.command('prune');
-
-describe('bower home', function () {
-
-    var mainPackage = new helpers.TempDir({
-        'bower.json': {
-            name: 'package',
-            dependencies: {
-                jquery: '*'
-            }
-        },
-        'bower_components/jquery/jquery.js': 'jquery source'
-    });
-
-    it('correctly reads arguments', function() {
-        expect(prune.readOptions(['-p']))
-        .to.eql([{ production: true }]);
-    });
-
-    it('correctly reads long arguments', function() {
-        expect(prune.readOptions(['--production']))
-        .to.eql([{ production: true }]);
-    });
-
-    it('removes extraneous packages', function () {
-        mainPackage.prepare({
-            'bower_components/angular/angular.js': 'angular source',
-            'bower_components/angular/.bower.json': { name: 'angular' }
-        });
-
-        return helpers.run(prune, [{}, { cwd: mainPackage.path }]).then(function() {
-            expect(mainPackage.exists('bower_components/angular/angular.js'))
-            .to.be(false);
-        });
-    });
-
-    it('leaves non-bower packages', function () {
-        mainPackage.prepare({
-            'bower_components/angular/angular.js': 'angular source'
-        });
-
-        return helpers.run(prune, [{}, { cwd: mainPackage.path }]).then(function() {
-            expect(mainPackage.exists('bower_components/angular/angular.js'))
-            .to.be(true);
-        });
-    });
-
-    it('deals with custom directory', function () {
-        mainPackage.prepare({
-            '.bowerrc': { directory: 'components' },
-            'bower_components/angular/.bower.json': { name: 'angular' },
-            'bower_components/angular/angular.js': 'angular source',
-            'components/angular/.bower.json': { name: 'angular' },
-            'components/angular/angular.js': 'angular source'
-        });
-
-        return helpers.run(prune, [{}, { cwd: mainPackage.path }]).then(function() {
-            expect(mainPackage.exists('components/angular/angular.js')).to.be(false);
-            expect(mainPackage.exists('bower_components/angular/angular.js')).to.be(true);
-        });
-    });
-});

test/commands/register.js

@@ -1,117 +0,0 @@
-var Q = require('q');
-var expect = require('expect.js');
-var helpers = require('../helpers');
-
-var register = helpers.command('register');
-
-var fakeRepositoryFactory = function (canonicalDir, pkgMeta) {
-    function FakeRepository() { }
-
-    FakeRepository.prototype.fetch = function() {
-        return Q.fcall(function () {
-            return [canonicalDir, pkgMeta];
-        });
-    };
-
-    FakeRepository.prototype.getRegistryClient = function() {
-        return {
-            register: function (name, url, cb) {
-                cb(null, { name: name, url: url });
-            }
-        };
-    };
-
-    return FakeRepository;
-};
-
-var register = helpers.command('register');
-
-var registerFactory = function (canonicalDir, pkgMeta) {
-    return helpers.command('register', {
-        '../core/PackageRepository': fakeRepositoryFactory(
-            canonicalDir, pkgMeta
-        )
-    });
-};
-
-describe('bower register', function () {
-
-    var mainPackage = new helpers.TempDir({
-        'bower.json': {
-            name: 'package'
-        }
-    });
-
-    it('correctly reads arguments', function() {
-        expect(register.readOptions(['jquery', 'url']))
-        .to.eql(['jquery', 'url']);
-    });
-
-    it('errors if name is not provided', function () {
-        return helpers.run(register).fail(function(reason) {
-            expect(reason.message).to.be('Usage: bower register <name> <url>');
-            expect(reason.code).to.be('EINVFORMAT');
-        });
-    });
-
-    it('errors if url is not provided', function () {
-        return helpers.run(register, ['some-name'])
-        .fail(function(reason) {
-            expect(reason.message).to.be('Usage: bower register <name> <url>');
-            expect(reason.code).to.be('EINVFORMAT');
-        });
-    });
-
-    it('errors if trying to register private package', function () {
-        mainPackage.prepare({ 'bower.json': { private: true } });
-
-        var register = registerFactory(mainPackage.path, mainPackage.meta());
-        return helpers.run(register, ['some-name', 'git://fake-url.git'])
-        .fail(function(reason) {
-            expect(reason.message).to.be('The package you are trying to register is marked as private');
-            expect(reason.code).to.be('EPRIV');
-        });
-    });
-
-    it('should call registry client with name and url', function () {
-        mainPackage.prepare();
-
-        var register = registerFactory(mainPackage.path, mainPackage.meta());
-        return helpers.run(register, ['some-name', 'git://fake-url.git'])
-        .spread(function(result) {
-            expect(result).to.eql({
-                // Result from register action on stub
-                name: 'some-name', url: 'git://fake-url.git'
-            });
-        });
-    });
-
-    it('should confirm in interactive mode', function () {
-        mainPackage.prepare();
-
-        var register = registerFactory(mainPackage.path, mainPackage.meta());
-
-        var promise = helpers.run(register,
-            ['some-name', 'git://fake-url.git', { interactive: true }]
-        );
-
-        return helpers.expectEvent(promise.logger, 'confirm')
-        .spread(function(e) {
-            expect(e.type).to.be('confirm');
-            expect(e.message).to.be('Registering a package will make it installable via the registry (https://bower.herokuapp.com), continue?');
-            expect(e.default).to.be(true);
-        });
-    });
-
-    it('should skip confirming when forcing', function () {
-        mainPackage.prepare();
-
-        var register = registerFactory(mainPackage.path, mainPackage.meta());
-
-        return helpers.run(register,
-            ['some-name', 'git://fake-url.git',
-                { interactive: true, force: true }
-            ]
-        );
-    });
-});

test/commands/search.js

@@ -1,44 +0,0 @@
-var Q = require('q');
-var expect = require('expect.js');
-var helpers = require('../helpers');
-
-var search = helpers.command('search');
-
-describe('bower search', function () {
-
-    it('correctly reads arguments', function() {
-        expect(search.readOptions(['jquery']))
-        .to.eql(['jquery']);
-    });
-
-    it('searches for single repository', function () {
-        return Q.Promise(function(resolve) {
-            var search = helpers.command('search', {
-                'bower-registry-client': function() {
-                    return {
-                        search: resolve
-                    };
-                }
-            });
-
-            helpers.run(search, ['jquery'], {});
-        }).then(function(query) {
-            expect(query).to.be('jquery');
-        });
-    });
-
-    it('lists all repositories if no query given', function () {
-        return Q.Promise(function(resolve) {
-            var search = helpers.command('search', {
-                'bower-registry-client': function() {
-                    return {
-                        list: resolve
-                    };
-                }
-            });
-
-            helpers.run(search, [], {});
-        });
-    });
-
-});

test/commands/uninstall.js

@@ -1,9 +1,9 @@
 var path = require('path');
 var expect = require('expect.js');
-var fs = require('../../lib/util/fs');
+var fs = require('fs');
 
 var helpers = require('../helpers');
-var uninstall = helpers.command('uninstall');
+var bower = helpers.require('lib/index');
 
 describe('bower uninstall', function () {
 
@@ -31,24 +31,20 @@ describe('bower uninstall', function () {
         interactive: true
     };
 
-    it('correctly reads arguments', function() {
-        expect(uninstall.readOptions(['jquery', '-S', '-D']))
-        .to.eql([['jquery'], { save: true, saveDev: true }]);
-    });
-
-    it('correctly reads long arguments', function() {
-        expect(uninstall.readOptions(['jquery', '--save', '--save-dev']))
-        .to.eql([['jquery'], { save: true, saveDev: true }]);
-    });
-
     it('does not remove anything from dependencies by default', function () {
-        return helpers.run(uninstall, [['underscore'], undefined, config]).then(function () {
+        var logger = bower.commands.uninstall(['underscore'], undefined, config);
+
+        return helpers.expectEvent(logger, 'end')
+        .then(function () {
             expect(bowerJson().dependencies).to.eql({ 'underscore': '*' });
         });
     });
 
     it('removes dependency from bower.json if --save flag is used', function () {
-        return helpers.run(uninstall, [['underscore'], {save: true}, config]).then(function () {
+        var logger = bower.commands.uninstall(['underscore'], {save: true}, config);
+
+        return helpers.expectEvent(logger, 'end')
+        .then(function () {
             expect(bowerJson().dependencies).to.eql({});
         });
     });

test/commands/unregister.js

@@ -1,79 +0,0 @@
-var expect = require('expect.js');
-var helpers = require('../helpers');
-
-var fakeRepositoryFactory = function () {
-    function FakeRepository() { }
-
-    FakeRepository.prototype.getRegistryClient = function() {
-        return {
-            unregister: function (name, cb) {
-                cb(null, { name: name });
-            }
-        };
-    };
-
-    return FakeRepository;
-};
-
-var unregister = helpers.command('unregister');
-
-var unregisterFactory = function () {
-    return helpers.command('unregister', {
-        '../core/PackageRepository': fakeRepositoryFactory()
-    });
-};
-
-describe('bower unregister', function () {
-
-    it('correctly reads arguments', function() {
-        expect(unregister.readOptions(['jquery']))
-        .to.eql(['jquery']);
-    });
-
-    it('errors if name is not provided', function () {
-        return helpers.run(unregister).fail(function(reason) {
-            expect(reason.message).to.be('Usage: bower unregister <name> <url>');
-            expect(reason.code).to.be('EINVFORMAT');
-        });
-    });
-
-    it('should call registry client with name', function () {
-        var unregister = unregisterFactory();
-
-        return helpers.run(unregister, ['some-name'])
-        .spread(function(result) {
-            expect(result).to.eql({
-                // Result from register action on stub
-                name: 'some-name'
-            });
-        });
-    });
-
-    it('should confirm in interactive mode', function () {
-        var register = unregisterFactory();
-
-        var promise = helpers.run(register,
-            ['some-name', {
-                interactive: true,
-                registry: { register: 'http://localhost' }
-            }]
-        );
-
-        return helpers.expectEvent(promise.logger, 'confirm')
-        .spread(function(e) {
-            expect(e.type).to.be('confirm');
-            expect(e.message).to.be('You are about to remove component "some-name" from the bower registry (http://localhost). It is generally considered bad behavior to remove versions of a library that others are depending on. Are you really sure?');
-            expect(e.default).to.be(false);
-        });
-    });
-
-    it('should skip confirming when forcing', function () {
-        var register = unregisterFactory();
-
-        return helpers.run(register,
-            ['some-name',
-                { interactive: true, force: true }
-            ]
-        );
-    });
-});

test/commands/update.js

@@ -1,23 +1,14 @@
 var expect = require('expect.js');
 var object = require('mout').object;
-var semver = require('semver');
 
 var helpers = require('../helpers');
-var updateCmd = helpers.command('update');
 var commands = helpers.require('lib/index').commands;
 
 describe('bower update', function () {
-    this.timeout(10000);
+
     var tempDir = new helpers.TempDir();
 
-    var subPackage = new helpers.TempDir({
-        'bower.json': {
-            name: 'subPackage'
-        }
-    }).prepare();
-
     var gitPackage = new helpers.TempDir();
-
     gitPackage.prepareGit({
         '1.0.0': {
             'bower.json': {
@@ -27,29 +18,28 @@ describe('bower update', function () {
         },
         '1.0.1': {
             'bower.json': {
-                name: 'package',
-                dependencies: {
-                    subPackage: subPackage.path
-                }
+                name: 'package'
             },
             'version.txt': '1.0.1'
         }
     });
 
-    var mainPackage = new helpers.TempDir({
+    var package = new helpers.TempDir({
         'bower.json': {
             name: 'package'
         }
     }).prepare();
 
-    var update = function(packages, options, config) {
+    var updateLogger = function(packages, options, config) {
         config = object.merge(config || {}, {
             cwd: tempDir.path
         });
 
-        var logger = commands.update(
-            packages, options, config
-        );
+        return commands.update(packages, options, config);
+    };
+
+    var update = function(packages, options, config) {
+        var logger = updateLogger(packages, options, config);
 
         return helpers.expectEvent(logger, 'end');
     };
@@ -66,24 +56,14 @@ describe('bower update', function () {
         return helpers.expectEvent(logger, 'end');
     };
 
-    it('correctly reads arguments', function() {
-        expect(updateCmd.readOptions(['jquery', '-F', '-p', '-S', '-D']))
-        .to.eql([['jquery'], {
-            forceLatest: true,
-            production: true,
-            save: true,
-            saveDev: true
-        }]);
-    });
-
     it('install missing packages', function () {
-        mainPackage.prepare();
+        package.prepare();
 
         tempDir.prepare({
             'bower.json': {
                 name: 'test',
                 dependencies: {
-                    package: mainPackage.path
+                    package: package.path
                 }
             }
         });
@@ -94,91 +74,19 @@ describe('bower update', function () {
         });
     });
 
-    it('does not install ignored dependencies', function() {
-        var package3 = new helpers.TempDir({
-          'bower.json': {
-              name: 'package3'
-          }
-      }).prepare();
-
-        var package2 = new helpers.TempDir({
-          'bower.json': {
-              name: 'package2',
-              dependencies: {
-                  package3: package3.path
-              }
-          }
-      }).prepare();
-
-        tempDir.prepare({
-          'bower.json': {
-              name: 'test',
-              dependencies: {
-                  package2: package2.path
-              }
-          },
-          '.bowerrc': {
-              ignoredDependencies: ['package3']
-          }
-      });
-
-        return update().then(function() {
-          expect(tempDir.exists('bower_components/package2/bower.json')).to.equal(true);
-          expect(tempDir.exists('bower_components/package3')).to.equal(false);
-      });
-
-    });
-
-    it('does not install ignored dependencies if run multiple times', function() {
-        var package3 = new helpers.TempDir({
-          'bower.json': {
-              name: 'package3'
-          }
-      }).prepare();
-
-        var package2 = new helpers.TempDir({
-          'bower.json': {
-              name: 'package2',
-              dependencies: {
-                  package3: package3.path
-              }
-          }
-      }).prepare();
-
-        tempDir.prepare({
-          'bower.json': {
-              name: 'test',
-              dependencies: {
-                  package2: package2.path
-              }
-          },
-          '.bowerrc': {
-              ignoredDependencies: ['package3']
-          }
-      });
-
-        return update().then(function() {
-          return update().then(function() {
-              expect(tempDir.exists('bower_components/package2/bower.json')).to.equal(true);
-              expect(tempDir.exists('bower_components/package3')).to.equal(false);
-          });
-      });
-
-    });
-
     it('runs preinstall hook when installing missing package', function () {
-        mainPackage.prepare();
+        package.prepare();
 
         tempDir.prepare({
             'bower.json': {
                 name: 'test',
                 dependencies: {
-                    package: mainPackage.path
+                    package: package.path
                 }
             },
             '.bowerrc': {
                 scripts: {
-                    preinstall: 'node -e \'require("fs").writeFileSync("preinstall.txt", "%")\''
+                    preinstall: 'bash -c "echo -n % > preinstall.txt"'
                 }
             }
         });
@@ -189,18 +97,18 @@ describe('bower update', function () {
     });
 
     it('runs postinstall hook when installing missing package', function () {
-        mainPackage.prepare();
+        package.prepare();
 
         tempDir.prepare({
             'bower.json': {
                 name: 'test',
                 dependencies: {
-                    package: mainPackage.path
+                    package: package.path
                 }
             },
             '.bowerrc': {
                 scripts: {
-                    postinstall: 'node -e \'require("fs").writeFileSync("postinstall.txt", "%")\''
+                    postinstall: 'bash -c "echo -n % > postinstall.txt"'
                 }
             }
         });
@@ -211,18 +119,18 @@ describe('bower update', function () {
     });
 
     it('doesn\'t runs postinstall when no package is update', function () {
-        mainPackage.prepare();
+        package.prepare();
 
         tempDir.prepare({
             'bower.json': {
                 name: 'test',
                 dependencies: {
-                    package: mainPackage.path
+                    package: package.path
                 }
             },
             '.bowerrc': {
                 scripts: {
-                    postinstall: 'node -e \'require("fs").writeFileSync("postinstall.txt", "%")\''
+                    postinstall: 'bash -c "echo -n % > postinstall.txt"'
                 }
             }
         });
@@ -250,7 +158,7 @@ describe('bower update', function () {
 
             expect(tempDir.read('bower_components/package/version.txt')).to.contain('1.0.0');
 
-            tempDir.prepare({
+             tempDir.prepare({
                 'bower.json': {
                     name: 'test',
                     dependencies: {
@@ -265,277 +173,6 @@ describe('bower update', function () {
         });
     });
 
-    it('doesn\'t update extraneous packages', function () {
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test'
-            }
-        });
-
-        return install(['underscore#1.5.0']).then(function() {
-
-            expect(tempDir.readJson('bower_components/underscore/package.json').version).to.equal('1.5.0');
-
-            return update(null, {save: true}).then(function() {
-                expect(tempDir.readJson('bower_components/underscore/package.json').version).to.equal('1.5.0');
-                expect(tempDir.readJson('bower.json')).to.not.have.property('dependencies');
-            });
-        });
-    });
-
-    it('updates bower.json dep after updating with --save flag', function () {
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test',
-                dependencies: {
-                    underscore: '~1.5.0'
-                }
-            }
-        });
-
-        return install().then(function() {
-
-            expect(tempDir.readJson('bower.json').dependencies.underscore).to.equal('~1.5.0');
-
-            return update(null, {save: true}).then(function() {
-                expect(tempDir.readJson('bower.json').dependencies.underscore).to.equal('~1.5.2');
-            });
-
-        });
-    });
-
-    it('updates bower.json dev dep after updating with --save-dev flag', function () {
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test',
-                devDependencies: {
-                    underscore: '~1.5.0'
-                }
-            }
-        });
-
-        return install().then(function() {
-
-            expect(tempDir.readJson('bower.json').devDependencies.underscore).to.equal('~1.5.0');
-
-            return update(null, {saveDev: true}).then(function() {
-                expect(tempDir.readJson('bower.json').devDependencies.underscore).to.equal('~1.5.2');
-            });
-
-        });
-    });
-
-    it('replaces "any" range with latest version', function () {
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test',
-                dependencies: {
-                    underscore: '*'
-                }
-            }
-        });
-
-        return install().then(function() {
-
-            expect(tempDir.readJson('bower.json').dependencies.underscore).to.equal('*');
-
-            return update(null, {save: true}).then(function() {
-                var version = semver.gte(tempDir.readJson('bower.json').dependencies.underscore.replace('~', ''), '1.8.3');
-                expect(version).to.be.ok();
-            });
-
-        });
-    });
-
-    it('updates multiple components in bower.json after updating with --save flag', function () {
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test',
-                dependencies: {
-                    underscore: '~1.5.0',
-                    lodash: '~1.0.0'
-                },
-                devDependencies: {
-                    neat: '~1.5.0'
-                },
-            }
-        });
-
-        return install().then(function() {
-
-            expect(tempDir.readJson('bower.json').dependencies.underscore).to.equal('~1.5.0');
-            expect(tempDir.readJson('bower.json').dependencies.lodash).to.equal('~1.0.0');
-            expect(tempDir.readJson('bower.json').devDependencies.neat).to.equal('~1.5.0');
-
-            return update(null, {save: true}).then(function() {
-                // Normal deps should have changed
-                expect(tempDir.readJson('bower.json').dependencies.underscore).to.equal('~1.5.2');
-                expect(tempDir.readJson('bower.json').dependencies.lodash).to.equal('~1.0.2');
-                // Dev deps should not have changed
-                expect(tempDir.readJson('bower.json').devDependencies.neat).to.equal('~1.5.0');
-            });
-
-        });
-    });
-
-    it('updates multiple components in bower.json after updating with --save-dev flag', function () {
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test',
-                dependencies: {
-                    neat: '~1.5.0'
-                },
-                devDependencies: {
-                    underscore: '~1.5.0',
-                    lodash: '~1.0.0'
-                }
-            }
-        });
-
-        return install().then(function() {
-
-            expect(tempDir.readJson('bower.json').dependencies.neat).to.equal('~1.5.0');
-            expect(tempDir.readJson('bower.json').devDependencies.underscore).to.equal('~1.5.0');
-            expect(tempDir.readJson('bower.json').devDependencies.lodash).to.equal('~1.0.0');
-
-            return update(null, {saveDev: true}).then(function() {
-                // Normal deps should not have changed
-                expect(tempDir.readJson('bower.json').dependencies.neat).to.equal('~1.5.0');
-                // Dev deps should have changed
-                expect(tempDir.readJson('bower.json').devDependencies.underscore).to.equal('~1.5.2');
-                expect(tempDir.readJson('bower.json').devDependencies.lodash).to.equal('~1.0.2');
-            });
-
-        });
-    });
-
-    it('correctly interprets semver range specifier pre-1.0', function () {
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test',
-                dependencies: {
-                    underscore: '^0.1.0'
-                }
-            }
-        });
-
-        return install().then(function() {
-
-            expect(tempDir.readJson('bower.json').dependencies.underscore).to.equal('^0.1.0');
-
-            return update(null, {save: true}).then(function() {
-                expect(tempDir.readJson('bower.json').dependencies.underscore).to.equal('~0.1.1');
-            });
-
-        });
-    });
-
-    it('correctly interprets semver range specifier post-1.0', function () {
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test',
-                dependencies: {
-                    lodash: '^1.0.0'
-                }
-            }
-        });
-
-        return install().then(function() {
-
-            expect(tempDir.readJson('bower.json').dependencies.lodash).to.equal('^1.0.0');
-
-            return update(null, {save: true}).then(function() {
-                expect(tempDir.readJson('bower.json').dependencies.lodash).to.equal('~1.3.1');
-            });
-
-        });
-    });
-
-    it('doesn\'t update bower.json if versions are identical', function () {
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test',
-                dependencies: {
-                    underscore: '1.5.0'
-                }
-            }
-        });
-
-        return install().then(function() {
-
-            expect(tempDir.readJson('bower.json').dependencies.underscore).to.equal('1.5.0');
-
-            return update(null, {save: true}).then(function() {
-                expect(tempDir.readJson('bower.json').dependencies.underscore).to.equal('1.5.0');
-            });
-
-        });
-    });
-
-    it('does not install ignored dependencies when updating a package', function () {
-        var package3 = new helpers.TempDir({
-            'bower.json': {
-                name: 'package3'
-            }
-        }).prepare();
-
-        var package2 = new helpers.TempDir().prepareGit({
-            '1.0.0': {
-                'bower.json': {
-                    name: 'package2',
-                    version: '1.0.0',
-                    dependencies: {
-                        package3: package3.path
-                    }
-                }
-            },
-            '1.0.1': {
-                'bower.json': {
-                    name: 'package2',
-                    version: '1.0.1',
-                    dependencies: {
-                        package3: package3.path
-                    }
-                }
-            }
-        });
-
-        tempDir.prepare({
-            'bower.json': {
-                name: 'test',
-                dependencies: {
-                    package2: package2.path + '#1.0.0'
-                }
-            },
-            '.bowerrc': {
-                ignoredDependencies: ['package3']
-            }
-        });
-
-        return install().then(function() {
-
-            expect(tempDir.readJson('bower_components/package2/bower.json').version).to.equal('1.0.0');
-            expect(tempDir.exists('bower_components/package3')).to.equal(false);
-
-            tempDir.prepare({
-                'bower.json': {
-                    name: 'test',
-                    dependencies: {
-                        package2: package2.path + '#1.0.1'
-                    }
-                },
-                '.bowerrc': {
-                    ignoredDependencies: ['package3']
-                }
-            });
-
-            return update().then(function() {
-                expect(tempDir.readJson('bower_components/package2/bower.json').version).to.equal('1.0.1');
-                expect(tempDir.exists('bower_components/package3')).to.equal(false);
-            });
-        });
-    });
-
     it('runs preinstall hook when updating a package', function () {
         tempDir.prepare({
             'bower.json': {
@@ -543,27 +180,27 @@ describe('bower update', function () {
                 dependencies: {
                     package: gitPackage.path + '#1.0.0'
                 }
+            },
+            '.bowerrc': {
+                scripts: {
+                    preinstall: 'bash -c "echo -n % > preinstall.txt"'
+                }
             }
         });
 
         return install().then(function() {
-            tempDir.prepare({
+             tempDir.prepare({
                 'bower.json': {
                     name: 'test',
                     dependencies: {
                         package: gitPackage.path + '#1.0.1'
                     }
-                },
-                '.bowerrc': {
-                    scripts: {
-                        preinstall: 'node -e \'require("fs").writeFileSync("preinstall.txt", "%")\''
-                    }
                 }
             });
 
             expect(tempDir.exists('preinstall.txt')).to.be(false);
             return update().then(function() {
-                expect(tempDir.read('preinstall.txt')).to.be('subPackage package');
+                expect(tempDir.read('preinstall.txt')).to.be('package');
             });
         });
     });
@@ -575,28 +212,27 @@ describe('bower update', function () {
                 dependencies: {
                     package: gitPackage.path + '#1.0.0'
                 }
+            },
+            '.bowerrc': {
+                scripts: {
+                    postinstall: 'bash -c "echo -n % > postinstall.txt"'
+                }
             }
         });
 
         return install().then(function() {
-            tempDir.prepare({
+             tempDir.prepare({
                 'bower.json': {
                     name: 'test',
                     dependencies: {
                         package: gitPackage.path + '#1.0.1'
                     }
-                },
-                '.bowerrc': {
-                    scripts: {
-                        preinstall: 'node -e \'require("fs").writeFileSync("preinstall.txt", "%")\'',
-                        postinstall: 'node -e \'require("fs").writeFileSync("postinstall.txt", "%")\''
-                    }
                 }
             });
 
             expect(tempDir.exists('postinstall.txt')).to.be(false);
             return update().then(function() {
-                expect(tempDir.read('postinstall.txt')).to.be('subPackage package');
+                expect(tempDir.read('postinstall.txt')).to.be('package');
             });
         });
     });

test/commands/version.js

@@ -1,89 +0,0 @@
-var expect = require('expect.js');
-
-var helpers = require('../helpers');
-var version = helpers.require('lib/commands').version;
-
-describe('bower list', function () {
-
-    var mainPackage = new helpers.TempDir({
-        'bower.json': {
-            name: 'foobar',
-            version: '0.0.0'
-        }
-    });
-
-    var gitPackage = new helpers.TempDir({
-        'v0.0.0': {
-            'bower.json': {
-                name: 'foobar',
-                version: '0.0.0'
-            }
-        }
-    });
-
-    it('bumps patch version', function() {
-        mainPackage.prepare();
-
-        return helpers.run(version, ['patch', {}, { cwd: mainPackage.path }]).then(function() {
-            expect(mainPackage.readJson('bower.json').version).to.be('0.0.1');
-        });
-    });
-
-    it('bumps minor version', function() {
-        mainPackage.prepare();
-
-        return helpers.run(version, ['minor', {}, { cwd: mainPackage.path }]).then(function() {
-            expect(mainPackage.readJson('bower.json').version).to.be('0.1.0');
-        });
-    });
-
-    it('bumps major version', function() {
-        mainPackage.prepare();
-
-        return helpers.run(version, ['major', {}, { cwd: mainPackage.path }]).then(function() {
-            expect(mainPackage.readJson('bower.json').version).to.be('1.0.0');
-        });
-    });
-
-    it('changes version', function() {
-        mainPackage.prepare();
-
-        return helpers.run(version, ['1.2.3', {}, { cwd: mainPackage.path }]).then(function() {
-            expect(mainPackage.readJson('bower.json').version).to.be('1.2.3');
-        });
-    });
-
-    it('returns the new version', function() {
-        mainPackage.prepare();
-
-        return helpers.run(version, ['major', {}, { cwd: mainPackage.path }]).then(function(results) {
-            expect(results[0]).to.be('1.0.0');
-        });
-    });
-
-    it('bumps patch version, create commit, and tag', function() {
-        gitPackage.prepareGit();
-
-        return helpers.run(version, ['patch', {}, { cwd: gitPackage.path }]).then(function() {
-            expect(gitPackage.readJson('bower.json').version).to.be('0.0.1');
-
-            var tags = gitPackage.git('tag');
-            expect(tags).to.be('v0.0.0\nv0.0.1\n');
-            var message = gitPackage.git('log', '--pretty=format:%s', '-n1');
-            expect(message).to.be('v0.0.1');
-        });
-    });
-
-    it('bumps with custom commit message', function() {
-        gitPackage.prepareGit();
-
-        return helpers.run(version, ['patch', { message: 'Bumping %s, because what'}, { cwd: gitPackage.path }]).then(function() {
-            expect(gitPackage.readJson('bower.json').version).to.be('0.0.1');
-
-            var tags = gitPackage.git('tag');
-            expect(tags).to.be('v0.0.0\nv0.0.1\n');
-            var message = gitPackage.git('log', '--pretty=format:%s', '-n1');
-            expect(message).to.be('Bumping 0.0.1, because what');
-        });
-    });
-});

test/core/Manager.js

@@ -1,6 +1,6 @@
 var expect = require('expect.js');
 var path = require('path');
-var rimraf = require('../../lib/util/rimraf');
+var rimraf = require('rimraf');
 var Logger = require('bower-logger');
 var Manager = require('../../lib/core/Manager');
 var defaultConfig = require('../../lib/config');

test/core/packageRepository.js

@@ -2,8 +2,8 @@ var expect = require('expect.js');
 var Q = require('q');
 var path = require('path');
 var mout = require('mout');
-var fs = require('../../lib/util/fs');
-var rimraf = require('../../lib/util/rimraf');
+var fs = require('graceful-fs');
+var rimraf = require('rimraf');
 var RegistryClient = require('bower-registry-client');
 var Logger = require('bower-logger');
 var proxyquire = require('proxyquire');
@@ -11,7 +11,6 @@ var defaultConfig = require('../../lib/config');
 var ResolveCache = require('../../lib/core/ResolveCache');
 var resolvers = require('../../lib/core/resolvers');
 var copy = require('../../lib/util/copy');
-var helpers = require('../helpers');
 
 describe('PackageRepository', function () {
     var packageRepository;
@@ -22,8 +21,7 @@ describe('PackageRepository', function () {
     var tempPackage = path.resolve(__dirname, '../tmp/temp-package');
     var packagesCacheDir = path.join(__dirname, '../tmp/temp-resolve-cache');
     var registryCacheDir = path.join(__dirname, '../tmp/temp-registry-cache');
-    var mockSource = helpers.localSource(testPackage);
-
+    var mockSource = 'file://' + testPackage;
     var forceCaching = true;
 
     after(function () {
@@ -45,10 +43,7 @@ describe('PackageRepository', function () {
         });
 
         // Mock the resolver factory to always return a resolver for the test package
-        function resolverFactory(decEndpoint, options, _registryClient) {
-            var _config = options.config;
-            var _logger = options.logger;
-
+        function resolverFactory(decEndpoint, _config, _logger, _registryClient) {
             expect(_config).to.eql(config);
             expect(_logger).to.be.an(Logger);
             expect(_registryClient).to.be.an(RegistryClient);
@@ -60,8 +55,8 @@ describe('PackageRepository', function () {
 
             if (forceCaching) {
                 // Force to use cache even for local resources
-                resolver.isCacheable = function () {
-                    return true;
+                resolver.isNotCacheable = function () {
+                    return false;
                 };
             }
 
@@ -70,9 +65,7 @@ describe('PackageRepository', function () {
             return Q.resolve(resolver);
         }
         resolverFactory.getConstructor = function () {
-            return Q.resolve([resolvers.GitRemote, {
-                source: helpers.localSource(testPackage)
-            }]);
+            return Q.resolve([resolvers.GitRemote, 'file://' + testPackage, false]);
         };
         resolverFactory.clearRuntimeCache = function () {
             resolverFactoryClearHook();
@@ -189,7 +182,7 @@ describe('PackageRepository', function () {
                 return originalRetrieve.apply(this, arguments);
             };
 
-            packageRepository.fetch({ name: '', source: helpers.localSource(testPackage), target: '~0.1.0' })
+            packageRepository.fetch({ name: '', source: testPackage, target: '~0.1.0' })
             .spread(function (canonicalDir, pkgMeta) {
                 expect(called).to.be(false);
                 expect(fs.existsSync(canonicalDir)).to.be(true);
@@ -244,7 +237,8 @@ describe('PackageRepository', function () {
             resolverFactoryHook = function (resolver) {
                 var originalHasNew = resolver.hasNew;
 
-                resolver.hasNew = function (pkgMeta) {
+                resolver.hasNew = function (canonicalDir, pkgMeta) {
+                    expect(canonicalDir).to.equal(tempPackage);
                     expect(pkgMeta).to.eql(json);
                     called = true;
                     return originalHasNew.apply(this, arguments);
@@ -287,7 +281,8 @@ describe('PackageRepository', function () {
                     return originalResolve.apply(this, arguments);
                 };
 
-                resolver.hasNew = function (pkgMeta) {
+                resolver.hasNew = function (canonicalDir, pkgMeta) {
+                    expect(canonicalDir).to.equal(tempPackage);
                     expect(pkgMeta).to.eql(json);
                     called.push('hasNew');
                     return Q.resolve(true);
@@ -330,7 +325,8 @@ describe('PackageRepository', function () {
                     return originalResolve.apply(this, arguments);
                 };
 
-                resolver.hasNew = function (pkgMeta) {
+                resolver.hasNew = function (canonicalDir, pkgMeta) {
+                    expect(canonicalDir).to.equal(tempPackage);
                     expect(pkgMeta).to.eql(json);
                     called.push('hasNew');
                     return Q.resolve(false);
@@ -366,7 +362,8 @@ describe('PackageRepository', function () {
             resolverFactoryHook = function (resolver) {
                 var originalResolve = resolver.resolve;
 
-                resolver.hasNew = function (pkgMeta) {
+                resolver.hasNew = function (canonicalDir, pkgMeta) {
+                    expect(canonicalDir).to.equal(tempPackage);
                     expect(pkgMeta).to.eql(json);
                     called.push('resolve');
                     return originalResolve.apply(this, arguments);

test/core/resolveCache.js

@@ -1,15 +1,15 @@
 var path = require('path');
 var mout = require('mout');
-var rimraf = require('../../lib/util/rimraf');
-var fs = require('../../lib/util/fs');
+var rimraf = require('rimraf');
+var fs = require('graceful-fs');
 var Q = require('q');
 var expect = require('expect.js');
 var mkdirp = require('mkdirp');
-var md5 = require('md5-hex');
 var ResolveCache = require('../../lib/core/ResolveCache');
 var defaultConfig = require('../../lib/config');
 var cmd = require('../../lib/util/cmd');
 var copy = require('../../lib/util/copy');
+var md5 = require('../../lib/util/md5');
 
 describe('ResolveCache', function () {
     var resolveCache;
@@ -908,6 +908,7 @@ describe('ResolveCache', function () {
                 expect(entries).to.be.an('array');
 
                 expectedJson = fs.readFileSync(path.join(__dirname, '../assets/resolve-cache/list-json-1.json'));
+                expectedJson = expectedJson.toString().trim();
 
                 mout.object.forOwn(entries, function (entry) {
                     // Trim absolute bower path from json
@@ -916,7 +917,8 @@ describe('ResolveCache', function () {
                     entry.canonicalDir = entry.canonicalDir.replace(/\\/g, '/');
                 });
 
-                expect(entries).to.eql(JSON.parse(expectedJson));
+                json = JSON.stringify(entries, null, '  ');
+                expect(json).to.equal(expectedJson);
 
                 next();
             })