Fix missing host from ssh source

Update year to 2017

.appveyor.yml

@@ -0,0 +1,46 @@
+# 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"

.editorconfig

@@ -15,5 +15,4 @@ trim_trailing_whitespace = false
 insert_final_newline = false
 
 [{package,bower}.json]
-indent_style = space
 indent_size = 2

.eslintrc

@@ -0,0 +1,52 @@
+{
+  "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, "consistent", { "keywords": true }],
+    "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, {"anonymous": "always", "named": "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
+  }
+}

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,44 @@
+<!--
+
+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:**

.gitignore

@@ -9,3 +9,6 @@
 /bower.json
 /component.json
 /bower_components
+/test/sample
+!/test/sample/bower.json
+/npm-shrinkwrap.json

.travis.yml

@@ -1,25 +1,43 @@
+sudo: false
+
+language: node_js
+
+# Use node 8 for build
+node_js:
+  - "8"
+
+# Then test with specific node version
 env:
-  - NODE_VERSION=0.10
-  - NODE_VERSION=0.11
+  - 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
 
 install:
-  - 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
+  - yarn
+  - nvm install $TEST_NODE_VERSION
+  - npm install -g grunt
 
 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

CHANGELOG.md

@@ -1,5 +1,203 @@
 # 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
+
+## 1.5.3 - 2015-09-24
+
+- Revert auto sorting of bower dependencies, fixes ([#1897](https://github.com/bower/bower/issues/1897))
+- Fix --save-exact feature for github endpoints, fixes ([#1925](https://github.com/bower/bower/issues/1925))
+- Fix `bower init` to support private flag again ([#1819](https://github.com/bower/bower/pull/1819))
+- Bump insight dependency to support prompt timeout ([#1102](https://github.com/bower/bower/issues/1102))
+
+## 1.5.2 - 2015-08-25
+
+- Revert update semver version from 2.x to 5.x, fixes ([#1896](https://github.com/bower/bower/issues/1896))
+- Make bower commands work from subdirectories, fixes ([#1893](https://github.com/bower/bower/issues/1893))
+- Put auto shallow cloning for git behind a flag, fixes ([#1764](https://github.com/bower/bower/issues/1764))
+
+## 1.5.1 - 2015-08-24
+
+- If cwd provided explicitly, force using it, fixes #1866
+
+## 1.5.0 - 2015-08-24
+
+- Pluggable Resolvers! http://bower.io/docs/pluggable-resolvers/
+- Update semver version from 2.x to 5.x ([#1852](https://github.com/bower/bower/issues/1852))
+- Auto-sort dependencies alphabetically ([#1381](https://github.com/bower/bower/issues/1381))
+- Make bower commands work from subdirectories ([#1866](https://github.com/bower/bower/issues/1866))
+- No longer prefer installing bower as global module ([#1865](https://github.com/bower/bower/issues/1865))
+
+## 1.4.2 - 2015-11-24
+
+- [fix] Lock lru-cache dependency to 2.7.0
+
 ## 1.4.1 - 2015-04-01
 
 - [fix] Reading .bowerrc upwards directory tree ([#1763](https://github.com/bower/bower/issues/1763))

CONTRIBUTING.md

@@ -1,35 +1,26 @@
 # 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.  (Jan 2014)
+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)
 
 ## Casual Involvement
+
 * Improve the bower.io site ([tickets](https://github.com/bower/bower.github.io/issues))
-* Move forward [bower.io redesign](https://github.com/bower/bower.github.io/issues/7)
-* Attend team meetings
 * Comment on issues and drive to resolution
 
 ## High-impact Involvement
 
-* Maintaining the bower client. 
-  * [Authoring client tests](https://github.com/bower/bower/issues/801)
+* Maintaining the bower client.
   * 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 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.
+We communicate through a channel on Discord https://discord.gg/0fFM7QF0KpZRh2cY 
 
+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
 
@@ -38,57 +29,15 @@ 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), our
-  [Mailing List](http://groups.google.com/group/twitter-bower)
+  [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),
   (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
 
@@ -172,6 +121,8 @@ 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.
 

Gruntfile.js

@@ -1,11 +1,20 @@
 'use strict';
+
+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) {
     require('load-grunt-tasks')(grunt);
 
     grunt.initConfig({
-        jshint: {
+        eslint: {
             options: {
-                jshintrc: '.jshintrc'
+                fix: true
             },
             files: [
                 'Gruntfile.js',
@@ -14,6 +23,7 @@ module.exports = function (grunt) {
                 'test/**/*.js',
                 '!test/assets/**/*',
                 '!test/reports/**/*',
+                '!test/sample/**/*',
                 '!test/tmp/**/*'
             ]
         },
@@ -33,28 +43,171 @@ module.exports = function (grunt) {
             }
         },
         exec: {
-            assets: {
+            'assets': {
                 command: 'node test/packages.js && node test/packages-svn.js'
             },
             'assets-force': {
                 command: 'node test/packages.js --force && node test/packages-svn.js --force'
             },
-            cover: {
-                command: 'STRICT_REQUIRE=1 node node_modules/istanbul/lib/cli.js cover --dir ./test/reports node_modules/mocha/bin/_mocha -- --timeout 30000 -R dot test/test.js'
+            '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'
             },
-            coveralls: {
-                command: 'node node_modules/.bin/coveralls < test/reports/lcov.info'
+            'coveralls': {
+                command: 'npm run coveralls < test/reports/lcov.info',
+                exitCodes: [0, 1, 2, 3] // Alow for failure for coverage report
             }
         },
         watch: {
-            files: ['<%= jshint.files %>'],
-            tasks: ['jshint', 'simplemocha:short']
+            files: ['<%= eslint.files %>'],
+            tasks: ['eslint', 'simplemocha:short']
         }
     });
 
     grunt.registerTask('assets', ['exec:assets-force']);
-    grunt.registerTask('test', ['jshint', 'exec:assets', 'simplemocha:full']);
+    grunt.registerTask('test', ['eslint', 'exec:assets', 'simplemocha:full']);
     grunt.registerTask('cover', 'exec:cover');
-    grunt.registerTask('travis', ['jshint', 'exec:assets', 'exec:cover', 'exec:coveralls']);
+    grunt.registerTask('travis', ['eslint', '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();
+        });
+    });
 };

HOOKS.md

@@ -1,21 +0,0 @@
-# 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.

LICENSE

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

README.md

@@ -1,10 +1,18 @@
-# Bower
+# Bower - A package manager for the web
 
-[![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) 
+[![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)
 
 <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.
 
@@ -45,7 +53,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 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 a module loader (like [RequireJS](http://requirejs.org/)).
 
 ### Uninstalling packages
 
@@ -59,18 +67,19 @@ $ 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`
 
-### Running commands with sudo
+### Never run Bower with sudo
 
-Bower is a user command, there is no need to execute it with superuser permissions.
-However, if you still want to run commands with sudo, use `--allow-root` option.
+Bower is a user command; there is no need to execute it with superuser permissions.
 
 ### Windows users
 
 To use Bower on Windows, you must install
-[msysgit](http://msysgit.github.io/) correctly. Be sure to check the
-option shown below:
+[Git for Windows](http://git-for-windows.github.io/) correctly. Be sure to check the
+options shown below:
 
-![msysgit](http://f.cl.ly/items/2V2O3i1p3R2F1r2v0a12/mysgit.png)
+<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" />
 
 Note that if you use TortoiseGit and if Bower keeps asking for your SSH
 password, you should add the following environment variable: `GIT_SSH -
@@ -92,17 +101,15 @@ 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](CONTRIBUTING.md#bugs)
+* [Bug reports](https://github.com/bower/bower/wiki/Report-a-Bug)
 * [Feature requests](CONTRIBUTING.md#features)
 * [Pull requests](CONTRIBUTING.md#pull-requests)
 
@@ -113,8 +120,81 @@ 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) 2015 Twitter and [other contributors](https://github.com/bower/bower/graphs/contributors)
+Copyright (c) 2012-present Twitter and [other contributors](https://github.com/bower/bower/graphs/contributors)
 
 Licensed under the MIT License

appveyor.yml

@@ -1,40 +0,0 @@
-# Thanks for Grunt for template of this file!
-
-# http://www.appveyor.com/docs/appveyor-yml
-
-# Fix line endings in Windows. (runs before repo cloning)
-init:
-  - git config --global core.autocrlf input
-
-# Test against these versions of Node.js.
-environment:
-  matrix:
-    - nodejs_version: "0.10"
-    # - nodejs_version: "0.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}"

bin/bower

@@ -1,142 +1,3 @@
 #!/usr/bin/env node
-'use strict';
 
-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();
-        }
-    }
-});
+require('../lib/bin/bower');

lib/bin/bower.js

@@ -0,0 +1,145 @@
+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();
+    }
+}

lib/commands/cache/clean.js

@@ -1,8 +1,8 @@
-var fs = require('graceful-fs');
+var fs = require('../../util/fs');
 var path = require('path');
 var mout = require('mout');
 var Q = require('q');
-var rimraf = require('rimraf');
+var rimraf = require('../../util/rimraf');
 var endpointParser = require('bower-endpoint-parser');
 var PackageRepository = require('../../core/PackageRepository');
 var semver = require('../../util/semver');

lib/commands/help.js

@@ -1,15 +1,15 @@
 var Q = require('q');
 var path = require('path');
-var fs = require('graceful-fs');
+var fs = require('../util/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) {

lib/commands/home.js

@@ -40,7 +40,7 @@ function home(logger, name, config) {
             throw createError('No homepage set for ' + pkgMeta.name, 'ENOHOME');
         }
 
-        open(homepage);
+        open(homepage, { wait: false });
         return homepage;
     });
 }

lib/commands/index.js

@@ -1,5 +1,6 @@
 var Q = require('q');
 var Logger = require('bower-logger');
+var config = require('../config');
 
 /**
  * Require commands only when called.
@@ -9,24 +10,24 @@ var Logger = require('bower-logger');
  * return as soon as possible and load and execute the command asynchronously.
  */
 function commandFactory(id) {
-    if (process.env.STRICT_REQUIRE) {
-        require(id);
-    }
-
-    function command() {
+    function runApi() {
+        var command = require(id);
         var commandArgs = [].slice.call(arguments);
 
         return withLogger(function (logger) {
             commandArgs.unshift(logger);
-            return require(id).apply(undefined, commandArgs);
+
+            return command.apply(undefined, commandArgs);
         });
     }
 
     function runFromArgv(argv) {
-        return withLogger(function (logger) {
-            var command = require(id);
+        var commandArgs;
+        var command = require(id);
 
-            var commandArgs = command.readOptions(argv);
+        commandArgs = command.readOptions(argv);
+
+        return withLogger(function (logger) {
             commandArgs.unshift(logger);
 
             return command.apply(undefined, commandArgs);
@@ -38,19 +39,21 @@ function commandFactory(id) {
 
         Q.try(func, logger)
         .done(function () {
+            config.restore();
             var args = [].slice.call(arguments);
             args.unshift('end');
             logger.emit.apply(logger, args);
         }, function (error) {
+            config.restore();
             logger.emit('error', error);
         });
 
         return logger;
     }
 
-    command.line = runFromArgv;
+    runApi.line = runFromArgv;
 
-    return command;
+    return runApi;
 }
 
 

lib/commands/info.js

@@ -2,7 +2,6 @@ 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) {
@@ -10,48 +9,51 @@ 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) {
-        if (versions) {
-            return {
-                name: decEndpoint.source,
-                versions: versions,
-                latest: pkgMeta
-            };
-        }
+        .spread(function (pkgMeta, versions) {
+            if (versions) {
+                return {
+                    name: decEndpoint.source,
+                    versions: versions,
+                    latest: pkgMeta
+                };
+            }
 
-        return pkgMeta;
-    });
+            return pkgMeta;
+        });
 }
 
 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) !== '_';
+        .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;
         });
-
-        // Retrieve specific property
-        if (property) {
-            pkgMeta = mout.object.get(pkgMeta, property);
-        }
-
-        return pkgMeta;
-    });
 }
 
 // -------------------

lib/commands/init.js

@@ -1,12 +1,11 @@
 var mout = require('mout');
-var fs = require('graceful-fs');
+var fs = require('../util/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');
 
@@ -58,7 +57,7 @@ function readJson(project, logger) {
 function saveJson(project, logger, json) {
     // Cleanup empty props (null values, empty strings, objects and arrays)
     mout.object.forOwn(json, function (value, key) {
-        if (value == null || mout.lang.isEmpty(value)) {
+        if (!validConfigValue(value)) {
             delete json[key];
         }
     });
@@ -81,6 +80,18 @@ function saveJson(project, logger, json) {
     });
 }
 
+// Test if value is of a type supported by bower.json[0] - Object, Array, String, Boolean - or a Number
+// [0]: https://github.com/bower/bower.json-spec
+function validConfigValue(val) {
+    return (
+        mout.lang.isObject(val)  ||
+        mout.lang.isArray(val)   ||
+        mout.lang.isString(val)  ||
+        mout.lang.isBoolean(val) ||
+        mout.lang.isNumber(val)
+    );
+}
+
 function setDefaults(config, json) {
     var name;
     var promise = Q.resolve();
@@ -90,19 +101,6 @@ 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
@@ -176,12 +174,6 @@ function promptUser(logger, json) {
             'default': json.name,
             'type': 'input'
         },
-        {
-            'name': 'version',
-            'message': 'version',
-            'default': json.version,
-            'type': 'input'
-        },
         {
             'name': 'description',
             'message': 'description',
@@ -194,12 +186,6 @@ function promptUser(logger, json) {
             'default': json.main,
             'type': 'input'
         },
-        {
-            'name': 'moduleType',
-            'message': 'what types of modules does this package expose?',
-            'type': 'checkbox',
-            'choices': ['amd', 'es6', 'globals', 'node', 'yui']
-        },
         {
             'name': 'keywords',
             'message': 'keywords',
@@ -247,10 +233,8 @@ function promptUser(logger, json) {
     return Q.nfcall(logger.prompt.bind(logger), questions)
     .then(function (answers) {
         json.name = answers.name;
-        json.version = answers.version;
         json.description = answers.description;
         json.main = answers.main;
-        json.moduleType = answers.moduleType;
         json.keywords = toArray(answers.keywords);
         json.authors = toArray(answers.authors, ',');
         json.license = answers.license;

lib/commands/install.js

@@ -1,12 +1,10 @@
 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);
@@ -14,14 +12,18 @@ 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('/');
+
         return endpointParser.decompose(endpoint);
     });
-    tracker.trackDecomposedEndpoints('install', decEndpoints);
 
     return project.install(decEndpoints, options, config);
 }
@@ -32,11 +34,11 @@ 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' }
+        '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);

lib/commands/link.js

@@ -1,9 +1,10 @@
 var path = require('path');
-var rimraf = require('rimraf');
+var rimraf = require('../util/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) {
@@ -49,7 +50,7 @@ function linkTo(logger, name, localName, config) {
 
     localName = localName || name;
     src = path.join(config.storage.links, name);
-    dst = path.join(config.cwd, config.directory, localName);
+    dst = path.join(relativeToBaseDir(config.cwd)(config.directory), localName);
 
     // Delete destination folder if any
     return Q.nfcall(rimraf, dst)

lib/commands/login.js

@@ -63,6 +63,7 @@ function login(logger, options, config) {
 
     return promise.then(function (result) {
         configstore.set('accessToken', result.token);
+        logger.info('EAUTH', 'Logged in as ' + configstore.get('username'), {});
 
         return result;
     }, function (error) {
@@ -95,6 +96,7 @@ function login(logger, options, config) {
             })
             .then(function (result) {
                 configstore.set('accessToken', result.token);
+                logger.info('EAUTH', 'Logged in as ' + configstore.get('username'), {});
 
                 return result;
             }, function () {

lib/commands/lookup.js

@@ -1,5 +1,5 @@
 var Q = require('q');
-var RegistryClient = require('bower-registry-client');
+var PackageRepository = require('../core/PackageRepository');
 var defaultConfig = require('../config');
 
 function lookup(logger, name, config) {
@@ -7,17 +7,13 @@ function lookup(logger, name, config) {
         return new Q(null);
     }
 
-    var registryClient;
-
     config = defaultConfig(config);
-    config.cache = config.storage.registry;
 
-    registryClient = new RegistryClient(config, logger);
+    var repository = new PackageRepository(config, logger);
+    var registryClient = repository.getRegistryClient();
 
     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

lib/commands/register.js

@@ -1,25 +1,26 @@
-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, url, config) {
+function register(logger, name, source, 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();
-    url = (url || '').trim();
+    source = (source || '').trim();
+
+    url = source.match(githubSourceRegex) ? getGithubUrl(source) : source;
 
     // Bypass any cache
     config.offline = false;
@@ -31,18 +32,6 @@ function register(logger, name, url, config) {
             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);
@@ -84,22 +73,6 @@ function register(logger, name, url, config) {
     });
 }
 
-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) {

lib/commands/search.js

@@ -1,34 +1,37 @@
 var Q = require('q');
-var RegistryClient = require('bower-registry-client');
-var Tracker = require('../util/analytics').Tracker;
+var PackageRepository = require('../core/PackageRepository');
 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;
 
-    registryClient = new RegistryClient(config, logger);
-    tracker = new Tracker(config);
-    tracker.track('search', name);
+    var repository = new PackageRepository(config, logger);
+    var registryClient = repository.getRegistryClient();
 
-    // If no name was specified, list all packages
-    if (!name) {
-        return Q.nfcall(registryClient.list.bind(registryClient));
-    // Otherwise search it
-    } else {
+    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');
+        }
+
+        return Q.nfcall(registryClient.list.bind(registryClient));
     }
 }
 
 // -------------------
 
 search.readOptions = function (argv) {
-    var cli = require('../util/cli');
     var options = cli.readOptions(argv);
-    var name = options.argv.remain.slice(1).join(' ');
+    var terms = options.argv.remain.slice(1);
+
+    var name = terms.join(' ');
 
     return [name];
 };

lib/commands/uninstall.js

@@ -1,7 +1,6 @@
 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) {
@@ -10,14 +9,10 @@ function uninstall(logger, names, options, config) {
     }
 
     var project;
-    var tracker;
 
     options = options || {};
     config = defaultConfig(config);
     project = new Project(config, logger);
-    tracker = new Tracker(config);
-
-    tracker.trackNames('uninstall', names);
 
     return project.getTree(options)
     .spread(function (tree, flattened) {

lib/commands/unregister.js

@@ -3,7 +3,6 @@ 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) {
@@ -14,12 +13,10 @@ function unregister(logger, name, config) {
 
     var repository;
     var registryClient;
-    var tracker;
     var force;
 
     config = defaultConfig(config);
     force = config.force;
-    tracker = new Tracker(config);
 
     // Bypass any cache
     config.offline = false;
@@ -30,8 +27,6 @@ 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')
@@ -64,7 +59,6 @@ function unregister(logger, name, config) {
         return Q.nfcall(registryClient.unregister.bind(registryClient), name);
     })
     .then(function (result) {
-        tracker.track('unregistered');
         logger.info('Package unregistered', name);
 
         return result;

lib/commands/version.js

@@ -1,119 +1,152 @@
 var semver = require('semver');
 var which = require('which');
-var fs = require('fs');
+var fs = require('../util/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(project, versionArg, options.message);
+    return bump(logger, config, versionArg, options.message);
 }
 
-function bump(project, versionArg, message) {
-    var cwd = project._config.cwd || process.cwd();
+function bump(logger, config, versionArg, message) {
+    var cwd = config.cwd || process.cwd();
     var newVersion;
-    var doGitCommit = false;
 
-    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;
-    });
-}
-
-function getNewVersion(currentVersion, versionArg) {
-    var newVersion = semver.valid(versionArg);
-    if (!newVersion) {
-        newVersion = semver.inc(currentVersion, versionArg);
+    if (!versionArg) {
+        throw createError('No <version> agrument provided', 'EREADOPTIONS');
     }
-    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;
-}
 
-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 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 });
+            }
         }
-        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');
+        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 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});
+        return driver.bump(cwd, newVersion, message).then(function () {
+            return {
+                oldVersion: currentVersion,
+                newVersion: newVersion
+            }
+        });
     })
-    .then(function () {
-        return Q.nfcall(execFile, 'git', ['tag', tag, '-am', message], {env: process.env, cwd: cwd});
+    .then(function (result) {
+        logger.info('version', 'Bumped package version from ' + result.oldVersion + ' to ' + result.newVersion, result);
+
+        return result.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});
+        });
+    }
+}
+
 
 version.readOptions = function (argv) {
     var cli = require('../util/cli');

lib/config.js

@@ -2,39 +2,24 @@ var tty = require('tty');
 var object = require('mout').object;
 var bowerConfig = require('bower-config');
 var Configstore = require('configstore');
-var findup = require('findup-sync');
-var path = require('path');
 
-var cachedConfigs = {};
+var current;
 
 function defaultConfig(config) {
     config = config || {};
 
-    var cwd = config.cwd || path.dirname(findup('bower.json', {
-        cwd: process.cwd()
-    })) || process.cwd();
-
-    config.cwd = cwd;
-
-    var cachedConfig = readCachedConfig(cwd);
-
-    return object.merge(cachedConfig, config);
+    return readCachedConfig(config.cwd || process.cwd(), config);
 }
 
-function readCachedConfig(cwd) {
-    if (cachedConfigs[cwd]) {
-        return cachedConfigs[cwd];
-    }
+function readCachedConfig(cwd, overwrites) {
+    current = bowerConfig.create(cwd).load(overwrites);
+
+    var config = current.toObject();
 
-    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 = (
@@ -62,9 +47,17 @@ function readCachedConfig(cwd) {
     return config;
 }
 
-function resetCache () {
-    cachedConfigs = {};
+function restoreConfig() {
+    if (current) {
+        current.restore();
+    }
+}
+
+function resetCache() {
+    restoreConfig();
+    current = undefined;
 }
 
 module.exports = defaultConfig;
+module.exports.restore = restoreConfig;
 module.exports.reset = resetCache;

lib/core/Manager.js

@@ -2,14 +2,15 @@ var Q = require('q');
 var mout = require('mout');
 var path = require('path');
 var mkdirp = require('mkdirp');
-var rimraf = require('rimraf');
-var fs = require('graceful-fs');
+var rimraf = require('../util/rimraf');
+var fs = require('../util/fs');
 var endpointParser = require('bower-endpoint-parser');
 var PackageRepository = require('./PackageRepository');
 var semver = require('../util/semver');
 var copy = require('../util/copy');
 var createError = require('../util/createError');
 var scripts = require('./scripts');
+var relativeToBaseDir = require('../util/relativeToBaseDir');
 
 function Manager(config, logger) {
     this._config = config;
@@ -23,11 +24,13 @@ function Manager(config, logger) {
 
 Manager.prototype.configure = function (setup) {
     var targetsHash = {};
-
     this._conflicted = {};
 
-    // Targets
-    this._targets = setup.targets || [];
+    // Targets - ignore those specified in ignoredDependencies
+    this._targets = mout.array.reject(setup.targets || [], function (target) {
+        return mout.array.contains(this._config.ignoredDependencies, target.name );
+    }, this);
+
     this._targets.forEach(function (decEndpoint) {
         decEndpoint.initialName = decEndpoint.name;
         decEndpoint.dependants = mout.object.values(decEndpoint.dependants);
@@ -122,7 +125,7 @@ Manager.prototype.resolve = function () {
 
 Manager.prototype.preinstall = function (json) {
     var that = this;
-    var componentsDir = path.join(this._config.cwd, this._config.directory);
+    var componentsDir = relativeToBaseDir(this._config.cwd)(this._config.directory);
 
     // If nothing to install, skip the code bellow
     if (mout.lang.isEmpty(that._dissected)) {
@@ -139,7 +142,7 @@ Manager.prototype.preinstall = function (json) {
 
 Manager.prototype.postinstall = function (json) {
     var that = this;
-    var componentsDir = path.join(this._config.cwd, this._config.directory);
+    var componentsDir = relativeToBaseDir(this._config.cwd)(this._config.directory);
 
     // If nothing to install, skip the code bellow
     if (mout.lang.isEmpty(that._dissected)) {
@@ -156,6 +159,7 @@ Manager.prototype.postinstall = function (json) {
 
 Manager.prototype.install = function (json) {
     var componentsDir;
+    var componentsDirContents;
     var that = this;
 
     // If already resolving, error out
@@ -168,20 +172,29 @@ Manager.prototype.install = function (json) {
         return Q.resolve({});
     }
 
-    componentsDir = path.join(this._config.cwd, this._config.directory);
+    componentsDir = relativeToBaseDir(this._config.cwd)(this._config.directory);
     return Q.nfcall(mkdirp, componentsDir)
     .then(function () {
         var promises = [];
+        componentsDirContents = fs.readdirSync(componentsDir);
 
         mout.object.forOwn(that._dissected, function (decEndpoint, name) {
             var promise;
             var dst;
             var release = decEndpoint.pkgMeta._release;
+            var exists = mout.array.contains(componentsDirContents, name);
 
             that._logger.action('install', name + (release ? '#' + release : ''), that.toData(decEndpoint));
 
             dst = path.join(componentsDir, name);
 
+            if (exists && !that._installed[name] && !that._config.force) {
+                // There is a folder in the components directory that has
+                // this name, but it was not installed by bower.
+                that._logger.warn('skipped', name + ' was not installed because there is already a non-bower directory with that name in the components directory (' + path.relative(that._config.cwd, dst) + '). You can force installation with --force.');
+                return;
+            }
+
             // Remove existent and copy canonical dir
             promise = Q.nfcall(rimraf, dst)
             .then(copy.copyDir.bind(copy, decEndpoint.canonicalDir, dst))
@@ -373,7 +386,7 @@ Manager.prototype._onFetchSuccess = function (decEndpoint, canonicalDir, pkgMeta
 
     // If the package is not targetable, flag it
     // It will be needed later so that untargetable endpoints
-    // will not get * converted to ~version
+    // will not get * converted to ^version
     if (!isTargetable) {
         decEndpoint.untargetable = true;
     }
@@ -445,6 +458,12 @@ Manager.prototype._parseDependencies = function (decEndpoint, pkgMeta) {
         var compatible;
         var childDecEndpoint = endpointParser.json2decomposed(key, value);
 
+        // Check if this depdendency should be skipped.
+        if (mout.array.contains(this._config.ignoredDependencies, childDecEndpoint.name)) {
+            this._logger.action('skipped', childDecEndpoint.name, this.toData(decEndpoint));
+            return;
+        }
+
         // Check if a compatible one is already resolved
         // If there's one, we don't need to resolve it twice
         resolved = this._resolved[key];
@@ -568,6 +587,17 @@ Manager.prototype._dissect = function () {
                 }
             }
 
+            // If they are equal and one of them is an exact target,
+            // give higher priority
+            if (!result) {
+                if (first.target === first.pkgMeta.version) {
+                    return -1;
+                }
+                if (second.target === second.pkgMeta.version) {
+                    return 1;
+                }
+            }
+
             return result;
         });
 
@@ -576,7 +606,7 @@ Manager.prototype._dissect = function () {
         // If they are not, the resolver is incapable of handling targets
         semvers.forEach(function (decEndpoint) {
             if (decEndpoint.newly && decEndpoint.target === '*' && !decEndpoint.untargetable) {
-                decEndpoint.target = '~' + decEndpoint.pkgMeta.version;
+                decEndpoint.target = '^' + decEndpoint.pkgMeta.version;
                 decEndpoint.originalTarget = '*';
             }
         });
@@ -616,7 +646,7 @@ Manager.prototype._dissect = function () {
         }, this);
 
         // Filter only packages that need to be installed
-        componentsDir = path.resolve(that._config.cwd, that._config.directory);
+        componentsDir = relativeToBaseDir(this._config.cwd)(this._config.directory);
         this._dissected = mout.object.filter(suitables, function (decEndpoint, name) {
             var installedMeta = this._installed[name];
             var dst;
@@ -659,6 +689,8 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
     var save;
     var choices;
     var picks = [];
+    var versionRegex = /(?:[\d\w]\.){2}[\d\w](?:.)*/;
+    var picksReleases;
 
     // If there are both semver and non-semver, there's no way
     // to figure out the suitable one
@@ -814,14 +846,21 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
     });
 
     choices = picks.map(function (pick, index) { return index + 1; });
+    picksReleases = picks.map(function (pick) { return pick.pkgMeta._release; });
     return Q.nfcall(this._logger.prompt.bind(this._logger), {
         type: 'input',
         message: 'Answer',
         validate: function (choice) {
+            var invalidChoice = 'Invalid choice';
+
+            if (choice.match(versionRegex)) {
+                return picksReleases.indexOf(choice) != -1 ? true : invalidChoice;
+            }
+
             choice = Number(mout.string.trim(choice.trim(), '!'));
 
             if (!choice || choice < 1 || choice > picks.length) {
-                return 'Invalid choice';
+                return invalidChoice;
             }
 
             return true;
@@ -833,8 +872,13 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
         // Sanitize choice
         choice = choice.trim();
         save = /^!/.test(choice) || /!$/.test(choice);  // Save if prefixed or suffixed with !
-        choice = Number(mout.string.trim(choice, '!'));
-        pick = picks[choice - 1];
+
+        if (choice.match(versionRegex)) {
+            pick = picks[picksReleases.indexOf(choice)];
+        } else {
+            choice = Number(mout.string.trim(choice, '!'));
+            pick = picks[choice - 1];
+        }
 
         // Save resolution
         if (save) {

lib/core/PackageRepository.js

@@ -1,11 +1,12 @@
 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;
 
     this._config = config;
@@ -14,6 +15,7 @@ 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
@@ -87,7 +89,7 @@ PackageRepository.prototype.fetch = function (decEndpoint) {
             }
 
             // Otherwise check for new contents
-            logger.action('validate', (pkgMeta._release ? pkgMeta._release + ' against ': '') +
+            logger.action('validate', (pkgMeta._release ? pkgMeta._release + ' against ' : '') +
                                       resolver.getSource() + (resolver.getTarget() ? '#' + resolver.getTarget() : ''));
 
             return resolver.hasNew(pkgMeta)

lib/core/Project.js

@@ -1,27 +1,22 @@
 var glob = require('glob');
 var path = require('path');
-var fs = require('graceful-fs');
+var fs = require('../util/fs');
 var Q = require('q');
 var mout = require('mout');
-var rimraf = require('rimraf');
+var rimraf = require('../util/rimraf');
 var endpointParser = require('bower-endpoint-parser');
 var Logger = require('bower-logger');
+var md5 = require('md5-hex');
 var Manager = require('./Manager');
-var defaultConfig = require('../config');
 var semver = require('../util/semver');
-var md5 = require('../util/md5');
 var createError = require('../util/createError');
 var readJson = require('../util/readJson');
 var validLink = require('../util/validLink');
 var scripts = require('./scripts');
-var sortobject = require('deep-sort-object');
+var relativeToBaseDir = require('../util/relativeToBaseDir');
 
 function Project(config, logger) {
-    // This is the only architecture component that ensures defaults
-    // on config and logger
-    // The reason behind it is that users can likely use this component
-    // directly if commands do not fulfil their needs
-    this._config = defaultConfig(config);
+    this._config = config;
     this._logger = logger || new Logger();
     this._manager = new Manager(this._config, this._logger);
 
@@ -50,7 +45,7 @@ Project.prototype.install = function (decEndpoints, options, config) {
     .spread(function (json, tree) {
         // It shows an error when issuing `bower install`
         // and no bower.json is present in current directory
-        if(!that._jsonFile && decEndpoints.length === 0 ) {
+        if (!that._jsonFile && decEndpoints.length === 0 ) {
             throw createError('No bower.json present', 'ENOENT');
         }
 
@@ -87,23 +82,25 @@ Project.prototype.install = function (decEndpoints, options, config) {
     })
     .then(function (installed) {
         // Handle save and saveDev options
-        if (that._options.save || that._options.saveDev) {
+        if (that._options.save || that._options.saveDev || that._options.saveExact || that._config.save || that._config.saveExact) {
             // Cycle through the specified endpoints
             decEndpoints.forEach(function (decEndpoint) {
                 var jsonEndpoint;
 
                 jsonEndpoint = endpointParser.decomposed2json(decEndpoint);
 
-                if (that._options.saveExact) {
-                    jsonEndpoint[decEndpoint.name] = decEndpoint.pkgMeta.version;
-                }
-
-                if (that._options.save) {
-                    that._json.dependencies = sortobject(mout.object.mixIn(that._json.dependencies || {}, jsonEndpoint));
+                if (that._options.saveExact || that._config.saveExact) {
+                    if (decEndpoint.name !== decEndpoint.source) {
+                        jsonEndpoint[decEndpoint.name] = decEndpoint.source + '#' + decEndpoint.pkgMeta.version;
+                    } else {
+                        jsonEndpoint[decEndpoint.name] = decEndpoint.pkgMeta.version;
+                    }
                 }
 
                 if (that._options.saveDev) {
-                    that._json.devDependencies = sortobject(mout.object.mixIn(that._json.devDependencies || {}, jsonEndpoint));
+                    that._json.devDependencies = mout.object.mixIn(that._json.devDependencies || {}, jsonEndpoint);
+                } else {
+                    that._json.dependencies = mout.object.mixIn(that._json.dependencies || {}, jsonEndpoint);
                 }
             });
         }
@@ -216,6 +213,20 @@ Project.prototype.update = function (names, options) {
     });
 };
 
+function resolveUrlNames(names, flattened)
+{
+    for (var i = 0; i < names.length; i++)
+        if (! flattened[names[i]])
+    {
+            var url = names[i].trim().replace(/\/$/, '');
+            var packName;
+            for (packName in flattened)
+                if (! ( !flattened[packName].source))
+                    if (url == flattened[packName].source.trim().replace(/\/$/, ''))
+                        names[i] = packName;
+        }
+}
+
 Project.prototype.uninstall = function (names, options) {
     var that = this;
     var packages = {};
@@ -233,6 +244,7 @@ Project.prototype.uninstall = function (names, options) {
     // Fill in the packages to be uninstalled
     .spread(function (json, tree, flattened) {
         var promise = Q.resolve();
+        resolveUrlNames(names, flattened);
 
         names.forEach(function (name) {
             var decEndpoint = flattened[name];
@@ -560,9 +572,29 @@ Project.prototype._readJson = function () {
         return Q.resolve(this._json);
     }
 
-    // Read local json
-    return this._json = readJson(this._config.cwd, {
-        assume: { name: path.basename(this._config.cwd) || 'root' }
+    return Q.fcall(function () {
+        // This will throw if package.json does not exist
+        return fs.readFileSync(path.join(that._config.cwd, 'package.json'));
+    })
+    .then(function (buffer) {
+        // If package.json exists, use it's values as defaults
+        var defaults = {}, npm = JSON.parse(buffer.toString());
+
+        defaults.name        = npm.name || path.basename(that._config.cwd) || 'root';
+        defaults.description = npm.description;
+        defaults.main        = npm.main;
+        defaults.authors     = npm.contributors || npm.author;
+        defaults.license     = npm.license;
+        defaults.keywords    = npm.keywords;
+
+        return defaults;
+    })
+    .catch(function (err) {
+        // Most likely no package.json so just set default name
+        return { name: path.basename(that._config.cwd) || 'root' };
+    })
+    .then(function (defaults) {
+        return that._json = readJson(that._config.cwd, { assume: defaults, logger: that._logger });
     })
     .spread(function (json, deprecated, assumed) {
         var jsonStr;
@@ -591,7 +623,7 @@ Project.prototype._readInstalled = function () {
 
     // Gather all folders that are actual packages by
     // looking for the package metadata file
-    componentsDir = path.join(this._config.cwd, this._config.directory);
+    componentsDir = relativeToBaseDir(this._config.cwd)(this._config.directory);
     return this._installed = Q.nfcall(glob, '*/.bower.json', {
         cwd: componentsDir,
         dot: true
@@ -632,7 +664,7 @@ Project.prototype._readLinks = function () {
     var that = this;
 
     // Read directory, looking for links
-    componentsDir = path.join(this._config.cwd, this._config.directory);
+    componentsDir = relativeToBaseDir(this._config.cwd)(this._config.directory);
     return Q.nfcall(fs.readdir, componentsDir)
     .then(function (filenames) {
         var promises;
@@ -724,7 +756,7 @@ Project.prototype._removePackages = function (packages) {
             }
 
             // Remove from json only if successfully deleted
-            if (that._options.save && that._json.dependencies) {
+            if ((that._options.save || that._config.save) && that._json.dependencies) {
                 promise = promise
                 .then(function () {
                     delete that._json.dependencies[name];
@@ -747,6 +779,9 @@ Project.prototype._removePackages = function (packages) {
     .then(function () {
         return that.saveJson();
     })
+    // Run post-uninstall hook before resolving with removed packages.
+    .then(scripts.postuninstall.bind(
+        null, that._config, that._logger, packages, that._installed, that._json))
     // Resolve with removed packages
     .then(function () {
         return mout.object.filter(packages, function (dir) {

lib/core/ResolveCache.js

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

lib/core/resolverFactory.js

@@ -1,16 +1,17 @@
 var Q = require('q');
-var fs = require('graceful-fs');
+var fs = require('../util/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('../../package.json').version;
+    options.version = require('../version');
 
     return getConstructor(decEndpoint, options, registryClient)
     .spread(function (ConcreteResolver, decEndpoint) {
@@ -24,7 +25,7 @@ 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 construcotor of resolver
+    // If a step can guess the resolver, it returns with constructor of resolver
 
     var promise = Q.resolve();
 
@@ -44,12 +45,30 @@ function getConstructor(decEndpoint, options, registryClient) {
     // its "match" to check if given resolves supports given decEndpoint
     addResolver(function () {
         var selectedResolver;
+        var resolverNames;
 
-        var resolverNames = config.resolvers || [];
+        if (Array.isArray(config.resolvers)) {
+            resolverNames = config.resolvers;
+        } else if (!!config.resolvers) {
+            resolverNames = config.resolvers.split(',');
+        } else {
+            resolverNames = [];
+        }
 
         var resolverPromises = resolverNames.map(function (resolverName) {
-            var resolver = resolvers[resolverName]
-                || pluginResolverFactory(require(resolverName), options);
+
+
+            var resolver = resolvers[resolverName];
+
+            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 () {
                 if (selectedResolver === undefined) {
@@ -84,7 +103,7 @@ function getConstructor(decEndpoint, options, registryClient) {
     // Git case: git git+ssh, git+http, git+https
     //           .git at the end (probably ssh shorthand)
     //           git@ at the start
-    addResolver(function() {
+    addResolver(function () {
         if (/^git(\+(ssh|https?))?:\/\//i.test(source) || /\.git\/?$/i.test(source) || /^git@/i.test(source)) {
             decEndpoint.source = source.replace(/^git\+/, '');
 

lib/core/resolvers/FsResolver.js

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

lib/core/resolvers/GitHubResolver.js

@@ -29,16 +29,13 @@ 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://');
     }
 
     // Enable shallow clones for GitHub repos
-    this._shallowClone = function() {
+    this._shallowClone = function () {
         return Q.resolve(true);
     };
 }
@@ -49,14 +46,10 @@ mout.object.mixIn(GitHubResolver, GitRemoteResolver);
 // -----------------
 
 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 name = this._resolution.tag || this._resolution.branch || this._resolution.commit;
+    var tarballUrl = 'https://github.com/' + this._org + '/' + this._repo + '/archive/' + name + '.tar.gz';
+
     var file = path.join(this._tempDir, 'archive.tar.gz');
     var reqHeaders = {};
     var that = this;
@@ -72,7 +65,7 @@ GitHubResolver.prototype._checkout = function () {
 
     // Download tarball
     return download(tarballUrl, file, {
-        proxy: this._config.httpsProxy,
+        ca: this._config.ca.default,
         strictSSL: this._config.strictSsl,
         timeout: this._config.timeout,
         headers: reqHeaders
@@ -121,7 +114,6 @@ GitHubResolver.prototype._checkout = function () {
 
         return that._cleanTempDir()
         .then(GitRemoteResolver.prototype._checkout.bind(that));
-
     });
 };
 

lib/core/resolvers/GitRemoteResolver.js

@@ -19,14 +19,14 @@ function GitRemoteResolver(decEndpoint, config, logger) {
         this._name = this._name.slice(0, -4);
     }
 
-    // Get the host of this source
+    // Get the remote of this source
     if (!/:\/\//.test(this._source)) {
-        this._host = url.parse('ssh://' + this._source).host;
+        this._remote = url.parse('ssh://' + this._source);
     } else {
-        this._host = url.parse(this._source).host;
+        this._remote = url.parse(this._source);
     }
-
-    this._remote = url.parse(this._source);
+    
+    this._host = this._remote.host;
 
     // Verify whether the server supports shallow cloning
     this._shallowClone = this._supportsShallowCloning;
@@ -119,7 +119,7 @@ GitRemoteResolver.prototype._fastClone = function (resolution) {
 
     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(this._host)) {
+        if (shallowCloningSupported && !GitRemoteResolver._noShallow.get(that._host)) {
             args.push('--depth', 1);
         }
 
@@ -191,6 +191,11 @@ GitRemoteResolver.prototype._supportsShallowCloning = function () {
         return Q.resolve(false);
     }
 
+
+    if (!this._host || !this._config.shallowCloneHosts || this._config.shallowCloneHosts.indexOf(this._host) === -1) {
+        return Q.resolve(false);
+    }
+
     // Check for protocol - the remote check for hosts supporting shallow cloning is only required for
     // HTTP or HTTPS, not for Git or SSH.
     // Also check for hosts that have been checked in a previous request and have been found to support
@@ -199,7 +204,7 @@ GitRemoteResolver.prototype._supportsShallowCloning = function () {
             && !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

lib/core/resolvers/GitResolver.js

@@ -1,8 +1,7 @@
 var util = require('util');
 var path = require('path');
 var Q = require('q');
-var chmodr = require('chmodr');
-var rimraf = require('rimraf');
+var rimraf = require('../../util/rimraf');
 var mkdirp = require('mkdirp');
 var which = require('which');
 var LRU = require('lru-cache');
@@ -28,6 +27,18 @@ 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) {
@@ -144,7 +155,7 @@ GitResolver.prototype._findResolution = function (target) {
                 throw createError('No tag found that was able to satisfy ' + target, 'ENORESTARGET', {
                     details: !versions.length ?
                         'No versions found in ' + that._source :
-                        'Available versions: ' + versions.map(function (version) { return version.version; }).join(', ')
+                        'Available versions in ' + that._source + ': ' + versions.map(function (version) { return version.version; }).join(', ')
                 });
             });
         });
@@ -195,23 +206,7 @@ GitResolver.prototype._findResolution = function (target) {
 GitResolver.prototype._cleanup = function () {
     var gitFolder = path.join(this._tempDir, '.git');
 
-    // 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);
-    }
+    return Q.nfcall(rimraf, gitFolder);
 };
 
 GitResolver.prototype._savePkgMeta = function (meta) {
@@ -221,7 +216,7 @@ GitResolver.prototype._savePkgMeta = function (meta) {
         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)) {
+        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

lib/core/resolvers/Resolver.js

@@ -1,12 +1,13 @@
-var fs = require('graceful-fs');
+var fs = require('../../util/fs');
 var path = require('path');
 var Q = require('q');
 var tmp = require('tmp');
 var mkdirp = require('mkdirp');
-var rimraf = require('rimraf');
+var rimraf = require('../../util/rimraf');
 var readJson = require('../../util/readJson');
 var createError = require('../../util/createError');
 var removeIgnores = require('../../util/removeIgnores');
+var md5 = require('md5-hex');
 
 tmp.setGracefulCleanup();
 
@@ -107,8 +108,7 @@ Resolver.prototype.isCacheable = function () {
     // We don't want to cache moving targets like branches
     if (this._pkgMeta &&
         this._pkgMeta._resolution &&
-        this._pkgMeta._resolution.type === 'branch')
-    {
+        this._pkgMeta._resolution.type === 'branch') {
         return false;
     }
 
@@ -145,7 +145,7 @@ Resolver.prototype._createTempDir = function () {
     return Q.nfcall(mkdirp, this._config.tmp)
     .then(function () {
         return Q.nfcall(tmp.dir, {
-            template: path.join(this._config.tmp, this._name + '-' + process.pid + '-XXXXXX'),
+            template: path.join(this._config.tmp, md5(this._name) + '-' + process.pid + '-XXXXXX'),
             mode: 0777 & ~process.umask(),
             unsafeCleanup: true
         });
@@ -178,7 +178,8 @@ Resolver.prototype._readJson = function (dir) {
 
     dir = dir || this._tempDir;
     return readJson(dir, {
-        assume: { name: this._name }
+        assume: { name: this._name },
+        logger: that._logger
     })
     .spread(function (json, deprecated) {
         if (deprecated) {
@@ -217,15 +218,6 @@ 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);
 

lib/core/resolvers/SvnResolver.js

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

lib/core/resolvers/UrlResolver.js

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

lib/core/resolvers/pluginResolverFactory.js

@@ -1,6 +1,6 @@
 var Q = require('q');
 var path = require('path');
-var fs = require('fs');
+var fs = require('../../util/fs');
 var object = require('mout/object');
 
 var semver = require('../../util/semver');
@@ -52,7 +52,7 @@ function pluginResolverFactory(resolverFactory, bower) {
         return this._decEndpoint.target || '*';
     };
 
-    PluginResolver.prototype.getName = function() {
+    PluginResolver.prototype.getName = function () {
         if (!this._decEndpoint.name && typeof resolver.getName === 'function') {
             return resolver.getName.call(resolver, this.getSource());
         } else if (!this._decEndpoint.name) {
@@ -70,7 +70,7 @@ function pluginResolverFactory(resolverFactory, bower) {
 
     // Plugin Resolver is always considered potentially cacheable
     // The "resolve" method decides whether to use cached or fetch new version.
-    PluginResolver.prototype.isCacheable = function() {
+    PluginResolver.prototype.isCacheable = function () {
         return true;
     };
 
@@ -95,11 +95,11 @@ function pluginResolverFactory(resolverFactory, bower) {
 
         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)) {
@@ -109,7 +109,7 @@ function pluginResolverFactory(resolverFactory, bower) {
                             throw createError('Resolver did not provide releases of package.');
                         }
 
-                        var releases = this._releases = result;
+                        var releases = that._releases = result;
 
                         var versions = releases.filter(function (target) {
                             return semver.clean(target.version);
@@ -191,7 +191,8 @@ function pluginResolverFactory(resolverFactory, bower) {
         var that = this;
 
         return readJson(dir, {
-            assume: { name: that.getName() }
+            assume: { name: that.getName() },
+            logger: bower.logger
         })
         .spread(function (json, deprecated) {
             if (deprecated) {
@@ -275,7 +276,7 @@ function pluginResolverFactory(resolverFactory, bower) {
         });
     };
 
-    PluginResolver.isTargetable = function() {
+    PluginResolver.isTargetable = function () {
         // If resolver doesn't define versions function, it's not targetable..
         return typeof resolver.releases === 'function';
     };

lib/core/scripts.js

@@ -78,17 +78,18 @@ var run = function (cmdString, action, logger, config) {
 
 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 cmdString = mout.string.replace(config.scripts[action], '%', orderedPackages.join(' '));
+    var placeholder = new RegExp('%', 'g');
+    var cmdString = mout.string.replace(config.scripts[action], placeholder, 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

lib/index.js

@@ -1,30 +1,6 @@
-var abbrev = require('abbrev');
-var mout = require('mout');
 var commands = require('./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;
-}
+var version = require('./version');
+var abbreviations = require('./util/abbreviations')(commands);
 
 function clearRuntimeCache() {
     // Note that in edge cases, some architecture components instance's
@@ -35,7 +11,7 @@ function clearRuntimeCache() {
 }
 
 module.exports = {
-    version: pkg.version,
+    version: version,
     commands: commands,
     config: require('./config')(),
     abbreviations: abbreviations,

lib/renderers/JsonRenderer.js

@@ -31,10 +31,8 @@ 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);
-    /*jshint camelcase:true*/
 
     this.log(err);
     this.end();

lib/renderers/StandardRenderer.js

@@ -5,7 +5,8 @@ var archy = require('archy');
 var Q = require('q');
 var stringifyObject = require('stringify-object');
 var os = require('os');
-var pkg = require(path.join(__dirname, '../..', 'package.json'));
+var semverUtils = require('semver-utils');
+var version = require('../version');
 var template = require('../util/template');
 
 function StandardRenderer(command, config) {
@@ -71,19 +72,17 @@ StandardRenderer.prototype.error = function (err) {
     // Print trace if verbose, the error has no code
     // or if the error is a node error
     if (this._config.verbose || !err.code || err.errno) {
-        /*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: ' + pkg.version + '\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');
     }
@@ -209,6 +208,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);
     }
 

lib/templates/helpers/rpad.js

@@ -3,10 +3,9 @@ var mout = require('mout');
 function rpad(Handlebars) {
     Handlebars.registerHelper('rpad', function (context) {
         var hash = context.hash;
-        var length = parseInt(hash.length, 10);
+        var minLength = parseInt(hash.minLength, 10);
         var chr = hash.char;
-
-        return mout.string.rpad(context.fn(this), length, chr);
+        return mout.string.rpad(context.fn(this), minLength, chr);
     });
 }
 

lib/templates/json/help-install.json

@@ -11,6 +11,11 @@
             "flag":        "--force-latest",
             "description": "Force latest version on conflict"
         },
+        {
+            "shorthand":   "-f",
+            "flag":        "--force",
+            "description": "If dependencies are installed, it reinstalls all installed components. It also forces installation even when there are non-bower directories with the same name in the components directory. Also bypasses the cache and overwrites to the cache anyway."
+        },
         {
             "shorthand":   "-h",
             "flag":        "--help",

lib/templates/json/help-lookup.json

@@ -1,6 +1,6 @@
 {
     "command": "lookup",
-    "description": "Looks up a package URL by name.",
+    "description": "Look up a single package URL by name.",
     "usage": [
         "lookup <name> [<options>]"
     ],

lib/templates/json/help-register.json

@@ -5,6 +5,11 @@
         "register <name> <url> [<options>]"
     ],
     "options": [
+        {
+            "shorthand":   "-f",
+            "flag":        "--force",
+            "description": "Bypasses confirmation. Bower login is still needed."
+        },
         {
             "shorthand":   "-h",
             "flag":        "--help",

lib/templates/json/help-search.json

@@ -1,8 +1,7 @@
 {
     "command": "search",
-    "description": "Finds all packages or a specific package.",
+    "description": "Search for packages by name.",
     "usage": [
-        "search [<options>]",
         "search <name> [<options>]"
     ],
     "options": [

lib/templates/json/help-uninstall.json

@@ -5,6 +5,11 @@
         "uninstall <name> [<name> ..] [<options>]"
     ],
     "options": [
+        {
+            "shorthand":   "-f",
+            "flag":        "--force",
+            "description": "Continues uninstallation even after a dependency conflict"
+        },
         {
             "shorthand":   "-h",
             "flag":        "--help",

lib/templates/json/help-unregister.json

@@ -5,6 +5,11 @@
         "unregister <name> [<options>]"
     ],
     "options": [
+        {
+            "shorthand":   "-f",
+            "flag":        "--force",
+            "description": "Bypasses confirmation. Bower login is still needed."
+        },
         {
             "shorthand":   "-h",
             "flag":        "--help",

lib/templates/json/help-update.json

@@ -19,6 +19,16 @@
             "shorthand":   "-p",
             "flag":        "--production",
             "description": "Do not install project devDependencies"
+        },
+        {
+            "shorthand":   "-S",
+            "flag":        "--save",
+            "description": "Update dependencies in bower.json"
+        },
+        {
+            "shorthand":   "-D",
+            "flag":        "--save-dev",
+            "description": "Update devDependencies in bower.json"
         }
     ]
 }

lib/templates/json/help-version.json

@@ -0,0 +1,14 @@
+{
+    "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"
+        }
+    ]
+}

lib/templates/json/help.json

@@ -12,10 +12,10 @@
         "link":            "Symlink a package folder",
         "list":            "List local packages - and possible updates",
         "login":           "Authenticate with GitHub and store credentials",
-        "lookup":          "Look up a package URL by name",
+        "lookup":          "Look up a single package URL by name",
         "prune":           "Removes local extraneous packages",
         "register":        "Register a package",
-        "search":          "Search for a package by name",
+        "search":          "Search for packages by name",
         "update":          "Update a local package",
         "uninstall":       "Remove a local package",
         "unregister":      "Remove a package from the registry",
@@ -34,7 +34,7 @@
         },
         {
             "shorthand":   "-l",
-            "flag":        "--log-level",
+            "flag":        "--loglevel",
             "description": "What level of logs to report"
         },
         {
@@ -69,6 +69,10 @@
         {
             "flag":        "--no-color",
             "description": "Disable colors"
+        },
+        {
+            "flag":        "--config.interactive=false",
+            "description": "Disable prompts"
         }
     ]
 }

lib/templates/std/conflict.std

@@ -1,4 +1,4 @@
-{{#yellow}}Unable to find a suitable version for {{name}}, please choose one:{{/yellow}}
+{{#yellow}}Unable to find a suitable version for {{name}}, please choose one by typing one of the numbers below:{{/yellow}}
 {{#condense}}
 {{#each picks}}
     {{#magenta}}{{sum @index 1}}){{/magenta}} {{#cyan}}{{endpoint.name}}#{{endpoint.target}}{{/cyan}}{{#if pkgMeta._release}} which resolved to {{#green}}{{pkgMeta._release}}{{/green}}{{/if}}{{#if dependants}} and is required by {{#green}}{{dependants}}{{/green}}{{/if}}

lib/templates/std/help-cache.std

@@ -11,7 +11,7 @@ Commands:
 
 {{#condense}}
 {{#each commands}}
-    {{#rpad length="23"}}{{@key}}{{/rpad}} {{.}}
+    {{#rpad minLength="23"}}{{@key}}{{/rpad}} {{.}}
 {{/each}}
 {{/condense}}
-
+{{#rpad minLength="23"}}{{/rpad}}

lib/templates/std/help-generic.std

@@ -7,11 +7,12 @@ Usage:
 {{/each}}
 {{/condense}}
 
+
 Options:
 
 {{#condense}}
 {{#each options}}
-    {{#yellow}}{{#rpad length="23"}}{{#if shorthand}}{{shorthand}}, {{/if}}{{flag}}{{/rpad}}{{/yellow}} {{description}}
+    {{#yellow}}{{#rpad minLength="23"}}{{#if shorthand}}{{shorthand}}, {{/if}}{{flag}}{{/rpad}}{{/yellow}} {{description}}
 {{/each}}
 {{/condense}}
 

lib/templates/std/help.std

@@ -11,7 +11,7 @@ Commands:
 
 {{#condense}}
 {{#each commands}}
-    {{#rpad length="23"}}{{@key}}{{/rpad}} {{.}}
+    {{#rpad minLength="23"}}{{@key}}{{/rpad}} {{.}}
 {{/each}}
 {{/condense}}
 
@@ -19,7 +19,7 @@ Options:
 
 {{#condense}}
 {{#each options}}
-    {{#yellow}}{{#rpad length="23"}}{{#if shorthand}}{{shorthand}}, {{/if}}{{flag}}{{/rpad}}{{/yellow}} {{description}}
+    {{#yellow}}{{#rpad minLength="23"}}{{#if shorthand}}{{shorthand}}, {{/if}}{{flag}}{{/rpad}}{{/yellow}} {{description}}
 {{/each}}
 {{/condense}}
 

lib/templates/std/info.std

@@ -5,6 +5,10 @@
 {{/versions}}
 {{/condense}}
 
+
+{{#if hidePreReleases}}
+Show {{numPreReleases}} additional prereleases with ‘bower info {{name}} --verbose’
+{{/if}}
 You can request info for a specific version with 'bower info {{name}}#<version>'
 {{else}}No versions available.
 {{/if}}

lib/util/abbreviations.js

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

lib/util/analytics.js

@@ -1,113 +0,0 @@
-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));
-};

lib/util/copy.js

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

lib/util/createLink.js

@@ -1,4 +1,4 @@
-var fs = require('graceful-fs');
+var fs = require('./fs');
 var path = require('path');
 var Q = require('q');
 var mkdirp = require('mkdirp');

lib/util/download.js

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

lib/util/extract.js

@@ -1,5 +1,5 @@
 var path = require('path');
-var fs = require('graceful-fs');
+var fs = require('./fs');
 var zlib = require('zlib');
 var DecompressZip = require('decompress-zip');
 var tar = require('tar-fs');
@@ -7,6 +7,9 @@ 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
@@ -49,15 +52,24 @@ function extractZip(archive, dst) {
 function extractTar(archive, dst) {
     var deferred = Q.defer();
 
-    fs.createReadStream(archive)
-    .on('error', deferred.reject)
+    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', deferred.reject)
-    .on('finish', deferred.resolve.bind(deferred, dst));
+    .on('error', reject)
+    .on('finish', function (result) {
+        destroy(stream);
+        deferred.resolve(dst);
+    });
 
     return deferred.promise;
 }
@@ -65,17 +77,26 @@ function extractTar(archive, dst) {
 function extractTarGz(archive, dst) {
     var deferred = Q.defer();
 
-    fs.createReadStream(archive)
-    .on('error', deferred.reject)
+    var stream = fs.createReadStream(archive);
+
+    var reject = function (error) {
+        destroy(stream);
+        deferred.reject(error);
+    };
+
+    stream.on('error', reject)
     .pipe(zlib.createGunzip())
-    .on('error', deferred.reject)
+    .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', deferred.reject)
-    .on('finish', deferred.resolve.bind(deferred, dst));
+    .on('error', reject)
+    .on('finish', function (result) {
+        destroy(stream);
+        deferred.resolve(dst);
+    });
 
     return deferred.promise;
 }
@@ -83,13 +104,21 @@ function extractTarGz(archive, dst) {
 function extractGz(archive, dst) {
     var deferred = Q.defer();
 
-    fs.createReadStream(archive)
-    .on('error', deferred.reject)
+    var stream = fs.createReadStream(archive);
+
+    var reject = function (error) {
+        destroy(stream);
+        deferred.reject(error);
+    };
+    stream.on('error', reject)
     .pipe(zlib.createGunzip())
-    .on('error', deferred.reject)
-    .pipe(fs.createWriteStream(dst))
-    .on('error', deferred.reject)
-    .on('close', deferred.resolve.bind(deferred, dst));
+    .on('error', reject)
+    .pipe(createWriteStream(dst))
+    .on('error', reject)
+    .on('finish', function (result) {
+        destroy(stream);
+        deferred.resolve(dst);
+    });
 
     return deferred.promise;
 }
@@ -136,15 +165,11 @@ function isSingleDir(dir) {
     });
 }
 
-function moveSingleDirContents(dir) {
-    var destDir = path.dirname(dir);
-
-    return Q.nfcall(fs.readdir, dir)
+function moveDirectory(srcDir, destDir) {
+    return Q.nfcall(fs.readdir, srcDir)
     .then(function (files) {
-        var promises;
-
-        promises = files.map(function (file) {
-            var src = path.join(dir, file);
+        var promises = files.map(function (file) {
+            var src = path.join(srcDir, file);
             var dst = path.join(destDir, file);
 
             return Q.nfcall(fs.rename, src, dst);
@@ -153,7 +178,7 @@ function moveSingleDirContents(dir) {
         return Q.all(promises);
     })
     .then(function () {
-        return Q.nfcall(fs.rmdir, dir);
+        return Q.nfcall(fs.rmdir, srcDir);
     });
 }
 
@@ -187,44 +212,53 @@ function extract(src, dst, opts) {
         return Q.reject(createError('File ' + src + ' is not a known 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 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');
+            }
+
+            // Extract archive
+            return extractor(src, tempDir);
+        });
+
+        // Remove archive
+        if (!opts.keepArchive) {
+            promise = promise
+            .then(function () {
+                return Q.nfcall(fs.unlink, src);
+            });
         }
 
-        // Extract archive
-        return extractor(src, dst);
-    });
-
-    // 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
-
-    // Remove archive
-    if (!opts.keepArchive) {
+        // 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 Q.nfcall(fs.unlink, src);
-        });
-    }
-
-    // Move contents if a single directory was extracted
-    if (!opts.keepStructure) {
-        promise = promise
-        .then(function () {
-            return isSingleDir(dst);
+            return isSingleDir(tempDir);
         })
         .then(function (singleDir) {
-            return singleDir ? moveSingleDirContents(singleDir) : null;
+            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;
+        // Resolve promise to the dst dir
+        return promise.then(function () {
+            return dst;
+        });
     });
 }
 

lib/util/fs.js

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

lib/util/isPathAbsolute.js

@@ -0,0 +1,5 @@
+function isPathAbsolute(filePath) {
+    return filePath.charAt(0) === '/';
+}
+
+module.exports = isPathAbsolute;

lib/util/readJson.js

@@ -17,6 +17,16 @@ function readJson(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;
 

lib/util/relativeToBaseDir.js

@@ -0,0 +1,14 @@
+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;

lib/util/removeIgnores.js

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

lib/util/resolve.js

@@ -0,0 +1,22 @@
+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;
+}

lib/util/rimraf.js

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

lib/util/rootCheck.js

@@ -1,4 +1,3 @@
-/*jshint multistr:true*/
 'use strict';
 var isRoot = require('is-root');
 var createError = require('./createError');
@@ -19,7 +18,7 @@ sudo, please spend a few minutes learning more about how your system should work
 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');

lib/util/template.js

@@ -1,10 +1,10 @@
 var path = require('path');
-var fs = require('graceful-fs');
+var fs = require('./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

lib/util/userAgent.js

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

lib/util/validLink.js

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

lib/version.js

@@ -0,0 +1,3 @@
+var findup = require('findup-sync');
+
+module.exports = require(findup('package.json', { cwd: __dirname })).version;