Lock lru-cache package

2026-04-24 03:00:19 -04:00 · 2015-11-24 11:43:13 -05:00
257 changed files with 10256 additions and 27481 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,46 +0,0 @@
-# http://www.appveyor.com/docs/appveyor-yml
-
-# Set build version format here instead of in the admin panel.
-version: "{build}"
-
-# 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: "4"
-    - nodejs_version: "6"
-    - nodejs_version: "8"
-    - nodejs_version: "9"
-
-# Finish on first failed build
-matrix:
-  fast_finish: true
-
-# Install node, display versions, install dependencies
-install:
-  - ps: Install-Product node 8
-  - node --version && npm --version
-  - git --version && svn --version
-  - npm install -g yarn grunt
-  - yarn
-  - ps: Install-Product node $env:nodejs_version
-
-# Post-install test scripts.
-test_script:
-  - cmd: npm run ci
-
-# Make clone much faster
-shallow_clone: true
-
-# Disable Visual Studio build and deploy
-build: off
-deploy: off
-
-# Cache node modules, and refresh if package.json changes
-cache:
-  - "%LOCALAPPDATA%\\Yarn"
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,4 +15,5 @@ trim_trailing_whitespace = false
 insert_final_newline = false

 [{package,bower}.json]
+indent_style = space
 indent_size = 2
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,52 +0,0 @@
-{
-  "env": {
-    "node": true,
-    "mocha": true
-  },
-  "rules": {
-    "no-bitwise": 0,
-    "curly": 0,
-    "eqeqeq": 0,
-    "guard-for-in": 0,
-    "no-use-before-define": 0,
-    "no-caller": 2,
-    "no-new": 2,
-    "no-plusplus": 0,
-    "no-undef": 2,
-    "no-unused-vars": 0,
-    "strict": 0,
-    "semi": 0,
-    "comma-spacing": 2,
-    "quote-props": [2, "as-needed"],
-    "quotes": [2, "single", "avoid-escape"],
-    "indent": [2, 4],
-    "no-cond-assign": [ 2, "except-parens" ],
-    "no-debugger": 2,
-    "no-dupe-args": 2,
-    "no-dupe-keys": 2,
-    "no-duplicate-case": 2,
-    "no-unreachable": 2,
-    "valid-typeof": 2,
-    "no-fallthrough": 2,
-    "no-ex-assign": 2,
-    "no-eq-null": 0,
-    "no-eval": 0,
-    "no-unused-expressions": 0,
-    "block-scoped-var": 0,
-    "no-iterator": 0,
-    "no-loop-func": 2,
-    "no-script-url": 0,
-    "no-shadow": 0,
-    "no-new-func": 2,
-    "no-new-wrappers": 2,
-    "no-invalid-this": 0,
-    "space-before-blocks": [2, "always"],
-    "space-before-function-paren": [2, "never"],
-    "space-infix-ops": 2,
-    "keyword-spacing": 2,
-    "new-parens": 2,
-    "no-multiple-empty-lines": [2, { max: 2}],
-    "eol-last": 2,
-    "no-trailing-spaces": 2
-  }
-}
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,44 +0,0 @@
-<!--
-
-If you are reporting a new issue, make sure that we do not have any duplicates.
-You can ensure this by searching the issue list for this repository.
-
-You are welcome to open issues to discuss important general topics concerning Bower.
-However for support questions, please consider using http://stackoverflow.com or
-asking for help in our Discord channel: https://discordapp.com/invite/0fFM7QF0KpZaDeN9
-
-# BUG REPORT
-
-Use the commands below to provide key information to reproduce:
-You do NOT have to include this information if this is a FEATURE REQUEST OR DISCUSSION
-
-For more information about reporting bugs, see:
-https://github.com/bower/bower/wiki/Report-a-Bug
-
-->
-
-**Output of `bower -v && npm -v && node -v`:**
-
-```
-(paste your output here)
-```
-
-**Additional environment details (proxy, private registry, etc.):**
-
-
-
-**Steps to reproduce the issue:**
-
-1.
-2.
-3.
-
-**Describe the results you received:**
-
-
-
-**Describe the results you expected:**
-
-
-
-**Additional information:**
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-!lib/bin
 /node_modules
 /npm-debug.log

@@ -10,6 +9,3 @@
 /bower.json
 /component.json
 /bower_components
-/test/sample
-!/test/sample/bower.json
-/npm-shrinkwrap.json
--- a/packages/bower-logger/.jshintrc
+++ b/packages/bower-logger/.jshintrc
@@ -26,7 +26,7 @@
    "plusplus": false,
    "regexp": false,
    "undef": true,
-    "unused": true,
+    "unused": "vars",
    "quotmark": "single",
    "strict": false,
    "trailing": true,
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,2 +0,0 @@
-**/node_modules/**
-**/test/assets/**
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,43 +1,25 @@
-sudo: false
-
-language: node_js
-
-# Use node 8 for build
-node_js:
-  - "8"
-
-# Then test with specific node version
 env:
-  - TEST_NODE_VERSION="0.10"
-  - TEST_NODE_VERSION="0.12"
-  - TEST_NODE_VERSION="4"
-  - TEST_NODE_VERSION="6"
-  - TEST_NODE_VERSION="8"
-  - TEST_NODE_VERSION="9"
-
-before_install:
-  - node --version
-  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.5.1
-  - export PATH=$HOME/.yarn/bin:$PATH
-
-cache:
-  yarn: true
+  - NODE_VERSION=0.10
+  - NODE_VERSION=0.11

 install:
-  - yarn
-  - nvm install $TEST_NODE_VERSION
-  - npm install -g grunt
+  - test $TRAVIS_OS_NAME = "osx" && brew install nvm && source $(brew --prefix nvm)/nvm.sh || test $TRAVIS_OS_NAME = "linux"
+  - nvm install $NODE_VERSION
+  - node --version
+  - npm --version
+  - git --version
+  - svn --version | head -n 1
+  - npm install -g grunt-cli
+  - npm install

 os:
  - osx
  - linux

 matrix:
-  fast_finish: true
  allow_failures:
    - os: osx
+    - env: "NODE_VERSION=0.11"

 script:
-  - nvm use $TEST_NODE_VERSION
-  - node --version && npm --version && git --version && svn --version | head -n 1
  - grunt travis
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,170 +1,5 @@
 # Changelog

-## 1.8.0 - 2016-11-07
-
- Download tar archives from GitHub when possible (#2263)
-  - Change default shorthand resolver for github from `git://` to `https://`
- Fix ssl handling by not setting GIT_SSL_NO_VERIFY=false (#2361)
- Allow for removing components with url instead of name (#2368)
- Show in warning message location of malformed bower.json (#2357)
- Improve handling of non-semver versions in git resolver (#2316)
- Fix handling of cached releases pluginResolverFactory (#2356)
- Allow to type the entire version when conflict occured (#2243)
- Allow `owner/reponame` shorthand for registering components (#2248)
- Allow single-char repo names and package names (#2249)
- Make `bower version` no longer honor `version` in bower.json (#2232)
- Add `postinstall` hook (#2252)
- Allow for `@` instead of `#` for `install` and `info` commands (#2322)
- Upgrade all bundled modules
-
-## 1.7.9 - 2016-04-05
-
- Show warnings for invalid bower.json fields
- Update bower-json
-  - Less strict validation on package name (allow spaces, slashes, and "@")
-
-## 1.7.8 - 2016-04-04
-
- Don't ask for git credentials in non-interactive session, fixes #956 #1009
- Prevent swallowing exceptions with programmatic api, fixes #2187
- Update graceful-fs to 4.x in all dependences, fixes nodejs/node#5213
- Resolve pluggable resolvers using cwd and fallback to global modules, fixes #1919
- Upgrade handlebars to 4.0.5, closes #2195
- Replace all % chatacters in defined scripts, instead of only first one, fixes #2174
- Update opn package to fix issues with "bower open" command on Windows
- Update bower-config
-  - Do not interpolate environment variables in script hooks, fixes bower/config#47
- Update bower-json
-  - Validate package name more strictly and allow only latin letters, dots, dashes and underscores
- Add support for "save" and "save-exact" in .bowerrc, #2161
-
-## 1.7.7 - 2016-01-27
-
-Revert locations of all files while still packaging `node_modules`.
-
-It's because people are depending on internals of bower, like
-`bower/lib/renderers/StandardRenderer`. We want to preserve this
-implicit contract, but we discourage it. The only official way
-to use bower programmatically is through `require('bower')`.
-
-## 1.7.6 - 2016-01-27
-
- Revert location of "bin/bower" as developers are using it directly ([#2157](https://github.com/bower/bower/issues/2157))
-  Note: Correctly, you should use an alias created in `npm bin --global`.
-
-## 1.7.5 - 2016-01-26
-
- Remove analytics from Bower, fixes ([#2150](https://github.com/bower/bower/pull/2150))
- Default to ^ operator on `bower install --save` ([#2145](https://github.com/bower/bower/pull/2145))
- Support absolute path in .bowerrc directory option ([#2130](https://github.com/bower/bower/pull/2130))
- Display user's name upon `bower login` command ([#2133](https://github.com/bower/bower/pull/2133))
- Decompress gzip files ([#2092](https://github.com/bower/bower/pull/2092))
- Prevent name clashes in package extraction ([#2102](https://github.com/bower/bower/pull/2102))
- When strictSsl is false, set GIT_SSL_NO_VERIFY=true ([#2129](https://github.com/bower/bower/issues/2129))
- Distribute bower with npm@3 for better Windows support ([#2146](https://github.com/bower/bower/issues/2146))
- Update request to 2.67.0 and fs-write-stream-atomic to 1.0.8
- Documentation improvements
-
-## 1.7.4 - 2016-01-21
-
-Unpublished because of issue with npm distribution:
-https://github.com/npm/npm/issues/11227
-
-## 1.7.3 - 2016-01-20
-
-Unpublished because of issue with npm distribution:
-https://github.com/npm/npm/issues/11227
-
-## 1.7.2 - 2015-12-31
-
- Lock "fs-write-stream-atomic" to 1.0.5
-
-## 1.7.1 - 2015-12-11
-
- Rollback "Add `bower update --save` functionality", it causes issues and needs more testing
- Fix backward-compatibility of `bower search --json` ([#2066](https://github.com/bower/bower/issues/2066))
- Ignore prerelease versions from `bower info` output
- Update update-notifier to 0.6.0
- Better formatting of help messages (https://github.com/bower/bower/commit/de3e1089da80f47ea3667c5ab80d301cddfd8c3e)
- Add help menu for update `--save` and `update --save-dev` (https://github.com/bower/bower/commit/612aaa88eb4d4b268b2d8665c338ac086af3a5b0)
-
-## 1.7.0 - 2015-12-07
-
- Add `bower update --save` functionality ([#2035](https://github.com/bower/bower/issues/2035))
- `bower search` shows help message when no package name is specified ([#2066](https://github.com/bower/bower/issues/2066))
- Update only those packages that are explicitly requested by the user. Related Issues
-  - [#256](https://github.com/bower/bower/issues/256)
-  - [#924](https://github.com/bower/bower/issues/924)
-  - [#1770](https://github.com/bower/bower/issues/1770)
- Allow for @ in username for SVN on windows ([#1650](https://github.com/bower/bower/issues/1650))
- Update bower config
-  - Loads the .bowerrc file from the cwd specified on the command line
-  - Allow the use of environment variables in .bowerrc ([#41](https://github.com/bower/config/issues/41))
-  - Allow for array notation in ENV variables ([#44](https://github.com/bower/config/issues/44))
-
-## 1.6.9 - 2015-12-04
-
- Change git version of fs-write-stream-atomic back to npm version ([#2079](https://github.com/bower/bower/issues/2079))
-
-## 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
@@ -174,7 +9,7 @@ Reverted release.
 - 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))
+- Bump insight dependency to support prompt timeout ([#1102](https://github.com/bower/bower/issues/1102)) 

 ## 1.5.2 - 2015-08-25

@@ -194,10 +29,6 @@ Reverted release.
 - 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))
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,26 +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 a Bower maintainer or supporting in any way, please fill 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.
-
-<a name="bugs"></a>
-## 🐛 [Bug reports](https://github.com/bower/bower/wiki/Report-a-Bug)
+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.
+* 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 Discord https://discord.gg/0fFM7QF0KpZRh2cY 
+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

@@ -29,15 +38,57 @@ 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),
-  [Discord Channel](https://discordapp.com/channels/119103197720739842/123728452816732160),
-  [Mailing List](http://groups.google.com/group/twitter-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.

 * Please **do not** derail or troll issues. Keep the discussion on topic and
  respect the opinions of others.

+
+<a name="bugs"></a>
+## Bug reports
+
+A bug is a _demonstrable problem_ that is caused by the code in the repository.
+Good bug reports are extremely helpful - thank you!
+
+Guidelines for bug reports:
+
+1. **Use the GitHub issue search** &mdash; check if the issue has already been
+   reported.
+
+2. **Check if the issue has been fixed** &mdash; try to reproduce it using the
+   latest `master` or development branch in the repository.
+
+3. **Isolate the problem** &mdash; ideally create a [reduced test
+   case](http://css-tricks.com/6263-reduced-test-cases/).
+
+A good bug report shouldn't leave others needing to chase you up for more
+information. Please try to be as detailed as possible in your report. What is
+your environment? What steps will reproduce the issue? What OS experiences the
+problem? What would you expect to be the outcome? All these details will help
+people to fix any potential bugs.
+
+Example:
+
+> Short and descriptive example bug report title
+>
+> A summary of the issue and the browser/OS environment in which it occurs. If
+> suitable, include the steps required to reproduce the bug.
+>
+> 1. This is the first step
+> 2. This is the second step
+> 3. Further steps, etc.
+>
+> `<url>` - a link to the reduced test case
+>
+> Any other information you want to share that is relevant to the issue being
+> reported. This might include the lines of code that you have identified as
+> causing the bug, and potential solutions (and your opinions on their
+> merits).
+
+
 <a name="features"></a>
 ## Feature requests

@@ -121,8 +172,6 @@ included in the project:
   force push to your remote feature branch. You may also be asked to squash
   commits.

-10. If you are asked to squash your commits, then please use `git rebase -i master`. It will ask you to pick your commits - pick the major commits and squash the rest.
-
 **IMPORTANT**: By submitting a patch, you agree to license your work under the
 same license as that used by the project.

--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,16 +1,12 @@
-var tmp = require('tmp');
-var childProcess = require('child_process');
-var arraydiff = require('arr-diff');
-var fs = require('fs');
-var wrench = require('wrench');
-var inquirer = require('inquirer');
-var path = require('path');
-
-module.exports = function(grunt) {
+'use strict';
+module.exports = function (grunt) {
    require('load-grunt-tasks')(grunt);

    grunt.initConfig({
-        eslint: {
+        jshint: {
+            options: {
+                jshintrc: '.jshintrc'
+            },
            files: [
                'Gruntfile.js',
                'bin/*',
@@ -18,7 +14,6 @@ module.exports = function(grunt) {
                'test/**/*.js',
                '!test/assets/**/*',
                '!test/reports/**/*',
-                '!test/sample/**/*',
                '!test/tmp/**/*'
            ]
        },
@@ -42,242 +37,24 @@ module.exports = function(grunt) {
                command: 'node test/packages.js && node test/packages-svn.js'
            },
            'assets-force': {
-                command:
-                    'node test/packages.js --force && node test/packages-svn.js --force'
+                command: 'node test/packages.js --force && node test/packages-svn.js --force'
            },
            cover: {
-                command:
-                    '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 -- --timeout 30000 -R dot test/test.js'
            },
            coveralls: {
-                command: 'npm run coveralls < test/reports/lcov.info',
-                exitCodes: [0, 1, 2, 3] // Alow for failure for coverage report
+                command: 'node node_modules/.bin/coveralls < test/reports/lcov.info'
            }
        },
        watch: {
-            files: ['<%= eslint.files %>'],
-            tasks: ['eslint', 'simplemocha:short']
+            files: ['<%= jshint.files %>'],
+            tasks: ['jshint', 'simplemocha:short']
        }
    });

    grunt.registerTask('assets', ['exec:assets-force']);
-    grunt.registerTask('test', ['eslint', 'exec:assets', 'simplemocha:full']);
+    grunt.registerTask('test', ['jshint', 'exec:assets', 'simplemocha:full']);
    grunt.registerTask('cover', 'exec:cover');
-    grunt.registerTask('travis', [
-        'eslint',
-        'exec:assets',
-        'exec:cover',
-        'exec:coveralls'
-    ]);
+    grunt.registerTask('travis', ['jshint', 'exec:assets', 'exec:cover', 'exec:coveralls']);
    grunt.registerTask('default', 'test');
-
-    grunt.task.registerTask(
-        'publish',
-        'Perform final checks and publish Bower',
-        function() {
-            var npmVersion = JSON.parse(
-                childProcess.execSync('npm version --json').toString()
-            ).npm.split('.');
-            var npmMajor = parseInt(npmVersion[0], 10);
-            var npmMinor = parseInt(npmVersion[1], 10);
-
-            var jsonPackage = require('./package');
-
-            if (npmMajor !== 3 || npmMinor < 5) {
-                grunt.log.writeln(
-                    'You need to use at least npm@3.5 to publish bower.'
-                );
-                grunt.log.writeln(
-                    'It is because npm 2.x produces too long paths that Windows does not handle.'
-                );
-                grunt.log.writeln('Please upgrade it: npm install -g npm');
-                process.exit(1);
-            }
-
-            var version = jsonPackage.version;
-            var changelog = fs.readFileSync('./CHANGELOG.md');
-
-            if (changelog.indexOf('## ' + version) === -1) {
-                grunt.log.writeln(
-                    'Please add changelog.md entry for this bower version (' +
-                        version +
-                        ')'
-                );
-
-                var lastRelease = childProcess
-                    .execSync('git tag | tail -1')
-                    .toString()
-                    .trim();
-
-                grunt.log.writeln(
-                    'Commits since last release (' + lastRelease + '): \n'
-                );
-
-                grunt.log.writeln(
-                    childProcess
-                        .execSync('git log --oneline ' + lastRelease + '..')
-                        .toString()
-                );
-
-                process.exit(1);
-            }
-
-            if (
-                childProcess
-                    .execSync('git rev-parse --abbrev-ref HEAD')
-                    .toString()
-                    .trim() !== 'master'
-            ) {
-                grunt.log.writeln(
-                    'You need to release bower from the "master" branch'
-                );
-
-                process.exit(1);
-            }
-
-            if (process.env.SKIP_TESTS !== '1') {
-                grunt.log.writeln('Reinstalling dependencies...');
-                childProcess.execSync('rm -rf node_modules && npm install', {
-                    stdio: [0, 1, 2]
-                });
-
-                grunt.log.writeln('Running test suite...');
-                childProcess.execSync('grunt test', { stdio: [0, 1, 2] });
-            }
-
-            var dir = tmp.dirSync().name;
-
-            wrench.copyDirSyncRecursive(__dirname, dir, {
-                forceDelete: true,
-                include: function(path) {
-                    return !path.match(/node_modules|\.git|test/);
-                }
-            });
-
-            grunt.log.writeln('Installing production dependencies...');
-            childProcess.execSync('npm install --production --silent', {
-                cwd: dir,
-                stdio: [0, 1, 2]
-            });
-
-            delete jsonPackage.dependencies;
-            delete jsonPackage.devDependencies;
-            delete jsonPackage.scripts;
-
-            fs.writeFileSync(
-                path.resolve(dir, 'package.json'),
-                JSON.stringify(jsonPackage, null, '  ') + '\n'
-            );
-
-            grunt.log.writeln('Moving node_modules to lib directory...');
-
-            wrench.copyDirSyncRecursive(
-                path.resolve(dir, 'node_modules'),
-                path.resolve(dir, 'lib', 'node_modules')
-            );
-            wrench.rmdirSyncRecursive(path.resolve(dir, 'node_modules'));
-
-            grunt.log.writeln('Testing bower on sample project...');
-
-            childProcess.execSync(
-                'cd test/sample && rm -rf bower_components && ' +
-                    dir +
-                    '/bin/bower install --force',
-                { stdio: [0, 1, 2] }
-            );
-
-            var expectedPackages = (
-                'SHA-1 ace-builds almond angular angular-animate angular-bootstrap angular-charts angular-contenteditable ' +
-                'angular-deckgrid angular-fullscreen angular-gravatar angular-hotkeys angular-local-storage angular-marked ' +
-                'angular-moment angular-sanitize angular-touch angular-ui-router angular-ui-sortable ' +
-                'angulartics asEvented bootstrap coffee-script d3 es6-shim font-awesome howler jquery ' +
-                'jquery-ui jquery-waypoints js-beautify lodash lz-string marked moment ng-file-upload peerjs ' +
-                'requirejs restangular slimScroll slimScrollHorizontal venturocket-angular-slider'
-            ).split(' ');
-
-            var installedPackages = fs.readdirSync(
-                './test/sample/bower_components'
-            );
-
-            var installedDiff = arraydiff(expectedPackages, installedPackages);
-
-            if (installedDiff.length > 0) {
-                grunt.log.writeln(
-                    'ERROR. Some packages were not installed by bower: '
-                );
-                grunt.log.writeln(installedDiff.join(', '));
-
-                process.exit(1);
-            }
-
-            grunt.log.writeln('\nBower production bundle installed in:');
-            grunt.log.writeln(dir + '\n');
-
-            var questions = [
-                {
-                    type: 'confirm',
-                    name: 'review',
-                    message: 'Did you review all the changes with "git diff"?',
-                    default: false
-                },
-                {
-                    type: 'confirm',
-                    name: 'changelog',
-                    message:
-                        'Are you sure the CHANGELOG.md contains all changes?',
-                    default: false
-                },
-                {
-                    type: 'confirm',
-                    name: 'tests',
-                    message:
-                        'Are you sure all tests are passing on Travis and Appveyor?',
-                    default: false
-                },
-                {
-                    type: 'confirm',
-                    name: 'publish',
-                    message:
-                        'Are you SURE you want to publish ' +
-                        jsonPackage.name +
-                        '@' +
-                        jsonPackage.version +
-                        '?',
-                    default: false
-                }
-            ];
-
-            var done = this.async();
-
-            inquirer.prompt(questions, function(answers) {
-                if (
-                    !answers.review ||
-                    !answers.changelog ||
-                    !answers.tests ||
-                    !answers.publish
-                ) {
-                    grunt.log.writeln(
-                        'Please publish bower after you fix this issue'
-                    );
-
-                    process.exit(1);
-                }
-
-                grunt.log.writeln(
-                    '\nPlease remember to tag this relese, and add a release on Github!'
-                );
-                grunt.log.writeln(
-                    '\nAlso, please remember to test published Bower one more time!'
-                );
-                grunt.log.writeln('\nPublishing Bower...');
-
-                childProcess.execSync('npm publish --tag beta', {
-                    cwd: dir,
-                    stdio: [0, 1, 2]
-                });
-
-                done();
-            });
-        }
-    );
 };
--- a/HOOKS.md
+++ b/HOOKS.md
@@ -0,0 +1,21 @@
+# Install and Uninstall Hooks
+
+Bower provides 3 separate hooks that can be used to trigger other automated tools during Bower usage.  Importantly, these hooks are intended to allow external tools to help wire up the newly installed components into the parent project and other similar tasks.  These hooks are not intended to provide a post-installation build step for component authors.  As such, the configuration for these hooks is provided in the `.bowerrc` file in the parent project's directory.
+
+## Configuring
+
+In `.bowerrc` do:
+
+```js
+{
+	"scripts": {
+		"preinstall": "<your command here>",
+		"postinstall": "<your command here>",
+		"preuninstall": "<your command here>"
+	}
+}
+```
+
+The value of each script hook may contain a % character.  When your script is called, the % will be replaced with a space-separated list of components being installed or uninstalled.
+
+Your script will also include an environment variable `BOWER_PID` containing the PID of the parent Bower process that triggered the script.  This can be used to verify that a `preinstall` and `postinstall` steps are part of the same Bower process.
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2013-present Twitter and other contributors
+Copyright (c) 2015 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
--- a/README.md
+++ b/README.md
@@ -1,18 +1,10 @@
-# Bower - A package manager for the web
+# Bower

-[![Backers on Open Collective](https://opencollective.com/bower/backers/badge.svg)](#backers)
-[![Sponsors on Open Collective](https://opencollective.com/bower/sponsors/badge.svg)](#sponsors)
-
-> ..psst! While Bower is maintained, we recommend [yarn](https://yarnpkg.com/) and [webpack](https://webpack.js.org/) for new front-end projects!
-
-[![Unix CI](https://img.shields.io/travis/bower/bower/master.svg?maxAge=2592000)](https://travis-ci.org/bower/bower)
-[![Windows CI](https://img.shields.io/appveyor/ci/bower/bower/master.svg)](https://ci.appveyor.com/project/bower/bower)
-[![Coverage Status](https://img.shields.io/coveralls/bower/bower.svg)](https://coveralls.io/r/bower/bower?branch=master)
-[![Discord chat](https://img.shields.io/badge/discord-join%20chat%20%E2%86%92-brightgreen.svg?style=flat)](https://discord.gg/0fFM7QF0KpZRh2cY)
+[![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) 

 <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.

@@ -53,7 +45,7 @@ $ bower install <package>#<version> --save

 We discourage using bower components statically for performance and security reasons (if component has an `upload.php` file that is not ignored, that can be easily exploited to do malicious stuff).

-The best approach is to process components installed by bower with build tool (like [Grunt](http://gruntjs.com/) or [gulp](http://gulpjs.com/)), and serve them concatenated or using a module loader (like [RequireJS](http://requirejs.org/)).
+The best approach is to process components installed by bower with build tool (like [Grunt](http://gruntjs.com/) or [gulp](http://gulpjs.com/)), and serve them concatenated or using module loader (like [RequireJS](http://requirejs.org/)).

 ### Uninstalling packages

@@ -67,19 +59,18 @@ $ 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.
+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 -
@@ -101,15 +92,17 @@ Bower can be configured using JSON in a `.bowerrc` file. Read over available opt

 ## Support

-* [Discord chat](https://discord.gg/0fFM7QF0KpZRh2cY)
 * [StackOverflow](http://stackoverflow.com/questions/tagged/bower)
 * [Mailinglist](http://groups.google.com/group/twitter-bower) - twitter-bower@googlegroups.com
+* [\#bower](http://webchat.freenode.net/?channels=bower) on Freenode
+

 ## Contributing

-We welcome [contributions](https://github.com/bower/bower/graphs/contributors) of all kinds from anyone. Please take a moment to review the [guidelines for contributing](CONTRIBUTING.md).
+We welcome [contributions](https://github.com/bower/bower/graphs/contributors) 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)

@@ -120,81 +113,8 @@ Note that on Windows for tests to pass you need to configure Git before cloning:
 git config --global core.autocrlf input
 ```

-
-## Backers
-
-Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/bower#backer)]
-
-<a href="https://opencollective.com/bower/backer/0/website" target="_blank"><img src="https://opencollective.com/bower/backer/0/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/1/website" target="_blank"><img src="https://opencollective.com/bower/backer/1/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/2/website" target="_blank"><img src="https://opencollective.com/bower/backer/2/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/3/website" target="_blank"><img src="https://opencollective.com/bower/backer/3/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/4/website" target="_blank"><img src="https://opencollective.com/bower/backer/4/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/5/website" target="_blank"><img src="https://opencollective.com/bower/backer/5/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/6/website" target="_blank"><img src="https://opencollective.com/bower/backer/6/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/7/website" target="_blank"><img src="https://opencollective.com/bower/backer/7/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/8/website" target="_blank"><img src="https://opencollective.com/bower/backer/8/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/9/website" target="_blank"><img src="https://opencollective.com/bower/backer/9/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/10/website" target="_blank"><img src="https://opencollective.com/bower/backer/10/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/11/website" target="_blank"><img src="https://opencollective.com/bower/backer/11/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/12/website" target="_blank"><img src="https://opencollective.com/bower/backer/12/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/13/website" target="_blank"><img src="https://opencollective.com/bower/backer/13/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/14/website" target="_blank"><img src="https://opencollective.com/bower/backer/14/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/15/website" target="_blank"><img src="https://opencollective.com/bower/backer/15/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/16/website" target="_blank"><img src="https://opencollective.com/bower/backer/16/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/17/website" target="_blank"><img src="https://opencollective.com/bower/backer/17/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/18/website" target="_blank"><img src="https://opencollective.com/bower/backer/18/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/19/website" target="_blank"><img src="https://opencollective.com/bower/backer/19/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/20/website" target="_blank"><img src="https://opencollective.com/bower/backer/20/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/21/website" target="_blank"><img src="https://opencollective.com/bower/backer/21/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/22/website" target="_blank"><img src="https://opencollective.com/bower/backer/22/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/23/website" target="_blank"><img src="https://opencollective.com/bower/backer/23/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/24/website" target="_blank"><img src="https://opencollective.com/bower/backer/24/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/25/website" target="_blank"><img src="https://opencollective.com/bower/backer/25/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/26/website" target="_blank"><img src="https://opencollective.com/bower/backer/26/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/27/website" target="_blank"><img src="https://opencollective.com/bower/backer/27/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/28/website" target="_blank"><img src="https://opencollective.com/bower/backer/28/avatar.svg"></a>
-<a href="https://opencollective.com/bower/backer/29/website" target="_blank"><img src="https://opencollective.com/bower/backer/29/avatar.svg"></a>
-
-
-## Sponsors
-
-Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/bower#sponsor)]
-
-<a href="https://opencollective.com/bower/sponsor/0/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/0/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/1/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/1/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/2/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/2/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/3/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/3/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/4/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/4/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/5/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/5/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/6/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/6/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/7/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/7/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/8/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/9/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/9/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/10/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/10/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/11/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/11/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/12/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/12/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/13/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/13/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/14/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/14/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/15/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/15/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/16/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/16/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/17/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/17/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/18/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/18/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/19/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/19/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/20/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/20/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/21/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/21/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/22/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/22/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/23/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/23/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/24/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/24/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/25/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/25/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/26/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/26/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/27/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/27/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/28/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/28/avatar.svg"></a>
-<a href="https://opencollective.com/bower/sponsor/29/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/29/avatar.svg"></a>
-
-
 ## License

-Copyright (c) 2012-present Twitter and [other contributors](https://github.com/bower/bower/graphs/contributors)
+Copyright (c) 2015 Twitter and [other contributors](https://github.com/bower/bower/graphs/contributors)

 Licensed under the MIT License
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -0,0 +1,40 @@
+# 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.11"
+
+# Allow failing jobs for bleeding-edge Node.js versions.
+matrix:
+  allow_failures:
+    - nodejs_version: "0.11"
+
+# Install scripts. (runs after repo cloning)
+install:
+  # Get the latest stable version of Node 0.STABLE.latest
+  - ps: Install-Product node $env:nodejs_version
+  # Install subversion
+  - choco install svn -y
+  # Install bower
+  - npm install
+
+# Post-install test scripts.
+test_script:
+  # Output useful info for debugging.
+  - node --version
+  - npm --version
+  - cmd: npm test
+
+# Don't actually build.
+build: off
+
+# Set build version format here instead of in the admin panel.
+version: "{build}"
--- a/bin/bower
+++ b/bin/bower
@@ -1,3 +1,142 @@
 #!/usr/bin/env node
+'use strict';

-require('../lib/bin/bower');
+process.bin = process.title = 'bower';
+
+var Q = require('q');
+var mout = require('mout');
+var Logger = require('bower-logger');
+var userHome = require('user-home');
+var bower = require('../lib');
+var pkg = require('../package.json');
+var cli = require('../lib/util/cli');
+var rootCheck = require('../lib/util/rootCheck');
+var analytics = require('../lib/util/analytics');
+
+var options;
+var renderer;
+var loglevel;
+var command;
+var commandFunc;
+var logger;
+var levels = Logger.LEVELS;
+
+options = cli.readOptions({
+    version: { type: Boolean, shorthand: 'v' },
+    help: { type: Boolean, shorthand: 'h' },
+    'allow-root': { type: Boolean }
+});
+
+// Handle print of version
+if (options.version) {
+    process.stdout.write(pkg.version + '\n');
+    process.exit();
+}
+
+// Root check
+rootCheck(options, bower.config);
+
+// Set loglevel
+if (bower.config.silent) {
+    loglevel = levels.error;
+} else if (bower.config.verbose) {
+    loglevel = -Infinity;
+    Q.longStackSupport = true;
+} else if (bower.config.quiet) {
+    loglevel = levels.warn;
+} else {
+    loglevel = levels[bower.config.loglevel] || levels.info;
+}
+
+// Get the command to execute
+while (options.argv.remain.length) {
+    command = options.argv.remain.join(' ');
+
+    // Alias lookup
+    if (bower.abbreviations[command]) {
+        command = bower.abbreviations[command].replace(/\s/g, '.');
+        break;
+    }
+
+    command = command.replace(/\s/g, '.');
+
+    // Direct lookup
+    if (mout.object.has(bower.commands, command)) {
+        break;
+    }
+
+    options.argv.remain.pop();
+}
+
+// Ask for Insights on first run.
+analytics.setup(bower.config).then(function () {
+    // Execute the command
+    commandFunc = command && mout.object.get(bower.commands, command);
+    command = command && command.replace(/\./g, ' ');
+
+    // If no command was specified, show bower help
+    // Do the same if the command is unknown
+    if (!commandFunc) {
+        logger = bower.commands.help();
+        command = 'help';
+    // If the user requested help, show the command's help
+    // Do the same if the actual command is a group of other commands (e.g.: cache)
+    } else if (options.help || !commandFunc.line) {
+        logger = bower.commands.help(command);
+        command = 'help';
+    // Call the line method
+    } else {
+        logger = commandFunc.line(process.argv);
+
+        // If the method failed to interpret the process arguments
+        // show the command help
+        if (!logger) {
+            logger = bower.commands.help(command);
+            command = 'help';
+        }
+    }
+
+    // Get the renderer and configure it with the executed command
+    renderer = cli.getRenderer(command, logger.json, bower.config);
+
+    logger
+    .on('end', function (data) {
+        if (!bower.config.silent && !bower.config.quiet) {
+            renderer.end(data);
+        }
+    })
+    .on('error', function (err)  {
+        if (levels.error >= loglevel) {
+            renderer.error(err);
+        }
+
+        process.exit(1);
+    })
+    .on('log', function (log) {
+        if (levels[log.level] >= loglevel) {
+            renderer.log(log);
+        }
+    })
+    .on('prompt', function (prompt, callback) {
+        renderer.prompt(prompt)
+        .then(function (answer) {
+            callback(answer);
+        });
+    });
+
+    // Warn if HOME is not SET
+    if (!userHome) {
+        logger.warn('no-home', 'HOME environment variable not set. User config will not be loaded.');
+    }
+
+    if (bower.config.interactive) {
+        var updateNotifier = require('update-notifier');
+
+        // Check for newer version of Bower
+        var notifier = updateNotifier({pkg: pkg});
+
+        if (notifier.update && levels.info >= loglevel) {
+            notifier.notify();
+        }
+    }
+});
--- a/lib/bin/bower.js
+++ b/lib/bin/bower.js
@@ -1,150 +0,0 @@
-process.bin = process.title = 'bower';
-
-var Q = require('q');
-var mout = require('mout');
-var Logger = require('bower-logger');
-var userHome = require('user-home');
-var bower = require('../');
-var version = require('../version');
-var cli = require('../util/cli');
-var rootCheck = require('../util/rootCheck');
-
-var options;
-var renderer;
-var loglevel;
-var command;
-var commandFunc;
-var logger;
-var levels = Logger.LEVELS;
-
-options = cli.readOptions({
-    version: { type: Boolean, shorthand: 'v' },
-    help: { type: Boolean, shorthand: 'h' },
-    'allow-root': { type: Boolean }
-});
-
-// Handle print of version
-if (options.version) {
-    process.stdout.write(version + '\n');
-    process.exit();
-}
-
-// Root check
-rootCheck(options, bower.config);
-
-// Set loglevel
-if (bower.config.silent) {
-    loglevel = levels.error;
-} else if (bower.config.verbose) {
-    loglevel = -Infinity;
-    Q.longStackSupport = true;
-} else if (bower.config.quiet) {
-    loglevel = levels.warn;
-} else {
-    loglevel = levels[bower.config.loglevel] || levels.info;
-}
-
-// Get the command to execute
-while (options.argv.remain.length) {
-    command = options.argv.remain.join(' ');
-
-    // Alias lookup
-    if (bower.abbreviations[command]) {
-        command = bower.abbreviations[command].replace(/\s/g, '.');
-        break;
-    }
-
-    command = command.replace(/\s/g, '.');
-
-    // Direct lookup
-    if (mout.object.has(bower.commands, command)) {
-        break;
-    }
-
-    options.argv.remain.pop();
-}
-
-// Execute the command
-commandFunc = command && mout.object.get(bower.commands, command);
-command = command && command.replace(/\./g, ' ');
-
-// If no command was specified, show bower help
-// Do the same if the command is unknown
-if (!commandFunc) {
-    logger = bower.commands.help();
-    command = 'help';
-    // If the user requested help, show the command's help
-    // Do the same if the actual command is a group of other commands (e.g.: cache)
-} else if (options.help || !commandFunc.line) {
-    logger = bower.commands.help(command);
-    command = 'help';
-    // Call the line method
-} else {
-    logger = commandFunc.line(process.argv);
-
-    // If the method failed to interpret the process arguments
-    // show the command help
-    if (!logger) {
-        logger = bower.commands.help(command);
-        command = 'help';
-    }
-}
-
-// Get the renderer and configure it with the executed command
-renderer = cli.getRenderer(command, logger.json, bower.config);
-
-function handleLogger(logger, renderer) {
-    logger
-        .on('end', function(data) {
-            if (!bower.config.silent && !bower.config.quiet) {
-                renderer.end(data);
-            }
-        })
-        .on('error', function(err) {
-            if (
-                command !== 'help' &&
-                (err.code === 'EREADOPTIONS' || err.code === 'EINVFORMAT')
-            ) {
-                logger = bower.commands.help(command);
-                renderer = cli.getRenderer('help', logger.json, bower.config);
-                handleLogger(logger, renderer);
-            } else {
-                if (levels.error >= loglevel) {
-                    renderer.error(err);
-                }
-
-                process.exit(1);
-            }
-        })
-        .on('log', function(log) {
-            if (levels[log.level] >= loglevel) {
-                renderer.log(log);
-            }
-        })
-        .on('prompt', function(prompt, callback) {
-            renderer.prompt(prompt).then(function(answer) {
-                callback(answer);
-            });
-        });
-}
-
-handleLogger(logger, renderer);
-
-// Warn if HOME is not SET
-if (!userHome) {
-    logger.warn(
-        'no-home',
-        'HOME environment variable not set. User config will not be loaded.'
-    );
-}
-
-if (bower.config.interactive) {
-    var updateNotifier = require('update-notifier');
-
-    // Check for newer version of Bower
-    var notifier = updateNotifier({ pkg: { name: 'bower', version: version } });
-
-    if (notifier.update && levels.info >= loglevel) {
-        notifier.notify();
-    }
-}
--- a/lib/commands/cache/clean.js
+++ b/lib/commands/cache/clean.js
@@ -1,8 +1,8 @@
-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');
@@ -22,10 +22,10 @@ function clean(logger, endpoints, options, config) {

    // Generate decomposed endpoints and names based on the endpoints
    if (endpoints) {
-        decEndpoints = endpoints.map(function(endpoint) {
+        decEndpoints = endpoints.map(function (endpoint) {
            return endpointParser.decompose(endpoint);
        });
-        names = decEndpoints.map(function(decEndpoint) {
+        names = decEndpoints.map(function (decEndpoint) {
            return decEndpoint.name || decEndpoint.source;
        });
    }
@@ -33,26 +33,27 @@ function clean(logger, endpoints, options, config) {
    return Q.all([
        clearPackages(decEndpoints, config, logger),
        clearLinks(names, config, logger)
-    ]).spread(function(entries) {
+    ])
+    .spread(function (entries) {
        return entries;
    });
 }

 function clearPackages(decEndpoints, config, logger) {
-    var repository = new PackageRepository(config, logger);
+    var repository =  new PackageRepository(config, logger);

-    return repository.list().then(function(entries) {
+    return repository.list()
+    .then(function (entries) {
        var promises;

        // Filter entries according to the specified packages
        if (decEndpoints) {
-            entries = entries.filter(function(entry) {
-                return !!mout.array.find(decEndpoints, function(decEndpoint) {
+            entries = entries.filter(function (entry) {
+                return !!mout.array.find(decEndpoints, function (decEndpoint) {
                    var entryPkgMeta = entry.pkgMeta;

                    // Check if name or source match the entry
-                    if (
-                        decEndpoint.name !== entryPkgMeta.name &&
+                    if  (decEndpoint.name !== entryPkgMeta.name &&
                        decEndpoint.source !== entryPkgMeta.name &&
                        decEndpoint.source !== entryPkgMeta._source
                    ) {
@@ -66,47 +67,36 @@ function clearPackages(decEndpoints, config, logger) {

                    // If it's a semver target, compare using semver spec
                    if (semver.validRange(decEndpoint.target)) {
-                        return semver.satisfies(
-                            entryPkgMeta.version,
-                            decEndpoint.target
-                        );
+                        return semver.satisfies(entryPkgMeta.version, decEndpoint.target);
                    }

                    // Otherwise, compare against target/release
-                    return (
-                        decEndpoint.target === entryPkgMeta._target ||
-                        decEndpoint.target === entryPkgMeta._release
-                    );
+                    return decEndpoint.target === entryPkgMeta._target ||
+                           decEndpoint.target === entryPkgMeta._release;
                });
            });
        }

-        promises = entries.map(function(entry) {
-            return repository.eliminate(entry.pkgMeta).then(function() {
-                logger.info(
-                    'deleted',
-                    'Cached package ' +
-                        entry.pkgMeta.name +
-                        ': ' +
-                        entry.canonicalDir,
-                    {
-                        file: entry.canonicalDir
-                    }
-                );
+        promises = entries.map(function (entry) {
+            return repository.eliminate(entry.pkgMeta)
+            .then(function () {
+                logger.info('deleted', 'Cached package ' + entry.pkgMeta.name + ': ' + entry.canonicalDir, {
+                    file: entry.canonicalDir
+                });
            });
        });

        return Q.all(promises)
-            .then(function() {
-                if (!decEndpoints) {
-                    // Ensure that everything is cleaned,
-                    // even invalid packages in the cache
-                    return repository.clear();
-                }
-            })
-            .then(function() {
-                return entries;
-            });
+        .then(function () {
+            if (!decEndpoints) {
+                // Ensure that everything is cleaned,
+                // even invalid packages in the cache
+                return repository.clear();
+            }
+        })
+        .then(function () {
+            return entries;
+        });
    });
 }

@@ -116,59 +106,59 @@ function clearLinks(names, config, logger) {

    // If no names are passed, grab all links
    if (!names) {
-        promise = Q.nfcall(fs.readdir, dir).fail(function(err) {
+        promise = Q.nfcall(fs.readdir, dir)
+        .fail(function (err) {
            if (err.code === 'ENOENT') {
                return [];
            }

            throw err;
        });
-        // Otherwise use passed ones
+    // Otherwise use passed ones
    } else {
        promise = Q.resolve(names);
    }

-    return promise.then(function(names) {
+    return promise
+    .then(function (names) {
        var promises;
        var linksToRemove = [];

        // Decide which links to delete
-        promises = names.map(function(name) {
+        promises = names.map(function (name) {
            var link = path.join(config.storage.links, name);

-            return Q.nfcall(fs.readlink, link).then(
-                function(linkTarget) {
-                    // Link exists, check if it points to a folder
-                    // that still exists
-                    return (
-                        Q.nfcall(fs.stat, linkTarget)
-                            .then(function(stat) {
-                                // Target is not a folder..
-                                if (!stat.isDirectory()) {
-                                    linksToRemove.push(link);
-                                }
-                            })
-                            // Error occurred reading the link
-                            .fail(function() {
-                                linksToRemove.push(link);
-                            })
-                    );
-                    // Ignore if link does not exist
-                },
-                function(err) {
-                    if (err.code !== 'ENOENT') {
+            return Q.nfcall(fs.readlink, link)
+            .then(function (linkTarget) {
+                // Link exists, check if it points to a folder
+                // that still exists
+                return Q.nfcall(fs.stat, linkTarget)
+                .then(function (stat) {
+                    // Target is not a folder..
+                    if (!stat.isDirectory()) {
                        linksToRemove.push(link);
                    }
+                })
+                // Error occurred reading the link
+                .fail(function () {
+                    linksToRemove.push(link);
+                });
+            // Ignore if link does not exist
+            }, function (err) {
+                if (err.code !== 'ENOENT') {
+                    linksToRemove.push(link);
                }
-            );
+            });
        });

-        return Q.all(promises).then(function() {
+        return Q.all(promises)
+        .then(function () {
            var promises;

            // Remove each link that was declared as invalid
-            promises = linksToRemove.map(function(link) {
-                return Q.nfcall(rimraf, link).then(function() {
+            promises = linksToRemove.map(function (link) {
+                return Q.nfcall(rimraf, link)
+                .then(function () {
                    logger.info('deleted', 'Invalid link: ' + link, {
                        file: link
                    });
@@ -182,7 +172,7 @@ function clearLinks(names, config, logger) {

 // -------------------

-clean.readOptions = function(argv) {
+clean.readOptions = function (argv) {
    var cli = require('../../util/cli');
    var options = cli.readOptions(argv);
    var endpoints = options.argv.remain.slice(2);
--- a/lib/commands/cache/list.js
+++ b/lib/commands/cache/list.js
@@ -13,11 +13,12 @@ function list(logger, packages, options, config) {
        packages = null;
    }

-    return repository.list().then(function(entries) {
+    return repository.list()
+    .then(function (entries) {
        if (packages) {
            // Filter entries according to the specified packages
-            entries = entries.filter(function(entry) {
-                return !!mout.array.find(packages, function(pkg) {
+            entries = entries.filter(function (entry) {
+                return !!mout.array.find(packages, function (pkg) {
                    return pkg === entry.pkgMeta.name;
                });
            });
@@ -29,7 +30,7 @@ function list(logger, packages, options, config) {

 // -------------------

-list.readOptions = function(argv) {
+list.readOptions = function (argv) {
    var cli = require('../../util/cli');
    var options = cli.readOptions(argv);
    var packages = options.argv.remain.slice(2);
--- a/lib/commands/help.js
+++ b/lib/commands/help.js
@@ -1,23 +1,21 @@
 var Q = require('q');
 var path = require('path');
-var fs = require('../util/fs');
+var fs = require('graceful-fs');
 var createError = require('../util/createError');

 function help(logger, name, config) {
    var json;

    if (name) {
-        json = path.resolve(
-            __dirname,
-            '../templates/json/help-' + name.replace(/\s+/g, '/') + '.json'
-        );
+        json = path.resolve(__dirname, '../../templates/json/help-' + name.replace(/\s+/g, '/') + '.json');
    } else {
-        json = path.resolve(__dirname, '../templates/json/help.json');
+        json = path.resolve(__dirname, '../../templates/json/help.json');
    }

-    return Q.promise(function(resolve) {
+    return Q.promise(function (resolve) {
        fs.exists(json, resolve);
-    }).then(function(exists) {
+    })
+    .then(function (exists) {
        if (!exists) {
            throw createError('Unknown command: ' + name, 'EUNKNOWNCMD', {
                command: name
@@ -30,7 +28,7 @@ function help(logger, name, config) {

 // -------------------

-help.readOptions = function(argv) {
+help.readOptions = function (argv) {
    var cli = require('../util/cli');
    var options = cli.readOptions(argv);
    var name = options.argv.remain.slice(1).join(' ');
--- a/lib/commands/home.js
+++ b/lib/commands/home.js
@@ -16,7 +16,8 @@ function home(logger, name, config) {
    // If no name is specified, read the project json
    // If a name is specified, fetch from the package repository
    if (!name) {
-        promise = project.hasJson().then(function(json) {
+        promise = project.hasJson()
+        .then(function (json) {
            if (!json) {
                throw createError('You are not inside a package', 'ENOENT');
            }
@@ -25,30 +26,28 @@ function home(logger, name, config) {
        });
    } else {
        decEndpoint = endpointParser.decompose(name);
-        promise = project
-            .getPackageRepository()
-            .fetch(decEndpoint)
-            .spread(function(canonicalDir, pkgMeta) {
-                return pkgMeta;
-            });
+        promise = project.getPackageRepository().fetch(decEndpoint)
+        .spread(function (canonicalDir, pkgMeta) {
+            return pkgMeta;
+        });
    }

    // Get homepage and open it
-    return promise.then(function(pkgMeta) {
+    return promise.then(function (pkgMeta) {
        var homepage = pkgMeta.homepage;

        if (!homepage) {
            throw createError('No homepage set for ' + pkgMeta.name, 'ENOHOME');
        }

-        open(homepage, { wait: false });
+        open(homepage);
        return homepage;
    });
 }

 // -------------------

-home.readOptions = function(argv) {
+home.readOptions = function (argv) {
    var cli = require('../util/cli');
    var options = cli.readOptions(argv);
    var name = options.argv.remain[1];
--- a/lib/commands/index.js
+++ b/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.
@@ -10,24 +9,24 @@ var config = require('../config');
 * return as soon as possible and load and execute the command asynchronously.
 */
 function commandFactory(id) {
-    function runApi() {
-        var command = require(id);
+    if (process.env.STRICT_REQUIRE) {
+        require(id);
+    }
+
+    function command() {
        var commandArgs = [].slice.call(arguments);

-        return withLogger(function(logger) {
+        return withLogger(function (logger) {
            commandArgs.unshift(logger);
-
-            return command.apply(undefined, commandArgs);
+            return require(id).apply(undefined, commandArgs);
        });
    }

    function runFromArgv(argv) {
-        var commandArgs;
-        var command = require(id);
+        return withLogger(function (logger) {
+            var command = require(id);

-        commandArgs = command.readOptions(argv);
-
-        return withLogger(function(logger) {
+            var commandArgs = command.readOptions(argv);
            commandArgs.unshift(logger);

            return command.apply(undefined, commandArgs);
@@ -37,31 +36,28 @@ function commandFactory(id) {
    function withLogger(func) {
        var logger = new Logger();

-        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);
-            }
-        );
+        Q.try(func, logger)
+        .done(function () {
+            var args = [].slice.call(arguments);
+            args.unshift('end');
+            logger.emit.apply(logger, args);
+        }, function (error) {
+            logger.emit('error', error);
+        });

        return logger;
    }

-    runApi.line = runFromArgv;
+    command.line = runFromArgv;

-    return runApi;
+    return command;
 }

+
 module.exports = {
    cache: {
        clean: commandFactory('./cache/clean'),
-        list: commandFactory('./cache/list')
+        list: commandFactory('./cache/list'),
    },
    help: commandFactory('./help'),
    home: commandFactory('./home'),
--- a/lib/commands/info.js
+++ b/lib/commands/info.js
@@ -2,6 +2,7 @@ var mout = require('mout');
 var Q = require('q');
 var endpointParser = require('bower-endpoint-parser');
 var PackageRepository = require('../core/PackageRepository');
+var Tracker = require('../util/analytics').Tracker;
 var defaultConfig = require('../config');

 function info(logger, endpoint, property, config) {
@@ -9,27 +10,22 @@ function info(logger, endpoint, property, config) {
        return;
    }

-    // handle @ as version divider
-    var splitParts = endpoint.split('/');
-    splitParts[splitParts.length - 1] = splitParts[
-        splitParts.length - 1
-    ].replace('@', '#');
-    endpoint = splitParts.join('/');
-
    var repository;
    var decEndpoint;
+    var tracker;

    config = defaultConfig(config);
    repository = new PackageRepository(config, logger);
+    tracker = new Tracker(config);

    decEndpoint = endpointParser.decompose(endpoint);
+    tracker.trackDecomposedEndpoints('info', [decEndpoint]);

    return Q.all([
        getPkgMeta(repository, decEndpoint, property),
-        decEndpoint.target === '*' && !property
-            ? repository.versions(decEndpoint.source)
-            : null
-    ]).spread(function(pkgMeta, versions) {
+        decEndpoint.target === '*' && !property ? repository.versions(decEndpoint.source) : null
+    ])
+    .spread(function (pkgMeta, versions) {
        if (versions) {
            return {
                name: decEndpoint.source,
@@ -43,25 +39,24 @@ function info(logger, endpoint, property, config) {
 }

 function getPkgMeta(repository, decEndpoint, property) {
-    return repository
-        .fetch(decEndpoint)
-        .spread(function(canonicalDir, pkgMeta) {
-            pkgMeta = mout.object.filter(pkgMeta, function(value, key) {
-                return key.charAt(0) !== '_';
-            });
-
-            // Retrieve specific property
-            if (property) {
-                pkgMeta = mout.object.get(pkgMeta, property);
-            }
-
-            return pkgMeta;
+    return repository.fetch(decEndpoint)
+    .spread(function (canonicalDir, pkgMeta) {
+        pkgMeta = mout.object.filter(pkgMeta, function (value, key) {
+            return key.charAt(0) !== '_';
        });
+
+        // Retrieve specific property
+        if (property) {
+            pkgMeta = mout.object.get(pkgMeta, property);
+        }
+
+        return pkgMeta;
+    });
 }

 // -------------------

-info.readOptions = function(argv) {
+info.readOptions = function (argv) {
    var cli = require('../util/cli');
    var options = cli.readOptions(argv);
    var pkg = options.argv.remain[1];
--- a/lib/commands/init.js
+++ b/lib/commands/init.js
@@ -1,11 +1,12 @@
 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 GitFsResolver = require('../core/resolvers/GitFsResolver');
 var cmd = require('../util/cmd');
 var createError = require('../util/createError');

@@ -23,38 +24,31 @@ function init(logger, 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'
+            details: 'Note that you can manually force an interactive shell with --config.interactive'
        });
    }

    project = new Project(config, logger);

    // Start with existing JSON details
-    return (
-        readJson(project, logger)
-            // Fill in defaults
-            .then(setDefaults.bind(null, config))
-            // Now prompt user to make changes
-            .then(promptUser.bind(null, logger))
-            // Set ignore based on the response
-            .spread(setIgnore.bind(null, config))
-            // Set dependencies based on the response
-            .spread(setDependencies.bind(null, project))
-            // All done!
-            .spread(saveJson.bind(null, project, logger))
-    );
+    return readJson(project, logger)
+    // Fill in defaults
+    .then(setDefaults.bind(null, config))
+    // Now prompt user to make changes
+    .then(promptUser.bind(null, logger))
+    // Set ignore based on the response
+    .spread(setIgnore.bind(null, config))
+    // Set dependencies based on the response
+    .spread(setDependencies.bind(null, project))
+    // All done!
+    .spread(saveJson.bind(null, project, logger));
 }

 function readJson(project, logger) {
-    return project.hasJson().then(function(json) {
+    return project.hasJson()
+    .then(function (json) {
        if (json) {
-            logger.warn(
-                'existing',
-                'The existing ' +
-                    path.basename(json) +
-                    ' file will be used and filled in'
-            );
+            logger.warn('existing', 'The existing ' + path.basename(json) + ' file will be used and filled in');
        }

        return project.getJson();
@@ -63,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) {
+    mout.object.forOwn(json, function (value, key) {
        if (!validConfigValue(value)) {
            delete json[key];
        }
@@ -76,7 +70,8 @@ function saveJson(project, logger, json) {
        type: 'confirm',
        message: 'Looks good?',
        default: true
-    }).then(function(good) {
+    })
+    .then(function (good) {
        if (!good) {
            return null;
        }
@@ -90,9 +85,9 @@ function saveJson(project, logger, json) {
 // [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.isObject(val)  ||
+        mout.lang.isArray(val)   ||
+        mout.lang.isString(val)  ||
        mout.lang.isBoolean(val) ||
        mout.lang.isNumber(val)
    );
@@ -107,6 +102,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
@@ -122,70 +130,52 @@ function setDefaults(config, json) {
    // Homepage
    if (!json.homepage) {
        // Set as GitHub homepage if it's a GitHub repository
-        promise = promise.then(function() {
+        promise = promise.then(function () {
            return cmd('git', ['config', '--get', 'remote.origin.url'])
-                .spread(function(stdout) {
-                    var pair;
+            .spread(function (stdout) {
+                var pair;

-                    stdout = stdout.trim();
-                    if (!stdout) {
-                        return;
-                    }
+                stdout = stdout.trim();
+                if (!stdout) {
+                    return;
+                }

-                    pair = GitHubResolver.getOrgRepoPair(stdout);
-                    if (pair) {
-                        json.homepage =
-                            'https://github.com/' + pair.org + '/' + pair.repo;
-                    }
-                })
-                .fail(function() {});
+                pair = GitHubResolver.getOrgRepoPair(stdout);
+                if (pair) {
+                    json.homepage = 'https://github.com/' + pair.org + '/' + pair.repo;
+                }
+            })
+            .fail(function () { });
        });
    }

    if (!json.authors) {
-        promise = promise.then(function() {
+        promise = promise.then(function () {
            // Get the user name configured in git
-            return cmd('git', [
-                'config',
-                '--get',
-                '--global',
-                'user.name'
-            ]).spread(
-                function(stdout) {
-                    var gitEmail;
-                    var gitName = stdout.trim();
+            return cmd('git', ['config', '--get', '--global', 'user.name'])
+            .spread(function (stdout) {
+                var gitEmail;
+                var gitName = stdout.trim();

-                    // Abort if no name specified
-                    if (!gitName) {
-                        return;
-                    }
+                // Abort if no name specified
+                if (!gitName) {
+                    return;
+                }

-                    // Get the user email configured in git
-                    return cmd('git', [
-                        'config',
-                        '--get',
-                        '--global',
-                        'user.email'
-                    ])
-                        .spread(
-                            function(stdout) {
-                                gitEmail = stdout.trim();
-                            },
-                            function() {}
-                        )
-                        .then(function() {
-                            json.authors = gitName;
-                            json.authors += gitEmail
-                                ? ' <' + gitEmail + '>'
-                                : '';
-                        });
-                },
-                function() {}
-            );
+                // Get the user email configured in git
+                return cmd('git', ['config', '--get', '--global', 'user.email'])
+                .spread(function (stdout) {
+                    gitEmail = stdout.trim();
+                }, function () {})
+                .then(function () {
+                    json.authors = gitName;
+                    json.authors += gitEmail ? ' <' + gitEmail + '>' : '';
+                });
+            }, function () {});
        });
    }

-    return promise.then(function() {
+    return promise.then(function () {
        return json;
    });
 }
@@ -193,76 +183,86 @@ function setDefaults(config, json) {
 function promptUser(logger, json) {
    var questions = [
        {
-            name: 'name',
-            message: 'name',
-            default: json.name,
-            type: 'input'
+            'name': 'name',
+            'message': 'name',
+            'default': json.name,
+            'type': 'input'
        },
        {
-            name: 'description',
-            message: 'description',
-            default: json.description,
-            type: 'input'
+            'name': 'version',
+            'message': 'version',
+            'default': json.version,
+            'type': 'input'
        },
        {
-            name: 'main',
-            message: 'main file',
-            default: json.main,
-            type: 'input'
+            'name': 'description',
+            'message': 'description',
+            'default': json.description,
+            'type': 'input'
        },
        {
-            name: 'keywords',
-            message: 'keywords',
-            default: json.keywords ? json.keywords.toString() : null,
-            type: 'input'
+            'name': 'main',
+            'message': 'main file',
+            'default': json.main,
+            'type': 'input'
        },
        {
-            name: 'authors',
-            message: 'authors',
-            default: json.authors ? json.authors.toString() : null,
-            type: 'input'
+            'name': 'moduleType',
+            'message': 'what types of modules does this package expose?',
+            'type': 'checkbox',
+            'choices': ['amd', 'es6', 'globals', 'node', 'yui']
        },
        {
-            name: 'license',
-            message: 'license',
-            default: json.license || 'MIT',
-            type: 'input'
+            'name': 'keywords',
+            'message': 'keywords',
+            'default': json.keywords ? json.keywords.toString() : null,
+            'type': 'input'
        },
        {
-            name: 'homepage',
-            message: 'homepage',
-            default: json.homepage,
-            type: 'input'
+            'name': 'authors',
+            'message': 'authors',
+            'default': json.authors ? json.authors.toString() : null,
+            'type': 'input'
        },
        {
-            name: 'dependencies',
-            message: 'set currently installed components as dependencies?',
-            default:
-                !mout.object.size(json.dependencies) &&
-                !mout.object.size(json.devDependencies),
-            type: 'confirm'
+            'name': 'license',
+            'message': 'license',
+            'default': json.license || 'MIT',
+            'type': 'input'
        },
        {
-            name: 'ignore',
-            message: 'add commonly ignored files to ignore list?',
-            default: true,
-            type: 'confirm'
+            'name': 'homepage',
+            'message': 'homepage',
+            'default': json.homepage,
+            'type': 'input'
        },
        {
-            name: 'private',
-            message:
-                'would you like to mark this package as private which prevents it from being accidentally published to the registry?',
-            default: !!json.private,
-            type: 'confirm'
+            'name': 'dependencies',
+            'message': 'set currently installed components as dependencies?',
+            'default': !mout.object.size(json.dependencies) && !mout.object.size(json.devDependencies),
+            'type': 'confirm'
+        },
+        {
+            'name': 'ignore',
+            'message': 'add commonly ignored files to ignore list?',
+            'default': true,
+            'type': 'confirm'
+        },
+        {
+            'name': 'private',
+            'message': 'would you like to mark this package as private which prevents it from being accidentally published to the registry?',
+            'default': !!json.private,
+            'type': 'confirm'
        }
    ];

-    return Q.nfcall(logger.prompt.bind(logger), questions).then(function(
-        answers
-    ) {
+    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;
        json.keywords = toArray(answers.keywords);
        json.authors = toArray(answers.authors, ',');
        json.license = answers.license;
@@ -277,12 +277,12 @@ function toArray(value, splitter) {
    var arr = value.split(splitter || /[\s,]/);

    // Trim values
-    arr = arr.map(function(item) {
+    arr = arr.map(function (item) {
        return item.trim();
    });

    // Filter empty values
-    arr = arr.filter(function(item) {
+    arr = arr.filter(function (item) {
        return !!item;
    });

@@ -306,12 +306,13 @@ function setIgnore(config, json, answers) {

 function setDependencies(project, json, answers) {
    if (answers.dependencies) {
-        return project.getTree().spread(function(tree, flattened, extraneous) {
+        return project.getTree()
+        .spread(function (tree, flattened, extraneous) {
            if (extraneous.length) {
                json.dependencies = {};

                // Add extraneous as dependencies
-                extraneous.forEach(function(extra) {
+                extraneous.forEach(function (extra) {
                    var jsonEndpoint;

                    // Skip linked packages
@@ -319,9 +320,7 @@ function setDependencies(project, json, answers) {
                        return;
                    }

-                    jsonEndpoint = endpointParser.decomposed2json(
-                        extra.endpoint
-                    );
+                    jsonEndpoint = endpointParser.decomposed2json(extra.endpoint);
                    mout.object.mixIn(json.dependencies, jsonEndpoint);
                });
            }
@@ -335,7 +334,7 @@ function setDependencies(project, json, answers) {

 // -------------------

-init.readOptions = function(argv) {
+init.readOptions = function (argv) {
    return [];
 };

--- a/lib/commands/install.js
+++ b/lib/commands/install.js
@@ -1,10 +1,12 @@
 var endpointParser = require('bower-endpoint-parser');
 var Project = require('../core/Project');
+var Tracker = require('../util/analytics').Tracker;
 var defaultConfig = require('../config');

 function install(logger, endpoints, options, config) {
    var project;
    var decEndpoints;
+    var tracker;

    options = options || {};
    config = defaultConfig(config);
@@ -12,38 +14,30 @@ function install(logger, endpoints, options, config) {
        options.save = config.defaultSave;
    }
    project = new Project(config, logger);
+    tracker = new Tracker(config);

    // Convert endpoints to decomposed endpoints
    endpoints = endpoints || [];
-    decEndpoints = endpoints.map(function(endpoint) {
-        // handle @ as version divider
-        var splitParts = endpoint.split('/');
-        splitParts[splitParts.length - 1] = splitParts[
-            splitParts.length - 1
-        ].replace('@', '#');
-        endpoint = splitParts.join('/');
-
+    decEndpoints = endpoints.map(function (endpoint) {
        return endpointParser.decompose(endpoint);
    });
+    tracker.trackDecomposedEndpoints('install', decEndpoints);

    return project.install(decEndpoints, options, config);
 }

 // -------------------

-install.readOptions = function(argv) {
+install.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' },
-            'save-exact': { type: Boolean, shorthand: 'E' }
-        },
-        argv
-    );
+    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' },
+        'save-exact': { type: Boolean, shorthand: 'E' }
+    }, argv);

    var packages = options.argv.remain.slice(1);

--- a/lib/commands/link.js
+++ b/lib/commands/link.js
@@ -1,10 +1,9 @@
 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 defaultConfig = require('../config');
-var relativeToBaseDir = require('../util/relativeToBaseDir');

 function link(logger, name, localName, config) {
    if (name) {
@@ -20,24 +19,23 @@ function linkSelf(logger, config) {
    config = defaultConfig(config);
    project = new Project(config, logger);

-    return project.getJson().then(function(json) {
+    return project.getJson()
+    .then(function (json) {
        var src = config.cwd;
        var dst = path.join(config.storage.links, json.name);

        // Delete previous link if any
-        return (
-            Q.nfcall(rimraf, dst)
-                // Link globally
-                .then(function() {
-                    return createLink(src, dst);
-                })
-                .then(function() {
-                    return {
-                        src: src,
-                        dst: dst
-                    };
-                })
-        );
+        return Q.nfcall(rimraf, dst)
+        // Link globally
+        .then(function () {
+            return createLink(src, dst);
+        })
+        .then(function () {
+            return {
+                src: src,
+                dst: dst
+            };
+        });
    });
 }

@@ -51,32 +49,30 @@ function linkTo(logger, name, localName, config) {

    localName = localName || name;
    src = path.join(config.storage.links, name);
-    dst = path.join(relativeToBaseDir(config.cwd)(config.directory), localName);
+    dst = path.join(config.cwd, config.directory, localName);

    // Delete destination folder if any
-    return (
-        Q.nfcall(rimraf, dst)
-            // Link locally
-            .then(function() {
-                return createLink(src, dst);
-            })
-            // Install linked package deps
-            .then(function() {
-                return project.update([localName]);
-            })
-            .then(function(installed) {
-                return {
-                    src: src,
-                    dst: dst,
-                    installed: installed
-                };
-            })
-    );
+    return Q.nfcall(rimraf, dst)
+    // Link locally
+    .then(function () {
+        return createLink(src, dst);
+    })
+    // Install linked package deps
+    .then(function () {
+        return project.update([localName]);
+    })
+    .then(function (installed) {
+        return {
+            src: src,
+            dst: dst,
+            installed: installed
+        };
+    });
 }

 // -------------------

-link.readOptions = function(argv) {
+link.readOptions = function (argv) {
    var cli = require('../util/cli');
    var options = cli.readOptions(argv);
    var name = options.argv.remain[1];
--- a/lib/commands/list.js
+++ b/lib/commands/list.js
@@ -11,48 +11,39 @@ function list(logger, options, config) {
    options = options || {};

    // Make relative option true by default when used with paths
-    if (options.paths && options.relative == null) {
+    if (options.paths && options.relative == null)  {
        options.relative = true;
    }

    config = defaultConfig(config);
    project = new Project(config, logger);

-    return project.getTree(options).spread(function(tree, flattened) {
+    return project.getTree(options)
+    .spread(function (tree, flattened) {
        // Relativize paths
        // Also normalize paths on windows
-        project.walkTree(
-            tree,
-            function(node) {
-                if (node.missing) {
-                    return;
-                }
-
-                if (options.relative) {
-                    node.canonicalDir = path.relative(
-                        config.cwd,
-                        node.canonicalDir
-                    );
-                }
-                if (options.paths) {
-                    node.canonicalDir = normalize(node.canonicalDir);
-                }
-            },
-            true
-        );
-
-        // Note that we need to to parse the flattened tree because it might
-        // contain additional packages
-        mout.object.forOwn(flattened, function(node) {
+        project.walkTree(tree, function (node) {
            if (node.missing) {
                return;
            }

            if (options.relative) {
-                node.canonicalDir = path.relative(
-                    config.cwd,
-                    node.canonicalDir
-                );
+                node.canonicalDir = path.relative(config.cwd, node.canonicalDir);
+            }
+            if (options.paths) {
+                node.canonicalDir = normalize(node.canonicalDir);
+            }
+        }, true);
+
+        // Note that we need to to parse the flattened tree because it might
+        // contain additional packages
+        mout.object.forOwn(flattened, function (node) {
+            if (node.missing) {
+                return;
+            }
+
+            if (options.relative) {
+                node.canonicalDir = path.relative(config.cwd, node.canonicalDir);
            }
            if (options.paths) {
                node.canonicalDir = normalize(node.canonicalDir);
@@ -70,7 +61,8 @@ function list(logger, options, config) {
        }

        // Check for new versions
-        return checkVersions(project, tree, logger).then(function() {
+        return checkVersions(project, tree, logger)
+        .then(function () {
            return tree;
        });
    });
@@ -82,40 +74,32 @@ function checkVersions(project, tree, logger) {
    var repository = project.getPackageRepository();

    // Gather all nodes, ignoring linked nodes
-    project.walkTree(
-        tree,
-        function(node) {
-            if (!node.linked) {
-                nodes.push(node);
-            }
-        },
-        true
-    );
+    project.walkTree(tree, function (node) {
+        if (!node.linked) {
+            nodes.push(node);
+        }
+    }, 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
-    promises = nodes.map(function(node) {
+    promises = nodes.map(function (node) {
        var target = node.endpoint.target;

-        return repository
-            .versions(node.endpoint.source)
-            .then(function(versions) {
-                node.versions = versions;
+        return repository.versions(node.endpoint.source)
+        .then(function (versions) {
+            node.versions = versions;

-                // Do not check if node's target is not a valid semver one
-                if (versions.length && semver.validRange(target)) {
-                    node.update = {
-                        target: semver.maxSatisfying(versions, target),
-                        latest: semver.maxSatisfying(versions, '*')
-                    };
-                }
-            });
+            // Do not check if node's target is not a valid semver one
+            if (versions.length && semver.validRange(target)) {
+                node.update = {
+                    target: semver.maxSatisfying(versions, target),
+                    latest: semver.maxSatisfying(versions, '*')
+                };
+            }
+        });
    });

    // Set the versions also for the root node
@@ -127,7 +111,7 @@ function checkVersions(project, tree, logger) {
 function paths(flattened) {
    var ret = {};

-    mout.object.forOwn(flattened, function(pkg, name) {
+    mout.object.forOwn(flattened, function (pkg, name) {
        var main;

        if (pkg.missing) {
@@ -148,7 +132,7 @@ function paths(flattened) {
        }

        // Concatenate each main entry with the canonical dir
-        main = main.map(function(part) {
+        main = main.map(function (part) {
            return normalize(path.join(pkg.canonicalDir, part).trim());
        });

@@ -166,16 +150,13 @@ function normalize(src) {

 // -------------------

-list.readOptions = function(argv) {
+list.readOptions = function (argv) {
    var cli = require('../util/cli');

-    var options = cli.readOptions(
-        {
-            paths: { type: Boolean, shorthand: 'p' },
-            relative: { type: Boolean, shorthand: 'r' }
-        },
-        argv
-    );
+    var options = cli.readOptions({
+        'paths': { type: Boolean, shorthand: 'p' },
+        'relative': { type: Boolean, shorthand: 'r' }
+    }, argv);

    delete options.argv;

--- a/lib/commands/login.js
+++ b/lib/commands/login.js
@@ -19,28 +19,24 @@ function login(logger, options, config) {
    } 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'
-                })
-            );
+            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': 'username',
+                'message': 'Username',
+                'type': 'input',
+                'default': configstore.get('username')
            },
            {
-                name: 'password',
-                message: 'Password',
-                type: 'password'
+                'name': 'password',
+                'message': 'Password',
+                'type': 'password'
            }
        ];

@@ -48,9 +44,8 @@ function login(logger, options, config) {
            version: '3.0.0'
        });

-        promise = Q.nfcall(logger.prompt.bind(logger), questions).then(function(
-            answers
-        ) {
+        promise = Q.nfcall(logger.prompt.bind(logger), questions)
+        .then(function (answers) {
            configstore.set('username', answers.username);

            github.authenticate({
@@ -61,91 +56,64 @@ function login(logger, options, config) {

            return Q.ninvoke(github.authorization, 'create', {
                scopes: ['user', 'repo'],
-                note:
-                    'Bower command line client (' +
-                    new Date().toISOString() +
-                    ')'
+                note: 'Bower command line client (' + (new Date()).toISOString() + ')'
            });
        });
    }

-    return promise.then(
-        function(result) {
-            configstore.set('accessToken', result.token);
-            logger.info(
-                'EAUTH',
-                'Logged in as ' + configstore.get('username'),
-                {}
-            );
+    return promise.then(function (result) {
+        configstore.set('accessToken', result.token);

-            return result;
-        },
-        function(error) {
-            var message;
+        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);
-                            logger.info(
-                                'EAUTH',
-                                'Logged in as ' + configstore.get('username'),
-                                {}
-                            );
-
-                            return result;
-                        },
-                        function() {
-                            logger.emit('error', createError(message, 'EAUTH'));
-                        }
-                    );
-            } else {
-                logger.emit('error', createError(message, 'EAUTH'));
-            }
+        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) {
+login.readOptions = function (argv) {
    var cli = require('../util/cli');

-    var options = cli.readOptions(
-        {
-            token: { type: String, shorthand: 't' }
-        },
-        argv
-    );
+    var options = cli.readOptions({
+        token: { type: String, shorthand: 't' },
+    }, argv);

    delete options.argv;

--- a/lib/commands/lookup.js
+++ b/lib/commands/lookup.js
@@ -1,5 +1,5 @@
 var Q = require('q');
-var PackageRepository = require('../core/PackageRepository');
+var RegistryClient = require('bower-registry-client');
 var defaultConfig = require('../config');

 function lookup(logger, name, config) {
@@ -7,26 +7,27 @@ function lookup(logger, name, config) {
        return new Q(null);
    }

+    var registryClient;
+
    config = defaultConfig(config);
+    config.cache = config.storage.registry;

-    var repository = new PackageRepository(config, logger);
-    var registryClient = repository.getRegistryClient();
+    registryClient = new RegistryClient(config, logger);

-    return Q.nfcall(registryClient.lookup.bind(registryClient), name).then(
-        function(entry) {
-            return !entry
-                ? null
-                : {
-                    name: name,
-                    url: entry.url
-                };
-        }
-    );
+    return Q.nfcall(registryClient.lookup.bind(registryClient), name)
+    .then(function (entry) {
+        // TODO: Handle entry.type.. for now it's only 'alias'
+        //       When we got published packages, this needs to be adjusted
+        return !entry ? null : {
+            name: name,
+            url: entry && entry.url
+        };
+    });
 }

 // -------------------

-lookup.readOptions = function(argv) {
+lookup.readOptions = function (argv) {
    var cli = require('../util/cli');
    var options = cli.readOptions(argv);
    var name = options.argv.remain[1];
--- a/lib/commands/prune.js
+++ b/lib/commands/prune.js
@@ -17,40 +17,35 @@ function clean(project, options, removed) {

    // Continually call clean until there is no more extraneous
    // dependencies to remove
-    return project
-        .getTree(options)
-        .spread(function(tree, flattened, extraneous) {
-            var names = extraneous.map(function(extra) {
-                return extra.endpoint.name;
-            });
-
-            // Uninstall extraneous
-            return project
-                .uninstall(names, options)
-                .then(function(uninstalled) {
-                    // Are we done?
-                    if (!mout.object.size(uninstalled)) {
-                        return removed;
-                    }
-
-                    // Not yet, recurse!
-                    mout.object.mixIn(removed, uninstalled);
-                    return clean(project, options, removed);
-                });
+    return project.getTree(options)
+    .spread(function (tree, flattened, extraneous) {
+        var names = extraneous.map(function (extra) {
+            return extra.endpoint.name;
        });
+
+        // Uninstall extraneous
+        return project.uninstall(names, options)
+        .then(function (uninstalled) {
+            // Are we done?
+            if (!mout.object.size(uninstalled)) {
+                return removed;
+            }
+
+            // Not yet, recurse!
+            mout.object.mixIn(removed, uninstalled);
+            return clean(project, options, removed);
+        });
+    });
 }

 // -------------------

-prune.readOptions = function(argv) {
+prune.readOptions = function (argv) {
    var cli = require('../util/cli');

-    var options = cli.readOptions(
-        {
-            production: { type: Boolean, shorthand: 'p' }
-        },
-        argv
-    );
+    var options = cli.readOptions({
+        'production': { type: Boolean, shorthand: 'p' },
+    }, argv);

    delete options.argv;

--- a/lib/commands/register.js
+++ b/lib/commands/register.js
@@ -1,93 +1,108 @@
+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 createError = require('../util/createError');
 var defaultConfig = require('../config');
+var GitHubResolver = require('../core/resolvers/GitHubResolver');

-function register(logger, name, source, config) {
+function register(logger, name, url, config) {
    var repository;
    var registryClient;
+    var tracker;
    var force;
-    var url;
-    var githubSourceRegex = /^\w[\w-]*\/\w[\w-]*$/;
-    var getGithubUrl = function(source) {
-        return 'git@github.com:' + source + '.git';
-    };

    config = defaultConfig(config);
    force = config.force;
+    tracker = new Tracker(config);

    name = (name || '').trim();
-    source = (source || '').trim();
-
-    url = source.match(githubSourceRegex) ? getGithubUrl(source) : source;
+    url = (url || '').trim();

    // Bypass any cache
    config.offline = false;
    config.force = true;

-    return Q.try(function() {
+    return Q.try(function () {
        // Verify name and url
        if (!name || !url) {
-            throw createError(
-                'Usage: bower register <name> <url>',
-                'EINVFORMAT'
-            );
+            throw createError('Usage: bower register <name> <url>', 'EINVFORMAT');
        }

+        // 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');
+
        // Attempt to resolve the package referenced by the URL to ensure
        // everything is ok before registering
        repository = new PackageRepository(config, logger);
        return repository.fetch({ name: name, source: url, target: '*' });
    })
-        .spread(function(canonicalDir, pkgMeta) {
-            if (pkgMeta.private) {
-                throw createError(
-                    'The package you are trying to register is marked as private',
-                    'EPRIV'
-                );
-            }
+    .spread(function (canonicalDir, pkgMeta) {
+        if (pkgMeta.private) {
+            throw createError('The package you are trying to register is marked as private', 'EPRIV');
+        }

-            // If non interactive or user forced, bypass confirmation
-            if (!config.interactive || force) {
-                return true;
-            }
+        // If non interactive or user forced, bypass confirmation
+        if (!config.interactive || force) {
+            return true;
+        }

-            // Confirm if the user really wants to register
-            return Q.nfcall(logger.prompt.bind(logger), {
-                type: 'confirm',
-                message:
-                    'Registering a package will make it installable via the registry (' +
-                    chalk.cyan.underline(config.registry.register) +
-                    '), continue?',
-                default: true
-            });
-        })
-        .then(function(result) {
-            // If user response was negative, abort
-            if (!result) {
-                return;
-            }
-
-            // Register
-            registryClient = repository.getRegistryClient();
-
-            logger.action('register', url, {
-                name: name,
-                url: url
-            });
-
-            return Q.nfcall(
-                registryClient.register.bind(registryClient),
-                name,
-                url
-            );
+        // Confirm if the user really wants to register
+        return Q.nfcall(logger.prompt.bind(logger), {
+            type: 'confirm',
+            message: 'Registering a package will make it installable via the registry (' +
+                chalk.cyan.underline(config.registry.register) + '), continue?',
+            default: true
        });
+    })
+    .then(function (result) {
+        // If user response was negative, abort
+        if (!result) {
+            return;
+        }
+
+        // Register
+        registryClient = repository.getRegistryClient();
+
+        logger.action('register', url, {
+            name: name,
+            url: url
+        });
+
+        return Q.nfcall(registryClient.register.bind(registryClient), name, url);
+    });
+}
+
+function convertUrl(url, logger) {
+    var pair;
+    var newUrl;
+
+    if (!mout.string.startsWith(url, 'git://')) {
+        // Convert GitHub 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);
+        }
+    }
+
+    return newUrl || url;
 }

 // -------------------

-register.readOptions = function(argv) {
+register.readOptions = function (argv) {
    var cli = require('../util/cli');

    var options = cli.readOptions(argv);
--- a/lib/commands/search.js
+++ b/lib/commands/search.js
@@ -1,37 +1,34 @@
 var Q = require('q');
-var PackageRepository = require('../core/PackageRepository');
+var RegistryClient = require('bower-registry-client');
+var Tracker = require('../util/analytics').Tracker;
 var defaultConfig = require('../config');
-var cli = require('../util/cli');
-var createError = require('../util/createError');

 function search(logger, name, config) {
    var registryClient;
+    var tracker;

    config = defaultConfig(config);
+    config.cache = config.storage.registry;

-    var repository = new PackageRepository(config, logger);
-    var registryClient = repository.getRegistryClient();
-
-    if (name) {
-        return Q.nfcall(registryClient.search.bind(registryClient), name);
-    } else {
-        // List all packages when in interactive mode + json enabled, and
-        // always when in non-interactive mode
-        if (config.interactive && !config.json) {
-            throw createError('no parameter to bower search', 'EREADOPTIONS');
-        }
+    registryClient = new RegistryClient(config, logger);
+    tracker = new Tracker(config);
+    tracker.track('search', name);

+    // If no name was specified, list all packages
+    if (!name) {
        return Q.nfcall(registryClient.list.bind(registryClient));
+    // Otherwise search it
+    } else {
+        return Q.nfcall(registryClient.search.bind(registryClient), name);
    }
 }

 // -------------------

-search.readOptions = function(argv) {
+search.readOptions = function (argv) {
+    var cli = require('../util/cli');
    var options = cli.readOptions(argv);
-    var terms = options.argv.remain.slice(1);
-
-    var name = terms.join(' ');
+    var name = options.argv.remain.slice(1).join(' ');

    return [name];
 };
--- a/lib/commands/uninstall.js
+++ b/lib/commands/uninstall.js
@@ -1,6 +1,7 @@
 var mout = require('mout');
 var Q = require('q');
 var Project = require('../core/Project');
+var Tracker = require('../util/analytics').Tracker;
 var defaultConfig = require('../config');

 function uninstall(logger, names, options, config) {
@@ -9,67 +10,63 @@ function uninstall(logger, names, options, config) {
    }

    var project;
+    var tracker;

    options = options || {};
    config = defaultConfig(config);
    project = new Project(config, logger);
+    tracker = new Tracker(config);

-    return project.getTree(options).spread(function(tree, flattened) {
+    tracker.trackNames('uninstall', names);
+
+    return project.getTree(options)
+    .spread(function (tree, flattened) {
        // Uninstall nodes
-        return (
-            project
-                .uninstall(names, options)
-                // Clean out non-shared uninstalled dependencies
-                .then(function(uninstalled) {
-                    var names = Object.keys(uninstalled);
-                    var children = [];
+        return project.uninstall(names, options)
+        // Clean out non-shared uninstalled dependencies
+        .then(function (uninstalled) {
+            var names = Object.keys(uninstalled);
+            var children = [];

-                    // Grab the dependencies of packages that were uninstalled
-                    mout.object.forOwn(flattened, function(node) {
-                        if (names.indexOf(node.endpoint.name) !== -1) {
-                            children.push.apply(
-                                children,
-                                mout.object.keys(node.dependencies)
-                            );
-                        }
-                    });
+            // Grab the dependencies of packages that were uninstalled
+            mout.object.forOwn(flattened, function (node) {
+                if (names.indexOf(node.endpoint.name) !== -1) {
+                    children.push.apply(children, mout.object.keys(node.dependencies));
+                }
+            });

-                    // Clean them!
-                    return clean(project, children, uninstalled);
-                })
-        );
+            // Clean them!
+            return clean(project, children, uninstalled);
+        });
    });
 }

 function clean(project, names, removed) {
    removed = removed || {};

-    return project.getTree().spread(function(tree, flattened) {
+    return project.getTree()
+    .spread(function (tree, flattened) {
        var nodes = [];
        var dependantsCounter = {};

        // Grab the nodes of each specified name
-        mout.object.forOwn(flattened, function(node) {
+        mout.object.forOwn(flattened, function (node) {
            if (names.indexOf(node.endpoint.name) !== -1) {
                nodes.push(node);
            }
        });

        // Walk the down the tree, gathering dependants of the packages
-        project.walkTree(
-            tree,
-            function(node, nodeName) {
-                if (names.indexOf(nodeName) !== -1) {
-                    dependantsCounter[nodeName] =
-                        dependantsCounter[nodeName] || 0;
-                    dependantsCounter[nodeName] += node.nrDependants;
-                }
-            },
-            true
-        );
+        project.walkTree(tree, function (node, nodeName) {
+            if (names.indexOf(nodeName) !== -1) {
+                dependantsCounter[nodeName] = dependantsCounter[nodeName] || 0;
+                dependantsCounter[nodeName] += node.nrDependants;
+            }
+        }, true);
+

        // Filter out those that have no dependants
-        nodes = nodes.filter(function(node) {
+        nodes = nodes.filter(function (node) {
            return !dependantsCounter[node.endpoint.name];
        });

@@ -79,48 +76,39 @@ function clean(project, names, removed) {
        }

        // Grab the nodes after filtering
-        names = nodes.map(function(node) {
+        names = nodes.map(function (node) {
            return node.endpoint.name;
        });

        // Uninstall them
-        return (
-            project
-                .uninstall(names)
-                // Clean out non-shared uninstalled dependencies
-                .then(function(uninstalled) {
-                    var children;
+        return project.uninstall(names)
+        // Clean out non-shared uninstalled dependencies
+        .then(function (uninstalled) {
+            var children;

-                    mout.object.mixIn(removed, uninstalled);
+            mout.object.mixIn(removed, uninstalled);

-                    // Grab the dependencies of packages that were uninstalled
-                    children = [];
-                    nodes.forEach(function(node) {
-                        children.push.apply(
-                            children,
-                            mout.object.keys(node.dependencies)
-                        );
-                    });
+            // Grab the dependencies of packages that were uninstalled
+            children = [];
+            nodes.forEach(function (node) {
+                children.push.apply(children, mout.object.keys(node.dependencies));
+            });

-                    // Recurse!
-                    return clean(project, children, removed);
-                })
-        );
+            // Recurse!
+            return clean(project, children, removed);
+        });
    });
 }

 // -------------------

-uninstall.readOptions = function(argv) {
+uninstall.readOptions = function (argv) {
    var cli = require('../util/cli');

-    var options = cli.readOptions(
-        {
-            save: { type: Boolean, shorthand: 'S' },
-            'save-dev': { type: Boolean, shorthand: 'D' }
-        },
-        argv
-    );
+    var options = cli.readOptions({
+        'save': { type: Boolean, shorthand: 'S' },
+        'save-dev': { type: Boolean, shorthand: 'D' }
+    }, argv);

    var names = options.argv.remain.slice(1);

--- a/lib/commands/unregister.js
+++ b/lib/commands/unregister.js
@@ -3,19 +3,23 @@ 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;
@@ -26,59 +30,50 @@ function unregister(logger, name, config) {

    repository = new PackageRepository(config, logger);

+    tracker.track('unregister');
+
    if (!config.accessToken) {
-        return logger.emit(
-            'error',
-            createError(
-                'Use "bower login" with collaborator credentials',
-                'EFORBIDDEN'
-            )
+        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;
-            }
+    .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) {
-            logger.info('Package unregistered', name);
-
-            return result;
+        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) {
+unregister.readOptions = function (argv) {
    var cli = require('../util/cli');

    var options = cli.readOptions(argv);
--- a/lib/commands/update.js
+++ b/lib/commands/update.js
@@ -18,16 +18,13 @@ function update(logger, names, options, config) {

 // -------------------

-update.readOptions = function(argv) {
+update.readOptions = function (argv) {
    var cli = require('../util/cli');

-    var options = cli.readOptions(
-        {
-            'force-latest': { type: Boolean, shorthand: 'F' },
-            production: { type: Boolean, shorthand: 'p' }
-        },
-        argv
-    );
+    var options = cli.readOptions({
+        'force-latest': { type: Boolean, shorthand: 'F' },
+        'production': { type: Boolean, shorthand: 'p' }
+    }, argv);

    var names = options.argv.remain.slice(1);

--- a/lib/commands/version.js
+++ b/lib/commands/version.js
@@ -1,208 +1,126 @@
 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 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);

-    return bump(logger, config, versionArg, options.message);
+    return bump(project, versionArg, options.message);
 }

-function bump(logger, config, versionArg, message) {
-    var cwd = config.cwd || process.cwd();
+function bump(project, versionArg, message) {
+    var cwd = project._config.cwd || process.cwd();
    var newVersion;
+    var doGitCommit = false;

-    if (!versionArg) {
-        throw createError('No <version> agrument provided', 'EREADOPTIONS');
-    }
-
-    return driver
-        .check(cwd)
-        .then(function() {
-            return Q.all([driver.versions(cwd), driver.currentVersion(cwd)]);
-        })
-        .spread(function(versions, currentVersion) {
-            currentVersion = currentVersion || '0.0.0';
-
-            if (semver.valid(versionArg)) {
-                newVersion = semver.valid(versionArg);
-            } else {
-                newVersion = semver.inc(currentVersion, versionArg);
-
-                if (!newVersion) {
-                    throw createError(
-                        'Invalid <version> argument: ' + versionArg,
-                        'EINVALIDVERSION',
-                        { version: versionArg }
-                    );
-                }
-            }
-
-            newVersion =
-                currentVersion[0] === 'v' ? 'v' + newVersion : newVersion;
-
-            if (versions) {
-                versions.forEach(function(version) {
-                    if (semver.eq(version, newVersion)) {
-                        throw createError(
-                            'Version exists: ' + newVersion,
-                            'EVERSIONEXISTS',
-                            { versions: versions, newVersion: newVersion }
-                        );
-                    }
-                });
-            }
-
-            return driver.bump(cwd, newVersion, message).then(function() {
-                return {
-                    oldVersion: currentVersion,
-                    newVersion: newVersion
-                };
-            });
-        })
-        .then(function(result) {
-            logger.info(
-                'version',
-                'Bumped package version from ' +
-                    result.oldVersion +
-                    ' to ' +
-                    result.newVersion,
-                result
-            );
-
-            return result.newVersion;
-        });
+    return checkGit(cwd)
+    .then(function (hasGit) {
+        doGitCommit = hasGit;
+    })
+    .then(project.getJson.bind(project))
+    .then(function (json) {
+        newVersion = getNewVersion(json.version, versionArg);
+        json.version = newVersion;
+    })
+    .then(project.saveJson.bind(project))
+    .then(function () {
+        if (doGitCommit) {
+            return gitCommitAndTag(cwd, newVersion, message);
+        }
+    })
+    .then(function () {
+        console.log('v' + newVersion);
+        return newVersion;
+    });
 }

-var driver = {
-    check: function(cwd) {
-        function checkGit(cwd) {
-            var gitDir = path.join(cwd, '.git');
-            return Q.nfcall(fs.stat, gitDir).then(
-                function(stat) {
-                    if (stat.isDirectory()) {
-                        return checkGitStatus(cwd);
-                    }
-                    return false;
-                },
-                function() {
-                    //Ignore not found .git directory
-                    return false;
-                }
-            );
-        }
-
-        function checkGitStatus(cwd) {
-            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 }
-                    );
-                })
-                .then(function(value) {
-                    var stdout = value[0];
-                    var lines = filterModifiedStatusLines(stdout);
-                    if (lines.length) {
-                        throw createError(
-                            'Version bump requires clean working directory',
-                            'EWORKINGDIRECTORYDIRTY'
-                        );
-                    }
-                    return true;
-                });
-        }
-
-        function filterModifiedStatusLines(stdout) {
-            return stdout
-                .trim()
-                .split('\n')
-                .filter(function(line) {
-                    return line.trim() && !line.match(/^\?\? /);
-                })
-                .map(function(line) {
-                    return line.trim();
-                });
-        }
-
-        return checkGit(cwd).then(function(hasGit) {
-            if (!hasGit) {
-                throw createError(
-                    'Version bump currently supports only git repositories',
-                    'ENOTGITREPOSITORY'
-                );
-            }
-        });
-    },
-    versions: function(cwd) {
-        return Q.nfcall(execFile, 'git', ['tag'], {
-            env: process.env,
-            cwd: cwd
-        }).then(
-            function(res) {
-                var versions = res[0].split(/\r?\n/).filter(semver.valid);
-
-                return versions;
-            },
-            function() {
-                return [];
-            }
-        );
-    },
-    currentVersion: function(cwd) {
-        return Q.nfcall(execFile, 'git', ['describe', '--abbrev=0', '--tags'], {
-            env: process.env,
-            cwd: cwd
-        }).then(
-            function(res) {
-                var version = res[0].split(/\r?\n/).filter(semver.valid)[0];
-
-                return version;
-            },
-            function() {
-                return undefined;
-            }
-        );
-    },
-    bump: function(cwd, tag, message) {
-        message = message || tag;
-        message = message.replace(/%s/g, tag);
-        return Q.nfcall(
-            execFile,
-            'git',
-            ['commit', '-m', message, '--allow-empty'],
-            { env: process.env, cwd: cwd }
-        ).then(function() {
-            return Q.nfcall(execFile, 'git', ['tag', tag, '-am', message], {
-                env: process.env,
-                cwd: cwd
-            });
-        });
+function getNewVersion(currentVersion, versionArg) {
+    var newVersion = semver.valid(versionArg);
+    if (!newVersion) {
+        newVersion = semver.inc(currentVersion, versionArg);
    }
-};
+    if (!newVersion) {
+        throw createError('Invalid version argument: `' + versionArg + '`. Usage: `bower version [<newversion> | major | minor | patch]`', 'EINVALIDVERSION');
+    }
+    if (currentVersion === newVersion) {
+        throw createError('Version not changed', 'EVERSIONNOTCHANGED');
+    }
+    return newVersion;
+}

-version.readOptions = function(argv) {
+function checkGit(cwd) {
+    var gitDir = path.join(cwd, '.git');
+    return Q.nfcall(fs.stat, gitDir)
+    .then(function (stat) {
+        if (stat.isDirectory()) {
+            return checkGitStatus(cwd);
+        }
+        return false;
+    }, function () {
+        //Ignore not found .git directory
+        return false;
+    });
+}
+
+function checkGitStatus(cwd) {
+    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});
+    })
+    .then(function (value) {
+        var stdout = value[0];
+        var lines = filterModifiedStatusLines(stdout);
+        if (lines.length) {
+            throw createError('Git working directory not clean.\n' + lines.join('\n'), 'EWORKINGDIRECTORYDIRTY');
+        }
+        return true;
+    });
+}
+
+function filterModifiedStatusLines(stdout) {
+    return stdout.trim().split('\n')
+    .filter(function (line) {
+        return line.trim() && !line.match(/^\?\? /);
+    }).map(function (line) {
+        return line.trim();
+    });
+}
+
+function gitCommitAndTag(cwd, 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})
+    .then(function () {
+        return Q.nfcall(execFile, 'git', ['commit', '-m', message], {env: process.env, cwd: cwd});
+    })
+    .then(function () {
+        return Q.nfcall(execFile, 'git', ['tag', tag, '-am', message], {env: process.env, cwd: cwd});
+    });
+}
+
+// -------------------
+
+version.readOptions = function (argv) {
    var cli = require('../util/cli');

-    var options = cli.readOptions(
-        {
-            message: { type: String, shorthand: 'm' }
-        },
-        argv
-    );
+    var options = cli.readOptions({
+        'message': { type: String, shorthand: 'm'}
+    }, argv);

    return [options.argv.remain[1], options];
 };
--- a/lib/config.js
+++ b/lib/config.js
@@ -3,61 +3,60 @@ var object = require('mout').object;
 var bowerConfig = require('bower-config');
 var Configstore = require('configstore');

-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);
-
-    var config = current.toObject();
+function readCachedConfig(cwd) {
+    if (cachedConfigs[cwd]) {
+        return cachedConfigs[cwd];
+    }

+    var config = cachedConfigs[cwd] = bowerConfig.read(cwd);
    var configstore = new Configstore('bower-github').all;

    object.mixIn(config, configstore);

+    // Delete the json attribute because it is no longer supported
+    // and conflicts with --json
+    delete config.json;
+
    // If interactive is auto (null), guess its value
    if (config.interactive == null) {
-        config.interactive =
-            process.bin === 'bower' && tty.isatty(1) && !process.env.CI;
+        config.interactive = (
+            process.bin === 'bower' &&
+            tty.isatty(1) &&
+            !process.env.CI
+        );
    }

    // 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;
+function resetCache () {
+    cachedConfigs = {};
 }

 module.exports = defaultConfig;
-module.exports.restore = restoreConfig;
 module.exports.reset = resetCache;
--- a/lib/core/Manager.js
+++ b/lib/core/Manager.js
--- a/lib/core/PackageRepository.js
+++ b/lib/core/PackageRepository.js
@@ -1,9 +1,9 @@
 var mout = require('mout');
 var Q = require('q');
+var RegistryClient = require('bower-registry-client');
 var ResolveCache = require('./ResolveCache');
 var resolverFactory = require('./resolverFactory');
 var createError = require('../util/createError');
-var RegistryClient = require('bower-registry-client');

 function PackageRepository(config, logger) {
    var registryOptions;
@@ -14,7 +14,6 @@ function PackageRepository(config, logger) {
    // Instantiate the registry
    registryOptions = mout.object.deepMixIn({}, this._config);
    registryOptions.cache = this._config.storage.registry;
-
    this._registryClient = new RegistryClient(registryOptions, logger);

    // Instantiate the resolve cache
@@ -23,7 +22,7 @@ function PackageRepository(config, logger) {

 // -----------------

-PackageRepository.prototype.fetch = function(decEndpoint) {
+PackageRepository.prototype.fetch = function (decEndpoint) {
    var logger;
    var that = this;
    var isTargetable;
@@ -35,192 +34,132 @@ PackageRepository.prototype.fetch = function(decEndpoint) {
    // used to fetch
    logger = this._logger.geminate();
    // Intercept all logs, adding additional information
-    logger.intercept(function(log) {
+    logger.intercept(function (log) {
        that._extendLog(log, info);
    });

-    return (
-        this._getResolver(decEndpoint, logger)
-            // 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;
+    return this._getResolver(decEndpoint, logger)
+    // 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()) {
-                    return that._resolve(resolver, logger);
+        if (!resolver.isCacheable()) {
+            return that._resolve(resolver, logger);
+        }
+
+        // If force flag is used, bypass cache, but write to cache anyway
+        if (that._config.force) {
+            logger.action('resolve', resolver.getSource() + '#' + resolver.getTarget());
+            return that._resolve(resolver, logger);
+        }
+
+        // Note that we use the resolver methods to query the
+        // cache because transformations/normalisations can occur
+        return that._resolveCache.retrieve(resolver.getSource(), resolver.getTarget())
+        // Decide if we can use the one from the resolve cache
+        .spread(function (canonicalDir, pkgMeta) {
+            // If there's no package in the cache
+            if (!canonicalDir) {
+                // And the offline flag is passed, error out
+                if (that._config.offline) {
+                    throw createError('No cached version for ' + resolver.getSource() + '#' + resolver.getTarget(), 'ENOCACHE', {
+                        resolver: resolver
+                    });
                }

-                // If force flag is used, bypass cache, but write to cache anyway
-                if (that._config.force) {
-                    logger.action(
-                        'resolve',
-                        resolver.getSource() + '#' + resolver.getTarget()
-                    );
-                    return that._resolve(resolver, logger);
-                }
+                // Otherwise, we have to resolve it
+                logger.info('not-cached', resolver.getSource() + (resolver.getTarget() ? '#' + resolver.getTarget() : ''));
+                logger.action('resolve', resolver.getSource() + '#' + resolver.getTarget());

-                // Note that we use the resolver methods to query the
-                // cache because transformations/normalisations can occur
-                return (
-                    that._resolveCache
-                        .retrieve(resolver.getSource(), resolver.getTarget())
-                        // Decide if we can use the one from the resolve cache
-                        .spread(function(canonicalDir, pkgMeta) {
-                            // If there's no package in the cache
-                            if (!canonicalDir) {
-                                // And the offline flag is passed, error out
-                                if (that._config.offline) {
-                                    throw createError(
-                                        'No cached version for ' +
-                                            resolver.getSource() +
-                                            '#' +
-                                            resolver.getTarget(),
-                                        'ENOCACHE',
-                                        {
-                                            resolver: resolver
-                                        }
-                                    );
-                                }
-
-                                // Otherwise, we have to resolve it
-                                logger.info(
-                                    'not-cached',
-                                    resolver.getSource() +
-                                        (resolver.getTarget()
-                                            ? '#' + resolver.getTarget()
-                                            : '')
-                                );
-                                logger.action(
-                                    'resolve',
-                                    resolver.getSource() +
-                                        '#' +
-                                        resolver.getTarget()
-                                );
-
-                                return that._resolve(resolver, logger);
-                            }
-
-                            info.canonicalDir = canonicalDir;
-                            info.pkgMeta = pkgMeta;
-
-                            logger.info(
-                                'cached',
-                                resolver.getSource() +
-                                    (pkgMeta._release
-                                        ? '#' + pkgMeta._release
-                                        : '')
-                            );
-
-                            // If offline flag is used, use directly the cached one
-                            if (that._config.offline) {
-                                return [canonicalDir, pkgMeta, isTargetable];
-                            }
-
-                            // Otherwise check for new contents
-                            logger.action(
-                                'validate',
-                                (pkgMeta._release
-                                    ? pkgMeta._release + ' against '
-                                    : '') +
-                                    resolver.getSource() +
-                                    (resolver.getTarget()
-                                        ? '#' + resolver.getTarget()
-                                        : '')
-                            );
-
-                            return resolver
-                                .hasNew(pkgMeta)
-                                .then(function(hasNew) {
-                                    // If there are no new contents, resolve to
-                                    // the cached one
-                                    if (!hasNew) {
-                                        return [
-                                            canonicalDir,
-                                            pkgMeta,
-                                            isTargetable
-                                        ];
-                                    }
-
-                                    // Otherwise resolve to the newest one
-                                    logger.info(
-                                        'new',
-                                        'version for ' +
-                                            resolver.getSource() +
-                                            '#' +
-                                            resolver.getTarget()
-                                    );
-                                    logger.action(
-                                        'resolve',
-                                        resolver.getSource() +
-                                            '#' +
-                                            resolver.getTarget()
-                                    );
-
-                                    return that._resolve(resolver, logger);
-                                });
-                        })
-                );
-            })
-            // If something went wrong, also extend the error
-            .fail(function(err) {
-                that._extendLog(err, info);
-                throw err;
-            })
-    );
-};
-
-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) {
-            // If offline, resolve using the cached versions
-            if (this._config.offline) {
-                return this._resolveCache.versions(resolver.getSource());
+                return that._resolve(resolver, logger);
            }

-            // Otherwise, fetch remotely
-            return resolver.constructor.versions(resolver.getSource());
-        }.bind(this)
-    );
+            info.canonicalDir = canonicalDir;
+            info.pkgMeta = pkgMeta;
+
+            logger.info('cached', resolver.getSource() + (pkgMeta._release ? '#' + pkgMeta._release : ''));
+
+            // If offline flag is used, use directly the cached one
+            if (that._config.offline) {
+                return [canonicalDir, pkgMeta, isTargetable];
+            }
+
+            // Otherwise check for new contents
+            logger.action('validate', (pkgMeta._release ? pkgMeta._release + ' against ': '') +
+                                      resolver.getSource() + (resolver.getTarget() ? '#' + resolver.getTarget() : ''));
+
+            return resolver.hasNew(pkgMeta)
+            .then(function (hasNew) {
+                // If there are no new contents, resolve to
+                // the cached one
+                if (!hasNew) {
+                    return [canonicalDir, pkgMeta, isTargetable];
+                }
+
+                // Otherwise resolve to the newest one
+                logger.info('new', 'version for ' + resolver.getSource() + '#' + resolver.getTarget());
+                logger.action('resolve', resolver.getSource() + '#' + resolver.getTarget());
+
+                return that._resolve(resolver, logger);
+            });
+        });
+    })
+    // If something went wrong, also extend the error
+    .fail(function (err) {
+        that._extendLog(err, info);
+        throw err;
+    });
 };

-PackageRepository.prototype.eliminate = function(pkgMeta) {
+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) {
+        // If offline, resolve using the cached versions
+        if (this._config.offline) {
+            return this._resolveCache.versions(resolver.getSource());
+        }
+
+        // Otherwise, fetch remotely
+        return resolver.constructor.versions(resolver.getSource());
+    }.bind(this));
+};
+
+PackageRepository.prototype.eliminate = function (pkgMeta) {
    return Q.all([
        this._resolveCache.eliminate(pkgMeta),
-        Q.nfcall(
-            this._registryClient.clearCache.bind(this._registryClient),
-            pkgMeta.name
-        )
+        Q.nfcall(this._registryClient.clearCache.bind(this._registryClient), pkgMeta.name)
    ]);
 };

-PackageRepository.prototype.clear = function() {
+PackageRepository.prototype.clear = function () {
    return Q.all([
        this._resolveCache.clear(),
        Q.nfcall(this._registryClient.clearCache.bind(this._registryClient))
    ]);
 };

-PackageRepository.prototype.reset = function() {
+PackageRepository.prototype.reset = function () {
    this._resolveCache.reset();
    this._registryClient.resetCache();
 };

-PackageRepository.prototype.list = function() {
+PackageRepository.prototype.list = function () {
    return this._resolveCache.list();
 };

-PackageRepository.prototype.getRegistryClient = function() {
+PackageRepository.prototype.getRegistryClient = function () {
    return this._registryClient;
 };

-PackageRepository.prototype.getResolveCache = function() {
+PackageRepository.prototype.getResolveCache = function () {
    return this._resolveCache;
 };

-PackageRepository.clearRuntimeCache = function() {
+PackageRepository.clearRuntimeCache = function () {
    ResolveCache.clearRuntimeCache();
    RegistryClient.clearRuntimeCache();
    resolverFactory.clearRuntimeCache();
@@ -228,59 +167,41 @@ PackageRepository.clearRuntimeCache = function() {

 // ---------------------

-PackageRepository.prototype._getResolver = function(decEndpoint, logger) {
+PackageRepository.prototype._getResolver = function (decEndpoint, logger) {
    logger = logger || this._logger;

    // Get the appropriate resolver
-    return resolverFactory(
-        decEndpoint,
-        { config: this._config, logger: logger },
-        this._registryClient
-    );
+    return resolverFactory(decEndpoint, { config: this._config, logger: logger }, this._registryClient);
 };

-PackageRepository.prototype._resolve = function(resolver, logger) {
+PackageRepository.prototype._resolve = function (resolver, logger) {
    var that = this;

    // Resolve the resolver
-    return (
-        resolver
-            .resolve()
-            // Store in the cache
-            .then(function(canonicalDir) {
-                if (!resolver.isCacheable()) {
-                    return canonicalDir;
-                }
+    return resolver.resolve()
+    // Store in the cache
+    .then(function (canonicalDir) {
+        if (!resolver.isCacheable()) {
+            return canonicalDir;
+        }

-                return that._resolveCache.store(
-                    canonicalDir,
-                    resolver.getPkgMeta()
-                );
-            })
-            // Resolve promise with canonical dir and package meta
-            .then(function(dir) {
-                var pkgMeta = resolver.getPkgMeta();
+        return that._resolveCache.store(canonicalDir, resolver.getPkgMeta());
+    })
+    // Resolve promise with canonical dir and package meta
+    .then(function (dir) {
+        var pkgMeta = resolver.getPkgMeta();

-                logger.info(
-                    'resolved',
-                    resolver.getSource() +
-                        (pkgMeta._release ? '#' + pkgMeta._release : '')
-                );
-                return [dir, pkgMeta, resolver.constructor.isTargetable()];
-            })
-    );
+        logger.info('resolved', resolver.getSource() + (pkgMeta._release ? '#' + pkgMeta._release : ''));
+        return [dir, pkgMeta, resolver.constructor.isTargetable()];
+    });
 };

-PackageRepository.prototype._extendLog = function(log, info) {
+PackageRepository.prototype._extendLog = function (log, info) {
    log.data = log.data || {};

    // Store endpoint info in each log
    if (info.decEndpoint) {
-        log.data.endpoint = mout.object.pick(info.decEndpoint, [
-            'name',
-            'source',
-            'target'
-        ]);
+        log.data.endpoint = mout.object.pick(info.decEndpoint, ['name', 'source', 'target']);
    }

    // Store the resolver info in each log
--- a/lib/core/Project.js
+++ b/lib/core/Project.js
--- a/lib/core/ResolveCache.js
+++ b/lib/core/ResolveCache.js
@@ -1,9 +1,9 @@
-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');
@@ -29,7 +29,7 @@ function ResolveCache(config) {
    if (!this._cache) {
        this._cache = new LRU({
            max: 100,
-            maxAge: 60 * 5 * 1000 // 5 minutes
+            maxAge: 60 * 5 * 1000  // 5 minutes
        });
        this.constructor._cache.set(this._dir, this._cache);
    }
@@ -40,7 +40,7 @@ function ResolveCache(config) {

 // -----------------

-ResolveCache.prototype.retrieve = function(source, target) {
+ResolveCache.prototype.retrieve = function (source, target) {
    var sourceId = md5(source);
    var dir = path.join(this._dir, sourceId);
    var that = this;
@@ -48,57 +48,56 @@ ResolveCache.prototype.retrieve = function(source, target) {
    target = target || '*';

    return this._getVersions(sourceId)
-        .spread(function(versions) {
-            var suitable;
+    .spread(function (versions) {
+        var suitable;

-            // If target is a semver, find a suitable version
-            if (semver.validRange(target)) {
-                suitable = semver.maxSatisfying(versions, target, true);
+        // If target is a semver, find a suitable version
+        if (semver.validRange(target)) {
+            suitable = semver.maxSatisfying(versions, target, true);

-                if (suitable) {
-                    return suitable;
-                }
+            if (suitable) {
+                return suitable;
            }
+        }

-            // If target is '*' check if there's a cached '_wildcard'
-            if (target === '*') {
-                return mout.array.find(versions, function(version) {
-                    return version === '_wildcard';
-                });
-            }
-
-            // Otherwise check if there's an exact match
-            return mout.array.find(versions, function(version) {
-                return version === target;
+        // If target is '*' check if there's a cached '_wildcard'
+        if (target === '*') {
+            return mout.array.find(versions, function (version) {
+                return version === '_wildcard';
            });
-        })
-        .then(function(version) {
-            var canonicalDir;
+        }

-            if (!version) {
-                return [];
-            }
-
-            // Resolve with canonical dir and package meta
-            canonicalDir = path.join(dir, encodeURIComponent(version));
-            return that._readPkgMeta(canonicalDir).then(
-                function(pkgMeta) {
-                    return [canonicalDir, pkgMeta];
-                },
-                function() {
-                    // If there was an error, invalidate the in-memory cache,
-                    // delete the cached package and try again
-                    that._cache.del(sourceId);
-
-                    return Q.nfcall(rimraf, canonicalDir).then(function() {
-                        return that.retrieve(source, target);
-                    });
-                }
-            );
+        // Otherwise check if there's an exact match
+        return mout.array.find(versions, function (version) {
+            return version === target;
        });
+    })
+    .then(function (version) {
+        var canonicalDir;
+
+        if (!version) {
+            return [];
+        }
+
+        // Resolve with canonical dir and package meta
+        canonicalDir = path.join(dir, encodeURIComponent(version));
+        return that._readPkgMeta(canonicalDir)
+        .then(function (pkgMeta) {
+            return [canonicalDir, pkgMeta];
+        }, function () {
+            // If there was an error, invalidate the in-memory cache,
+            // delete the cached package and try again
+            that._cache.del(sourceId);
+
+            return Q.nfcall(rimraf, canonicalDir)
+            .then(function () {
+                return that.retrieve(source, target);
+            });
+        });
+    });
 };

-ResolveCache.prototype.store = function(canonicalDir, pkgMeta) {
+ResolveCache.prototype.store = function (canonicalDir, pkgMeta) {
    var sourceId;
    var release;
    var dir;
@@ -109,82 +108,70 @@ ResolveCache.prototype.store = function(canonicalDir, pkgMeta) {
    promise = pkgMeta ? Q.resolve(pkgMeta) : this._readPkgMeta(canonicalDir);

    return promise
-        .then(function(pkgMeta) {
-            sourceId = md5(pkgMeta._source);
-            release = that._getPkgRelease(pkgMeta);
-            dir = path.join(that._dir, sourceId, release);
-            pkgLock = path.join(
-                that._lockDir,
-                sourceId + '-' + release + '.lock'
-            );
+    .then(function (pkgMeta) {
+        sourceId = md5(pkgMeta._source);
+        release = that._getPkgRelease(pkgMeta);
+        dir = path.join(that._dir, sourceId, release);
+        pkgLock = path.join(that._lockDir, sourceId + '-' + release + '.lock');

-            // Check if destination directory exists to prevent issuing lock at all times
-            return Q.nfcall(fs.stat, dir)
-                .fail(function(err) {
-                    var lockParams = { wait: 250, retries: 25, stale: 60000 };
-                    return Q.nfcall(lockFile.lock, pkgLock, lockParams)
-                        .then(function() {
-                            // Ensure other process didn't start copying files before lock was created
-                            return Q.nfcall(fs.stat, dir).fail(function(err) {
-                                // If stat fails, it is expected to return ENOENT
-                                if (err.code !== 'ENOENT') {
-                                    throw err;
-                                }
+        // Check if destination directory exists to prevent issuing lock at all times
+        return Q.nfcall(fs.stat, dir)
+        .fail(function (err) {
+            var lockParams = { wait: 250, retries: 25, stale: 60000 };
+            return Q.nfcall(lockFile.lock, pkgLock, lockParams).then(function () {
+                // Ensure other process didn't start copying files before lock was created
+                return Q.nfcall(fs.stat, dir)
+                .fail(function (err) {
+                    // If stat fails, it is expected to return ENOENT
+                    if (err.code !== 'ENOENT') {
+                        throw err;
+                    }

-                                // Create missing directory and copy files there
-                                return Q.nfcall(mkdirp, path.dirname(dir)).then(
-                                    function() {
-                                        return Q.nfcall(
-                                            fs.rename,
-                                            canonicalDir,
-                                            dir
-                                        ).fail(function(err) {
-                                            // If error is EXDEV it means that we are trying to rename
-                                            // across different drives, so we copy and remove it instead
-                                            if (err.code !== 'EXDEV') {
-                                                throw err;
-                                            }
+                    // Create missing directory and copy files there
+                    return Q.nfcall(mkdirp, path.dirname(dir)).then(function () {
+                        return Q.nfcall(fs.rename, canonicalDir, dir)
+                        .fail(function (err) {
+                            // If error is EXDEV it means that we are trying to rename
+                            // across different drives, so we copy and remove it instead
+                            if (err.code !== 'EXDEV') {
+                                throw err;
+                            }

-                                            return copy.copyDir(
-                                                canonicalDir,
-                                                dir
-                                            );
-                                        });
-                                    }
-                                );
-                            });
-                        })
-                        .finally(function() {
-                            lockFile.unlockSync(pkgLock);
+                            return copy.copyDir(canonicalDir, dir);
                        });
-                })
-                .finally(function() {
-                    // Ensure no tmp dir is left on disk.
-                    return Q.nfcall(rimraf, canonicalDir);
+                    });
                });
-        })
-        .then(function() {
-            var versions = that._cache.get(sourceId);
-
-            // Add it to the in memory cache
-            // and sort the versions afterwards
-            if (versions && versions.indexOf(release) === -1) {
-                versions.push(release);
-                that._sortVersions(versions);
-            }
-
-            // Resolve with the final location
-            return dir;
+            }).finally(function () {
+                lockFile.unlockSync(pkgLock);
+            });
+        }).finally(function () {
+            // Ensure no tmp dir is left on disk.
+            return Q.nfcall(rimraf, canonicalDir);
        });
+    })
+    .then(function () {
+        var versions = that._cache.get(sourceId);
+
+        // Add it to the in memory cache
+        // and sort the versions afterwards
+        if (versions && versions.indexOf(release) === -1) {
+            versions.push(release);
+            that._sortVersions(versions);
+        }
+
+        // Resolve with the final location
+        return dir;
+    });
 };

-ResolveCache.prototype.eliminate = function(pkgMeta) {
+ResolveCache.prototype.eliminate = function (pkgMeta) {
    var sourceId = md5(pkgMeta._source);
    var release = this._getPkgRelease(pkgMeta);
    var dir = path.join(this._dir, sourceId, release);
    var that = this;

-    return Q.nfcall(rimraf, dir).then(function() {
+    return Q.nfcall(rimraf, dir)
+    .then(function () {
        var versions = that._cache.get(sourceId) || [];
        mout.array.remove(versions, release);

@@ -195,7 +182,8 @@ ResolveCache.prototype.eliminate = function(pkgMeta) {
        if (!versions.length) {
            that._cache.del(sourceId);

-            return that._getVersions(sourceId).spread(function(versions) {
+            return that._getVersions(sourceId)
+            .spread(function (versions) {
                if (!versions.length) {
                    // Do not keep in-memory cache if it's completely
                    // empty
@@ -208,144 +196,125 @@ ResolveCache.prototype.eliminate = function(pkgMeta) {
    });
 };

-ResolveCache.prototype.clear = function() {
+ResolveCache.prototype.clear = function () {
    return Q.nfcall(rimraf, this._dir)
-        .then(
-            function() {
-                return Q.nfcall(fs.mkdir, this._dir);
-            }.bind(this)
-        )
-        .then(
-            function() {
-                this._cache.reset();
-            }.bind(this)
-        );
+    .then(function () {
+        return Q.nfcall(fs.mkdir, this._dir);
+    }.bind(this))
+    .then(function () {
+        this._cache.reset();
+    }.bind(this));
 };

-ResolveCache.prototype.reset = function() {
+ResolveCache.prototype.reset = function () {
    this._cache.reset();
    return this;
 };

-ResolveCache.prototype.versions = function(source) {
+ResolveCache.prototype.versions = function (source) {
    var sourceId = md5(source);

-    return this._getVersions(sourceId).spread(function(versions) {
-        return versions.filter(function(version) {
+    return this._getVersions(sourceId)
+    .spread(function (versions) {
+        return versions.filter(function (version) {
            return semver.valid(version);
        });
    });
 };

-ResolveCache.prototype.list = function() {
+ResolveCache.prototype.list = function () {
    var promises;
    var dirs = [];
    var that = this;

    // Get the list of directories
-    return (
-        Q.nfcall(fs.readdir, this._dir)
-            .then(function(sourceIds) {
-                promises = sourceIds.map(function(sourceId) {
-                    return Q.nfcall(
-                        fs.readdir,
-                        path.join(that._dir, sourceId)
-                    ).then(
-                        function(versions) {
-                            versions.forEach(function(version) {
-                                var dir = path.join(
-                                    that._dir,
-                                    sourceId,
-                                    version
-                                );
-                                dirs.push(dir);
-                            });
-                        },
-                        function(err) {
-                            // Ignore lurking files, e.g.: .DS_Store if the user
-                            // has navigated throughout the cache
-                            if (err.code === 'ENOTDIR' && err.path) {
-                                return Q.nfcall(rimraf, err.path);
-                            }
-
-                            throw err;
-                        }
-                    );
+    return Q.nfcall(fs.readdir, this._dir)
+    .then(function (sourceIds) {
+        promises = sourceIds.map(function (sourceId) {
+            return Q.nfcall(fs.readdir, path.join(that._dir, sourceId))
+            .then(function (versions) {
+                versions.forEach(function (version) {
+                    var dir = path.join(that._dir, sourceId, version);
+                    dirs.push(dir);
                });
+            }, function (err) {
+                // Ignore lurking files, e.g.: .DS_Store if the user
+                // has navigated throughout the cache
+                if (err.code === 'ENOTDIR' && err.path) {
+                    return Q.nfcall(rimraf, err.path);
+                }

-                return Q.all(promises);
-            })
-            // Read every package meta
-            .then(function() {
-                promises = dirs.map(function(dir) {
-                    return that._readPkgMeta(dir).then(
-                        function(pkgMeta) {
-                            return {
-                                canonicalDir: dir,
-                                pkgMeta: pkgMeta
-                            };
-                        },
-                        function() {
-                            // If it fails to read, invalidate the in memory
-                            // cache for the source and delete the entry directory
-                            var sourceId = path.basename(path.dirname(dir));
-                            that._cache.del(sourceId);
+                throw err;
+            });
+        });

-                            return Q.nfcall(rimraf, dir);
-                        }
-                    );
-                });
+        return Q.all(promises);
+    })
+    // Read every package meta
+    .then(function () {
+        promises = dirs.map(function (dir) {
+            return that._readPkgMeta(dir)
+            .then(function (pkgMeta) {
+                return {
+                    canonicalDir: dir,
+                    pkgMeta: pkgMeta
+                };
+            }, function () {
+                // If it fails to read, invalidate the in memory
+                // cache for the source and delete the entry directory
+                var sourceId = path.basename(path.dirname(dir));
+                that._cache.del(sourceId);

-                return Q.all(promises);
-            })
-            // Sort by name ASC & release ASC
-            .then(function(entries) {
-                // Ignore falsy entries due to errors reading
-                // package metas
-                entries = entries.filter(function(entry) {
-                    return !!entry;
-                });
+                return Q.nfcall(rimraf, dir);
+            });
+        });

-                return entries.sort(function(entry1, entry2) {
-                    var pkgMeta1 = entry1.pkgMeta;
-                    var pkgMeta2 = entry2.pkgMeta;
-                    var comp = pkgMeta1.name.localeCompare(pkgMeta2.name);
+        return Q.all(promises);
+    })
+    // Sort by name ASC & release ASC
+    .then(function (entries) {
+        // Ignore falsy entries due to errors reading
+        // package metas
+        entries = entries.filter(function (entry) {
+            return !!entry;
+        });

-                    // Sort by name
-                    if (comp) {
-                        return comp;
-                    }
+        return entries.sort(function (entry1, entry2) {
+            var pkgMeta1 = entry1.pkgMeta;
+            var pkgMeta2 = entry2.pkgMeta;
+            var comp = pkgMeta1.name.localeCompare(pkgMeta2.name);

-                    // Sort by version
-                    if (pkgMeta1.version && pkgMeta2.version) {
-                        return semver.compare(
-                            pkgMeta1.version,
-                            pkgMeta2.version
-                        );
-                    }
-                    if (pkgMeta1.version) {
-                        return -1;
-                    }
-                    if (pkgMeta2.version) {
-                        return 1;
-                    }
+            // Sort by name
+            if (comp) {
+                return comp;
+            }

-                    // Sort by target
-                    return pkgMeta1._target.localeCompare(pkgMeta2._target);
-                });
-            })
-    );
+            // Sort by version
+            if (pkgMeta1.version && pkgMeta2.version) {
+                return semver.compare(pkgMeta1.version, pkgMeta2.version);
+            }
+            if (pkgMeta1.version) {
+                return -1;
+            }
+            if (pkgMeta2.version) {
+                return 1;
+            }
+
+            // Sort by target
+            return pkgMeta1._target.localeCompare(pkgMeta2._target);
+        });
+    });
 };

 // ------------------------

-ResolveCache.clearRuntimeCache = function() {
+ResolveCache.clearRuntimeCache = function () {
    // Note that _cache refers to the static _cache variable
    // that holds other caches per dir!
    // Do not confuse it with the instance cache

    // Clear cache of each directory
-    this._cache.forEach(function(cache) {
+    this._cache.forEach(function (cache) {
        cache.reset();
    });

@@ -355,10 +324,8 @@ ResolveCache.clearRuntimeCache = function() {

 // ------------------------

-ResolveCache.prototype._getPkgRelease = function(pkgMeta) {
-    var release =
-        pkgMeta.version ||
-        (pkgMeta._target === '*' ? '_wildcard' : pkgMeta._target);
+ResolveCache.prototype._getPkgRelease = function (pkgMeta) {
+    var release = pkgMeta.version || (pkgMeta._target === '*' ? '_wildcard' : pkgMeta._target);

    // Encode some dangerous chars such as / and \
    release = encodeURIComponent(release);
@@ -366,15 +333,16 @@ ResolveCache.prototype._getPkgRelease = function(pkgMeta) {
    return release;
 };

-ResolveCache.prototype._readPkgMeta = function(dir) {
+ResolveCache.prototype._readPkgMeta = function (dir) {
    var filename = path.join(dir, '.bower.json');

-    return readJson(filename).spread(function(json) {
+    return readJson(filename)
+    .spread(function (json) {
        return json;
    });
 };

-ResolveCache.prototype._getVersions = function(sourceId) {
+ResolveCache.prototype._getVersions = function (sourceId) {
    var dir;
    var versions = this._cache.get(sourceId);
    var that = this;
@@ -384,31 +352,29 @@ ResolveCache.prototype._getVersions = function(sourceId) {
    }

    dir = path.join(this._dir, sourceId);
-    return Q.nfcall(fs.readdir, dir).then(
-        function(versions) {
-            // Sort and cache in memory
-            that._sortVersions(versions);
-            versions = versions.map(decodeURIComponent);
+    return Q.nfcall(fs.readdir, dir)
+    .then(function (versions) {
+        // Sort and cache in memory
+        that._sortVersions(versions);
+        versions = versions.map(decodeURIComponent);
+        that._cache.set(sourceId, versions);
+        return [versions, false];
+    }, function (err) {
+        // If the directory does not exists, resolve
+        // as an empty array
+        if (err.code === 'ENOENT') {
+            versions = [];
            that._cache.set(sourceId, versions);
            return [versions, false];
-        },
-        function(err) {
-            // If the directory does not exists, resolve
-            // as an empty array
-            if (err.code === 'ENOENT') {
-                versions = [];
-                that._cache.set(sourceId, versions);
-                return [versions, false];
-            }
-
-            throw err;
        }
-    );
+
+        throw err;
+    });
 };

-ResolveCache.prototype._sortVersions = function(versions) {
+ResolveCache.prototype._sortVersions = function (versions) {
    // Sort DESC
-    versions.sort(function(version1, version2) {
+    versions.sort(function (version1, version2) {
        var validSemver1 = semver.valid(version1);
        var validSemver2 = semver.valid(version2);

@@ -434,7 +400,7 @@ ResolveCache.prototype._sortVersions = function(versions) {

 ResolveCache._cache = new LRU({
    max: 5,
-    maxAge: 60 * 30 * 1000 // 30 minutes
+    maxAge: 60 * 30 * 1000  // 30 minutes
 });

 module.exports = ResolveCache;
--- a/lib/core/resolverFactory.js
+++ b/lib/core/resolverFactory.js
@@ -1,27 +1,20 @@
 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 resolve = require('../util/resolve');

 var pluginResolverFactory = require('./resolvers/pluginResolverFactory');

 function createInstance(decEndpoint, options, registryClient) {
    decEndpoint = mout.object.pick(decEndpoint, ['name', 'target', 'source']);

-    options.version = require('../version');
+    options.version = require('../../package.json').version;

-    return getConstructor(decEndpoint, options, registryClient).spread(function(
-        ConcreteResolver,
-        decEndpoint
-    ) {
-        return new ConcreteResolver(
-            decEndpoint,
-            options.config,
-            options.logger
-        );
+    return getConstructor(decEndpoint, options, registryClient)
+    .spread(function (ConcreteResolver, decEndpoint) {
+        return new ConcreteResolver(decEndpoint, options.config, options.logger);
    });
 }

@@ -31,12 +24,12 @@ function getConstructor(decEndpoint, options, registryClient) {

    // 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 constructor of resolver
+    // 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) {
+    var addResolver = function (resolverFactory) {
+        promise = promise.then(function (result) {
            if (result === undefined) {
                return resolverFactory(decEndpoint, options);
            } else {
@@ -49,44 +42,22 @@ function getConstructor(decEndpoint, options, registryClient) {
    //
    // It requires each resolver defined in config.resolvers and calls
    // its "match" to check if given resolves supports given decEndpoint
-    addResolver(function() {
+    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 resolverNames = config.resolvers || [];

-        var resolverPromises = resolverNames.map(function(resolverName) {
-            var resolver = resolvers[resolverName];
+        var resolverPromises = resolverNames.map(function (resolverName) {
+            var resolver = resolvers[resolverName]
+                || pluginResolverFactory(require(resolverName), options);

-            if (resolver === undefined) {
-                var resolverPath = resolve(resolverName, { cwd: config.cwd });
-
-                if (resolverPath === undefined) {
-                    throw createError(
-                        'Bower resolver not found: ' + resolverName,
-                        'ENORESOLVER'
-                    );
-                }
-
-                resolver = pluginResolverFactory(
-                    require(resolverPath),
-                    options
-                );
-            }
-
-            return function() {
+            return function () {
                if (selectedResolver === undefined) {
                    var match = resolver.match.bind(resolver);

-                    return Q.fcall(match, source).then(function(result) {
+                    return Q.fcall(match, source).then(function (result) {
                        if (result) {
-                            return (selectedResolver = resolver);
+                            return selectedResolver = resolver;
                        }
                    });
                } else {
@@ -95,39 +66,26 @@ function getConstructor(decEndpoint, options, registryClient) {
            };
        });

-        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];
-                        }
-                    });
-                }
-            });
+        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];
+                    }
+                });
+            }
+        });
    });

    // 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)
-        ) {
+        if (/^git(\+(ssh|https?))?:\/\//i.test(source) || /\.git\/?$/i.test(source) || /^git@/i.test(source)) {
            decEndpoint.source = source.replace(/^git\+/, '');

            // If it's a GitHub repository, return the specialized resolver
@@ -140,74 +98,65 @@ function getConstructor(decEndpoint, options, registryClient) {
    });

    // SVN case: svn, svn+ssh, svn+http, svn+https, svn+file
-    addResolver(function() {
+    addResolver(function () {
        if (/^svn(\+(ssh|https?|file))?:\/\//i.test(source)) {
            return [resolvers.Svn, decEndpoint];
        }
    });

    // URL case
-    addResolver(function() {
+    addResolver(function () {
        if (/^https?:\/\//i.exec(source)) {
            return [resolvers.Url, decEndpoint];
        }
    });

+
    // If source is ./ or ../ or an absolute path

-    addResolver(function() {
+    addResolver(function () {
        var absolutePath = path.resolve(config.cwd, source);

-        if (
-            /^\.\.?[\/\\]/.test(source) ||
-            /^~\//.test(source) ||
+        if (/^\.\.?[\/\\]/.test(source) || /^~\//.test(source) ||
            path.normalize(source).replace(/[\/\\]+$/, '') === absolutePath
        ) {
-            return (
-                Q.nfcall(fs.stat, path.join(absolutePath, '.git'))
-                    .then(function(stats) {
-                        decEndpoint.source = absolutePath;
+            return Q.nfcall(fs.stat, path.join(absolutePath, '.git'))
+            .then(function (stats) {
+                decEndpoint.source = absolutePath;

-                        if (stats.isDirectory()) {
-                            return Q.resolve([resolvers.GitFs, decEndpoint]);
-                        }
+                if (stats.isDirectory()) {
+                    return Q.resolve([resolvers.GitFs, decEndpoint]);
+                }

-                        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;
+                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]);
-                            }
+                    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;
+                    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]);
-                        });
-                    })
-            );
+                    return Q.resolve([resolvers.Fs, decEndpoint]);
+                });
+            });
        }
    });

    // Check if is a shorthand and expand it
-    addResolver(function() {
-        // Check if the shorthandResolver is falsy
-        if (!config.shorthandResolver) {
-            return;
-        }
-
+    addResolver(function () {
        // Skip ssh and/or URL with auth
        if (/[:@]/.test(source)) {
            return;
@@ -216,34 +165,26 @@ function getConstructor(decEndpoint, options, registryClient) {
        // Ensure exactly only one "/"
        var parts = source.split('/');
        if (parts.length === 2) {
-            decEndpoint.source = mout.string.interpolate(
-                config.shorthandResolver,
-                {
-                    shorthand: source,
-                    owner: parts[0],
-                    package: parts[1]
-                }
-            );
+            decEndpoint.source = mout.string.interpolate(config.shorthandResolver, {
+                shorthand: source,
+                owner: parts[0],
+                package: parts[1]
+            });

            return getConstructor(decEndpoint, options, registryClient);
        }
    });

    // As last resort, we try the registry
-    addResolver(function() {
+    addResolver(function () {
        if (!registryClient) {
            return;
        }

-        return Q.nfcall(
-            registryClient.lookup.bind(registryClient),
-            source
-        ).then(function(entry) {
+        return Q.nfcall(registryClient.lookup.bind(registryClient), source)
+        .then(function (entry) {
            if (!entry) {
-                throw createError(
-                    'Package ' + source + ' not found',
-                    'ENOTFOUND'
-                );
+                throw createError('Package ' + source + ' not found', 'ENOTFOUND');
            }

            decEndpoint.registry = true;
@@ -258,18 +199,15 @@ function getConstructor(decEndpoint, options, registryClient) {
        });
    });

-    addResolver(function() {
-        throw createError(
-            'Could not find appropriate resolver for ' + source,
-            'ENORESOLVER'
-        );
+    addResolver(function () {
+        throw createError('Could not find appropriate resolver for ' + source, 'ENORESOLVER');
    });

    return promise;
 }

 function clearRuntimeCache() {
-    mout.object.values(resolvers).forEach(function(ConcreteResolver) {
+    mout.object.values(resolvers).forEach(function (ConcreteResolver) {
        ConcreteResolver.clearRuntimeCache();
    });
 }
--- a/lib/core/resolvers/FsResolver.js
+++ b/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');
@@ -17,19 +17,13 @@ function FsResolver(decEndpoint, config, logger) {

    // If target was specified, simply reject the promise
    if (this._target !== '*') {
-        throw createError(
-            "File system sources can't resolve targets",
-            'ENORESTARGET'
-        );
+        throw createError('File system sources can\'t resolve targets', 'ENORESTARGET');
    }

    // If the name was guessed
    if (this._guessedName) {
        // Remove extension
-        this._name = this._name.substr(
-            0,
-            this._name.length - path.extname(this._name).length
-        );
+        this._name = this._name.substr(0, this._name.length - path.extname(this._name).length);
    }
 }

@@ -38,7 +32,7 @@ mout.object.mixIn(FsResolver, Resolver);

 // -----------------

-FsResolver.isTargetable = function() {
+FsResolver.isTargetable = function () {
    return false;
 };

@@ -48,18 +42,19 @@ FsResolver.isTargetable = function() {
 // TODO: There's room for improvement by using streams if the source
 //       is an archive file, by piping read stream to the zip extractor
 //       This will likely increase the complexity of code but might worth it
-FsResolver.prototype._resolve = function() {
+FsResolver.prototype._resolve = function () {
    return this._copy()
-        .then(this._extract.bind(this))
-        .then(this._rename.bind(this));
+    .then(this._extract.bind(this))
+    .then(this._rename.bind(this));
 };

 // -----------------

-FsResolver.prototype._copy = function() {
+FsResolver.prototype._copy = function () {
    var that = this;

-    return Q.nfcall(fs.stat, this._source).then(function(stat) {
+    return Q.nfcall(fs.stat, this._source)
+    .then(function (stat) {
        var dst;
        var copyOpts;
        var promise;
@@ -73,24 +68,22 @@ FsResolver.prototype._copy = function() {

            // Read the bower.json inside the folder, so that we
            // copy only the necessary files if it has ignore specified
-            promise = that
-                ._readJson(that._source)
-                .then(function(json) {
-                    copyOpts.ignore = json.ignore;
-                    return copy.copyDir(that._source, dst, copyOpts);
-                })
-                .then(function() {
-                    // Resolve to null because it's a dir
-                    return;
-                });
-            // Else it's a file
+            promise = that._readJson(that._source)
+            .then(function (json) {
+                copyOpts.ignore = json.ignore;
+                return copy.copyDir(that._source, dst, copyOpts);
+            })
+            .then(function () {
+                // Resolve to null because it's a dir
+                return;
+            });
+        // Else it's a file
        } else {
            dst = path.join(that._tempDir, path.basename(that._source));
-            promise = copy
-                .copyFile(that._source, dst, copyOpts)
-                .then(function() {
-                    return dst;
-                });
+            promise = copy.copyFile(that._source, dst, copyOpts)
+            .then(function () {
+                return dst;
+            });
        }

        that._logger.action('copy', that._source, {
@@ -102,7 +95,7 @@ FsResolver.prototype._copy = function() {
    });
 };

-FsResolver.prototype._extract = function(file) {
+FsResolver.prototype._extract = function (file) {
    if (!file || !extract.canExtract(file)) {
        return Q.resolve();
    }
@@ -115,34 +108,30 @@ FsResolver.prototype._extract = function(file) {
    return extract(file, this._tempDir);
 };

-FsResolver.prototype._rename = function() {
-    return Q.nfcall(fs.readdir, this._tempDir).then(
-        function(files) {
-            var file;
-            var oldPath;
-            var newPath;
+FsResolver.prototype._rename = function () {
+    return Q.nfcall(fs.readdir, this._tempDir)
+    .then(function (files) {
+        var file;
+        var oldPath;
+        var newPath;

-            // Remove any OS specific files from the files array
-            // before checking its length
-            files = files.filter(junk.isnt);
+        // Remove any OS specific files from the files array
+        // before checking its length
+        files = files.filter(junk.isnt);

-            // Only rename if there's only one file and it's not the json
-            if (
-                files.length === 1 &&
-                !/^(bower|component)\.json$/.test(files[0])
-            ) {
-                file = files[0];
-                this._singleFile = 'index' + path.extname(file);
-                oldPath = path.join(this._tempDir, file);
-                newPath = path.join(this._tempDir, this._singleFile);
+        // Only rename if there's only one file and it's not the json
+        if (files.length === 1 && !/^(bower|component)\.json$/.test(files[0])) {
+            file = files[0];
+            this._singleFile = 'index' + path.extname(file);
+            oldPath = path.join(this._tempDir, file);
+            newPath = path.join(this._tempDir, this._singleFile);

-                return Q.nfcall(fs.rename, oldPath, newPath);
-            }
-        }.bind(this)
-    );
+            return Q.nfcall(fs.rename, oldPath, newPath);
+        }
+    }.bind(this));
 };

-FsResolver.prototype._savePkgMeta = function(meta) {
+FsResolver.prototype._savePkgMeta = function (meta) {
    // Store main if is a single file
    if (this._singleFile) {
        meta.main = this._singleFile;
--- a/lib/core/resolvers/GitFsResolver.js
+++ b/lib/core/resolvers/GitFsResolver.js
@@ -19,52 +19,31 @@ mout.object.mixIn(GitFsResolver, GitResolver);
 // -----------------

 // Override the checkout function to work with the local copy
-GitFsResolver.prototype._checkout = function() {
+GitFsResolver.prototype._checkout = function () {
    var resolution = this._resolution;

    // The checkout process could be similar to the GitRemoteResolver by prepending file:// to the source
    // But from my performance measures, it's faster to copy the folder and just checkout in there
-    this._logger.action(
-        'checkout',
-        resolution.tag || resolution.branch || resolution.commit,
-        {
-            resolution: resolution,
-            to: this._tempDir
-        }
-    );
+    this._logger.action('checkout', resolution.tag || resolution.branch || resolution.commit, {
+        resolution: resolution,
+        to: this._tempDir
+    });

    // Copy files to the temporary directory first
-    return (
-        this._copy()
-            .then(
-                cmd.bind(
-                    cmd,
-                    'git',
-                    [
-                        'checkout',
-                        '-f',
-                        resolution.tag || resolution.branch || resolution.commit
-                    ],
-                    { cwd: this._tempDir }
-                )
-            )
-            // Cleanup unstaged files
-            .then(
-                cmd.bind(cmd, 'git', ['clean', '-f', '-d'], {
-                    cwd: this._tempDir
-                })
-            )
-    );
+    return this._copy()
+    .then(cmd.bind(cmd, 'git', ['checkout', '-f', resolution.tag || resolution.branch || resolution.commit], { cwd: this._tempDir }))
+    // Cleanup unstaged files
+    .then(cmd.bind(cmd, 'git', ['clean', '-f', '-d'], { cwd: this._tempDir }));
 };

-GitFsResolver.prototype._copy = function() {
+GitFsResolver.prototype._copy = function () {
    return copy.copyDir(this._source, this._tempDir);
 };

 // -----------------

 // Grab refs locally
-GitFsResolver.refs = function(source) {
+GitFsResolver.refs = function (source) {
    var value;

    // TODO: Normalize source because of the various available protocols?
@@ -73,24 +52,20 @@ GitFsResolver.refs = function(source) {
        return Q.resolve(value);
    }

-    value = cmd('git', ['show-ref', '--tags', '--heads'], {
-        cwd: source
-    }).spread(
-        function(stdout) {
-            var refs;
+    value = cmd('git', ['show-ref', '--tags', '--heads'], { cwd : source })
+    .spread(function (stdout) {
+        var refs;

-            refs = stdout
-                .toString()
-                .trim() // Trim trailing and leading spaces
-                .replace(/[\t ]+/g, ' ') // Standardize spaces (some git versions make tabs, other spaces)
-                .split(/[\r\n]+/); // Split lines into an array
+        refs = stdout.toString()
+        .trim()                         // Trim trailing and leading spaces
+        .replace(/[\t ]+/g, ' ')        // Standardize spaces (some git versions make tabs, other spaces)
+        .split(/[\r\n]+/);              // Split lines into an array

-            // Update the refs with the actual refs
-            this._cache.refs.set(source, refs);
+        // Update the refs with the actual refs
+        this._cache.refs.set(source, refs);

-            return refs;
-        }.bind(this)
-    );
+        return refs;
+    }.bind(this));

    // Store the promise to be reused until it resolves
    // to a specific value
--- a/lib/core/resolvers/GitHubResolver.js
+++ b/lib/core/resolvers/GitHubResolver.js
@@ -29,6 +29,9 @@ function GitHubResolver(decEndpoint, config, logger) {
        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://');
@@ -45,21 +48,15 @@ mout.object.mixIn(GitHubResolver, GitRemoteResolver);

 // -----------------

-GitHubResolver.prototype._checkout = function() {
-    var msg;
-    var name =
-        this._resolution.tag ||
-        this._resolution.branch ||
-        this._resolution.commit;
-    var tarballUrl =
-        'https://github.com/' +
-        this._org +
-        '/' +
-        this._repo +
-        '/archive/' +
-        name +
-        '.tar.gz';
+GitHubResolver.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://github.com/' + this._org + '/' + this._repo + '/archive/' + this._resolution.tag + '.tar.gz';
    var file = path.join(this._tempDir, 'archive.tar.gz');
    var reqHeaders = {};
    var that = this;
@@ -75,93 +72,60 @@ 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
    })
-        .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(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
-                });
+        // 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 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));
+        });
+    // 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));
-            }
-        );
+        return that._cleanTempDir()
+        .then(GitRemoteResolver.prototype._checkout.bind(that));
+
+    });
 };

-GitHubResolver.prototype._savePkgMeta = function(meta) {
+GitHubResolver.prototype._savePkgMeta = function (meta) {
    // Set homepage if not defined
    if (!meta.homepage) {
        meta.homepage = 'https://github.com/' + this._org + '/' + this._repo;
@@ -172,12 +136,10 @@ GitHubResolver.prototype._savePkgMeta = function(meta) {

 // ----------------

-GitHubResolver.getOrgRepoPair = function(url) {
+GitHubResolver.getOrgRepoPair = function (url) {
    var match;

-    match = url.match(
-        /(?:@|:\/\/)github.com[:\/]([^\/\s]+?)\/([^\/\s]+?)(?:\.git)?\/?$/i
-    );
+    match = url.match(/(?:@|:\/\/)github.com[:\/]([^\/\s]+?)\/([^\/\s]+?)(?:\.git)?\/?$/i);
    if (!match) {
        return null;
    }
--- a/lib/core/resolvers/GitRemoteResolver.js
+++ b/lib/core/resolvers/GitRemoteResolver.js
@@ -19,14 +19,14 @@ function GitRemoteResolver(decEndpoint, config, logger) {
        this._name = this._name.slice(0, -4);
    }

-    // Get the remote of this source
+    // Get the host of this source
    if (!/:\/\//.test(this._source)) {
-        this._remote = url.parse('ssh://' + this._source);
+        this._host = url.parse('ssh://' + this._source).host;
    } else {
-        this._remote = url.parse(this._source);
+        this._host = url.parse(this._source).host;
    }

-    this._host = this._remote.host;
+    this._remote = url.parse(this._source);

    // Verify whether the server supports shallow cloning
    this._shallowClone = this._supportsShallowCloning;
@@ -37,37 +37,33 @@ mout.object.mixIn(GitRemoteResolver, GitResolver);

 // -----------------

-GitRemoteResolver.prototype._checkout = function() {
+GitRemoteResolver.prototype._checkout = function () {
    var promise;
    var timer;
    var reporter;
    var that = this;
    var resolution = this._resolution;

-    this._logger.action(
-        'checkout',
-        resolution.tag || resolution.branch || resolution.commit,
-        {
-            resolution: resolution,
-            to: this._tempDir
-        }
-    );
+    this._logger.action('checkout', resolution.tag || resolution.branch || resolution.commit, {
+        resolution: resolution,
+        to: this._tempDir
+    });

    // If resolution is a commit, we need to clone the entire repo and check it out
    // Because a commit is not a named ref, there's no better solution
    if (resolution.type === 'commit') {
        promise = this._slowClone(resolution);
-        // Otherwise we are checking out a named ref so we can optimize it
+    // Otherwise we are checking out a named ref so we can optimize it
    } else {
        promise = this._fastClone(resolution);
    }

    // Throttle the progress reporter to 1 time each sec
-    reporter = mout.fn.throttle(function(data) {
+    reporter = mout.fn.throttle(function (data) {
        var lines;

        lines = data.split(/[\r\n]+/);
-        lines.forEach(function(line) {
+        lines.forEach(function (line) {
            if (/\d{1,3}\%/.test(line)) {
                // TODO: There are some strange chars that appear once in a while (\u001b[K)
                //       Trim also those?
@@ -77,125 +73,94 @@ GitRemoteResolver.prototype._checkout = function() {
    }, 1000);

    // Start reporting progress after a few seconds
-    timer = setTimeout(function() {
+    timer = setTimeout(function () {
        promise.progress(reporter);
    }, 8000);

-    return (
-        promise
-            // Add additional proxy information to the error if necessary
-            .fail(function(err) {
-                that._suggestProxyWorkaround(err);
-                throw err;
-            })
-            // Clear timer at the end
-            .fin(function() {
-                clearTimeout(timer);
-                reporter.cancel();
-            })
-    );
+    return promise
+    // Add additional proxy information to the error if necessary
+    .fail(function (err) {
+        that._suggestProxyWorkaround(err);
+        throw err;
+    })
+    // Clear timer at the end
+    .fin(function () {
+        clearTimeout(timer);
+        reporter.cancel();
+    });
 };

-GitRemoteResolver.prototype._findResolution = function(target) {
+GitRemoteResolver.prototype._findResolution = function (target) {
    var that = this;

    // Override this function to include a meaningful message related to proxies
    // if necessary
-    return GitResolver.prototype._findResolution
-        .call(this, target)
-        .fail(function(err) {
-            that._suggestProxyWorkaround(err);
-            throw err;
-        });
+    return GitResolver.prototype._findResolution.call(this, target)
+    .fail(function (err) {
+        that._suggestProxyWorkaround(err);
+        throw err;
+    });
 };

 // ------------------------------

-GitRemoteResolver.prototype._slowClone = function(resolution) {
-    return cmd('git', [
-        'clone',
-        this._source,
-        this._tempDir,
-        '--progress'
-    ]).then(
-        cmd.bind(cmd, 'git', ['checkout', resolution.commit], {
-            cwd: this._tempDir
-        })
-    );
+GitRemoteResolver.prototype._slowClone = function (resolution) {
+    return cmd('git', ['clone', this._source, this._tempDir, '--progress'])
+    .then(cmd.bind(cmd, 'git', ['checkout', resolution.commit], { cwd: this._tempDir }));
 };

-GitRemoteResolver.prototype._fastClone = function(resolution) {
+GitRemoteResolver.prototype._fastClone = function (resolution) {
    var branch,
        args,
        that = this;

    branch = resolution.tag || resolution.branch;
-    args = ['clone', this._source, '-b', branch, '--progress', '.'];
+    args = ['clone',  this._source, '-b', branch, '--progress', '.'];

-    return this._shallowClone().then(function(shallowCloningSupported) {
+    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)
-        ) {
+        if (shallowCloningSupported && !GitRemoteResolver._noShallow.get(this._host)) {
            args.push('--depth', 1);
        }

-        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);
-                }
-
-                throw err;
+        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);
+            }
+
+            throw err;
+        });
    });
 };

-GitRemoteResolver.prototype._suggestProxyWorkaround = function(err) {
-    if (
-        (this._config.proxy || this._config.httpsProxy) &&
+GitRemoteResolver.prototype._suggestProxyWorkaround = function (err) {
+    if ((this._config.proxy || this._config.httpsProxy) &&
        mout.string.startsWith(this._source, 'git://') &&
-        err.code === 'ECMDERR' &&
-        err.details
+        err.code === 'ECMDERR' && err.details
    ) {
        err.details = err.details.trim();
-        err.details +=
-            '\n\nWhen under a proxy, you must configure git to use https:// instead of git://.';
-        err.details +=
-            '\nYou can configure it for every endpoint or for this specific host as follows:';
+        err.details += '\n\nWhen under a proxy, you must configure git to use https:// instead of git://.';
+        err.details += '\nYou can configure it for every endpoint or for this specific host as follows:';
        err.details += '\ngit config --global url."https://".insteadOf git://';
-        err.details +=
-            '\ngit config --global url."https://' +
-            this._host +
-            '".insteadOf git://' +
-            this._host;
-        err.details +=
-            'Ignore this suggestion if you already have this configured.';
+        err.details += '\ngit config --global url."https://' + this._host + '".insteadOf git://' + this._host;
+        err.details += 'Ignore this suggestion if you already have this configured.';
    }
 };

@@ -217,7 +182,7 @@ GitRemoteResolver.prototype._suggestProxyWorkaround = function(err) {
 //      negotiation that needs to take place.
 //
 // The above should cover most cases, including BitBucket.
-GitRemoteResolver.prototype._supportsShallowCloning = function() {
+GitRemoteResolver.prototype._supportsShallowCloning = function () {
    var value = true;

    // Verify that the remote could be parsed and that a protocol is set
@@ -226,11 +191,8 @@ GitRemoteResolver.prototype._supportsShallowCloning = function() {
        return Q.resolve(false);
    }

-    if (
-        !this._host ||
-        !this._config.shallowCloneHosts ||
-        this._config.shallowCloneHosts.indexOf(this._host) === -1
-    ) {
+
+    if (!this._host || !this._config.shallowCloneHosts || this._config.shallowCloneHosts.indexOf(this._host) === -1) {
        return Q.resolve(false);
    }

@@ -238,43 +200,34 @@ GitRemoteResolver.prototype._supportsShallowCloning = function() {
    // 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)
-    ) {
+    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'
-        });
+        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;
+        })
+        .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'
-                );
+            // 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
-                );
+            this._logger.debug('detect-smart-git', 'Smart Git host detected: ' + isSmartServer);

-                if (isSmartServer) {
-                    // Cache this host
-                    GitRemoteResolver._canShallow.set(this._host, true);
-                }
+            if (isSmartServer) {
+                // Cache this host
+                GitRemoteResolver._canShallow.set(this._host, true);
+            }

-                return isSmartServer;
-            }.bind(this)
-        );
-    } else {
+            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
@@ -287,7 +240,7 @@ GitRemoteResolver.prototype._supportsShallowCloning = function() {
 // ------------------------------

 // Grab refs remotely
-GitRemoteResolver.refs = function(source) {
+GitRemoteResolver.refs = function (source) {
    var value;

    // TODO: Normalize source because of the various available protocols?
@@ -297,22 +250,20 @@ GitRemoteResolver.refs = function(source) {
    }

    // Store the promise in the refs object
-    value = cmd('git', ['ls-remote', '--tags', '--heads', source]).spread(
-        function(stdout) {
-            var refs;
+    value = cmd('git', ['ls-remote', '--tags', '--heads', source])
+    .spread(function (stdout) {
+        var refs;

-            refs = stdout
-                .toString()
-                .trim() // Trim trailing and leading spaces
-                .replace(/[\t ]+/g, ' ') // Standardize spaces (some git versions make tabs, other spaces)
-                .split(/[\r\n]+/); // Split lines into an array
+        refs = stdout.toString()
+        .trim()                         // Trim trailing and leading spaces
+        .replace(/[\t ]+/g, ' ')        // Standardize spaces (some git versions make tabs, other spaces)
+        .split(/[\r\n]+/);              // Split lines into an array

-            // Update the refs with the actual refs
-            this._cache.refs.set(source, refs);
+        // Update the refs with the actual refs
+        this._cache.refs.set(source, refs);

-            return refs;
-        }.bind(this)
-    );
+        return refs;
+    }.bind(this));

    // Store the promise to be reused until it resolves
    // to a specific value
--- a/lib/core/resolvers/GitResolver.js
+++ b/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');
@@ -27,18 +28,6 @@ function GitResolver(decEndpoint, config, logger) {
    mkdirp.sync(config.storage.empty);
    process.env.GIT_TEMPLATE_DIR = config.storage.empty;

-    if (!config.strictSsl) {
-        process.env.GIT_SSL_NO_VERIFY = 'true';
-    }
-
-    if (!config.interactive) {
-        process.env.GIT_TERMINAL_PROMPT = '0';
-
-        if (!process.env.SSH_ASKPASS) {
-            process.env.SSH_ASKPASS = 'echo';
-        }
-    }
-
    Resolver.call(this, decEndpoint, config, logger);

    if (!hasGit) {
@@ -51,20 +40,18 @@ mout.object.mixIn(GitResolver, Resolver);

 // -----------------

-GitResolver.prototype._hasNew = function(pkgMeta) {
+GitResolver.prototype._hasNew = function (pkgMeta) {
    var oldResolution = pkgMeta._resolution || {};

-    return this._findResolution().then(function(resolution) {
+    return this._findResolution()
+    .then(function (resolution) {
        // Check if resolution types are different
        if (oldResolution.type !== resolution.type) {
            return true;
        }

        // If resolved to a version, there is new content if the tags are not equal
-        if (
-            resolution.type === 'version' &&
-            semver.neq(resolution.tag, oldResolution.tag)
-        ) {
+        if (resolution.type === 'version' && semver.neq(resolution.tag, oldResolution.tag)) {
            return true;
        }

@@ -73,37 +60,35 @@ GitResolver.prototype._hasNew = function(pkgMeta) {
    });
 };

-GitResolver.prototype._resolve = function() {
+GitResolver.prototype._resolve = function () {
    var that = this;

-    return this._findResolution().then(function() {
-        return (
-            that
-                ._checkout()
-                // Always run cleanup after checkout to ensure that .git is removed!
-                // If it's not removed, problems might arise when the "tmp" module attempts
-                // to delete the temporary folder
-                .fin(function() {
-                    return that._cleanup();
-                })
-        );
+    return this._findResolution()
+    .then(function () {
+        return that._checkout()
+        // Always run cleanup after checkout to ensure that .git is removed!
+        // If it's not removed, problems might arise when the "tmp" module attempts
+        // to delete the temporary folder
+        .fin(function () {
+            return that._cleanup();
+        });
    });
 };

 // -----------------

 // Abstract functions that should be implemented by concrete git resolvers
-GitResolver.prototype._checkout = function() {
+GitResolver.prototype._checkout = function () {
    throw new Error('_checkout not implemented');
 };

-GitResolver.refs = function(source) {
+GitResolver.refs = function (source) {
    throw new Error('refs not implemented');
 };

 // -----------------

-GitResolver.prototype._findResolution = function(target) {
+GitResolver.prototype._findResolution = function (target) {
    var err;
    var self = this.constructor;
    var that = this;
@@ -112,15 +97,20 @@ GitResolver.prototype._findResolution = function(target) {

    // Target is a commit, so it's a stale target (not a moving target)
    // There's nothing to do in this case
-    if (/^[a-f0-9]{40}$/.test(target)) {
+    if ((/^[a-f0-9]{40}$/).test(target)) {
        this._resolution = { type: 'commit', commit: target };
        return Q.resolve(this._resolution);
    }

    // Target is a range/version
    if (semver.validRange(target)) {
-        return self.versions(this._source, true).then(function(versions) {
-            var versionsArr, version, index;
+        return self.versions(this._source, true)
+        .then(function (versions) {
+            var versionsArr,
+                version,
+                index;
+
+            versionsArr = versions.map(function (obj) { return obj.version; });

            // If there are no tags and target is *,
            // fallback to the latest commit on master
@@ -128,143 +118,114 @@ GitResolver.prototype._findResolution = function(target) {
                return that._findResolution('master');
            }

-            versionsArr = versions.map(function(obj) {
-                return obj.version;
-            });
+            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) {
                version = versions[index];
-                return (that._resolution = {
-                    type: 'version',
-                    tag: version.tag,
-                    commit: version.commit
-                });
+                return that._resolution = { type: 'version', tag: version.tag, commit: version.commit };
            }

            // Check if there's an exact branch/tag with this name as last resort
            return Q.all([
                self.branches(that._source),
                self.tags(that._source)
-            ]).spread(function(branches, tags) {
+            ])
+            .spread(function (branches, tags) {
                // Use hasOwn because a branch/tag could have a name like "hasOwnProperty"
                if (mout.object.hasOwn(tags, target)) {
-                    return (that._resolution = {
-                        type: 'tag',
-                        tag: target,
-                        commit: tags[target]
-                    });
+                    return that._resolution = { type: 'tag', tag: target, commit: tags[target] };
                }
                if (mout.object.hasOwn(branches, target)) {
-                    return (that._resolution = {
-                        type: 'branch',
-                        branch: target,
-                        commit: branches[target]
-                    });
+                    return that._resolution = { type: 'branch', branch: target, commit: branches[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(', ')
-                    }
-                );
+                throw createError('No tag found that was able to satisfy ' + target, 'ENORESTARGET', {
+                    details: !versions.length ?
+                        'No versions found in ' + that._source :
+                        'Available versions: ' + versions.map(function (version) { return version.version; }).join(', ')
+                });
            });
        });
    }

    // Otherwise, target is either a tag or a branch
-    return Q.all([self.branches(that._source), self.tags(that._source)]).spread(
-        function(branches, tags) {
-            // Use hasOwn because a branch/tag could have a name like "hasOwnProperty"
-            if (mout.object.hasOwn(tags, target)) {
-                return (that._resolution = {
-                    type: 'tag',
-                    tag: target,
-                    commit: tags[target]
-                });
-            }
-            if (mout.object.hasOwn(branches, target)) {
-                return (that._resolution = {
-                    type: 'branch',
-                    branch: target,
-                    commit: branches[target]
-                });
-            }
-
-            if (/^[a-f0-9]{4,40}$/.test(target)) {
-                if (target.length < 12) {
-                    that._logger.warn(
-                        'short-sha',
-                        'Consider using longer commit SHA to avoid conflicts'
-                    );
-                }
-
-                that._resolution = { type: 'commit', commit: target };
-                return that._resolution;
-            }
-
-            branches = Object.keys(branches);
-            tags = Object.keys(tags);
-
-            err = createError(
-                'Tag/branch ' + target + ' does not exist',
-                'ENORESTARGET'
-            );
-            err.details = !tags.length
-                ? 'No tags found in ' + that._source
-                : 'Available tags: ' + tags.join(', ');
-            err.details += '\n';
-            err.details += !branches.length
-                ? 'No branches found in ' + that._source
-                : 'Available branches: ' + branches.join(', ');
-
-            throw err;
+    return Q.all([
+        self.branches(that._source),
+        self.tags(that._source)
+    ])
+    .spread(function (branches, tags) {
+        // Use hasOwn because a branch/tag could have a name like "hasOwnProperty"
+        if (mout.object.hasOwn(tags, target)) {
+            return that._resolution = { type: 'tag', tag: target, commit: tags[target] };
        }
-    );
+        if (mout.object.hasOwn(branches, target)) {
+            return that._resolution = { type: 'branch', branch: target, commit: branches[target] };
+        }
+
+        if ((/^[a-f0-9]{4,40}$/).test(target)) {
+            if (target.length < 12) {
+                that._logger.warn(
+                    'short-sha',
+                    'Consider using longer commit SHA to avoid conflicts'
+                );
+            }
+
+            that._resolution = { type: 'commit', commit: target };
+            return that._resolution;
+        }
+
+        branches = Object.keys(branches);
+        tags = Object.keys(tags);
+
+        err = createError('Tag/branch ' + target + ' does not exist', 'ENORESTARGET');
+        err.details = !tags.length ?
+                'No tags found in ' + that._source :
+                'Available tags: ' + tags.join(', ');
+        err.details += '\n';
+        err.details += !branches.length ?
+                'No branches found in ' + that._source :
+                'Available branches: ' + branches.join(', ');
+
+        throw err;
+    });
 };

-GitResolver.prototype._cleanup = function() {
+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) {
+GitResolver.prototype._savePkgMeta = function (meta) {
    var version;

    if (this._resolution.type === 'version') {
        version = semver.clean(this._resolution.tag);

        // Warn if the package meta version is different than the resolved one
-        if (
-            typeof meta.version === 'string' &&
-            semver.valid(meta.version) &&
-            semver.neq(meta.version, version)
-        ) {
-            this._logger.warn(
-                'mismatch',
-                'Version declared in the json (' +
-                    meta.version +
-                    ') is different than the resolved one (' +
-                    version +
-                    ')',
-                {
-                    resolution: this._resolution,
-                    pkgMeta: meta
-                }
-            );
+        if (typeof meta.version === 'string' && semver.neq(meta.version, version)) {
+            this._logger.warn('mismatch', 'Version declared in the json (' + meta.version + ') is different than the resolved one (' + version + ')', {
+                resolution: this._resolution,
+                pkgMeta: meta
+            });
        }

        // Ensure package meta version is the same as the resolution
@@ -278,10 +239,9 @@ GitResolver.prototype._savePkgMeta = function(meta) {
    // Save version/tag/commit in the release
    // Note that we can't store branches because _release is supposed to be
    // an unique id of this ref.
-    meta._release =
-        version ||
-        this._resolution.tag ||
-        this._resolution.commit.substr(0, 10);
+    meta._release = version ||
+                    this._resolution.tag ||
+                    this._resolution.commit.substr(0, 10);

    // Save resolution to be used in hasNew later
    meta._resolution = this._resolution;
@@ -291,56 +251,51 @@ GitResolver.prototype._savePkgMeta = function(meta) {

 // ------------------------------

-GitResolver.versions = function(source, extra) {
+GitResolver.versions = function (source, extra) {
    var value = this._cache.versions.get(source);

    if (value) {
-        return Q.resolve(value).then(
-            function() {
-                var versions = this._cache.versions.get(source);
+        return Q.resolve(value)
+        .then(function () {
+            var versions = this._cache.versions.get(source);

-                // If no extra information was requested,
-                // resolve simply with the versions
-                if (!extra) {
-                    versions = versions.map(function(version) {
-                        return version.version;
-                    });
-                }
-
-                return versions;
-            }.bind(this)
-        );
-    }
-
-    value = this.tags(source).then(
-        function(tags) {
-            var tag;
-            var version;
-            var versions = [];
-
-            // For each tag
-            for (tag in tags) {
-                version = semver.clean(tag);
-                if (version) {
-                    versions.push({
-                        version: version,
-                        tag: tag,
-                        commit: tags[tag]
-                    });
-                }
+            // If no extra information was requested,
+            // resolve simply with the versions
+            if (!extra) {
+                versions = versions.map(function (version) {
+                    return version.version;
+                });
            }

-            // Sort them by DESC order
-            versions.sort(function(a, b) {
-                return semver.rcompare(a.version, b.version);
-            });
+            return versions;
+        }.bind(this));
+    }

-            this._cache.versions.set(source, versions);
+    value = this.tags(source)
+    .then(function (tags) {
+        var tag;
+        var version;
+        var versions = [];
+
+        // For each tag
+        for (tag in tags) {
+            version = semver.clean(tag);
+            if (version) {
+                versions.push({ version: version, tag: tag, commit: tags[tag] });
+            }
+        }
+
+        // Sort them by DESC order
+        versions.sort(function (a, b) {
+            return semver.rcompare(a.version, b.version);
+        });
+
+        this._cache.versions.set(source, versions);
+
+        // Call the function again to keep it DRY
+        return this.versions(source, extra);
+    }.bind(this));

-            // Call the function again to keep it DRY
-            return this.versions(source, extra);
-        }.bind(this)
-    );

    // Store the promise to be reused until it resolves
    // to a specific value
@@ -349,31 +304,30 @@ GitResolver.versions = function(source, extra) {
    return value;
 };

-GitResolver.tags = function(source) {
+GitResolver.tags = function (source) {
    var value = this._cache.tags.get(source);

    if (value) {
        return Q.resolve(value);
    }

-    value = this.refs(source).then(
-        function(refs) {
-            var tags = {};
+    value = this.refs(source)
+    .then(function (refs) {
+        var tags = {};

-            // For each line in the refs, match only the tags
-            refs.forEach(function(line) {
-                var match = line.match(/^([a-f0-9]{40})\s+refs\/tags\/(\S+)/);
+        // For each line in the refs, match only the tags
+        refs.forEach(function (line) {
+            var match = line.match(/^([a-f0-9]{40})\s+refs\/tags\/(\S+)/);

-                if (match && !mout.string.endsWith(match[2], '^{}')) {
-                    tags[match[2]] = match[1];
-                }
-            });
+            if (match && !mout.string.endsWith(match[2], '^{}')) {
+                tags[match[2]] = match[1];
+            }
+        });

-            this._cache.tags.set(source, tags);
+        this._cache.tags.set(source, tags);

-            return tags;
-        }.bind(this)
-    );
+        return tags;
+    }.bind(this));

    // Store the promise to be reused until it resolves
    // to a specific value
@@ -382,33 +336,32 @@ GitResolver.tags = function(source) {
    return value;
 };

-GitResolver.branches = function(source) {
+GitResolver.branches = function (source) {
    var value = this._cache.branches.get(source);

    if (value) {
        return Q.resolve(value);
    }

-    value = this.refs(source).then(
-        function(refs) {
-            var branches = {};
+    value = this.refs(source)
+    .then(function (refs) {
+        var branches = {};

-            // For each line in the refs, extract only the heads
-            // Organize them in an object where keys are branches and values
-            // the commit hashes
-            refs.forEach(function(line) {
-                var match = line.match(/^([a-f0-9]{40})\s+refs\/heads\/(\S+)/);
+        // For each line in the refs, extract only the heads
+        // Organize them in an object where keys are branches and values
+        // the commit hashes
+        refs.forEach(function (line) {
+            var match = line.match(/^([a-f0-9]{40})\s+refs\/heads\/(\S+)/);

-                if (match) {
-                    branches[match[2]] = match[1];
-                }
-            });
+            if (match) {
+                branches[match[2]] = match[1];
+            }
+        });

-            this._cache.branches.set(source, branches);
+        this._cache.branches.set(source, branches);

-            return branches;
-        }.bind(this)
-    );
+        return branches;
+    }.bind(this));

    // Store the promise to be reused until it resolves
    // to a specific value
@@ -417,9 +370,9 @@ GitResolver.branches = function(source) {
    return value;
 };

-GitResolver.clearRuntimeCache = function() {
+GitResolver.clearRuntimeCache = function () {
    // Reset cache for branches, tags, etc
-    mout.object.forOwn(GitResolver._cache, function(lru) {
+    mout.object.forOwn(GitResolver._cache, function (lru) {
        lru.reset();
    });
 };
--- a/lib/core/resolvers/Resolver.js
+++ b/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();

@@ -24,27 +23,27 @@ function Resolver(decEndpoint, config, logger) {

 // -----------------

-Resolver.prototype.getSource = function() {
+Resolver.prototype.getSource = function () {
    return this._source;
 };

-Resolver.prototype.getName = function() {
+Resolver.prototype.getName = function () {
    return this._name;
 };

-Resolver.prototype.getTarget = function() {
+Resolver.prototype.getTarget = function () {
    return this._target;
 };

-Resolver.prototype.getTempDir = function() {
+Resolver.prototype.getTempDir = function () {
    return this._tempDir;
 };

-Resolver.prototype.getPkgMeta = function() {
+Resolver.prototype.getPkgMeta = function () {
    return this._pkgMeta;
 };

-Resolver.prototype.hasNew = function(pkgMeta) {
+Resolver.prototype.hasNew = function (pkgMeta) {
    var promise;
    var that = this;

@@ -58,12 +57,12 @@ Resolver.prototype.hasNew = function(pkgMeta) {
    // Avoid reading the package meta if already given
    promise = this._hasNew(pkgMeta);

-    return promise.fin(function() {
+    return promise.fin(function () {
        that._working = false;
    });
 };

-Resolver.prototype.resolve = function() {
+Resolver.prototype.resolve = function () {
    var that = this;

    // If already working, error out
@@ -74,104 +73,90 @@ Resolver.prototype.resolve = function() {
    this._working = true;

    // Create temporary dir
-    return (
-        this._createTempDir()
-            // Resolve self
-            .then(this._resolve.bind(this))
-            // Read json, generating the package meta
-            .then(this._readJson.bind(this, null))
-            // Apply and save package meta
-            .then(function(meta) {
-                return that
-                    ._applyPkgMeta(meta)
-                    .then(that._savePkgMeta.bind(that, meta));
-            })
-            .then(
-                function() {
-                    // Resolve with the folder
-                    return that._tempDir;
-                },
-                function(err) {
-                    // If something went wrong, unset the temporary dir
-                    that._tempDir = null;
-                    throw err;
-                }
-            )
-            .fin(function() {
-                that._working = false;
-            })
-    );
+    return this._createTempDir()
+    // Resolve self
+    .then(this._resolve.bind(this))
+    // Read json, generating the package meta
+    .then(this._readJson.bind(this, null))
+    // Apply and save package meta
+    .then(function (meta) {
+        return that._applyPkgMeta(meta)
+        .then(that._savePkgMeta.bind(that, meta));
+    })
+    .then(function () {
+        // Resolve with the folder
+        return that._tempDir;
+    }, function (err) {
+        // If something went wrong, unset the temporary dir
+        that._tempDir = null;
+        throw err;
+    })
+    .fin(function () {
+        that._working = false;
+    });
 };

-Resolver.prototype.isCacheable = function() {
+Resolver.prototype.isCacheable = function () {
    // Bypass cache for local dependencies
-    if (
-        this._source &&
+    if (this._source &&
        /^(?:file:[\/\\]{2}|[A-Z]:)?\.?\.?[\/\\]/.test(this._source)
    ) {
        return false;
    }

    // We don't want to cache moving targets like branches
-    if (
-        this._pkgMeta &&
+    if (this._pkgMeta &&
        this._pkgMeta._resolution &&
-        this._pkgMeta._resolution.type === 'branch'
-    ) {
+        this._pkgMeta._resolution.type === 'branch')
+    {
        return false;
    }

    return true;
 };

+
 // -----------------

 // Abstract functions that must be implemented by concrete resolvers
-Resolver.prototype._resolve = function() {
+Resolver.prototype._resolve = function () {
    throw new Error('_resolve not implemented');
 };

 // Abstract functions that can be re-implemented by concrete resolvers
 // as necessary
-Resolver.prototype._hasNew = function(pkgMeta) {
+Resolver.prototype._hasNew = function (pkgMeta) {
    return Q.resolve(true);
 };

-Resolver.isTargetable = function() {
+Resolver.isTargetable = function () {
    return true;
 };

-Resolver.versions = function(source) {
+Resolver.versions = function (source) {
    return Q.resolve([]);
 };

-Resolver.clearRuntimeCache = function() {};
+Resolver.clearRuntimeCache = function () {};

 // -----------------

-Resolver.prototype._createTempDir = function() {
+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'
-                    ),
-                    mode: 0777 & ~process.umask(),
-                    unsafeCleanup: true
-                });
-            }.bind(this)
-        )
-        .then(
-            function(dir) {
-                // nfcall may return multiple callback arguments as an array
-                return (this._tempDir = Array.isArray(dir) ? dir[0] : dir);
-            }.bind(this)
-        );
+    .then(function () {
+        return Q.nfcall(tmp.dir, {
+            template: path.join(this._config.tmp, this._name + '-' + process.pid + '-XXXXXX'),
+            mode: 0777 & ~process.umask(),
+            unsafeCleanup: true
+        });
+    }.bind(this))
+    .then(function (dir) {
+        // nfcall may return multiple callback arguments as an array
+        return this._tempDir = Array.isArray(dir) ? dir[0] : dir;
+    }.bind(this));
 };

-Resolver.prototype._cleanTempDir = function() {
+Resolver.prototype._cleanTempDir = function () {
    var tempDir = this._tempDir;

    if (!tempDir) {
@@ -180,37 +165,31 @@ Resolver.prototype._cleanTempDir = function() {

    // Delete and create folder
    return Q.nfcall(rimraf, tempDir)
-        .then(function() {
-            return Q.nfcall(mkdirp, tempDir, 0777 & ~process.umask());
-        })
-        .then(function() {
-            return tempDir;
-        });
+    .then(function () {
+        return Q.nfcall(mkdirp, tempDir, 0777 & ~process.umask());
+    })
+    .then(function () {
+        return tempDir;
+    });
 };

-Resolver.prototype._readJson = function(dir) {
+Resolver.prototype._readJson = function (dir) {
    var that = this;

    dir = dir || this._tempDir;
    return readJson(dir, {
-        assume: { name: this._name },
-        logger: that._logger
-    }).spread(function(json, deprecated) {
+        assume: { name: this._name }
+    })
+    .spread(function (json, deprecated) {
        if (deprecated) {
-            that._logger.warn(
-                'deprecated',
-                'Package ' +
-                    that._name +
-                    ' is using the deprecated ' +
-                    deprecated
-            );
+            that._logger.warn('deprecated', 'Package ' + that._name + ' is using the deprecated ' + deprecated);
        }

        return json;
    });
 };

-Resolver.prototype._applyPkgMeta = function(meta) {
+Resolver.prototype._applyPkgMeta = function (meta) {
    // 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._guessedName) {
@@ -224,12 +203,13 @@ Resolver.prototype._applyPkgMeta = function(meta) {
    }

    // Otherwise remove them from the temp dir
-    return removeIgnores(this._tempDir, meta).then(function() {
+    return removeIgnores(this._tempDir, meta)
+    .then(function () {
        return meta;
    });
 };

-Resolver.prototype._savePkgMeta = function(meta) {
+Resolver.prototype._savePkgMeta = function (meta) {
    var that = this;
    var contents;

@@ -237,15 +217,21 @@ Resolver.prototype._savePkgMeta = function(meta) {
    meta._source = this._source;
    meta._target = this._target;

+    ['main', 'ignore'].forEach(function (attr) {
+        if (meta[attr]) return;
+
+        that._logger.log(
+            'warn', 'invalid-meta',
+            (meta.name || 'component') + ' is missing "' + attr + '" entry in bower.json'
+        );
+    });
+
    // Stringify contents
    contents = JSON.stringify(meta, null, 2);

-    return Q.nfcall(
-        fs.writeFile,
-        path.join(this._tempDir, '.bower.json'),
-        contents
-    ).then(function() {
-        return (that._pkgMeta = meta);
+    return Q.nfcall(fs.writeFile, path.join(this._tempDir, '.bower.json'), contents)
+    .then(function () {
+        return that._pkgMeta = meta;
    });
 };

--- a/lib/core/resolvers/SvnResolver.js
+++ b/lib/core/resolvers/SvnResolver.js
@@ -31,29 +31,27 @@ mout.object.mixIn(SvnResolver, Resolver);

 // -----------------

-SvnResolver.getSource = function(source) {
+SvnResolver.getSource = function (source) {
    var uri = this._source || source;

    return uri
-        .replace(/^svn\+(https?|file):\/\//i, '$1://') // Change svn+http or svn+https or svn+file to http(s), file respectively
-        .replace('svn://', 'http://') // Change svn to http
-        .replace(/\/+$/, ''); // Remove trailing slashes
+        .replace(/^svn\+(https?|file):\/\//i, '$1://')  // Change svn+http or svn+https or svn+file to http(s), file respectively
+        .replace('svn://', 'http://')  // Change svn to http
+        .replace(/\/+$/, '');  // Remove trailing slashes
 };

-SvnResolver.prototype._hasNew = function(pkgMeta) {
+SvnResolver.prototype._hasNew = function (pkgMeta) {
    var oldResolution = pkgMeta._resolution || {};

-    return this._findResolution().then(function(resolution) {
+    return this._findResolution()
+    .then(function (resolution) {
        // Check if resolution types are different
        if (oldResolution.type !== resolution.type) {
            return true;
        }

        // If resolved to a version, there is new content if the tags are not equal
-        if (
-            resolution.type === 'version' &&
-            semver.neq(resolution.tag, oldResolution.tag)
-        ) {
+        if (resolution.type === 'version' && semver.neq(resolution.tag, oldResolution.tag)) {
            return true;
        }

@@ -62,17 +60,18 @@ SvnResolver.prototype._hasNew = function(pkgMeta) {
    });
 };

-SvnResolver.prototype._resolve = function() {
+SvnResolver.prototype._resolve = function () {
    var that = this;

-    return this._findResolution().then(function() {
+    return this._findResolution()
+    .then(function () {
        return that._export();
    });
 };

 // -----------------

-SvnResolver.prototype._export = function() {
+SvnResolver.prototype._export = function () {
    var promise;
    var timer;
    var reporter;
@@ -81,56 +80,27 @@ SvnResolver.prototype._export = function() {

    this.source = SvnResolver.getSource(this._source);

-    this._logger.action(
-        'export',
-        resolution.tag || resolution.branch || resolution.commit,
-        {
-            resolution: resolution,
-            to: this._tempDir
-        }
-    );
+    this._logger.action('export', resolution.tag || resolution.branch || resolution.commit, {
+        resolution: resolution,
+        to: this._tempDir
+    });

    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
-    reporter = mout.fn.throttle(function(data) {
+    reporter = mout.fn.throttle(function (data) {
        var lines;

        lines = data.split(/[\r\n]+/);
-        lines.forEach(function(line) {
+        lines.forEach(function (line) {
            if (/\d{1,3}\%/.test(line)) {
                // TODO: There are some strange chars that appear once in a while (\u001b[K)
                //       Trim also those?
@@ -140,27 +110,25 @@ SvnResolver.prototype._export = function() {
    }, 1000);

    // Start reporting progress after a few seconds
-    timer = setTimeout(function() {
+    timer = setTimeout(function () {
        promise.progress(reporter);
    }, 8000);

-    return (
-        promise
-            // Add additional proxy information to the error if necessary
-            .fail(function(err) {
-                throw err;
-            })
-            // Clear timer at the end
-            .fin(function() {
-                clearTimeout(timer);
-                reporter.cancel();
-            })
-    );
+    return promise
+    // Add additional proxy information to the error if necessary
+    .fail(function (err) {
+        throw err;
+    })
+    // Clear timer at the end
+    .fin(function () {
+        clearTimeout(timer);
+        reporter.cancel();
+    });
 };

 // -----------------

-SvnResolver.prototype._findResolution = function(target) {
+SvnResolver.prototype._findResolution = function (target) {
    var err;
    var self = this.constructor;
    var that = this;
@@ -171,7 +139,7 @@ SvnResolver.prototype._findResolution = function(target) {

    // Target is a revision, so it's a stale target (not a moving target)
    // There's nothing to do in this case
-    if (/^r\d+/.test(target)) {
+    if ((/^r\d+/).test(target)) {
        target = target.split('r');

        this._resolution = { type: 'commit', commit: target[1] };
@@ -180,12 +148,13 @@ SvnResolver.prototype._findResolution = function(target) {

    // Target is a range/version
    if (semver.validRange(target)) {
-        return self.versions(this._source, true).then(function(versions) {
-            var versionsArr, version, index;
+        return self.versions(this._source, true)
+        .then(function (versions) {
+            var versionsArr,
+                version,
+                index;

-            versionsArr = versions.map(function(obj) {
-                return obj.version;
-            });
+            versionsArr = versions.map(function (obj) { return obj.version; });

            // If there are no tags and target is *,
            // fallback to the latest commit on trunk
@@ -193,124 +162,80 @@ SvnResolver.prototype._findResolution = function(target) {
                return that._findResolution('trunk');
            }

-            versionsArr = versions.map(function(obj) {
-                return obj.version;
-            });
+            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) {
                version = versions[index];
-                return (that._resolution = {
-                    type: 'version',
-                    tag: version.tag,
-                    commit: version.commit
-                });
+                return that._resolution = { type: 'version', tag: version.tag, commit: version.commit };
            }

            // Check if there's an exact branch/tag with this name as last resort
            return Q.all([
                self.branches(that._source),
                self.tags(that._source)
-            ]).spread(function(branches, tags) {
+            ])
+            .spread(function (branches, tags) {
                // Use hasOwn because a branch/tag could have a name like "hasOwnProperty"
                if (mout.object.hasOwn(tags, target)) {
-                    return (that._resolution = {
-                        type: 'tag',
-                        tag: target,
-                        commit: tags[target]
-                    });
+                    return that._resolution = { type: 'tag', tag: target, commit: tags[target] };
                }
                if (mout.object.hasOwn(branches, target)) {
-                    return (that._resolution = {
-                        type: 'branch',
-                        branch: target,
-                        commit: branches[target]
-                    });
+                    return that._resolution = { type: 'branch', branch: target, commit: branches[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(', ')
-                    }
-                );
+                throw createError('No tag found that was able to satisfy ' + target, 'ENORESTARGET', {
+                    details: !versions.length ?
+                        'No versions found in ' + that._source :
+                        'Available versions: ' + versions.map(function (version) { return version.version; }).join(', ')
+                });
            });
        });
    }

    // Otherwise, target is either a tag or a branch
-    return Q.all([self.branches(that._source), self.tags(that._source)]).spread(
-        function(branches, tags) {
-            // Use hasOwn because a branch/tag could have a name like "hasOwnProperty"
-            if (mout.object.hasOwn(tags, target)) {
-                return (that._resolution = {
-                    type: 'tag',
-                    tag: target,
-                    commit: tags[target]
-                });
-            }
-            if (mout.object.hasOwn(branches, target)) {
-                return (that._resolution = {
-                    type: 'branch',
-                    branch: target,
-                    commit: branches[target]
-                });
-            }
-
-            branches = Object.keys(branches);
-            tags = Object.keys(tags);
-
-            err = createError(
-                'target ' + target + ' does not exist',
-                'ENORESTARGET'
-            );
-            err.details = !tags.length
-                ? 'No tags found in ' + that._source
-                : 'Available tags: ' + tags.join(', ');
-            err.details += '\n';
-            err.details += !branches.length
-                ? 'No branches found in ' + that._source
-                : 'Available branches: ' + branches.join(', ');
-
-            throw err;
+    return Q.all([
+        self.branches(that._source),
+        self.tags(that._source)
+    ])
+    .spread(function (branches, tags) {
+        // Use hasOwn because a branch/tag could have a name like "hasOwnProperty"
+        if (mout.object.hasOwn(tags, target)) {
+            return that._resolution = { type: 'tag', tag: target, commit: tags[target] };
        }
-    );
+        if (mout.object.hasOwn(branches, target)) {
+            return that._resolution = { type: 'branch', branch: target, commit: branches[target] };
+        }
+
+        branches = Object.keys(branches);
+        tags = Object.keys(tags);
+
+        err = createError('target ' + target + ' does not exist', 'ENORESTARGET');
+        err.details = !tags.length ?
+                'No tags found in ' + that._source :
+                'Available tags: ' + tags.join(', ');
+        err.details += '\n';
+        err.details += !branches.length ?
+                'No branches found in ' + that._source :
+                'Available branches: ' + branches.join(', ');
+
+        throw err;
+    });
 };

-SvnResolver.prototype._savePkgMeta = function(meta) {
+SvnResolver.prototype._savePkgMeta = function (meta) {
    var version;

    if (this._resolution.type === 'version') {
        version = semver.clean(this._resolution.tag);

        // Warn if the package meta version is different than the resolved one
-        if (
-            typeof meta.version === 'string' &&
-            semver.neq(meta.version, version)
-        ) {
-            this._logger.warn(
-                'mismatch',
-                'Version declared in the json (' +
-                    meta.version +
-                    ') is different than the resolved one (' +
-                    version +
-                    ')',
-                {
-                    resolution: this._resolution,
-                    pkgMeta: meta
-                }
-            );
+        if (typeof meta.version === 'string' && semver.neq(meta.version, version)) {
+            this._logger.warn('mismatch', 'Version declared in the json (' + meta.version + ') is different than the resolved one (' + version + ')', {
+                resolution: this._resolution,
+                pkgMeta: meta
+            });
        }

        // Ensure package meta version is the same as the resolution
@@ -324,7 +249,9 @@ SvnResolver.prototype._savePkgMeta = function(meta) {
    // Save version/tag/commit in the release
    // Note that we can't store branches because _release is supposed to be
    // an unique id of this ref.
-    meta._release = version || this._resolution.tag || this._resolution.commit;
+    meta._release = version ||
+                    this._resolution.tag ||
+                    this._resolution.commit;

    // Save resolution to be used in hasNew later
    meta._resolution = this._resolution;
@@ -334,58 +261,52 @@ SvnResolver.prototype._savePkgMeta = function(meta) {

 // ------------------------------

-SvnResolver.versions = function(source, extra) {
+SvnResolver.versions = function (source, extra) {
    source = SvnResolver.getSource(source);

    var value = this._cache.versions.get(source);

    if (value) {
-        return Q.resolve(value).then(
-            function() {
-                var versions = this._cache.versions.get(source);
+        return Q.resolve(value)
+        .then(function () {
+            var versions = this._cache.versions.get(source);

-                // If no extra information was requested,
-                // resolve simply with the versions
-                if (!extra) {
-                    versions = versions.map(function(version) {
-                        return version.version;
-                    });
-                }
-
-                return versions;
-            }.bind(this)
-        );
-    }
-
-    value = this.tags(source).then(
-        function(tags) {
-            var tag;
-            var version;
-            var versions = [];
-
-            // For each tag
-            for (tag in tags) {
-                version = semver.clean(tag);
-                if (version) {
-                    versions.push({
-                        version: version,
-                        tag: tag,
-                        commit: tags[tag]
-                    });
-                }
+            // If no extra information was requested,
+            // resolve simply with the versions
+            if (!extra) {
+                versions = versions.map(function (version) {
+                    return version.version;
+                });
            }

-            // Sort them by DESC order
-            versions.sort(function(a, b) {
-                return semver.rcompare(a.version, b.version);
-            });
+            return versions;
+        }.bind(this));
+    }

-            this._cache.versions.set(source, versions);
+    value = this.tags(source)
+    .then(function (tags) {
+        var tag;
+        var version;
+        var versions = [];

-            // Call the function again to keep it DRY
-            return this.versions(source, extra);
-        }.bind(this)
-    );
+        // For each tag
+        for (tag in tags) {
+            version = semver.clean(tag);
+            if (version) {
+                versions.push({ version: version, tag: tag, commit: tags[tag] });
+            }
+        }
+
+        // Sort them by DESC order
+        versions.sort(function (a, b) {
+            return semver.rcompare(a.version, b.version);
+        });
+
+        this._cache.versions.set(source, versions);
+
+        // Call the function again to keep it DRY
+        return this.versions(source, extra);
+    }.bind(this));

    // Store the promise to be reused until it resolves
    // to a specific value
@@ -394,7 +315,7 @@ SvnResolver.versions = function(source, extra) {
    return value;
 };

-SvnResolver.tags = function(source) {
+SvnResolver.tags = function (source) {
    source = SvnResolver.getSource(source);

    var value = this._cache.tags.get(source);
@@ -403,19 +324,14 @@ SvnResolver.tags = function(source) {
        return Q.resolve(value);
    }

-    value = cmd('svn', [
-        'list',
-        source + '/tags',
-        '--verbose',
-        '--non-interactive'
-    ]).spread(
-        function(stout) {
-            var tags = SvnResolver.parseSubversionListOutput(stout.toString());
+    value = cmd('svn', ['list', source + '/tags', '--verbose'])
+    .spread(function (stout) {
+        var tags = SvnResolver.parseSubversionListOutput(stout.toString());

-            this._cache.tags.set(source, tags);
-            return tags;
-        }.bind(this)
-    );
+        this._cache.tags.set(source, tags);
+        return tags;
+
+    }.bind(this));

    // Store the promise to be reused until it resolves
    // to a specific value
@@ -424,7 +340,7 @@ SvnResolver.tags = function(source) {
    return value;
 };

-SvnResolver.branches = function(source) {
+SvnResolver.branches = function (source) {
    source = SvnResolver.getSource(source);

    var value = this._cache.branches.get(source);
@@ -433,24 +349,17 @@ SvnResolver.branches = function(source) {
        return Q.resolve(value);
    }

-    value = cmd('svn', [
-        'list',
-        source + '/branches',
-        '--verbose',
-        '--non-interactive'
-    ]).spread(
-        function(stout) {
-            var branches = SvnResolver.parseSubversionListOutput(
-                stout.toString()
-            );
+    value = cmd('svn', ['list', source + '/branches', '--verbose'])
+    .spread(function (stout) {
+        var branches = SvnResolver.parseSubversionListOutput(stout.toString());

-            // trunk is a branch!
-            branches.trunk = '*';
+        // trunk is a branch!
+        branches.trunk = '*';

-            this._cache.branches.set(source, branches);
-            return branches;
-        }.bind(this)
-    );
+        this._cache.branches.set(source, branches);
+        return branches;
+
+    }.bind(this));

    // Store the promise to be reused until it resolves
    // to a specific value
@@ -459,12 +368,15 @@ SvnResolver.branches = function(source) {
    return value;
 };

-SvnResolver.parseSubversionListOutput = function(stout) {
+SvnResolver.parseSubversionListOutput = function (stout) {
+
    var entries = {};
-    var lines = stout.trim().split(/[\r\n]+/);
+    var lines = stout
+        .trim()
+        .split(/[\r\n]+/);

    // For each line in the refs, match only the branches
-    lines.forEach(function(line) {
+    lines.forEach(function (line) {
        var match = line.match(/\s+([0-9]+)\s.+\s([\w.$-]+)\//i);

        if (match && match[2] !== '.') {
@@ -475,9 +387,9 @@ SvnResolver.parseSubversionListOutput = function(stout) {
    return entries;
 };

-SvnResolver.clearRuntimeCache = function() {
+SvnResolver.clearRuntimeCache = function () {
    // Reset cache for branches, tags, etc
-    mout.object.forOwn(SvnResolver._cache, function(lru) {
+    mout.object.forOwn(SvnResolver._cache, function (lru) {
        lru.reset();
    });
 };
--- a/lib/core/resolvers/UrlResolver.js
+++ b/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');
@@ -16,7 +16,7 @@ function UrlResolver(decEndpoint, config, logger) {

    // If target was specified, error out
    if (this._target !== '*') {
-        throw createError("URL sources can't resolve targets", 'ENORESTARGET');
+        throw createError('URL sources can\'t resolve targets', 'ENORESTARGET');
    }

    // If the name was guessed
@@ -24,10 +24,7 @@ function UrlResolver(decEndpoint, config, logger) {
        // Remove the ?xxx part
        this._name = this._name.replace(/\?.*$/, '');
        // Remove extension
-        this._name = this._name.substr(
-            0,
-            this._name.length - path.extname(this._name).length
-        );
+        this._name = this._name.substr(0, this._name.length - path.extname(this._name).length);
    }

    this._remote = url.parse(this._source);
@@ -38,11 +35,11 @@ mout.object.mixIn(UrlResolver, Resolver);

 // -----------------

-UrlResolver.isTargetable = function() {
+UrlResolver.isTargetable = function () {
    return false;
 };

-UrlResolver.prototype._hasNew = function(pkgMeta) {
+UrlResolver.prototype._hasNew = function (pkgMeta) {
    var oldCacheHeaders = pkgMeta._cacheHeaders || {};
    var reqHeaders = {};

@@ -57,78 +54,58 @@ UrlResolver.prototype._hasNew = function(pkgMeta) {
    }

    // Make an HEAD request to the source
-    return (
-        Q.nfcall(request.head, this._source, {
-            ca: this._config.ca.default,
-            strictSSL: this._config.strictSsl,
-            timeout: this._config.timeout,
-            headers: reqHeaders
-        })
-            // Compare new headers with the old ones
-            .spread(
-                function(response) {
-                    var cacheHeaders;
+    return Q.nfcall(request.head, this._source, {
+        proxy: this._remote.protocol === 'https:' ? this._config.httpsProxy : this._config.proxy,
+        strictSSL: this._config.strictSsl,
+        timeout: this._config.timeout,
+        headers: reqHeaders
+    })
+    // Compare new headers with the old ones
+    .spread(function (response) {
+        var cacheHeaders;

-                    // If the server responded with 303 then the resource
-                    // still has the same ETag
-                    if (response.statusCode === 304) {
-                        return false;
-                    }
+        // If the server responded with 303 then the resource
+        // still has the same ETag
+        if (response.statusCode === 304) {
+            return false;
+        }

-                    // If status code is not in the 2xx range,
-                    // then just resolve to true
-                    if (
-                        response.statusCode < 200 ||
-                        response.statusCode >= 300
-                    ) {
-                        return true;
-                    }
+        // If status code is not in the 2xx range,
+        // then just resolve to true
+        if (response.statusCode < 200 || response.statusCode >= 300) {
+            return true;
+        }

-                    // Fallback to comparing cache headers
-                    cacheHeaders = this._collectCacheHeaders(response);
-                    return !mout.object.equals(oldCacheHeaders, cacheHeaders);
-                }.bind(this),
-                function() {
-                    // Assume new contents if the request failed
-                    // Note that we do not retry the request using the "request-replay" module
-                    // because it would take too long
-                    return true;
-                }
-            )
-    );
+        // Fallback to comparing cache headers
+        cacheHeaders = this._collectCacheHeaders(response);
+        return !mout.object.equals(oldCacheHeaders, cacheHeaders);
+    }.bind(this), function () {
+        // Assume new contents if the request failed
+        // Note that we do not retry the request using the "request-replay" module
+        // because it would take too long
+        return true;
+    });
 };

 // TODO: There's room for improvement by using streams if the URL
 //       is an archive file, by piping read stream to the zip extractor
 //       This will likely increase the complexity of code but might worth it

-UrlResolver.prototype._resolve = function() {
+UrlResolver.prototype._resolve = function () {
    // Download
-    return (
-        this._download()
-            // Parse headers
-            .spread(this._parseHeaders.bind(this))
-            // Extract file
-            .spread(this._extract.bind(this))
-            // Rename file to index
-            .then(this._rename.bind(this))
-    );
+    return this._download()
+    // Parse headers
+    .spread(this._parseHeaders.bind(this))
+    // Extract file
+    .spread(this._extract.bind(this))
+    // Rename file to index
+    .then(this._rename.bind(this));
 };

 // -----------------

-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);
-    }
-
+UrlResolver.prototype._download = function () {
+    var fileName = url.parse(path.basename(this._source)).pathname;
    var file = path.join(this._tempDir, fileName);
    var reqHeaders = {};
    var that = this;
@@ -144,48 +121,37 @@ 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
    })
-        .progress(function(state) {
-            var msg;
+    .progress(function (state) {
+        var msg;

-            // Retry?
-            if (state.retry) {
-                msg =
-                    'Download of ' +
-                    that._source +
-                    ' failed' +
-                    (state.error.code ? ' 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);
-            }
+        // Retry?
+        if (state.retry) {
+            msg = 'Download of ' + that._source + ' failed' + (state.error.code ? ' 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(response) {
-            that._response = response;
-            return [file, response];
-        });
+        // 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 (response) {
+        that._response = response;
+        return [file, response];
+    });
 };

-UrlResolver.prototype._parseHeaders = function(file, response) {
+UrlResolver.prototype._parseHeaders = function (file, response) {
    var disposition;
    var newFile;
    var match;
@@ -220,19 +186,20 @@ UrlResolver.prototype._parseHeaders = function(file, response) {

    newFile = path.join(this._tempDir, newFile);

-    return Q.nfcall(fs.rename, file, newFile).then(function() {
+    return Q.nfcall(fs.rename, file, newFile)
+    .then(function () {
        return [newFile, response];
    });
 };

-UrlResolver.prototype._extract = function(file, response) {
+UrlResolver.prototype._extract = function (file, response) {
    var mimeType = response.headers['content-type'];

    if (mimeType) {
        // Clean everything after ; and trim the end result
        mimeType = mimeType.split(';')[0].trim();
        // Some servers add quotes around the content-type, so we trim that also
-        mimeType = mout.string.trim(mimeType, ['"', "'"]);
+        mimeType = mout.string.trim(mimeType, ['"', '\'']);
    }

    if (!extract.canExtract(file, mimeType)) {
@@ -249,42 +216,36 @@ UrlResolver.prototype._extract = function(file, response) {
    });
 };

-UrlResolver.prototype._rename = function() {
-    return Q.nfcall(fs.readdir, this._tempDir).then(
-        function(files) {
-            var file;
-            var oldPath;
-            var newPath;
+UrlResolver.prototype._rename = function () {
+    return Q.nfcall(fs.readdir, this._tempDir)
+    .then(function (files) {
+        var file;
+        var oldPath;
+        var newPath;

-            // Remove any OS specific files from the files array
-            // before checking its length
-            files = files.filter(junk.isnt);
+        // Remove any OS specific files from the files array
+        // before checking its length
+        files = files.filter(junk.isnt);

-            // Only rename if there's only one file and it's not the json
-            if (
-                files.length === 1 &&
-                !/^(component|bower)\.json$/.test(files[0])
-            ) {
-                file = files[0];
-                this._singleFile = 'index' + path.extname(file);
-                oldPath = path.join(this._tempDir, file);
-                newPath = path.join(this._tempDir, this._singleFile);
+        // Only rename if there's only one file and it's not the json
+        if (files.length === 1 && !/^(component|bower)\.json$/.test(files[0])) {
+            file = files[0];
+            this._singleFile = 'index' + path.extname(file);
+            oldPath = path.join(this._tempDir, file);
+            newPath = path.join(this._tempDir, this._singleFile);

-                return Q.nfcall(fs.rename, oldPath, newPath);
-            }
-        }.bind(this)
-    );
+            return Q.nfcall(fs.rename, oldPath, newPath);
+        }
+    }.bind(this));
 };

-UrlResolver.prototype._savePkgMeta = function(meta) {
+UrlResolver.prototype._savePkgMeta = function (meta) {
    // Store collected headers in the package meta
    meta._cacheHeaders = this._collectCacheHeaders(this._response);

    // Store ETAG under _release
    if (meta._cacheHeaders.ETag) {
-        meta._release =
-            'e-tag:' +
-            mout.string.trim(meta._cacheHeaders.ETag.substr(0, 10), '"');
+        meta._release = 'e-tag:' + mout.string.trim(meta._cacheHeaders.ETag.substr(0, 10), '"');
    }

    // Store main if is a single file
@@ -295,11 +256,11 @@ UrlResolver.prototype._savePkgMeta = function(meta) {
    return Resolver.prototype._savePkgMeta.call(this, meta);
 };

-UrlResolver.prototype._collectCacheHeaders = function(res) {
+UrlResolver.prototype._collectCacheHeaders = function (res) {
    var headers = {};

    // Collect cache headers
-    this.constructor._cacheHeaders.forEach(function(name) {
+    this.constructor._cacheHeaders.forEach(function (name) {
        var value = res.headers[name.toLowerCase()];

        if (value != null) {
--- a/lib/core/resolvers/pluginResolverFactory.js
+++ b/lib/core/resolvers/pluginResolverFactory.js
@@ -1,6 +1,6 @@
 var Q = require('q');
 var path = require('path');
-var fs = require('../../util/fs');
+var fs = require('fs');
 var object = require('mout/object');

 var semver = require('../../util/semver');
@@ -12,12 +12,7 @@ function pluginResolverFactory(resolverFactory, bower) {
    bower = bower || {};

    if (typeof resolverFactory !== 'function') {
-        throw createError(
-            'Resolver has "' +
-                typeof resolverFactory +
-                '" type instead of "function" type.',
-            'ERESOLERAPI'
-        );
+        throw createError('Resolver has "' + typeof resolverFactory + '" type instead of "function" type.', 'ERESOLERAPI');
    }

    var resolver = resolverFactory(bower);
@@ -25,9 +20,7 @@ function pluginResolverFactory(resolverFactory, bower) {
    function maxSatisfyingVersion(versions, target) {
        var versionsArr, index;

-        versionsArr = versions.map(function(obj) {
-            return obj.version;
-        });
+        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 *
@@ -43,7 +36,7 @@ function pluginResolverFactory(resolverFactory, bower) {
    }

    // @private
-    PluginResolver.prototype.getEndpoint = function() {
+    PluginResolver.prototype.getEndpoint = function () {
        return object.merge(this._decEndpoint, {
            name: this.getName(),
            source: this.getSource(),
@@ -51,11 +44,11 @@ function pluginResolverFactory(resolverFactory, bower) {
        });
    };

-    PluginResolver.prototype.getSource = function() {
+    PluginResolver.prototype.getSource = function () {
        return this._decEndpoint.source;
    };

-    PluginResolver.prototype.getTarget = function() {
+    PluginResolver.prototype.getTarget = function () {
        return this._decEndpoint.target || '*';
    };

@@ -69,7 +62,7 @@ function pluginResolverFactory(resolverFactory, bower) {
        }
    };

-    PluginResolver.prototype.getPkgMeta = function() {
+    PluginResolver.prototype.getPkgMeta = function () {
        return this._pkgMeta;
    };

@@ -83,46 +76,42 @@ function pluginResolverFactory(resolverFactory, bower) {

    // 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) {
+    PluginResolver.prototype.hasNew = function (pkgMeta) {
        if (this.hasNewPromise) {
            return this.hasNewPromise;
        }

        this._pkgMeta = pkgMeta;

-        return (this.hasNewPromise = this.resolve().then(function(result) {
+        return this.hasNewPromise = this.resolve().then(function (result) {
            return result !== undefined;
-        }));
+        });
    };

-    PluginResolver.prototype.resolve = function() {
+    PluginResolver.prototype.resolve = function () {
        if (this.resolvePromise) {
            return this.resolvePromise;
        }

        var that = this;

-        return (this.resolvePromise = Q.fcall(function() {
+        return this.resolvePromise = Q.fcall(function() {
            var target = that.getTarget();

            // It means that we can accept ranges as targets
-            if (that.constructor.isTargetable()) {
+            if(that.constructor.isTargetable()) {
                that._release = target;

                if (semver.validRange(target)) {
-                    return Q.fcall(
-                        resolver.releases.bind(resolver),
-                        that.getSource()
-                    ).then(function(result) {
+                    return Q.fcall(resolver.releases.bind(resolver), that.getSource())
+                    .then(function (result) {
                        if (!result) {
-                            throw createError(
-                                'Resolver did not provide releases of package.'
-                            );
+                            throw createError('Resolver did not provide releases of package.');
                        }

-                        var releases = (that._releases = result);
+                        var releases = this._releases = result;

-                        var versions = releases.filter(function(target) {
+                        var versions = releases.filter(function (target) {
                            return semver.clean(target.version);
                        });

@@ -130,122 +119,90 @@ function pluginResolverFactory(resolverFactory, bower) {

                        if (maxRelease) {
                            that._version = maxRelease.version;
-                            that._release = that._decEndpoint.target =
-                                maxRelease.target;
+                            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(', ')
-                                }
-                            );
+                            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 +
-                                ')'
-                        )
-                    );
+                    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.'
-                    );
+        .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.');
                }

-                var cached = {};
+                that._tempDir = result.tempPath;

-                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;
-                            });
+                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) {
+    PluginResolver.prototype._readJson = function (dir) {
        var that = this;

        return readJson(dir, {
-            assume: { name: that.getName() },
-            logger: bower.logger
-        }).spread(function(json, deprecated) {
+            assume: { name: that.getName() }
+        })
+        .spread(function (json, deprecated) {
            if (deprecated) {
-                bower.logger.warn(
-                    'deprecated',
-                    'Package ' +
-                        that.getName() +
-                        ' is using the deprecated ' +
-                        deprecated
-                );
+                bower.logger.warn('deprecated', 'Package ' + that.getName() + ' is using the deprecated ' + deprecated);
            }

            return json;
        });
    };

-    PluginResolver.prototype._applyPkgMeta = function(meta, result) {
+    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) {
@@ -254,21 +211,17 @@ function pluginResolverFactory(resolverFactory, bower) {

        // 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
-        ) {
+        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 removeIgnores(this._tempDir, meta).then(function () {
            return meta;
        });
    };

-    PluginResolver.prototype._savePkgMeta = function(meta, result) {
+    PluginResolver.prototype._savePkgMeta = function (meta, result) {
        var that = this;

        meta._source = that.getSource();
@@ -291,37 +244,30 @@ function pluginResolverFactory(resolverFactory, bower) {
        // 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);
+        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
-        ) {
+    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.'
-                );
+                throw createError('Resolver did not provide releases of package.');
            }

-            var releases = (this._releases = result);
+            var releases = this._releases = result;

-            var versions = releases.map(function(version) {
+            var versions = releases.map(function (version) {
                return semver.clean(version.version);
            });

-            versions = versions.filter(function(version) {
+            versions = versions.filter(function (version) {
                return version;
            });

-            versions.sort(function(a, b) {
+            versions.sort(function (a, b) {
                return semver.rcompare(a, b);
            });

@@ -334,45 +280,34 @@ function pluginResolverFactory(resolverFactory, bower) {
        return typeof resolver.releases === 'function';
    };

-    PluginResolver.clearRuntimeCache = function() {
+    PluginResolver.clearRuntimeCache = function () {
        resolver = resolverFactory(bower);
    };

-    PluginResolver.match = function(source) {
+    PluginResolver.match = function (source) {
        if (typeof resolver.match !== 'function') {
-            throw createError(
-                'Resolver is missing "match" method.',
-                'ERESOLVERAPI'
-            );
+            throw createError('Resolver is missing "match" method.', 'ERESOLVERAPI');
        }

        var match = resolver.match.bind(resolver);

-        return Q.fcall(match, source).then(function(result) {
+        return Q.fcall(match, source).then(function (result) {
            if (typeof result !== 'boolean') {
-                throw createError(
-                    'Resolver\'s "match" method should return a boolean',
-                    'ERESOLVERAPI'
-                );
+                throw createError('Resolver\'s "match" method should return a boolean', 'ERESOLVERAPI');
            }

            return result;
        });
    };

-    PluginResolver.locate = function(source) {
+    PluginResolver.locate = function (source) {
        if (typeof resolver.locate !== 'function') {
            return source;
        }

-        return Q.fcall(resolver.locate.bind(resolver), source).then(function(
-            result
-        ) {
+        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'
-                );
+                throw createError('Resolver\'s "locate" method should return a string', 'ERESOLVERAPI');
            }

            return result;
@@ -382,4 +317,6 @@ function pluginResolverFactory(resolverFactory, bower) {
    return PluginResolver;
 }

+
 module.exports = pluginResolverFactory;
+
--- a/lib/core/scripts.js
+++ b/lib/core/scripts.js
@@ -3,36 +3,28 @@ var cmd = require('../util/cmd');
 var Q = require('q');
 var shellquote = require('shell-quote');

-var orderByDependencies = function(packages, installed, json) {
+var orderByDependencies = function (packages, installed, json) {
    var ordered = [];
    installed = mout.object.keys(installed);

-    var depsSatisfied = function(packageName) {
-        return (
-            mout.array.difference(
-                mout.object.keys(packages[packageName].dependencies),
-                installed,
-                ordered
-            ).length === 0
-        );
+    var depsSatisfied = function (packageName) {
+        return mout.array.difference(mout.object.keys(packages[packageName].dependencies), installed, ordered).length === 0;
    };

-    var depsFromBowerJson =
-        json && json.dependencies ? mout.object.keys(json.dependencies) : [];
+    var depsFromBowerJson = json && json.dependencies ? mout.object.keys(json.dependencies) : [];
    var packageNames = mout.object.keys(packages);

    //get the list of the packages that are specified in bower.json in that order
    //its nice to maintain that order for users
    var desiredOrder = mout.array.intersection(depsFromBowerJson, packageNames);
    //then add to the end any remaining packages that werent in bower.json
-    desiredOrder = desiredOrder.concat(
-        mout.array.difference(packageNames, desiredOrder)
-    );
+    desiredOrder = desiredOrder.concat(mout.array.difference(packageNames, desiredOrder));

    //the desired order isn't necessarily a correct dependency specific order
    //so we ensure that below
    var resolvedOne = true;
    while (resolvedOne) {
+
        resolvedOne = false;

        for (var i = 0; i < desiredOrder.length; i++) {
@@ -51,16 +43,17 @@ var orderByDependencies = function(packages, installed, json) {
            //so lets just jam those names on the end
            ordered = ordered.concat(desiredOrder);
        }
+
    }

    return ordered;
 };

-var run = function(cmdString, action, logger, config) {
+var run = function (cmdString, action, logger, config) {
    logger.action(action, cmdString);

    //pass env + BOWER_PID so callees can identify a preinstall+postinstall from the same bower instance
-    var env = mout.object.mixIn({ BOWER_PID: process.pid }, process.env);
+    var env = mout.object.mixIn({ 'BOWER_PID': process.pid }, process.env);
    var args = shellquote.parse(cmdString, env);
    var cmdName = args[0];
    mout.array.remove(args, cmdName); //no rest() in mout
@@ -72,8 +65,8 @@ var run = function(cmdString, action, logger, config) {

    var promise = cmd(cmdName, args, options);

-    promise.progress(function(progress) {
-        progress.split('\n').forEach(function(line) {
+    promise.progress(function (progress) {
+        progress.split('\n').forEach(function (line) {
            if (line) {
                logger.action(action, line);
            }
@@ -83,38 +76,19 @@ var run = function(cmdString, action, logger, config) {
    return promise;
 };

-var hook = function(
-    action,
-    ordered,
-    config,
-    logger,
-    packages,
-    installed,
-    json
-) {
-    if (
-        mout.object.keys(packages).length === 0 ||
-        !config.scripts ||
-        !config.scripts[action]
-    ) {
+var hook = function (action, ordered, config, logger, packages, installed, json) {
+    if (mout.object.keys(packages).length === 0 || !config.scripts || !config.scripts[action]) {
+        /*jshint newcap: false  */
        return Q();
    }

-    var orderedPackages = ordered
-        ? orderByDependencies(packages, installed, json)
-        : mout.object.keys(packages);
-    var placeholder = new RegExp('%', 'g');
-    var cmdString = mout.string.replace(
-        config.scripts[action],
-        placeholder,
-        orderedPackages.join(' ')
-    );
+    var orderedPackages = ordered ? orderByDependencies(packages, installed, json) : mout.object.keys(packages);
+    var cmdString = mout.string.replace(config.scripts[action], '%', orderedPackages.join(' '));
    return run(cmdString, action, logger, config);
 };

 module.exports = {
    preuninstall: mout.function.partial(hook, 'preuninstall', false),
-    postuninstall: mout.function.partial(hook, 'postuninstall', false),
    preinstall: mout.function.partial(hook, 'preinstall', true),
    postinstall: mout.function.partial(hook, 'postinstall', true),
    //only exposed for test
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,6 +1,30 @@
+var abbrev = require('abbrev');
+var mout = require('mout');
 var commands = require('./commands');
-var version = require('./version');
-var abbreviations = require('./util/abbreviations')(commands);
+var pkg = require('../package.json');
+
+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
@@ -11,7 +35,7 @@ function clearRuntimeCache() {
 }

 module.exports = {
-    version: version,
+    version: pkg.version,
    commands: commands,
    config: require('./config')(),
    abbreviations: abbreviations,
--- a/lib/renderers/JsonRenderer.js
+++ b/lib/renderers/JsonRenderer.js
@@ -7,7 +7,7 @@ function JsonRenderer() {
    this._nrLogs = 0;
 }

-JsonRenderer.prototype.end = function(data) {
+JsonRenderer.prototype.end = function (data) {
    if (this._nrLogs) {
        process.stderr.write(']\n');
    }
@@ -17,7 +17,7 @@ JsonRenderer.prototype.end = function(data) {
    }
 };

-JsonRenderer.prototype.error = function(err) {
+JsonRenderer.prototype.error = function (err) {
    var message = err.message;
    var stack;

@@ -31,14 +31,16 @@ JsonRenderer.prototype.error = function(err) {
    err.message = message;

    // Stack
+    /*jshint camelcase:false*/
    stack = err.fstream_stack || err.stack || 'N/A';
-    err.stacktrace = Array.isArray(stack) ? stack.join('\n') : stack;
+    err.stacktrace = (Array.isArray(stack) ? stack.join('\n') : stack);
+    /*jshint camelcase:true*/

    this.log(err);
    this.end();
 };

-JsonRenderer.prototype.log = function(log) {
+JsonRenderer.prototype.log = function (log) {
    if (!this._nrLogs) {
        process.stderr.write('[');
    } else {
@@ -49,12 +51,12 @@ JsonRenderer.prototype.log = function(log) {
    this._nrLogs++;
 };

-JsonRenderer.prototype.prompt = function(prompts) {
+JsonRenderer.prototype.prompt = function (prompts) {
    var promise = Q.resolve();
    var answers = {};
    var that = this;

-    prompts.forEach(function(prompt) {
+    prompts.forEach(function (prompt) {
        var opts;
        var funcName;

@@ -63,20 +65,18 @@ JsonRenderer.prototype.prompt = function(prompts) {

        // Prompt
        opts = {
-            silent: true, // To not mess with JSON output
-            trim: false, // To allow " " to not assume the default value
-            default: prompt.default == null ? '' : prompt.default, // If default is null, make it '' so that it does not retry
-            validator: !prompt.validate
-                ? null
-                : function(value) {
-                    var ret = prompt.validate(value);
+            silent: true,                                           // To not mess with JSON output
+            trim: false,                                            // To allow " " to not assume the default value
+            default: prompt.default == null ? '' : prompt.default,  // If default is null, make it '' so that it does not retry
+            validator: !prompt.validate ? null : function (value) {
+                var ret = prompt.validate(value);

-                    if (typeof ret === 'string') {
-                        throw ret;
-                    }
-
-                    return value;
+                if (typeof ret === 'string') {
+                    throw ret;
                }
+
+                return value;
+            },
        };

        // For now only "input", "confirm" and "password" are supported
@@ -92,39 +92,38 @@ JsonRenderer.prototype.prompt = function(prompts) {
            funcName = 'prompt';
            break;
        default:
-            promise = promise.then(function() {
+            promise = promise.then(function () {
                throw createError('Unknown prompt type', 'ENOTSUP');
            });
            return;
        }

-        promise = promise.then(function() {
+        promise = promise.then(function () {
            // Log
            prompt.level = 'prompt';
            that.log(prompt);

-            return Q.nfcall(promptly[funcName], '', opts).then(function(
-                answer
-            ) {
+            return Q.nfcall(promptly[funcName], '', opts)
+            .then(function (answer) {
                answers[prompt.name] = answer;
            });
        });

        if (prompt.type === 'checkbox') {
-            promise = promise.then(function() {
+            promise = promise.then(function () {
                answers[prompt.name] = answers[prompt.name].split(',');
            });
        }
    });

-    return promise.then(function() {
+    return promise.then(function () {
        return answers;
    });
 };

 // -------------------------

-JsonRenderer.prototype._stringify = function(log) {
+JsonRenderer.prototype._stringify = function (log) {
    // To json
    var str = JSON.stringify(log, null, '  ');
    // Remove colors in case some log has colors..
--- a/lib/renderers/StandardRenderer.js
+++ b/lib/renderers/StandardRenderer.js
@@ -5,15 +5,14 @@ var archy = require('archy');
 var Q = require('q');
 var stringifyObject = require('stringify-object');
 var os = require('os');
-var semverUtils = require('semver-utils');
-var version = require('../version');
+var pkg = require(path.join(__dirname, '../..', 'package.json'));
 var template = require('../util/template');

 function StandardRenderer(command, config) {
    this._sizes = {
-        id: 13, // Id max chars
+        id: 13,    // Id max chars
        label: 20, // Label max chars
-        sumup: 5 // Amount to sum when the label exceeds
+        sumup: 5   // Amount to sum when the label exceeds
    };
    this._colors = {
        warn: chalk.yellow,
@@ -32,7 +31,7 @@ function StandardRenderer(command, config) {
        this._compact = process.stdout.columns < 120;
    }

-    var exitOnPipeError = function(err) {
+    var exitOnPipeError = function (err) {
        if (err.code === 'EPIPE') {
            process.exit(0);
        }
@@ -43,7 +42,7 @@ function StandardRenderer(command, config) {
    process.stderr.on('error', exitOnPipeError);
 }

-StandardRenderer.prototype.end = function(data) {
+StandardRenderer.prototype.end = function (data) {
    var method = '_' + mout.string.camelCase(this._command);

    if (this[method]) {
@@ -51,7 +50,7 @@ StandardRenderer.prototype.end = function(data) {
    }
 };

-StandardRenderer.prototype.error = function(err) {
+StandardRenderer.prototype.error = function (err) {
    var str;
    var stack;

@@ -60,48 +59,37 @@ StandardRenderer.prototype.error = function(err) {
    err.id = err.code || 'error';
    err.level = 'error';

-    str =
-        this._prefix(err) +
-        ' ' +
-        err.message.replace(/\r?\n/g, ' ').trim() +
-        '\n';
+    str = this._prefix(err) + ' ' + err.message.replace(/\r?\n/g, ' ').trim() + '\n';
    this._write(process.stderr, 'bower ' + str);

    // Check if additional details were provided
    if (err.details) {
-        str =
-            chalk.yellow('\nAdditional error details:\n') +
-            err.details.trim() +
-            '\n';
+        str = chalk.yellow('\nAdditional error details:\n') + err.details.trim() + '\n';
        this._write(process.stderr, str);
    }

    // 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) {
+        /*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');
+        /*jshint camelcase:true*/

        this._write(process.stderr, str);
        this._write(process.stderr, new Error().stack);

        // Print bower version, node version and system info.
        this._write(process.stderr, chalk.yellow('\nSystem info:\n'));
-        this._write(process.stderr, 'Bower version: ' + version + '\n');
-        this._write(
-            process.stderr,
-            'Node version: ' + process.versions.node + '\n'
-        );
-        this._write(
-            process.stderr,
-            'OS: ' + os.type() + ' ' + os.release() + ' ' + os.arch() + '\n'
-        );
+        this._write(process.stderr, 'Bower version: ' + pkg.version + '\n');
+        this._write(process.stderr, 'Node version: ' + process.versions.node + '\n');
+        this._write(process.stderr, 'OS: ' + os.type() + ' ' + os.release() + ' ' + os.arch() + '\n');
    }
 };

-StandardRenderer.prototype.log = function(log) {
+StandardRenderer.prototype.log = function (log) {
    var method = '_' + mout.string.camelCase(log.id) + 'Log';

    this._guessOrigin(log);
@@ -114,12 +102,12 @@ StandardRenderer.prototype.log = function(log) {
    }
 };

-StandardRenderer.prototype.prompt = function(prompts) {
+StandardRenderer.prototype.prompt = function (prompts) {
    var deferred;

    // Strip colors from the prompt if color is disabled
    if (!this._config.color) {
-        prompts.forEach(function(prompt) {
+        prompts.forEach(function (prompt) {
            prompt.message = chalk.stripColor(prompt.message);
        });
    }
@@ -134,7 +122,7 @@ StandardRenderer.prototype.prompt = function(prompts) {

 // -------------------------

-StandardRenderer.prototype._help = function(data) {
+StandardRenderer.prototype._help = function (data) {
    var str;
    var that = this;
    var specific;
@@ -149,68 +137,60 @@ StandardRenderer.prototype._help = function(data) {
        if (template.exists(specific)) {
            str = template.render(specific, data);
        } else {
-            str = template.render('std/help-generic.std', data);
+            str =  template.render('std/help-generic.std', data);
        }

        that._write(process.stdout, str);
    }
 };

-StandardRenderer.prototype._install = function(packages) {
+StandardRenderer.prototype._install = function (packages) {
    var str = '';

-    mout.object.forOwn(
-        packages,
-        function(pkg) {
-            var cliTree;
+    mout.object.forOwn(packages, function (pkg) {
+        var cliTree;

-            // List only 1 level deep dependencies
-            mout.object.forOwn(pkg.dependencies, function(dependency) {
-                dependency.dependencies = {};
-            });
-            // Make canonical dir relative
-            pkg.canonicalDir = path.relative(
-                this._config.cwd,
-                pkg.canonicalDir
-            );
-            // Signal as root
-            pkg.root = true;
+        // List only 1 level deep dependencies
+        mout.object.forOwn(pkg.dependencies, function (dependency) {
+            dependency.dependencies = {};
+        });
+        // Make canonical dir relative
+        pkg.canonicalDir = path.relative(this._config.cwd, pkg.canonicalDir);
+        // Signal as root
+        pkg.root = true;

-            cliTree = this._tree2archy(pkg);
-            str += '\n' + archy(cliTree);
-        },
-        this
-    );
+        cliTree = this._tree2archy(pkg);
+        str += '\n' + archy(cliTree);
+    }, this);

    if (str) {
        this._write(process.stdout, str);
    }
 };

-StandardRenderer.prototype._update = function(packages) {
+StandardRenderer.prototype._update = function (packages) {
    this._install(packages);
 };

-StandardRenderer.prototype._list = function(tree) {
+StandardRenderer.prototype._list = function (tree) {
    var cliTree;

    if (tree.pkgMeta) {
        tree.root = true;
        cliTree = archy(this._tree2archy(tree));
    } else {
-        cliTree =
-            stringifyObject(tree, { indent: '  ' }).replace(/[{}]/g, '') + '\n';
+        cliTree = stringifyObject(tree, { indent: '  ' }).replace(/[{}]/g, '') + '\n';
    }

    this._write(process.stdout, cliTree);
 };

-StandardRenderer.prototype._search = function(results) {
+StandardRenderer.prototype._search = function (results) {
    var str = template.render('std/search-results.std', results);
    this._write(process.stdout, str);
 };

-StandardRenderer.prototype._info = function(data) {
+StandardRenderer.prototype._info = function (data) {
    var str = '';
    var pkgMeta = data;
    var includeVersions = false;
@@ -229,32 +209,19 @@ StandardRenderer.prototype._info = function(data) {

    // Render the versions at the end
    if (includeVersions) {
-        data.hidePreReleases = false;
-        data.numPreReleases = 0;
-        // If output isn't verbose, hide prereleases
-        if (!this._config.verbose) {
-            data.versions = mout.array.filter(data.versions, function(version) {
-                version = semverUtils.parse(version);
-                if (!version.release && !version.build) {
-                    return true;
-                }
-                data.numPreReleases++;
-            });
-            data.hidePreReleases = !!data.numPreReleases;
-        }
        str += '\n' + template.render('std/info.std', data);
    }

    this._write(process.stdout, str);
 };

-StandardRenderer.prototype._lookup = function(data) {
+StandardRenderer.prototype._lookup = function (data) {
    var str = template.render('std/lookup.std', data);

    this._write(process.stdout, str);
 };

-StandardRenderer.prototype._link = function(data) {
+StandardRenderer.prototype._link = function (data) {
    this._sizes.id = 4;

    this.log({
@@ -269,7 +236,7 @@ StandardRenderer.prototype._link = function(data) {
    }
 };

-StandardRenderer.prototype._register = function(data) {
+StandardRenderer.prototype._register = function (data) {
    var str;

    // If no data passed, it means the user aborted
@@ -281,20 +248,17 @@ StandardRenderer.prototype._register = function(data) {
    this._write(process.stdout, str);
 };

-StandardRenderer.prototype._cacheList = function(entries) {
-    entries.forEach(function(entry) {
+StandardRenderer.prototype._cacheList = function (entries) {
+    entries.forEach(function (entry) {
        var pkgMeta = entry.pkgMeta;
        var version = pkgMeta.version || pkgMeta._target;
-        this._write(
-            process.stdout,
-            pkgMeta.name + '=' + pkgMeta._source + '#' + version + '\n'
-        );
+        this._write(process.stdout, pkgMeta.name + '=' + pkgMeta._source + '#' + version + '\n');
    }, this);
 };

 // -------------------------

-StandardRenderer.prototype._genericLog = function(log) {
+StandardRenderer.prototype._genericLog = function (log) {
    var stream;
    var str;

@@ -308,7 +272,7 @@ StandardRenderer.prototype._genericLog = function(log) {
    this._write(stream, 'bower ' + str);
 };

-StandardRenderer.prototype._checkoutLog = function(log) {
+StandardRenderer.prototype._checkoutLog = function (log) {
    if (this._compact) {
        log.message = log.origin.split('#')[0] + '#' + log.message;
    }
@@ -316,7 +280,7 @@ StandardRenderer.prototype._checkoutLog = function(log) {
    this._genericLog(log);
 };

-StandardRenderer.prototype._progressLog = function(log) {
+StandardRenderer.prototype._progressLog = function (log) {
    if (this._compact) {
        log.message = log.origin + ' ' + log.message;
    }
@@ -324,7 +288,7 @@ StandardRenderer.prototype._progressLog = function(log) {
    this._genericLog(log);
 };

-StandardRenderer.prototype._extractLog = function(log) {
+StandardRenderer.prototype._extractLog = function (log) {
    if (this._compact) {
        log.message = log.origin + ' ' + log.message;
    }
@@ -332,23 +296,19 @@ StandardRenderer.prototype._extractLog = function(log) {
    this._genericLog(log);
 };

-StandardRenderer.prototype._incompatibleLog = function(log) {
+StandardRenderer.prototype._incompatibleLog = function (log) {
    var str;
    var templatePath;

    // Generate dependants string for each pick
-    log.data.picks.forEach(function(pick) {
-        pick.dependants = pick.dependants
-            .map(function(dependant) {
-                var release = dependant.pkgMeta._release;
-                return dependant.endpoint.name + (release ? '#' + release : '');
-            })
-            .join(', ');
+    log.data.picks.forEach(function (pick) {
+        pick.dependants = pick.dependants.map(function (dependant) {
+            var release = dependant.pkgMeta._release;
+            return dependant.endpoint.name + (release ? '#' + release : '');
+        }).join(', ');
    });

-    templatePath = log.data.suitable
-        ? 'std/conflict-resolved.std'
-        : 'std/conflict.std';
+    templatePath = log.data.suitable ? 'std/conflict-resolved.std' : 'std/conflict.std';
    str = template.render(templatePath, log.data);

    this._write(process.stdout, '\n');
@@ -356,18 +316,15 @@ StandardRenderer.prototype._incompatibleLog = function(log) {
    this._write(process.stdout, '\n');
 };

-StandardRenderer.prototype._solvedLog = function(log) {
+StandardRenderer.prototype._solvedLog = function (log) {
    this._incompatibleLog(log);
 };

-StandardRenderer.prototype._jsonLog = function(log) {
-    this._write(
-        process.stdout,
-        '\n' + this._highlightJson(log.data.json) + '\n\n'
-    );
+StandardRenderer.prototype._jsonLog = function (log) {
+    this._write(process.stdout, '\n' + this._highlightJson(log.data.json) + '\n\n');
 };

-StandardRenderer.prototype._cachedEntryLog = function(log) {
+StandardRenderer.prototype._cachedEntryLog = function (log) {
    if (this._compact) {
        log.message = log.origin;
    }
@@ -377,7 +334,7 @@ StandardRenderer.prototype._cachedEntryLog = function(log) {

 // -------------------------

-StandardRenderer.prototype._guessOrigin = function(log) {
+StandardRenderer.prototype._guessOrigin = function (log) {
    var data = log.data;

    if (!data) {
@@ -385,8 +342,7 @@ StandardRenderer.prototype._guessOrigin = function(log) {
    }

    if (data.endpoint) {
-        log.origin =
-            data.endpoint.name || (data.registry && data.endpoint.source);
+        log.origin = data.endpoint.name || (data.registry && data.endpoint.source);

        // Resort to using the resolver name for unnamed endpoints
        if (!log.origin && data.resolver) {
@@ -405,7 +361,7 @@ StandardRenderer.prototype._guessOrigin = function(log) {
    }
 };

-StandardRenderer.prototype._prefix = function(log) {
+StandardRenderer.prototype._prefix = function (log) {
    var label;
    var length;
    var nrSpaces;
@@ -437,7 +393,7 @@ StandardRenderer.prototype._prefix = function(log) {
    return chalk.green(label) + mout.string.repeat(' ', nrSpaces) + idColor(id);
 };

-StandardRenderer.prototype._write = function(stream, str) {
+StandardRenderer.prototype._write = function (stream, str) {
    if (!this._config.color) {
        str = chalk.stripColor(str);
    }
@@ -445,18 +401,18 @@ StandardRenderer.prototype._write = function(stream, str) {
    stream.write(str);
 };

-StandardRenderer.prototype._highlightJson = function(json) {
+StandardRenderer.prototype._highlightJson = function (json) {
    var cardinal = require('cardinal');

    return cardinal.highlight(stringifyObject(json, { indent: '  ' }), {
        theme: {
            String: {
-                _default: function(str) {
+                _default: function (str) {
                    return chalk.cyan(str);
                }
            },
            Identifier: {
-                _default: function(str) {
+                _default: function (str) {
                    return chalk.green(str);
                }
            }
@@ -465,11 +421,9 @@ StandardRenderer.prototype._highlightJson = function(json) {
    });
 };

-StandardRenderer.prototype._tree2archy = function(node) {
+StandardRenderer.prototype._tree2archy = function (node) {
    var dependencies = mout.object.values(node.dependencies);
-    var version = !node.missing
-        ? node.pkgMeta._release || node.pkgMeta.version
-        : null;
+    var version = !node.missing ? node.pkgMeta._release || node.pkgMeta.version : null;
    var label = node.endpoint.name + (version ? '#' + version : '');
    var update;

@@ -492,8 +446,7 @@ StandardRenderer.prototype._tree2archy = function(node) {
    }

    if (node.incompatible) {
-        label +=
-            chalk.yellow(' incompatible') + ' with ' + node.endpoint.target;
+        label += chalk.yellow(' incompatible') + ' with ' + node.endpoint.target;
    } else if (node.extraneous) {
        label += chalk.green(' extraneous');
    }
@@ -507,7 +460,7 @@ StandardRenderer.prototype._tree2archy = function(node) {
        }

        if (node.update.latest !== node.update.target) {
-            update += update ? ', ' : '';
+            update += (update ? ', ' : '');
            update += 'latest is ' + node.update.latest;
        }

@@ -535,7 +488,7 @@ StandardRenderer._wideCommands = [
    'register'
 ];
 StandardRenderer._idMappings = {
-    mutual: 'conflict',
+    'mutual': 'conflict',
    'cached-entry': 'cached'
 };

--- a/lib/templates/helpers/colors.js
+++ b/lib/templates/helpers/colors.js
@@ -1,13 +0,0 @@
-var chalk = require('chalk');
-
-var templateColors = ['yellow', 'green', 'cyan', 'red', 'white', 'magenta'];
-
-function colors(Handlebars) {
-    templateColors.forEach(function(color) {
-        Handlebars.registerHelper(color, function(context) {
-            return chalk[color](context.fn(this));
-        });
-    });
-}
-
-module.exports = colors;
--- a/lib/templates/helpers/rpad.js
+++ b/lib/templates/helpers/rpad.js
@@ -1,12 +0,0 @@
-var mout = require('mout');
-
-function rpad(Handlebars) {
-    Handlebars.registerHelper('rpad', function(context) {
-        var hash = context.hash;
-        var minLength = parseInt(hash.minLength, 10);
-        var chr = hash.char;
-        return mout.string.rpad(context.fn(this), minLength, chr);
-    });
-}
-
-module.exports = rpad;
--- a/lib/templates/json/help-version.json
+++ b/lib/templates/json/help-version.json
@@ -1,14 +0,0 @@
-{
-    "command": "version",
-    "description": "Creates an empty version commit and tag, and fail if the repo is not clean.\n\nThe <version> argument should be a valid semver string, or one of following:\nbuild, patch, minor, major.\n\nIf supplied with --message (shorthand: -m) config option, bower will use it\nas a commit message when creating a version commit. If the message config\ncontains %s then that will be replaced with the resulting version number.\n\nFor example:\n\n    bower version patch -m \"Upgrade to %s for reasons\"",
-    "usage": [
-        "version [<version> | major | minor | patch]"
-    ],
-    "options": [
-        {
-            "shorthand":   "-m",
-            "flag":        "--message",
-            "description": "Custom git commit and tag message"
-        }
-    ]
-}
--- a/lib/util/abbreviations.js
+++ b/lib/util/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;
-};
--- a/lib/util/analytics.js
+++ b/lib/util/analytics.js
@@ -0,0 +1,113 @@
+var Q = require('q');
+var mout = require('mout');
+
+var analytics = module.exports;
+
+var insight;
+
+var enableAnalytics = false;
+
+// Insight takes long to load, and often causes problems
+// in non-interactive environment, so we load it lazily
+//
+// Insight is used in two cases:
+//
+// 1. Read insight configuration (whether track user actions)
+// 2. Track user actions (Tracker.track method)
+//
+// We don't want to instantiate Insight in non-interactive mode
+// 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');
+        insight = new Insight({
+            trackingCode: 'UA-43531210-1',
+            pkg: require('../../package.json')
+        });
+    }
+}
+
+// Initializes the application-wide insight singleton and asks for the
+// permission on the CLI during the first run.
+//
+// This method is called only from bin/bower. Programmatic API skips it.
+analytics.setup = function setup (config) {
+    var deferred = Q.defer();
+
+    // No need for asking if analytics is set in bower config
+    if (config.analytics === undefined) {
+        ensureInsight();
+
+        // For non-interactive call from bin/bower we disable analytics
+        if (config.interactive) {
+            if (insight.optOut !== undefined) {
+                deferred.resolve(!insight.optOut);
+            } else {
+                insight.askPermission(null, function(err, optIn) {
+                    // optIn callback param was exactly opposite before 0.4.3
+                    // so we force at least insight@0.4.3 in package.json
+                    deferred.resolve(optIn);
+                });
+            }
+        } else {
+            // no specified value, no stored value, and can't prompt for one
+            // most likely CI environment; defaults to false to reduce data noise
+            deferred.resolve(false);
+        }
+    } else {
+        // use the specified value
+        deferred.resolve(config.analytics);
+    }
+
+    return deferred.promise.then(function (enabled) {
+        enableAnalytics = enabled;
+
+        return enabled;
+    });
+};
+
+var Tracker = analytics.Tracker = function Tracker(config) {
+    function analyticsEnabled () {
+        // Allow for overriding analytics default
+        if (config && config.analytics !== undefined) {
+            return config.analytics;
+        }
+
+        // TODO: let bower pass this variable from bin/bower instead closure
+        return enableAnalytics;
+    }
+
+    if (analyticsEnabled()) {
+        ensureInsight();
+    } else {
+        this.track = function noop () {};
+        this.trackDecomposedEndpoints = function noop () {};
+        this.trackPackages = function noop () {};
+        this.trackNames = function noop () {};
+    }
+};
+
+Tracker.prototype.track = function track() {
+    insight.track.apply(insight, arguments);
+};
+
+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;
+        this.track(command, meta.name, meta.version);
+    }.bind(this));
+};
+
+Tracker.prototype.trackNames = function trackNames(command, names) {
+    names.forEach(function (name) {
+        this.track(command, name);
+    }.bind(this));
+};
--- a/lib/util/cli.js
+++ b/lib/util/cli.js
@@ -15,10 +15,10 @@ function readOptions(options, argv) {
        options = options || {};
    }

-    types = mout.object.map(options, function(option) {
+    types = mout.object.map(options, function (option) {
        return option.type;
    });
-    mout.object.forOwn(options, function(option, name) {
+    mout.object.forOwn(options, function (option, name) {
        shorthands[option.shorthand] = '--' + name;
    });

@@ -26,7 +26,7 @@ function readOptions(options, argv) {

    // Filter only the specified options because nopt parses every --
    // Also make them camel case
-    mout.object.forOwn(noptOptions, function(value, key) {
+    mout.object.forOwn(noptOptions, function (value, key) {
        if (options[key]) {
            parsedOptions[mout.string.camelCase(key)] = value;
        }
--- a/lib/util/cmd.js
+++ b/lib/util/cmd.js
@@ -37,17 +37,17 @@ function getWindowsCommand(command) {
    try {
        fullCommand = which.sync(command);
    } catch (err) {
-        return (winWhichCache[command] = command);
+        return winWhichCache[command] = command;
    }

    extension = path.extname(fullCommand).toLowerCase();

    // Does it need to be converted?
    if (winBatchExtensions.indexOf(extension) === -1) {
-        return (winWhichCache[command] = command);
+        return winWhichCache[command] = command;
    }

-    return (winWhichCache[command] = fullCommand);
+    return winWhichCache[command] = fullCommand;
 }

 // Executes a shell command, buffering the stdout and stderr
@@ -67,25 +67,25 @@ function executeCmd(command, args, options) {

    // Buffer output, reporting progress
    process = cp.spawn(command, args, options);
-    process.stdout.on('data', function(data) {
+    process.stdout.on('data', function (data) {
        data = data.toString();
        deferred.notify(data);
        stdout += data;
    });
-    process.stderr.on('data', function(data) {
+    process.stderr.on('data', function (data) {
        data = data.toString();
        deferred.notify(data);
        stderr += data;
    });

    // If there is an error spawning the command, reject the promise
-    process.on('error', function(error) {
+    process.on('error', function (error) {
        return deferred.reject(error);
    });

    // Listen to the close event instead of exit
    // They are similar but close ensures that streams are flushed
-    process.on('close', function(code) {
+    process.on('close', function (code) {
        var fullCommand;
        var error;

@@ -99,19 +99,10 @@ 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',
-                {
-                    details: stderr,
-                    exitCode: code
-                }
-            );
+            error = createError('Failed to execute "' + fullCommand + '", exit code of #' + code + '\n' + stderr, 'ECMDERR', {
+                details: stderr,
+                exitCode: code
+            });

            return deferred.reject(error);
        }
--- a/lib/util/copy.js
+++ b/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) {
@@ -26,17 +26,18 @@ function copy(reader, writer) {
    deferred = Q.defer();

    reader
-        .on('error', deferred.reject)
-        // Pipe to writer
-        .pipe(fstream.Writer(writer))
-        .on('error', deferred.reject)
-        .on('close', deferred.resolve);
+    .on('error', deferred.reject)
+    // Pipe to writer
+    .pipe(fstream.Writer(writer))
+    .on('error', deferred.reject)
+    .on('close', deferred.resolve);

    return deferred.promise;
 }

 function copyMode(src, dst) {
-    return Q.nfcall(fs.stat, src).then(function(stat) {
+    return Q.nfcall(fs.stat, src)
+    .then(function (stat) {
        return Q.nfcall(fs.chmod, dst, stat.mode);
    });
 }
@@ -67,17 +68,14 @@ function copyFile(src, dst, opts) {

    opts = parseOptions(opts);

-    promise = copy(
-        {
-            path: src,
-            type: 'File'
-        },
-        {
-            path: dst,
-            mode: opts.mode,
-            type: 'File'
-        }
-    );
+    promise = copy({
+        path: src,
+        type: 'File'
+    }, {
+        path: dst,
+        mode: opts.mode,
+        type: 'File'
+    });

    if (opts.copyMode) {
        promise = promise.then(copyMode.bind(copyMode, src, dst));
@@ -95,18 +93,15 @@ function copyDir(src, dst, opts) {

    opts = parseOptions(opts);

-    promise = copy(
-        {
-            path: src,
-            type: 'Directory',
-            ignore: opts.ignore
-        },
-        {
-            path: dst,
-            mode: opts.mode,
-            type: 'Directory'
-        }
-    );
+    promise = copy({
+        path: src,
+        type: 'Directory',
+        ignore: opts.ignore
+    }, {
+        path: dst,
+        mode: opts.mode,
+        type: 'Directory'
+    });

    if (opts.copyMode) {
        promise = promise.then(copyMode.bind(copyMode, src, dst));
--- a/lib/util/createLink.js
+++ b/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');
@@ -10,55 +10,41 @@ function createLink(src, dst, type) {
    var dstDir = path.dirname(dst);

    // Create directory
-    return (
-        Q.nfcall(mkdirp, dstDir)
-            // Check if source exists
-            .then(function() {
-                return Q.nfcall(fs.stat, src).fail(function(error) {
-                    if (error.code === 'ENOENT') {
-                        throw createError(
-                            'Failed to create link to ' + path.basename(src),
-                            'ENOENT',
-                            {
-                                details:
-                                    src +
-                                    ' does not exist or points to a non-existent file'
-                            }
-                        );
-                    }
-
-                    throw error;
+    return Q.nfcall(mkdirp, dstDir)
+    // Check if source exists
+    .then(function () {
+        return Q.nfcall(fs.stat, src)
+        .fail(function (error) {
+            if (error.code === 'ENOENT') {
+                throw createError('Failed to create link to ' + path.basename(src), 'ENOENT', {
+                    details: src + ' does not exist or points to a non-existent file'
                });
-            })
-            // Create symlink
-            .then(function(stat) {
-                type = type || (stat.isDirectory() ? 'dir' : 'file');
+            }

-                return Q.nfcall(fs.symlink, src, dst, type).fail(function(err) {
-                    if (!isWin || err.code !== 'EPERM') {
-                        throw err;
-                    }
+            throw error;
+        });
+    })
+    // Create symlink
+    .then(function (stat) {
+        type = type || (stat.isDirectory() ? 'dir' : 'file');

-                    // Try with type "junction" on Windows
-                    // Junctions behave equally to true symlinks and can be created in
-                    // non elevated terminal (well, not always..)
-                    return Q.nfcall(fs.symlink, src, dst, 'junction').fail(
-                        function(err) {
-                            throw createError(
-                                'Unable to create link to ' +
-                                    path.basename(src),
-                                err.code,
-                                {
-                                    details:
-                                        err.message.trim() +
-                                        '\n\nTry running this command in an elevated terminal (run as root/administrator).'
-                                }
-                            );
-                        }
-                    );
+        return Q.nfcall(fs.symlink, src, dst, type)
+        .fail(function (err) {
+            if (!isWin || err.code !== 'EPERM') {
+                throw err;
+            }
+
+            // Try with type "junction" on Windows
+            // Junctions behave equally to true symlinks and can be created in
+            // non elevated terminal (well, not always..)
+            return Q.nfcall(fs.symlink, src, dst, 'junction')
+            .fail(function (err) {
+                throw createError('Unable to create link to ' + path.basename(src), err.code, {
+                    details: err.message.trim() + '\n\nTry running this command in an elevated terminal (run as root/administrator).'
                });
-            })
-    );
+            });
+        });
+    });
 }

 module.exports = createLink;
--- a/lib/util/download.js
+++ b/lib/util/download.js
@@ -3,150 +3,106 @@ 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;

-    options = mout.object.mixIn(
-        {
-            retries: 5,
-            factor: 2,
-            minTimeout: 1000,
-            maxTimeout: 35000,
-            randomize: true,
-            progressDelay: progressDelay,
-            gzip: true
-        },
-        options || {}
-    );
+    options = mout.object.mixIn({
+        retries: 5,
+        factor: 2,
+        minTimeout: 1000,
+        maxTimeout: 35000,
+        randomize: true
+    }, options || {});

    // Retry on network errors
    operation = retry.operation(options);
+    operation.attempt(function () {
+        var req;
+        var writeStream;
+        var contentLength;
+        var bytesDownloaded = 0;

-    operation.attempt(function() {
-        Q.fcall(fetch, url, file, options)
-            .then(function(response) {
-                deferred.resolve(response);
-            })
-            .progress(function(status) {
-                deferred.notify(status);
-            })
-            .fail(function(error) {
-                // Save timeout before retrying to report
-                var timeout = operation._timeouts[0];
-
-                // Reject if error is not a network error
-                if (errorCodes.indexOf(error.code) === -1) {
-                    return deferred.reject(error);
-                }
-
-                // Next attempt will start reporting download progress immediately
-                progressDelay = 0;
-
-                // This will schedule next retry or return false
-                if (operation.retry(error)) {
-                    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;
+        req = progress(request(url, options), {
+            delay: progressDelay
+        })
+        .on('response', function (res) {
+            var status = res.statusCode;

            if (status < 200 || status >= 300) {
-                return deferred.reject(
-                    createError('Status code of ' + status, 'EHTTP')
-                );
+                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);
-            });
-
-            writeStream.on('finish', function() {
-                if (!errored) {
-                    destroy(req);
-                    deferred.resolve(response);
-                }
-            });
-
-            req.pipe(writeStream);
+            response = res;
+            contentLength = Number(res.headers['content-length']);
        })
-        .on('data', function(data) {
+        .on('data', function (data) {
            bytesDownloaded += data.length;
        })
-        .on('progress', function(state) {
+        .on('progress', function (state) {
            deferred.notify(state);
        })
-        .on('error', reject)
-        .on('end', function() {
+        .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'
-                    )
-                );
+                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
+            if (errorCodes.indexOf(error.code) === -1) {
+                return deferred.reject(error);
+            }
+
+            // Next attempt will start reporting download progress immediately
+            progressDelay = 0;
+
+            // Check if there are more retries
+            if (operation.retry(error)) {
+                // 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
+                });
+            }
+
+            // No more retries, reject!
+            deferred.reject(error);
        });

+        // Pipe read stream to write stream
+        writeStream = req
+        .pipe(fs.createWriteStream(file))
+        .on('error', deferred.reject)
+        .on('close', function () {
+            deferred.resolve(response);
+        });
+    });
+
    return deferred.promise;
 }

--- a/lib/util/extract.js
+++ b/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,9 +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');
-var tmp = require('tmp');

 // This forces the default chunk size to something small in an attempt
 // to avoid issue #314
@@ -38,13 +35,13 @@ function extractZip(archive, dst) {
    var deferred = Q.defer();

    new DecompressZip(archive)
-        .on('error', deferred.reject)
-        .on('extract', deferred.resolve.bind(deferred, dst))
-        .extract({
-            path: dst,
-            follow: false, // Do not follow symlinks (#699)
-            filter: filterSymlinks // Filter symlink files
-        });
+    .on('error', deferred.reject)
+    .on('extract', deferred.resolve.bind(deferred, dst))
+    .extract({
+        path: dst,
+        follow: false,           // Do not follow symlinks (#699)
+        filter: filterSymlinks   // Filter symlink files
+    });

    return deferred.promise;
 }
@@ -52,27 +49,15 @@ 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)
-        .pipe(
-            tar.extract(dst, {
-                ignore: isSymlink, // Filter symlink files
-                dmode: 0555, // Ensure dirs are readable
-                fmode: 0444 // Ensure files are readable
-            })
-        )
-        .on('error', reject)
-        .on('finish', function(result) {
-            destroy(stream);
-            deferred.resolve(dst);
-        });
+    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
+    }))
+    .on('error', deferred.reject)
+    .on('finish', deferred.resolve.bind(deferred, dst));

    return deferred.promise;
 }
@@ -80,29 +65,17 @@ 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)
-        .pipe(zlib.createGunzip())
-        .on('error', reject)
-        .pipe(
-            tar.extract(dst, {
-                ignore: isSymlink, // Filter symlink files
-                dmode: 0555, // Ensure dirs are readable
-                fmode: 0444 // Ensure files are readable
-            })
-        )
-        .on('error', reject)
-        .on('finish', function(result) {
-            destroy(stream);
-            deferred.resolve(dst);
-        });
+    fs.createReadStream(archive)
+    .on('error', deferred.reject)
+    .pipe(zlib.createGunzip())
+    .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
+    }))
+    .on('error', deferred.reject)
+    .on('finish', deferred.resolve.bind(deferred, dst));

    return deferred.promise;
 }
@@ -110,22 +83,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)
-        .pipe(zlib.createGunzip())
-        .on('error', reject)
-        .pipe(createWriteStream(dst))
-        .on('error', reject)
-        .on('finish', function(result) {
-            destroy(stream);
-            deferred.resolve(dst);
-        });
+    fs.createReadStream(archive)
+    .on('error', deferred.reject)
+    .pipe(zlib.createGunzip())
+    .on('error', deferred.reject)
+    .pipe(fs.createWriteStream(dst))
+    .on('error', deferred.reject)
+    .on('close', deferred.resolve.bind(deferred, dst));

    return deferred.promise;
 }
@@ -143,7 +107,7 @@ function getExtractor(archive) {
    // This ensures that upper-cased extensions work
    archive = archive.toLowerCase();

-    var type = mout.array.find(extractorTypes, function(type) {
+    var type = mout.array.find(extractorTypes, function (type) {
        return mout.string.endsWith(archive, type);
    });

@@ -151,7 +115,8 @@ function getExtractor(archive) {
 }

 function isSingleDir(dir) {
-    return Q.nfcall(fs.readdir, dir).then(function(files) {
+    return Q.nfcall(fs.readdir, dir)
+    .then(function (files) {
        var singleDir;

        // Remove any OS specific files from the files array
@@ -164,27 +129,32 @@ function isSingleDir(dir) {

        singleDir = path.join(dir, files[0]);

-        return Q.nfcall(fs.stat, singleDir).then(function(stat) {
+        return Q.nfcall(fs.stat, singleDir)
+        .then(function (stat) {
            return stat.isDirectory() ? singleDir : false;
        });
    });
 }

-function moveDirectory(srcDir, destDir) {
-    return Q.nfcall(fs.readdir, srcDir)
-        .then(function(files) {
-            var promises = files.map(function(file) {
-                var src = path.join(srcDir, file);
-                var dst = path.join(destDir, file);
+function moveSingleDirContents(dir) {
+    var destDir = path.dirname(dir);

-                return Q.nfcall(fs.rename, src, dst);
-            });
+    return Q.nfcall(fs.readdir, dir)
+    .then(function (files) {
+        var promises;

-            return Q.all(promises);
-        })
-        .then(function() {
-            return Q.nfcall(fs.rmdir, srcDir);
+        promises = files.map(function (file) {
+            var src = path.join(dir, file);
+            var dst = path.join(destDir, file);
+
+            return Q.nfcall(fs.rename, src, dst);
        });
+
+        return Q.all(promises);
+    })
+    .then(function () {
+        return Q.nfcall(fs.rmdir, dir);
+    });
 }

 // -----------------------------
@@ -214,64 +184,48 @@ function extract(src, dst, opts) {

    // If extractor is null, then the archive type is unknown
    if (!extractor) {
-        return Q.reject(
-            createError(
-                'File ' + src + ' is not a known archive',
-                'ENOTARCHIVE'
-            )
-        );
+        return Q.reject(createError('File ' + src + ' is not a known archive', 'ENOTARCHIVE'));
    }

-    // Extract to a temporary directory in case of file name clashes
-    return Q.nfcall(tmp.dir, {
-        template: dst + '-XXXXXX',
-        mode: 0777 & ~process.umask()
-    })
-        .then(function(tempDir) {
-            // nfcall may return multiple callback arguments as an array
-            return Array.isArray(tempDir) ? tempDir[0] : tempDir;
-        })
-        .then(function(tempDir) {
-            // Check archive file size
-            promise = Q.nfcall(fs.stat, src).then(function(stat) {
-                if (stat.size <= 8) {
-                    throw createError(
-                        'File ' + src + ' is an invalid archive',
-                        'ENOTARCHIVE'
-                    );
-                }
+    // Check archive file size
+    promise = Q.nfcall(fs.stat, src)
+    .then(function (stat) {
+        if (stat.size <= 8) {
+            throw createError('File ' + src + ' is an invalid archive', 'ENOTARCHIVE');
+        }

-                // Extract archive
-                return extractor(src, tempDir);
-            });
+        // Extract archive
+        return extractor(src, dst);
+    });

-            // Remove archive
-            if (!opts.keepArchive) {
-                promise = promise.then(function() {
-                    return Q.nfcall(fs.unlink, src);
-                });
-            }
+    // TODO: There's an issue here if the src and dst are the same and
+    //       The zip name is the same as some of the zip file contents
+    //       Maybe create a temp directory inside dst, unzip it there,
+    //       unlink zip and then move contents

-            // Move contents from the temporary directory
-            // If the contents are a single directory (and we're not preserving structure),
-            // move its contents directly instead.
-            promise = promise
-                .then(function() {
-                    return isSingleDir(tempDir);
-                })
-                .then(function(singleDir) {
-                    if (singleDir && !opts.keepStructure) {
-                        return moveDirectory(singleDir, dst);
-                    } else {
-                        return moveDirectory(tempDir, dst);
-                    }
-                });
-
-            // Resolve promise to the dst dir
-            return promise.then(function() {
-                return dst;
-            });
+    // Remove archive
+    if (!opts.keepArchive) {
+        promise = promise
+        .then(function () {
+            return Q.nfcall(fs.unlink, src);
        });
+    }
+
+    // Move contents if a single directory was extracted
+    if (!opts.keepStructure) {
+        promise = promise
+        .then(function () {
+            return isSingleDir(dst);
+        })
+        .then(function (singleDir) {
+            return singleDir ? moveSingleDirContents(singleDir) : null;
+        });
+    }
+
+    // Resolve promise to the dst dir
+    return promise.then(function () {
+        return dst;
+    });
 }

 module.exports = extract;
--- a/lib/util/fs.js
+++ b/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;
-    }
-};
--- a/lib/util/isPathAbsolute.js
+++ b/lib/util/isPathAbsolute.js
@@ -1,5 +0,0 @@
-function isPathAbsolute(filePath) {
-    return filePath.charAt(0) === '/';
-}
-
-module.exports = isPathAbsolute;
--- a/lib/util/readJson.js
+++ b/lib/util/readJson.js
@@ -13,43 +13,31 @@ function readJson(file, options) {
    options = options || {};

    // Read
-    return Q.nfcall(bowerJson.read, file, options).spread(
-        function(json, jsonFile) {
-            var deprecated;
+    return Q.nfcall(bowerJson.read, file, options)
+    .spread(function (json, jsonFile) {
+        var deprecated;

-            if (options.logger) {
-                var issues = bowerJson.getIssues(json);
-                if (issues.warnings.length > 0) {
-                    options.logger.warn('invalid-meta', 'for:' + jsonFile);
-                }
-                issues.warnings.forEach(function(warning) {
-                    options.logger.warn('invalid-meta', warning);
-                });
-            }
+        jsonFile = path.basename(jsonFile);
+        deprecated = jsonFile === 'component.json' ? jsonFile : false;

-            jsonFile = path.basename(jsonFile);
-            deprecated = jsonFile === 'component.json' ? jsonFile : false;
-
-            return [json, deprecated, false];
-        },
-        function(err) {
-            // No json file was found, assume one
-            if (err.code === 'ENOENT' && options.assume) {
-                return [bowerJson.parse(options.assume, options), false, true];
-            }
-
-            err.details = err.message;
-
-            if (err.file) {
-                err.message = 'Failed to read ' + err.file;
-                err.data = { filename: err.file };
-            } else {
-                err.message = 'Failed to read json from ' + file;
-            }
-
-            throw err;
+        return [json, deprecated, false];
+    }, function (err) {
+        // No json file was found, assume one
+        if (err.code === 'ENOENT' && options.assume) {
+            return [bowerJson.parse(options.assume, options), false, true];
        }
-    );
+
+        err.details = err.message;
+
+        if (err.file) {
+            err.message = 'Failed to read ' + err.file;
+            err.data = { filename: err.file };
+        } else {
+            err.message = 'Failed to read json from ' + file;
+        }
+
+        throw err;
+    });
 }

 module.exports = readJson;
--- a/lib/util/relativeToBaseDir.js
+++ b/lib/util/relativeToBaseDir.js
@@ -1,14 +0,0 @@
-var path = require('path');
-var isPathAbsolute = require('./isPathAbsolute');
-
-function relativeToBaseDir(baseDir) {
-    return function(filePath) {
-        if (isPathAbsolute(filePath)) {
-            return path.resolve(filePath);
-        } else {
-            return path.resolve(baseDir, filePath);
-        }
-    };
-}
-
-module.exports = relativeToBaseDir;
--- a/lib/util/removeIgnores.js
+++ b/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');
@@ -14,7 +14,7 @@ function removeIgnores(dir, meta) {
    // Don't ignore main files
    nonIgnored = nonIgnored.concat(meta.main || []);

-    nonIgnored = nonIgnored.map(function(file) {
+    nonIgnored = nonIgnored.map(function (file) {
        return path.join(dir, file);
    });

@@ -27,7 +27,7 @@ function removeIgnores(dir, meta) {

    // Monkey patch applyIgnores such that we get hold of all ignored files
    applyIgnores = reader.applyIgnores;
-    reader.applyIgnores = function(entry) {
+    reader.applyIgnores = function (entry) {
        var ret = applyIgnores.apply(this, arguments);

        if (!ret) {
@@ -38,27 +38,28 @@ function removeIgnores(dir, meta) {
    };

    reader
-        .on('child', function(entry) {
-            nonIgnored.push(entry.path);
-        })
-        .on('error', deferred.reject)
-        .on('end', function() {
-            var promises;
+    .on('child', function (entry) {
+        nonIgnored.push(entry.path);
+    })
+    .on('error', deferred.reject)
+    .on('end', function () {
+        var promises;

-            // Ensure that we are not ignoring files that should not be ignored!
-            ignored = mout.array.unique(ignored);
-            ignored = ignored.filter(function(file) {
-                return nonIgnored.indexOf(file) === -1;
-            });
-
-            // Delete all the ignored files
-            promises = ignored.map(function(file) {
-                return Q.nfcall(rimraf, file);
-            });
-
-            return Q.all(promises).then(deferred.resolve, deferred.reject);
+        // Ensure that we are not ignoring files that should not be ignored!
+        ignored = mout.array.unique(ignored);
+        ignored = ignored.filter(function (file) {
+            return nonIgnored.indexOf(file) === -1;
        });

+        // Delete all the ignored files
+        promises = ignored.map(function (file) {
+            return Q.nfcall(rimraf, file);
+        });
+
+        return Q.all(promises)
+        .then(deferred.resolve, deferred.reject);
+    });
+
    return deferred.promise;
 }

--- a/lib/util/resolve.js
+++ b/lib/util/resolve.js
@@ -1,22 +0,0 @@
-var requireg = require('requireg');
-var resolve = require('resolve');
-
-function startsWith(string, searchString, position) {
-    position = position || 0;
-    return string.substr(position, searchString.length) === searchString;
-}
-
-module.exports = function(id, options) {
-    var resolvedPath;
-
-    var cwd = (options || {}).cwd || process.cwd();
-
-    try {
-        resolvedPath = resolve.sync(id, { basedir: cwd });
-    } catch (e) {
-        // Fallback to global require
-        resolvedPath = requireg.resolve(id);
-    }
-
-    return resolvedPath;
-};
--- a/lib/util/rimraf.js
+++ b/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();
-    }
-};
--- a/lib/util/rootCheck.js
+++ b/lib/util/rootCheck.js
@@ -1,3 +1,5 @@
+/*jshint multistr:true*/
+'use strict';
 var isRoot = require('is-root');
 var createError = require('./createError');

@@ -11,23 +13,18 @@ function rootCheck(options, config) {
        return;
    }

-    errorMsg =
-        'Since bower is a user command, there is no need to execute it with \
+    errorMsg = 'Since bower is a user command, there is no need to execute it with \
 superuser permissions.\nIf you\'re having permission errors when using bower without \
 sudo, please spend a few minutes learning more about how your system should work and \
 make any necessary repairs.\n\n\
 http://www.joyent.com/blog/installing-node-and-npm\n\
 https://gist.github.com/isaacs/579814\n\n\
-You can however run a command with sudo using "--allow-root" option';
+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
-            })
-        );
+        renderer.error(createError('Cannot be run with sudo', 'ESUDO', { details : errorMsg }));
        process.exit(1);
    }
 }
--- a/lib/util/semver.js
+++ b/lib/util/semver.js
@@ -6,13 +6,13 @@ function maxSatisfying(versions, range, strictMatch) {
    var filteredVersions;

    // Filter only valid versions, since semver.maxSatisfying() throws an error
-    versions = versions.filter(function(version) {
+    versions = versions.filter(function (version) {
        return semver.valid(version);
    });

    // Exact version & range match
    if (semver.valid(range)) {
-        version = mout.array.find(versions, function(version) {
+        version = mout.array.find(versions, function (version) {
            return version === range;
        });
        if (version) {
@@ -25,7 +25,7 @@ function maxSatisfying(versions, range, strictMatch) {
    // When strict match is enabled give priority to non-pre-releases
    // We do this by filtering every pre-release version
    if (strictMatch) {
-        filteredVersions = versions.map(function(version) {
+        filteredVersions = versions.map(function (version) {
            return !isPreRelease(version) ? version : null;
        });

@@ -57,10 +57,7 @@ function clean(version) {
    }

    // Keep builds!
-    return (
-        parsed.version +
-        (parsed.build.length ? '+' + parsed.build.join('.') : '')
-    );
+    return parsed.version + (parsed.build.length ? '+' + parsed.build.join('.') : '');
 }

 function isPreRelease(version) {
--- a/lib/util/template.js
+++ b/lib/util/template.js
@@ -1,14 +1,14 @@
 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');
+var helpers = require('../../templates/helpers');

-var templatesDir = path.resolve(__dirname, '../templates');
+var templatesDir = path.resolve(__dirname, '../../templates');
 var cache = {};

 // Register helpers
-mout.object.forOwn(helpers, function(register) {
+mout.object.forOwn(helpers, function (register) {
    register(Handlebars);
 });

--- a/lib/util/userAgent.js
+++ b/lib/util/userAgent.js
@@ -1,12 +0,0 @@
-var version = require('../version');
-
-module.exports =
-    'node/' +
-    process.version +
-    ' ' +
-    process.platform +
-    ' ' +
-    process.arch +
-    ' ' +
-    ';Bower ' +
-    version;
--- a/lib/util/validLink.js
+++ b/lib/util/validLink.js
@@ -1,22 +1,24 @@
 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
    // to a valid file
    return Q.nfcall(fs.lstat, file)
-        .then(function(lstat) {
-            if (!lstat.isSymbolicLink()) {
-                return [false];
-            }
+    .then(function (lstat) {
+        if (!lstat.isSymbolicLink()) {
+            return [false];
+        }

-            return Q.nfcall(fs.stat, file).then(function(stat) {
-                return [stat];
-            });
-        })
-        .fail(function(err) {
-            return [false, err];
+        return Q.nfcall(fs.stat, file)
+        .then(function (stat) {
+            return [stat];
        });
+    })
+    .fail(function (err) {
+        return [false, err];
+    });
 }

 module.exports = validLink;
+
--- a/lib/version.js
+++ b/lib/version.js
@@ -1,3 +0,0 @@
-var findup = require('findup-sync');
-
-module.exports = require(findup('package.json', { cwd: __dirname })).version;
--- a/package.json
+++ b/package.json
@@ -1,111 +1,87 @@
 {
  "name": "bower",
-  "version": "1.8.0",
+  "version": "1.5.4",
  "description": "The browser package manager",
  "author": "Twitter",
  "license": "MIT",
  "repository": "bower/bower",
  "main": "lib",
-  "bin": "bin/bower",
  "homepage": "http://bower.io",
  "engines": {
    "node": ">=0.10.0"
  },
-  "keywords": [
-    "bower"
-  ],
  "dependencies": {
    "abbrev": "^1.0.5",
    "archy": "1.0.0",
-    "bower-config": "^1.4.1",
+    "bower-config": "^0.6.1",
    "bower-endpoint-parser": "^0.2.2",
-    "bower-json": "^0.8.1",
+    "bower-json": "^0.4.0",
    "bower-logger": "^0.2.2",
-    "bower-registry-client": "^1.0.0",
+    "bower-registry-client": "^0.3.0",
    "cardinal": "0.4.4",
    "chalk": "^1.0.0",
-    "chmodr": "^1.0.2",
-    "configstore": "^2.0.0",
-    "decompress-zip": "^0.2.1",
-    "destroy": "^1.0.3",
-    "findup-sync": "^0.3.0",
-    "fs-write-stream-atomic": "1.0.8",
+    "chmodr": "0.1.0",
+    "configstore": "^0.3.2",
+    "decompress-zip": "^0.1.0",
    "fstream": "^1.0.3",
    "fstream-ignore": "^1.0.2",
    "github": "^0.2.3",
    "glob": "^4.3.2",
-    "graceful-fs": "^4.1.3",
-    "handlebars": "^4.0.5",
-    "inquirer": "0.10.0",
+    "graceful-fs": "^3.0.5",
+    "handlebars": "^2.0.0",
+    "inquirer": "0.8.0",
+    "insight": "^0.7.0",
    "is-root": "^1.0.0",
    "junk": "^1.0.0",
    "lockfile": "^1.0.0",
-    "lru-cache": "^2.5.0",
+    "lru-cache": "2.7.0",
    "md5-hex": "^1.0.2",
    "mkdirp": "0.5.0",
    "mout": "^0.11.0",
    "nopt": "^3.0.1",
-    "opn": "^4.0.0",
+    "opn": "^1.0.1",
    "p-throttler": "0.1.1",
    "promptly": "0.2.0",
    "q": "^1.1.2",
-    "request": "2.67.0",
+    "request": "2.53.0",
    "request-progress": "0.3.1",
-    "requireg": "^0.1.5",
-    "resolve": "^1.1.7",
    "retry": "0.6.1",
    "rimraf": "^2.2.8",
    "semver": "^2.3.0",
-    "semver-utils": "^1.1.1",
    "shell-quote": "^1.4.2",
    "stringify-object": "^1.0.0",
    "tar-fs": "^1.4.1",
-    "tmp": "0.0.28",
-    "update-notifier": "^0.6.0",
+    "tmp": "0.0.24",
+    "update-notifier": "^0.3.0",
    "user-home": "^1.1.0",
    "which": "^1.0.8"
  },
  "devDependencies": {
-    "arr-diff": "^2.0.0",
-    "chai": "^3.5.0",
-    "coveralls": "^2.11.9",
+    "chai": "^1.10.0",
+    "coveralls": "^2.11.2",
    "expect.js": "^0.3.1",
-    "grunt": "^1.0.1",
-    "grunt-cli": "^1.1.0",
-    "grunt-contrib-watch": "^1.0.0",
-    "grunt-eslint": "^18.1.0",
-    "grunt-exec": "^0.4.7",
-    "grunt-simple-mocha": "^0.4.1",
-    "husky": "^0.14.3",
-    "in-publish": "^2.0.0",
-    "istanbul": "^0.4.3",
-    "lint-staged": "^7.0.0",
-    "load-grunt-tasks": "^3.5.0",
-    "mocha": "^2.5.3",
+    "grunt": "^0.4.5",
+    "grunt-cli": "^0.1.13",
+    "grunt-contrib-jshint": "^0.10.0",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-exec": "^0.4.6",
+    "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": "^9.2.3",
-    "node-uuid": "^1.4.7",
-    "prettier": "^1.11.1",
-    "proxyquire": "^1.7.9",
-    "spawn-sync": "1.0.15",
-    "wrench": "^1.5.8"
+    "nock": "^0.56.0",
+    "node-uuid": "^1.4.2",
+    "proxyquire": "^1.3.0",
+    "spawn-sync": "^1.0.5"
  },
  "scripts": {
-    "test": "grunt test",
-    "ci": "grunt travis",
-    "coveralls": "coveralls",
-    "prepublish": "in-publish && echo 'You need to use \"grunt publish\" to publish bower' && false || not-in-publish",
-    "format": "prettier --write --single-quote --tab-width 4 '**/*.js'",
-    "precommit": "lint-staged && npm test"
-  },
-  "lint-staged": {
-    "*.js": [
-      "prettier --single-quote --tab-width 4",
-      "git add"
-    ]
+    "test": "grunt test"
  },
+  "bin": "bin/bower",
  "files": [
    "bin",
-    "lib"
+    "lib",
+    "templates"
  ]
 }
--- a/packages/bower-config/.editorconfig
+++ b/packages/bower-config/.editorconfig
@@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
--- a/packages/bower-config/.gitignore
+++ b/packages/bower-config/.gitignore
@@ -1,7 +0,0 @@
-node_modules
-npm-debug.log
-
-test/assets/github-test-package
-test/assets/github-test-package-copy
-test/assets/temp
-test/reports
--- a/packages/bower-config/.jshintrc
+++ b/packages/bower-config/.jshintrc
@@ -1,61 +0,0 @@
-{
-    "predef": [
-        "console",
-        "describe",
-        "it",
-        "after",
-        "afterEach",
-        "before",
-        "beforeEach"
-    ],
-
-    "indent": 4,
-    "node": true,
-    "devel": true,
-
-    "bitwise": false,
-    "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": true,
-    "quotmark": "single",
-    "strict": false,
-    "trailing": true,
-
-    "asi": false,
-    "boss": true,
-    "debug": false,
-    "eqnull": true,
-    "es5": false,
-    "esnext": false,
-    "evil": false,
-    "expr": false,
-    "funcscope": false,
-    "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,
-
-    "nomen": false,
-    "white": true
-}
--- a/packages/bower-config/.travis.yml
+++ b/packages/bower-config/.travis.yml
@@ -1,9 +0,0 @@
-sudo: false
-language: node_js
-node_js:
-  - '5'
-  - '4'
-  - '0.12'
-  - '0.10'
-script:
-  - grunt travis
--- a/packages/bower-config/CHANGELOG.md
+++ b/packages/bower-config/CHANGELOG.md
@@ -1,103 +0,0 @@
-# Changelog
-
-## 1.4.0
-
- Change default shorthand resolver from git:// to https://
-
-## 1.3.1
-
- Ignore hook scripts for environment variable expansion
-
-## 1.3.0 - 2015-12-07
-
- Allow the use of environment variables in .bowerrc. Fixes [#41](https://github.com/bower/config/issues/41)
- Loads the .bowerrc file from the cwd specified on the command line. Fixes [bower/bower#1993](https://github.com/bower/bower/issues/1993)
- Allwow for array notation in ENV variables [#44](https://github.com/bower/config/issues/44)
-
-## 1.2.3 - 2015-11-27
-
- Restores env variables if they are undefined at the beginning
- Handles default setting for config.ca. Together with [bower/bower PR #1972](https://github.com/bower/bower/pull/1972), fixes downloading with `strict-ssl` using custom CA
- Displays an error message if .bowerrc is a directory instead of file. Fixes [bower/bower#2022](https://github.com/bower/bower/issues/2022)
-
-## 1.2.2 - 2015-10-16
- Fixes registry configurartion expanding [bower/bower#1950](https://github.com/bower/bower/issues/1950)
-
-## 1.2.1 - 2015-10-15
- Fixes case insenstivity HTTP_PROXY setting issue on Windows
-
-## 1.2.0 - 2015-09-28
- Prevent defaulting cwd to process.cwd()
-
-## 1.1.2 - 2015-09-27
- Performs only camel case normalisation before merging
-
-## 1.1.1 - 2015-09-27
- Fix: Merge extra options after camel-case normalisation, instead of before it
-
-## 1.1.0 - 2015-09-27
- Allow for overwriting options with .load(overwrites) / .read(cwd, overwrites)
-
-## 1.0.1 - 2015-09-27
- Update dependencies and relax "mout" version range
- Most significant changes:
-  - graceful-fs updated from 2.x version to 4.x
-  - osenv updated to from 0.0.x to 0.1.x, [tmp location changed](https://github.com/npm/osenv/commit/d6eddbc026538b09026b1dbd60fbc081a8c67e03)
-
-## 1.0.0 - 2015-09-27
- Support for no-proxy configuration variable
- Overwrite HTTP_PROXY, HTTPS_PROXY, and NO_PROXY env variables in load method
- Normalise paths to certificates with contents of them, [#28](https://github.com/bower/config/pull/28)
-
-## 0.6.1 - 2015-04-1
- Fixes merging .bowerrc files upward directory tree. [#25](https://github.com/bower/config/issues/25)
-
-## 0.6.0 - 2015-03-30
- Merge .bowerrc files upward directory tree (fixes [bower/bower#1689](https://github.com/bower/bower/issues/1689)) [#24](https://github.com/bower/config/pull/24)
- Allow NPM config variables (resolves [bower/bower#1711](https://github.com/bower/bower/issues/1711)) [#23](https://github.com/bower/config/pull/23)
-
-## 0.5.2 - 2014-06-09
- Fixes downloading of bower modules with ignores when .bowerrc is overridden with a relative tmp path. [#17](https://github.com/bower/config/issues/17) [bower/bower#1299](https://github.com/bower/bower/issues/1299)
-
-## 0.5.1 - 2014-05-21
- [perf] Uses the same mout version as bower
- [perf] Uses only relevant parts of mout. Related [bower/bower#1134](https://github.com/bower/bower/pull/1134)
-
-## 0.5.0 - 2013-08-30
- Adds a DEFAULT_REGISTRY key to the Config class that exposes the bower registry UR. [#6](https://github.com/bower/config/issues/6)
-
-## 0.4.5 - 2013-08-28
- Fixes crashing when home is not set
-
-## 0.4.4 - 2013-08-21
- Supports nested environment variables [#8](https://github.com/bower/config/issues/8)
-
-## 0.4.3 - 2013-08-19
- Improvement in argv.config parsing
-
-## 0.4.2 - 2013-08-18
- Sets interative to auto
-
-## 0.4.1 - 2013-08-18
- Generates a fake user instead of using 'unknown'
-
-## 0.4.0 - 2013-08-16
- Suffixes temp folder with the user and 'bower'
-
-## 0.3.5 - 2013-08-14
- Casts buffer to string
-
-## 0.3.4 - 2013-08-11
- Empty .bowerrc files no longer throw an error.
-
-## 0.3.3 - 2013-08-11
- Changes git folder to empty (was not being used anyway)
-
-## 0.3.2 - 2013-08-07
- Uses a known user agent by default when a proxy.
-
-## 0.3.1 - 2013-08-06
- Fixes Typo
-
-## 0.3.0 - 2013-08-06
- Appends the username when using the temporary folder.
--- a/packages/bower-config/Gruntfile.js
+++ b/packages/bower-config/Gruntfile.js
@@ -1,54 +0,0 @@
-module.exports = function(grunt) {
-    require('load-grunt-tasks')(grunt);
-
-    grunt.initConfig({
-        jshint: {
-            options: {
-                jshintrc: '.jshintrc'
-            },
-            files: [
-                'Gruntfile.js',
-                'bin/*',
-                'lib/**/*.js',
-                'test/**/*.js',
-                '!test/assets/**/*',
-                '!test/reports/**/*',
-                '!test/tmp/**/*'
-            ]
-        },
-        simplemocha: {
-            options: {
-                reporter: 'spec',
-                timeout: '10000'
-            },
-            full: {
-                src: ['test/test.js']
-            },
-            short: {
-                options: {
-                    reporter: 'dot'
-                },
-                src: ['test/test.js']
-            }
-        },
-        exec: {
-            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'
-            },
-            coveralls: {
-                command:
-                    'node node_modules/.bin/coveralls < test/reports/lcov.info'
-            }
-        },
-        watch: {
-            files: ['<%= jshint.files %>'],
-            tasks: ['jshint', 'simplemocha:short']
-        }
-    });
-
-    grunt.registerTask('test', ['jshint', 'simplemocha:full']);
-    grunt.registerTask('cover', 'exec:cover');
-    grunt.registerTask('travis', ['jshint', 'exec:cover', 'exec:coveralls']);
-    grunt.registerTask('default', 'test');
-};
--- a/packages/bower-config/LICENSE
+++ b/packages/bower-config/LICENSE
@@ -1,19 +0,0 @@
-Copyright (c) 2012 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
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/packages/bower-config/README.md
+++ b/packages/bower-config/README.md
@@ -1,76 +0,0 @@
-# bower-config [![Build Status](https://secure.travis-ci.org/bower/config.png?branch=master)](http://travis-ci.org/bower/config)[![Coverage Status](https://coveralls.io/repos/bower/config/badge.svg?branch=master&service=github)](https://coveralls.io/github/bower/config?branch=master)
-
-> The Bower config (`.bowerrc`) reader and writer.
-
-[Bower](http://bower.io/) can be configured using JSON in a `.bowerrc` file. For example:
-
-    {
-      "directory": "app/components/",
-      "timeout": 120000,
-      "registry": {
-        "search": [
-          "http://localhost:8000",
-          "https://registry.bower.io"
-        ]
-      }
-    }
-
-View the complete [.bowerrc specification](http://bower.io/docs/config/#bowerrc-specification) on the website for more details. Both the `bower.json` and `.bowerrc` specifications are maintained at [github.com/bower/spec](https://github.com/bower/spec).
-
-## Install
-
-```sh
-$ npm install --save bower-config
-```
-
-
-## Usage
-
-#### .load(overwrites)
-
-Loads the bower configuration from the configuration files.
-
-Configuration is overwritten (after camelcase normalisation) with `overwrites` argument.
-
-This method overwrites following environment variables:
-
- `HTTP_PROXY` with `proxy` configuration variable
- `HTTPS_PROXY` with `https-proxy` configuration variable
- `NO_PROXY` with `no-proxy` configuration variable
-
-It also clears `http_proxy`, `https_proxy`, and `no_proxy` environment variables.
-
-To restore those variables you can use `restore` method.
-
-#### restore()
-
-Restores environment variables overwritten by `.load` method.
-
-#### .toObject()
-
-Returns a deep copy of the underlying configuration object.
-The returned configuration is normalised.
-The object keys will be camelCase.
-
-
-#### #create(cwd)
-
-Obtains a instance where `cwd` is the current working directory (defaults to `process.cwd`);
-
-```js
-var config = require('bower-config').create();
-// You can also specify a working directory
-var config2 = require('bower-config').create('./some/path');
-```
-
-#### #read(cwd, overrides)
-
-Alias for:
-
-```js
-var configObject = (new Config(cwd)).load(overrides).toJson();
-```
-
-## License
-
-Released under the [MIT License](http://www.opensource.org/licenses/mit-license.php).
--- a/packages/bower-config/lib/Config.js
+++ b/packages/bower-config/lib/Config.js
@@ -1,113 +0,0 @@
-var lang = require('mout/lang');
-var object = require('mout/object');
-var rc = require('./util/rc');
-var expand = require('./util/expand');
-var EnvProxy = require('./util/proxy');
-var path = require('path');
-var fs = require('fs');
-
-function Config(cwd) {
-    this._cwd = cwd;
-    this._proxy = new EnvProxy();
-    this._config = {};
-}
-
-Config.prototype.load = function(overwrites) {
-    this._config = rc('bower', this._cwd);
-
-    this._config = object.merge(
-        expand(this._config || {}),
-        expand(overwrites || {})
-    );
-
-    this._config = normalise(this._config);
-
-    this._proxy.set(this._config);
-
-    return this;
-};
-
-Config.prototype.restore = function() {
-    this._proxy.restore();
-};
-
-function readCertFile(path) {
-    path = path || '';
-
-    var sep = '-----END CERTIFICATE-----';
-
-    var certificates;
-
-    if (path.indexOf(sep) === -1) {
-        certificates = fs.readFileSync(path, { encoding: 'utf8' });
-    } else {
-        certificates = path;
-    }
-
-    return certificates
-        .split(sep)
-        .filter(function(s) {
-            return !s.match(/^\s*$/);
-        })
-        .map(function(s) {
-            return s + sep;
-        });
-}
-
-function loadCAs(caConfig) {
-    // If a ca file path has been specified, expand that here to the file's
-    // contents. As a user can specify these individually, we must load them
-    // one by one.
-    for (var p in caConfig) {
-        if (caConfig.hasOwnProperty(p)) {
-            var prop = caConfig[p];
-            if (Array.isArray(prop)) {
-                caConfig[p] = prop.map(function(s) {
-                    return readCertFile(s);
-                });
-            } else if (prop) {
-                caConfig[p] = readCertFile(prop);
-            }
-        }
-    }
-}
-
-Config.prototype.toObject = function() {
-    return lang.deepClone(this._config);
-};
-
-Config.create = function(cwd) {
-    return new Config(cwd);
-};
-
-Config.read = function(cwd, overrides) {
-    var config = Config.create(cwd);
-    return config.load(overrides).toObject();
-};
-
-function normalise(config) {
-    config = expand(config);
-
-    // Some backwards compatible things..
-    if (config.shorthandResolver) {
-        config.shorthandResolver = config.shorthandResolver
-            .replace(/\{\{\{/g, '{{')
-            .replace(/\}\}\}/g, '}}');
-    }
-
-    // Ensure that every registry endpoint does not end with /
-    config.registry.search = config.registry.search.map(function(url) {
-        return url.replace(/\/+$/, '');
-    });
-    config.registry.register = config.registry.register.replace(/\/+$/, '');
-    config.registry.publish = config.registry.publish.replace(/\/+$/, '');
-    config.tmp = path.resolve(config.tmp);
-
-    loadCAs(config.ca);
-
-    return config;
-}
-
-Config.DEFAULT_REGISTRY = require('./util/defaults').registry;
-
-module.exports = Config;
--- a/packages/bower-config/lib/util/defaults.js
+++ b/packages/bower-config/lib/util/defaults.js
@@ -1,46 +0,0 @@
-var path = require('path');
-var paths = require('./paths');
-
-// Guess proxy defined in the env
-var proxy = process.env.HTTP_PROXY || process.env.http_proxy || null;
-
-var httpsProxy = process.env.HTTPS_PROXY || process.env.https_proxy || proxy;
-
-var noProxy = process.env.NO_PROXY || process.env.no_proxy;
-
-// Use a well known user agent (in this case, curl) when using a proxy,
-// to avoid potential filtering on many corporate proxies with blank or unknown agents
-var userAgent =
-    !proxy && !httpsProxy
-        ? 'node/' +
-          process.version +
-          ' ' +
-          process.platform +
-          ' ' +
-          process.arch
-        : 'curl/7.21.4 (universal-apple-darwin11.0) libcurl/7.21.4 OpenSSL/0.9.8r zlib/1.2.5';
-
-var defaults = {
-    directory: 'bower_components',
-    registry: 'https://registry.bower.io',
-    'shorthand-resolver': 'https://github.com/{{owner}}/{{package}}.git',
-    tmp: paths.tmp,
-    proxy: proxy,
-    'https-proxy': httpsProxy,
-    'no-proxy': noProxy,
-    timeout: 30000,
-    ca: { search: [] },
-    'strict-ssl': true,
-    'user-agent': userAgent,
-    color: true,
-    interactive: null,
-    storage: {
-        packages: path.join(paths.cache, 'packages'),
-        links: path.join(paths.data, 'links'),
-        completion: path.join(paths.data, 'completion'),
-        registry: path.join(paths.cache, 'registry'),
-        empty: path.join(paths.data, 'empty') // Empty dir, used in GIT_TEMPLATE_DIR among others
-    }
-};
-
-module.exports = defaults;
--- a/packages/bower-config/lib/util/expand.js
+++ b/packages/bower-config/lib/util/expand.js
@@ -1,130 +0,0 @@
-var object = require('mout/object');
-var lang = require('mout/lang');
-var string = require('mout/string');
-
-function camelCase(config) {
-    var camelCased = {};
-
-    // Camel case
-    object.forOwn(config, function(value, key) {
-        // Ignore null values
-        if (value == null) {
-            return;
-        }
-
-        key = string.camelCase(key.replace(/_/g, '-'));
-        camelCased[key] = lang.isPlainObject(value) ? camelCase(value) : value;
-    });
-
-    return camelCased;
-}
-
-// Function to replace ${VAR} - style variables
-//  with values set in the environment
-// This function expects to be passed a string
-function doEnvReplaceStr(f) {
-    // Un-tildify
-    var untildify = require('untildify');
-    f = untildify(f);
-
-    // replace any ${ENV} values with the appropriate environ.
-    var envExpr = /(\\*)\$\{([^}]+)\}/g;
-    return f.replace(envExpr, function(orig, esc, name) {
-        esc = esc.length && esc.length % 2;
-        if (esc) return orig;
-        if (undefined === process.env[name]) {
-            throw new Error(
-                'Environment variable used in .bowerrc is not defined: ' + orig
-            );
-        }
-
-        return process.env[name];
-    });
-}
-
-function envReplace(config) {
-    var envReplaced = {};
-    if (lang.isArray(config)) {
-        envReplaced = [];
-    }
-
-    object.forOwn(config, function(value, key) {
-        // Ignore null values
-        if (value == null) {
-            return;
-        }
-
-        // Ignore 'scripts'
-        // These hooks run within the shell
-        // environment variable expansion is not required
-        if (key === 'scripts' && lang.isPlainObject(value)) {
-            envReplaced[key] = value;
-            return;
-        }
-
-        // Perform variable replacements based on var type
-        if (lang.isPlainObject(value)) {
-            envReplaced[key] = envReplace(value);
-        } else if (lang.isArray(value)) {
-            envReplaced[key] = envReplace(value);
-        } else if (lang.isString(value)) {
-            envReplaced[key] = doEnvReplaceStr(value);
-        } else {
-            envReplaced[key] = value;
-        }
-    });
-
-    return envReplaced;
-}
-
-function expand(config) {
-    config = camelCase(config);
-    config = envReplace(config);
-
-    if (typeof config.registry === 'string') {
-        config.registry = {
-            default: config.registry,
-            search: [config.registry],
-            register: config.registry,
-            publish: config.registry
-        };
-    } else if (typeof config.registry === 'object') {
-        config.registry.default =
-            config.registry.default || 'https://registry.bower.io';
-
-        config.registry = {
-            default: config.registry.default,
-            search: config.registry.search || config.registry.default,
-            register: config.registry.register || config.registry.default,
-            publish: config.registry.publish || config.registry.default
-        };
-
-        if (config.registry.search && !Array.isArray(config.registry.search)) {
-            config.registry.search = [config.registry.search];
-        }
-    }
-
-    // CA
-    if (typeof config.ca === 'string') {
-        config.ca = {
-            default: config.ca,
-            search: [config.ca],
-            register: config.ca,
-            publish: config.ca
-        };
-    } else if (typeof config.ca === 'object') {
-        if (config.ca.search && !Array.isArray(config.ca.search)) {
-            config.ca.search = [config.ca.search];
-        }
-
-        if (config.ca.default) {
-            config.ca.search = config.ca.search || config.ca.default;
-            config.ca.register = config.ca.register || config.ca.default;
-            config.ca.publish = config.ca.publish || config.ca.default;
-        }
-    }
-
-    return config;
-}
-
-module.exports = expand;
--- a/packages/bower-config/lib/util/paths.js
+++ b/packages/bower-config/lib/util/paths.js
@@ -1,52 +0,0 @@
-var os = require('os');
-var path = require('path');
-var osenv = require('osenv');
-var crypto = require('crypto');
-
-function generateFakeUser() {
-    var uid =
-        process.pid +
-        '-' +
-        Date.now() +
-        '-' +
-        Math.floor(Math.random() * 1000000);
-    return crypto
-        .createHash('md5')
-        .update(uid)
-        .digest('hex');
-}
-
-// Assume XDG defaults
-// See: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-var paths = {
-    config: process.env.XDG_CONFIG_HOME,
-    data: process.env.XDG_DATA_HOME,
-    cache: process.env.XDG_CACHE_HOME
-};
-
-// Guess some needed properties based on the user OS
-var user = (osenv.user() || generateFakeUser()).replace(/\\/g, '-');
-var tmp = path.join(os.tmpdir ? os.tmpdir() : os.tmpDir(), user);
-var home = osenv.home();
-var base;
-
-// Fallbacks for windows
-if (process.platform === 'win32') {
-    base = path.resolve(process.env.LOCALAPPDATA || home || tmp);
-    base = path.join(base, 'bower');
-
-    paths.config = paths.config || path.join(base, 'config');
-    paths.data = paths.data || path.join(base, 'data');
-    paths.cache = paths.cache || path.join(base, 'cache');
-    // Fallbacks for other operating systems
-} else {
-    base = path.resolve(home || tmp);
-
-    paths.config = paths.config || path.join(base, '.config/bower');
-    paths.data = paths.data || path.join(base, '.local/share/bower');
-    paths.cache = paths.cache || path.join(base, '.cache/bower');
-}
-
-paths.tmp = path.resolve(path.join(tmp, 'bower'));
-
-module.exports = paths;
--- a/packages/bower-config/lib/util/proxy.js
+++ b/packages/bower-config/lib/util/proxy.js
@@ -1,79 +0,0 @@
-// EnvProxy uses the proxy vaiables passed to it in set and sets the
-// process.env uppercase proxy variables to them with the ability
-// to restore the original values later
-var EnvProxy = function() {
-    this.restoreFrom = {};
-};
-
-EnvProxy.prototype.set = function(config) {
-    this.config = config;
-
-    // Override environment defaults if proxy config options are set
-    // This will make requests.js follow the proxies in config
-    if (Object.prototype.hasOwnProperty.call(config, 'noProxy')) {
-        this.restoreFrom.NO_PROXY = process.env.NO_PROXY;
-        this.restoreFrom.no_proxy = process.env.no_proxy;
-        delete process.env.no_proxy;
-        process.env.NO_PROXY = config.noProxy;
-    }
-
-    if (Object.prototype.hasOwnProperty.call(config, 'proxy')) {
-        this.restoreFrom.HTTP_PROXY = process.env.HTTP_PROXY;
-        this.restoreFrom.http_proxy = process.env.http_proxy;
-        delete process.env.http_proxy;
-        process.env.HTTP_PROXY = config.proxy;
-    }
-
-    if (Object.prototype.hasOwnProperty.call(config, 'httpsProxy')) {
-        this.restoreFrom.HTTPS_PROXY = process.env.HTTPS_PROXY;
-        this.restoreFrom.https_proxy = process.env.https_proxy;
-        delete process.env.https_proxy;
-        process.env.HTTPS_PROXY = config.httpsProxy;
-    }
-};
-
-EnvProxy.prototype.restore = function() {
-    if (Object.prototype.hasOwnProperty.call(this.config, 'noProxy')) {
-        if (this.restoreFrom.NO_PROXY !== undefined) {
-            process.env.NO_PROXY = this.restoreFrom.NO_PROXY;
-        } else {
-            delete process.env.NO_PROXY;
-        }
-
-        if (this.restoreFrom.no_proxy !== undefined) {
-            process.env.no_proxy = this.restoreFrom.no_proxy;
-        } else {
-            delete process.env.no_proxy;
-        }
-    }
-
-    if (Object.prototype.hasOwnProperty.call(this.config, 'proxy')) {
-        if (this.restoreFrom.HTTP_PROXY !== undefined) {
-            process.env.HTTP_PROXY = this.restoreFrom.HTTP_PROXY;
-        } else {
-            delete process.env.HTTP_PROXY;
-        }
-
-        if (this.restoreFrom.http_proxy !== undefined) {
-            process.env.http_proxy = this.restoreFrom.http_proxy;
-        } else {
-            delete process.env.http_proxy;
-        }
-    }
-
-    if (Object.prototype.hasOwnProperty.call(this.config, 'httpsProxy')) {
-        if (this.restoreFrom.HTTPS_PROXY !== undefined) {
-            process.env.HTTPS_PROXY = this.restoreFrom.HTTPS_PROXY;
-        } else {
-            delete process.env.HTTPS_PROXY;
-        }
-
-        if (this.restoreFrom.https_proxy !== undefined) {
-            process.env.https_proxy = this.restoreFrom.https_proxy;
-        } else {
-            delete process.env.https_proxy;
-        }
-    }
-};
-
-module.exports = EnvProxy;
--- a/packages/bower-config/lib/util/rc.js
+++ b/packages/bower-config/lib/util/rc.js
@@ -1,157 +0,0 @@
-var path = require('path');
-var fs = require('graceful-fs');
-var optimist = require('optimist');
-var osenv = require('osenv');
-var object = require('mout/object');
-var string = require('mout/string');
-var paths = require('./paths');
-var defaults = require('./defaults');
-
-var win = process.platform === 'win32';
-var home = osenv.home();
-
-function rc(name, cwd, argv) {
-    var argvConfig;
-
-    argv = argv || optimist.argv;
-
-    // Parse --config.foo=false
-    argvConfig = object.map(argv.config || {}, function(value) {
-        return value === 'false' ? false : value;
-    });
-
-    // If we have specified a cwd then use this as the base for getting config.
-    cwd = argvConfig.cwd ? argvConfig.cwd : cwd;
-
-    if (cwd) {
-        return object.deepMixIn.apply(null, [
-            {},
-            defaults,
-            { cwd: cwd },
-            win ? {} : json(path.join('/etc', name + 'rc')),
-            !home ? {} : json(path.join(home, '.' + name + 'rc')),
-            json(path.join(paths.config, name + 'rc')),
-            json(find('.' + name + 'rc', cwd)),
-            env('npm_package_config_' + name + '_'),
-            env(name + '_'),
-            argvConfig
-        ]);
-    } else {
-        return object.deepMixIn.apply(null, [
-            {},
-            defaults,
-            win ? {} : json(path.join('/etc', name + 'rc')),
-            !home ? {} : json(path.join(home, '.' + name + 'rc')),
-            json(path.join(paths.config, name + 'rc')),
-            env('npm_package_config_' + name + '_'),
-            env(name + '_'),
-            argvConfig
-        ]);
-    }
-}
-
-function parse(content, file) {
-    var error;
-
-    if (!content.trim().length) {
-        return {};
-    }
-
-    try {
-        return JSON.parse(content);
-    } catch (e) {
-        if (file) {
-            error = new Error('Unable to parse ' + file + ': ' + e.message);
-        } else {
-            error = new Error('Unable to parse rc config: ' + e.message);
-        }
-
-        error.details = content;
-        error.code = 'EMALFORMED';
-        throw error;
-    }
-}
-
-function json(file) {
-    var content = {};
-    if (!Array.isArray(file)) {
-        try {
-            content = fs.readFileSync(file).toString();
-        } catch (err) {
-            return null;
-        }
-
-        return parse(content, file);
-    } else {
-        // This is multiple json files
-        file.forEach(function(filename) {
-            if (fs.statSync(filename).isDirectory()) {
-                var error;
-                error = new Error(filename + ' should not be a directory');
-                error.code = 'EFILEISDIR';
-                throw error;
-            }
-            var json = fs.readFileSync(filename).toString();
-            json = parse(json, filename);
-            content = object.merge(content, json);
-        });
-
-        return content;
-    }
-}
-
-function env(prefix) {
-    var obj = {};
-    var prefixLength = prefix.length;
-
-    prefix = prefix.toLowerCase();
-
-    object.forOwn(process.env, function(value, key) {
-        key = key.toLowerCase();
-
-        if (string.startsWith(key, prefix)) {
-            var parsedKey = key
-                .substr(prefixLength)
-                .replace(/__/g, '.') // __ is used for nesting
-                .replace(/_/g, '-'); // _ is used as a - separator
-
-            //use a convention patern to accept array from process.env
-            //e.g. export bower_registry__search='["http://abc.com","http://def.com"]'
-            var match = /\[([^\]]*)\]/g.exec(value);
-            var targetValue;
-            if (!match || match.length === 0) {
-                targetValue = value;
-            } else {
-                targetValue = match[1].split(',').map(function(m) {
-                    return m.trim();
-                });
-            }
-            object.set(obj, parsedKey, targetValue);
-        }
-    });
-
-    return obj;
-}
-
-function find(filename, dir) {
-    var files = [];
-
-    var walk = function(filename, dir) {
-        var file = path.join(dir, filename);
-        var parent = path.dirname(dir);
-
-        if (fs.existsSync(file)) {
-            files.push(file);
-        }
-
-        if (parent !== dir) {
-            walk(filename, parent);
-        }
-    };
-
-    walk(filename, dir);
-    files.reverse();
-    return files;
-}
-
-module.exports = rc;
--- a/packages/bower-config/package.json
+++ b/packages/bower-config/package.json
@@ -1,45 +0,0 @@
-{
-  "name": "bower-config",
-  "version": "1.4.0",
-  "description": "The Bower config reader and writer.",
-  "author": "Twitter",
-  "license": "MIT",
-  "repository": "https://github.com/bower/bower/tree/master/packages/bower-config",
-  "main": "lib/Config",
-  "homepage": "http://bower.io",
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "dependencies": {
-    "graceful-fs": "^4.1.3",
-    "mout": "^1.0.0",
-    "optimist": "^0.6.1",
-    "osenv": "^0.1.3",
-    "untildify": "^2.1.0"
-  },
-  "devDependencies": {
-    "coveralls": "^2.11.4",
-    "expect.js": "^0.3.1",
-    "glob": "^4.5.3",
-    "grunt": "^0.4.5",
-    "grunt-cli": "^0.1.13",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-coveralls": "^1.0.0",
-    "grunt-exec": "^0.4.6",
-    "grunt-simple-mocha": "^0.4.0",
-    "istanbul": "^0.4.1",
-    "load-grunt-tasks": "^2.0.0",
-    "mkdirp": "^0.5.0",
-    "mocha": "~1.12.0",
-    "node-uuid": "^1.4.3",
-    "q": "^1.2.0",
-    "rimraf": "^2.3.2"
-  },
-  "scripts": {
-    "test": "grunt test"
-  },
-  "files": [
-    "lib"
-  ]
-}
--- a/packages/bower-config/test/assets/custom-ca-embed/.bowerrc
+++ b/packages/bower-config/test/assets/custom-ca-embed/.bowerrc
@@ -1,3 +0,0 @@
-{
-    "ca": "Equifax Secure CA\n=================\n-----BEGIN CERTIFICATE-----\nMIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE\nChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5\nMB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT\nB0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB\nnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR\nfM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW\n8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG\nA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE\nCxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG\nA1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS\nspXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB\nAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961\nzgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB\nBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95\n70+sB3c4\n-----END CERTIFICATE-----\n\nGlobalSign Root CA\n==================\n-----BEGIN CERTIFICATE-----\nMIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx\nGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds\nb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV\nBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD\nVQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa\nDuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc\nTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb\nKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP\nc1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX\ngzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV\nHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF\nAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj\nY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG\nj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH\nhm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC\nX4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==\n-----END CERTIFICATE-----"
-}
--- a/packages/bower-config/test/assets/custom-ca/.bowerrc
+++ b/packages/bower-config/test/assets/custom-ca/.bowerrc
@@ -1,3 +0,0 @@
-{
-    "ca": "test/assets/custom-ca/ca-bundle.crt"
-}
--- a/packages/bower-config/test/assets/custom-ca/ca-bundle.crt
+++ b/packages/bower-config/test/assets/custom-ca/ca-bundle.crt
@@ -1,40 +0,0 @@
-Equifax Secure CA
-=================
-----BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE
-ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT
-B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR
-fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW
-8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG
-A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE
-CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG
-A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS
-spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB
-Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961
-zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB
-BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
-70+sB3c4
-----END CERTIFICATE-----
-
-GlobalSign Root CA
-==================
-----BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
-GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
-b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
-BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
-VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
-DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
-THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
-Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
-c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
-gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
-AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
-Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
-j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
-hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
-X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
-----END CERTIFICATE-----
--- a/packages/bower-config/test/assets/env-variables-values/.bowerrc
+++ b/packages/bower-config/test/assets/env-variables-values/.bowerrc
@@ -1,15 +0,0 @@
-{
-   "scripts" : {
-      "postinstall" : "${_myshellvar}"
-   },
-   "storage" : {
-      "packages" : "${_BOWERRC_MY_PACKAGES}",
-      "registry" : {
-        "register": "~/.bower-test/registry",
-        "search": [
-          "${_BOWERRC_MY_USER}:${_BOWERRC_MY_PASS}"
-        ]
-      }
-   },
-   "tmp" : "${_BOWERRC_MY_TMP}"
-}
--- a/packages/bower-config/test/assets/env-variables/.bowerrc
+++ b/packages/bower-config/test/assets/env-variables/.bowerrc
@@ -1,5 +0,0 @@
-{
-  "proxy": "http://HTTP_PROXY",
-  "https-proxy": "http://HTTPS_PROXY",
-  "no-proxy": "google.com"
-}
--- a/Show More
+++ b/Show More