Update travis badges and remove old files

Bumps [stringstream](https://github.com/mhart/StringStream) from 0.0.5 to 0.0.6.
- [Release notes](https://github.com/mhart/StringStream/releases)
- [Commits](https://github.com/mhart/StringStream/compare/v0.0.5...v0.0.6)

Signed-off-by: dependabot[bot] <support@github.com>

.editorconfig

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

.eslintignore

@@ -0,0 +1,6 @@
+node_modules
+test/assets
+test/reports
+test/sample
+test/tmp
+packages/bower-logger/test

.eslintrc

@@ -17,9 +17,8 @@
     "strict": 0,
     "semi": 0,
     "comma-spacing": 2,
-    "quote-props": [2, "consistent", { "keywords": true }],
+    "quote-props": [2, "as-needed"],
     "quotes": [2, "single", "avoid-escape"],
-    "indent": [2, 4],
     "no-cond-assign": [ 2, "except-parens" ],
     "no-debugger": 2,
     "no-dupe-args": 2,
@@ -41,7 +40,7 @@
     "no-new-wrappers": 2,
     "no-invalid-this": 0,
     "space-before-blocks": [2, "always"],
-    "space-before-function-paren": [2, {"anonymous": "always", "named": "never"}],
+    "space-before-function-paren": [2, "never"],
     "space-infix-ops": 2,
     "keyword-spacing": 2,
     "new-parens": 2,

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+open_collective: bower

.github/workflows/nodejs.yml

@@ -0,0 +1,62 @@
+name: build
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  test:
+    name: Node v${{ matrix.node-version }} on ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        # https://github.com/actions/setup-node/issues/27
+        node-version: [0.10.x, 0.12.x, 4.x, 6.x, 8.x, 10.x, 12.x, 14.x]
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Set git config
+        shell: bash
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.symlinks true
+        if: runner.os == 'Windows'
+
+      - uses: actions/checkout@v2
+      - name: install
+        run: yarn
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: lint
+        run: npm run lint
+      - name: bower tests
+        run: npm test
+        env:
+          CI: true
+      - name: bower-logger tests
+        run: (cd packages/bower-logger && npm install && npm test)
+        env:
+          CI: true
+      - name: bower-config tests
+        run: (cd packages/bower-config && npm install && npm test)
+        env:
+          CI: true
+      - name: bower-endpoint-parser tests
+        run: (cd packages/bower-endpoint-parser && npm install && npm test)
+        env:
+          CI: true
+      - name: bower-json tests
+        run: (cd packages/bower-json && npm install && npm test)
+        env:
+          CI: true
+      - name: bower-registry-client tests
+        run: (cd packages/bower-registry-client && npm install && npm test)
+        env:
+          CI: true

.gitignore

@@ -1,2 +1,15 @@
-npm-debug.log*
-lerna-debug.log*
+!lib/bin
+/node_modules
+/npm-debug.log
+
+/test/assets/package-*/
+/test/assets/temp-*/
+/test/reports
+/test/tmp/
+
+/bower.json
+/component.json
+/bower_components
+/test/sample
+!/test/sample/bower.json
+/npm-shrinkwrap.json

.prettierignore

@@ -0,0 +1,4 @@
+**/node_modules/**
+**/test/assets/**
+**/bower_components/**
+test/sample

.travis.yml

@@ -1,33 +0,0 @@
-sudo: false
-
-language: node_js
-
-node_js:
-  - "0.10"
-  - "0.11"
-  - "0.12"
-  - "4.0"
-  - "4.1"
-  - "4.2"
-  - "5"
-  - "6"
-
-install:
-  - node --version
-  - npm --version
-  - git --version
-  - svn --version | head -n 1
-  - npm install
-
-os:
-  - osx
-  - linux
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - os: osx
-    - env: "NODE_VERSION=0.11"
-
-script:
-  - npm test

CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## Newer releases
+
+Please see: https://github.com/bower/bower/releases
+
+## 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
@@ -83,7 +104,7 @@ https://github.com/npm/npm/issues/11227
 - 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))
+  - Allow for array notation in ENV variables ([#44](https://github.com/bower/config/issues/44))
 
 ## 1.6.9 - 2015-12-04
 

CONTRIBUTING.md

@@ -18,7 +18,7 @@ Bower is a large community project with many different developers contributing a
 
 ## Team Meetings
 
-We communicate through a channel on slack: https://gitter.im/bower
+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.
 
@@ -29,9 +29,9 @@ The issue tracker is the preferred channel for [bug reports](#bugs),
 requests](#pull-requests), but please respect the following restrictions:
 
 * Please **do not** use the issue tracker for personal support requests. Use
-  [Stack Overflow](http://stackoverflow.com/questions/tagged/bower)
-  [Gitter Channel](https://gitter.im/bower/bower)
-  [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.
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016 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,13 +1,10 @@
 # Bower - A package manager for the web
 
-> Bower needs your help. If you're willing to help, please say hello to team@bower.io or [donate](https://salt.bountysource.com/teams/bower)
+[![Build](https://github.com/bower/bower/workflows/build/badge.svg)](https://github.com/bower/bower/actions?query=branch%3Amaster)
+[![Backers on Open Collective](https://opencollective.com/bower/backers/badge.svg)](#backers)
+[![Sponsors on Open Collective](https://opencollective.com/bower/sponsors/badge.svg)](#sponsors)
 
-[![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)
-[![Issue Stats](http://issuestats.com/github/bower/bower/badge/pr?style=flat)](http://issuestats.com/github/bower/bower)
-[![Issue Stats](http://issuestats.com/github/bower/bower/badge/issue?style=flat)](http://issuestats.com/github/bower/bower)
+> ..psst! While Bower is maintained, we recommend [yarn](https://yarnpkg.com/) and [webpack](https://webpack.js.org/) or [parcel](https://parceljs.org/) for new front-end projects!
 
 <img align="right" height="300" src="http://bower.io/img/bower-logo.png">
 
@@ -119,8 +116,116 @@ 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>
+<a href="https://opencollective.com/bower/backer/30/website" target="_blank"><img src="https://opencollective.com/bower/backer/30/avatar.svg"></a>
+<a href="https://opencollective.com/bower/backer/31/website" target="_blank"><img src="https://opencollective.com/bower/backer/31/avatar.svg"></a>
+<a href="https://opencollective.com/bower/backer/32/website" target="_blank"><img src="https://opencollective.com/bower/backer/32/avatar.svg"></a>
+<a href="https://opencollective.com/bower/backer/33/website" target="_blank"><img src="https://opencollective.com/bower/backer/33/avatar.svg"></a>
+<a href="https://opencollective.com/bower/backer/34/website" target="_blank"><img src="https://opencollective.com/bower/backer/34/avatar.svg"></a>
+<a href="https://opencollective.com/bower/backer/35/website" target="_blank"><img src="https://opencollective.com/bower/backer/35/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>
+<a href="https://opencollective.com/bower/sponsor/30/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/30/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/31/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/31/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/32/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/32/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/33/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/33/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/34/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/34/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/35/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/35/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/36/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/36/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/37/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/37/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/38/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/38/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/39/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/39/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/40/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/40/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/41/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/41/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/42/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/42/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/43/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/43/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/44/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/44/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/45/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/45/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/46/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/46/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/47/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/47/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/48/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/48/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/49/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/49/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/50/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/50/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/51/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/51/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/52/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/52/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/53/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/53/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/54/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/54/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/55/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/55/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/56/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/56/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/57/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/57/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/58/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/58/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/59/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/59/avatar.svg"></a>
+<a href="https://opencollective.com/bower/sponsor/60/website" target="_blank"><img src="https://opencollective.com/bower/sponsor/60/avatar.svg"></a>
+
 ## License
 
-Copyright (c) 2016 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,45 +0,0 @@
-# http://www.appveyor.com/docs/appveyor-yml
-
-# Set build version format here instead of in the admin panel.
-version: "{build}"
-
-# Fix line endings in Windows. (runs before repo cloning)
-init:
-  - git config --global core.autocrlf input
-
-# Test against these versions of Node.js.
-environment:
-  matrix:
-    - nodejs_version: "0.10"
-    - nodejs_version: "0.12"
-    - nodejs_version: "4.0"
-    - nodejs_version: "4.1"
-    - nodejs_version: "4.2"
-    - nodejs_version: "5"
-    - nodejs_version: "6"
-
-# Finish on first failed build
-matrix:
-  fast_finish: true
-
-# Install node, display versions, install dependencies
-install:
-  - ps: Install-Product node $env:nodejs_version
-  - node --version && npm --version
-  - git --version && svn --version
-  - npm install
-
-# Post-install test scripts.
-test_script:
-  - cmd: npm test
-
-# 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:
-  - node_modules -> package.json

lerna.json

@@ -1,10 +0,0 @@
-{
-  "lerna": "2.0.0-beta.23",
-  "version": "independent",
-  "publishConfig": {
-    "ignore": [
-      "ignored-file",
-      "*.md"
-    ]
-  }
-}

lib/bin/bower.js

@@ -18,8 +18,8 @@ var logger;
 var levels = Logger.LEVELS;
 
 options = cli.readOptions({
-    'version': { type: Boolean, shorthand: 'v' },
-    'help': { type: Boolean, shorthand: 'h' },
+    version: { type: Boolean, shorthand: 'v' },
+    help: { type: Boolean, shorthand: 'h' },
     'allow-root': { type: Boolean }
 });
 
@@ -73,12 +73,12 @@ command = command && command.replace(/\./g, ' ');
 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)
+    // 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
+    // Call the line method
 } else {
     logger = commandFunc.line(process.argv);
 
@@ -95,42 +95,47 @@ 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);
+        .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);
+                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.');
+    logger.warn(
+        'no-home',
+        'HOME environment variable not set. User config will not be loaded.'
+    );
 }
 
 if (bower.config.interactive) {

lib/commands/cache/clean.js

@@ -22,10 +22,10 @@ function clean(logger, endpoints, options, config) {
 
     // Generate decomposed endpoints and names based on the endpoints
     if (endpoints) {
-        decEndpoints = endpoints.map(function (endpoint) {
+        decEndpoints = endpoints.map(function(endpoint) {
             return endpointParser.decompose(endpoint);
         });
-        names = decEndpoints.map(function (decEndpoint) {
+        names = decEndpoints.map(function(decEndpoint) {
             return decEndpoint.name || decEndpoint.source;
         });
     }
@@ -33,27 +33,26 @@ function clean(logger, endpoints, options, config) {
     return Q.all([
         clearPackages(decEndpoints, config, logger),
         clearLinks(names, config, logger)
-    ])
-    .spread(function (entries) {
+    ]).spread(function(entries) {
         return entries;
     });
 }
 
 function clearPackages(decEndpoints, config, logger) {
-    var repository =  new PackageRepository(config, logger);
+    var repository = new PackageRepository(config, logger);
 
-    return repository.list()
-    .then(function (entries) {
+    return repository.list().then(function(entries) {
         var promises;
 
         // Filter entries according to the specified packages
         if (decEndpoints) {
-            entries = entries.filter(function (entry) {
-                return !!mout.array.find(decEndpoints, function (decEndpoint) {
+            entries = entries.filter(function(entry) {
+                return !!mout.array.find(decEndpoints, function(decEndpoint) {
                     var entryPkgMeta = entry.pkgMeta;
 
                     // Check if name or source match the entry
-                    if  (decEndpoint.name !== entryPkgMeta.name &&
+                    if (
+                        decEndpoint.name !== entryPkgMeta.name &&
                         decEndpoint.source !== entryPkgMeta.name &&
                         decEndpoint.source !== entryPkgMeta._source
                     ) {
@@ -67,36 +66,47 @@ function clearPackages(decEndpoints, config, logger) {
 
                     // If it's a semver target, compare using semver spec
                     if (semver.validRange(decEndpoint.target)) {
-                        return semver.satisfies(entryPkgMeta.version, decEndpoint.target);
+                        return semver.satisfies(
+                            entryPkgMeta.version,
+                            decEndpoint.target
+                        );
                     }
 
                     // Otherwise, compare against target/release
-                    return decEndpoint.target === entryPkgMeta._target ||
-                           decEndpoint.target === entryPkgMeta._release;
+                    return (
+                        decEndpoint.target === entryPkgMeta._target ||
+                        decEndpoint.target === entryPkgMeta._release
+                    );
                 });
             });
         }
 
-        promises = entries.map(function (entry) {
-            return repository.eliminate(entry.pkgMeta)
-            .then(function () {
-                logger.info('deleted', 'Cached package ' + entry.pkgMeta.name + ': ' + entry.canonicalDir, {
-                    file: entry.canonicalDir
-                });
+        promises = entries.map(function(entry) {
+            return repository.eliminate(entry.pkgMeta).then(function() {
+                logger.info(
+                    'deleted',
+                    'Cached package ' +
+                        entry.pkgMeta.name +
+                        ': ' +
+                        entry.canonicalDir,
+                    {
+                        file: entry.canonicalDir
+                    }
+                );
             });
         });
 
         return Q.all(promises)
-        .then(function () {
-            if (!decEndpoints) {
-                // Ensure that everything is cleaned,
-                // even invalid packages in the cache
-                return repository.clear();
-            }
-        })
-        .then(function () {
-            return entries;
-        });
+            .then(function() {
+                if (!decEndpoints) {
+                    // Ensure that everything is cleaned,
+                    // even invalid packages in the cache
+                    return repository.clear();
+                }
+            })
+            .then(function() {
+                return entries;
+            });
     });
 }
 
@@ -106,59 +116,59 @@ function clearLinks(names, config, logger) {
 
     // If no names are passed, grab all links
     if (!names) {
-        promise = Q.nfcall(fs.readdir, dir)
-        .fail(function (err) {
+        promise = Q.nfcall(fs.readdir, dir).fail(function(err) {
             if (err.code === 'ENOENT') {
                 return [];
             }
 
             throw err;
         });
-    // Otherwise use passed ones
+        // Otherwise use passed ones
     } else {
         promise = Q.resolve(names);
     }
 
-    return promise
-    .then(function (names) {
+    return promise.then(function(names) {
         var promises;
         var linksToRemove = [];
 
         // Decide which links to delete
-        promises = names.map(function (name) {
+        promises = names.map(function(name) {
             var link = path.join(config.storage.links, name);
 
-            return Q.nfcall(fs.readlink, link)
-            .then(function (linkTarget) {
-                // Link exists, check if it points to a folder
-                // that still exists
-                return Q.nfcall(fs.stat, linkTarget)
-                .then(function (stat) {
-                    // Target is not a folder..
-                    if (!stat.isDirectory()) {
+            return Q.nfcall(fs.readlink, link).then(
+                function(linkTarget) {
+                    // Link exists, check if it points to a folder
+                    // that still exists
+                    return (
+                        Q.nfcall(fs.stat, linkTarget)
+                            .then(function(stat) {
+                                // Target is not a folder..
+                                if (!stat.isDirectory()) {
+                                    linksToRemove.push(link);
+                                }
+                            })
+                            // Error occurred reading the link
+                            .fail(function() {
+                                linksToRemove.push(link);
+                            })
+                    );
+                    // Ignore if link does not exist
+                },
+                function(err) {
+                    if (err.code !== 'ENOENT') {
                         linksToRemove.push(link);
                     }
-                })
-                // Error occurred reading the link
-                .fail(function () {
-                    linksToRemove.push(link);
-                });
-            // Ignore if link does not exist
-            }, function (err) {
-                if (err.code !== 'ENOENT') {
-                    linksToRemove.push(link);
                 }
-            });
+            );
         });
 
-        return Q.all(promises)
-        .then(function () {
+        return Q.all(promises).then(function() {
             var promises;
 
             // Remove each link that was declared as invalid
-            promises = linksToRemove.map(function (link) {
-                return Q.nfcall(rimraf, link)
-                .then(function () {
+            promises = linksToRemove.map(function(link) {
+                return Q.nfcall(rimraf, link).then(function() {
                     logger.info('deleted', 'Invalid link: ' + link, {
                         file: link
                     });
@@ -172,7 +182,7 @@ function clearLinks(names, config, logger) {
 
 // -------------------
 
-clean.readOptions = function (argv) {
+clean.readOptions = function(argv) {
     var cli = require('../../util/cli');
     var options = cli.readOptions(argv);
     var endpoints = options.argv.remain.slice(2);

lib/commands/cache/list.js

@@ -13,12 +13,11 @@ function list(logger, packages, options, config) {
         packages = null;
     }
 
-    return repository.list()
-    .then(function (entries) {
+    return repository.list().then(function(entries) {
         if (packages) {
             // Filter entries according to the specified packages
-            entries = entries.filter(function (entry) {
-                return !!mout.array.find(packages, function (pkg) {
+            entries = entries.filter(function(entry) {
+                return !!mout.array.find(packages, function(pkg) {
                     return pkg === entry.pkgMeta.name;
                 });
             });
@@ -30,7 +29,7 @@ function list(logger, packages, options, config) {
 
 // -------------------
 
-list.readOptions = function (argv) {
+list.readOptions = function(argv) {
     var cli = require('../../util/cli');
     var options = cli.readOptions(argv);
     var packages = options.argv.remain.slice(2);

lib/commands/help.js

@@ -7,15 +7,17 @@ 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');
     }
 
-    return Q.promise(function (resolve) {
+    return Q.promise(function(resolve) {
         fs.exists(json, resolve);
-    })
-    .then(function (exists) {
+    }).then(function(exists) {
         if (!exists) {
             throw createError('Unknown command: ' + name, 'EUNKNOWNCMD', {
                 command: name
@@ -28,7 +30,7 @@ function help(logger, name, config) {
 
 // -------------------
 
-help.readOptions = function (argv) {
+help.readOptions = function(argv) {
     var cli = require('../util/cli');
     var options = cli.readOptions(argv);
     var name = options.argv.remain.slice(1).join(' ');

lib/commands/home.js

@@ -16,8 +16,7 @@ function home(logger, name, config) {
     // If no name is specified, read the project json
     // If a name is specified, fetch from the package repository
     if (!name) {
-        promise = project.hasJson()
-        .then(function (json) {
+        promise = project.hasJson().then(function(json) {
             if (!json) {
                 throw createError('You are not inside a package', 'ENOENT');
             }
@@ -26,14 +25,16 @@ function home(logger, name, config) {
         });
     } else {
         decEndpoint = endpointParser.decompose(name);
-        promise = project.getPackageRepository().fetch(decEndpoint)
-        .spread(function (canonicalDir, pkgMeta) {
-            return pkgMeta;
-        });
+        promise = project
+            .getPackageRepository()
+            .fetch(decEndpoint)
+            .spread(function(canonicalDir, pkgMeta) {
+                return pkgMeta;
+            });
     }
 
     // Get homepage and open it
-    return promise.then(function (pkgMeta) {
+    return promise.then(function(pkgMeta) {
         var homepage = pkgMeta.homepage;
 
         if (!homepage) {
@@ -47,7 +48,7 @@ function home(logger, name, config) {
 
 // -------------------
 
-home.readOptions = function (argv) {
+home.readOptions = function(argv) {
     var cli = require('../util/cli');
     var options = cli.readOptions(argv);
     var name = options.argv.remain[1];

lib/commands/index.js

@@ -14,7 +14,7 @@ function commandFactory(id) {
         var command = require(id);
         var commandArgs = [].slice.call(arguments);
 
-        return withLogger(function (logger) {
+        return withLogger(function(logger) {
             commandArgs.unshift(logger);
 
             return command.apply(undefined, commandArgs);
@@ -27,7 +27,7 @@ function commandFactory(id) {
 
         commandArgs = command.readOptions(argv);
 
-        return withLogger(function (logger) {
+        return withLogger(function(logger) {
             commandArgs.unshift(logger);
 
             return command.apply(undefined, commandArgs);
@@ -37,16 +37,18 @@ function commandFactory(id) {
     function withLogger(func) {
         var logger = new Logger();
 
-        Q.try(func, logger)
-        .done(function () {
-            config.restore();
-            var args = [].slice.call(arguments);
-            args.unshift('end');
-            logger.emit.apply(logger, args);
-        }, function (error) {
-            config.restore();
-            logger.emit('error', error);
-        });
+        Q.try(func, logger).done(
+            function() {
+                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;
     }
@@ -56,11 +58,10 @@ function commandFactory(id) {
     return runApi;
 }
 
-
 module.exports = {
     cache: {
         clean: commandFactory('./cache/clean'),
-        list: commandFactory('./cache/list'),
+        list: commandFactory('./cache/list')
     },
     help: commandFactory('./help'),
     home: commandFactory('./home'),

lib/commands/info.js

@@ -9,6 +9,13 @@ 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;
 
@@ -19,9 +26,10 @@ function info(logger, endpoint, property, config) {
 
     return Q.all([
         getPkgMeta(repository, decEndpoint, property),
-        decEndpoint.target === '*' && !property ? repository.versions(decEndpoint.source) : null
-    ])
-    .spread(function (pkgMeta, versions) {
+        decEndpoint.target === '*' && !property
+            ? repository.versions(decEndpoint.source)
+            : null
+    ]).spread(function(pkgMeta, versions) {
         if (versions) {
             return {
                 name: decEndpoint.source,
@@ -35,24 +43,25 @@ function info(logger, endpoint, property, config) {
 }
 
 function getPkgMeta(repository, decEndpoint, property) {
-    return repository.fetch(decEndpoint)
-    .spread(function (canonicalDir, pkgMeta) {
-        pkgMeta = mout.object.filter(pkgMeta, function (value, key) {
-            return key.charAt(0) !== '_';
+    return repository
+        .fetch(decEndpoint)
+        .spread(function(canonicalDir, pkgMeta) {
+            pkgMeta = mout.object.filter(pkgMeta, function(value, key) {
+                return key.charAt(0) !== '_';
+            });
+
+            // Retrieve specific property
+            if (property) {
+                pkgMeta = mout.object.get(pkgMeta, property);
+            }
+
+            return pkgMeta;
         });
-
-        // Retrieve specific property
-        if (property) {
-            pkgMeta = mout.object.get(pkgMeta, property);
-        }
-
-        return pkgMeta;
-    });
 }
 
 // -------------------
 
-info.readOptions = function (argv) {
+info.readOptions = function(argv) {
     var cli = require('../util/cli');
     var options = cli.readOptions(argv);
     var pkg = options.argv.remain[1];

lib/commands/init.js

@@ -0,0 +1,342 @@
+var mout = require('mout');
+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 cmd = require('../util/cmd');
+var createError = require('../util/createError');
+
+function init(logger, config) {
+    var project;
+
+    config = config || {};
+
+    if (!config.cwd) {
+        config.cwd = process.cwd();
+    }
+
+    config = defaultConfig(config);
+
+    // This command requires interactive to be enabled
+    if (!config.interactive) {
+        throw createError('Register requires an interactive shell', 'ENOINT', {
+            details:
+                'Note that you can manually force an interactive shell with --config.interactive'
+        });
+    }
+
+    project = new Project(config, logger);
+
+    // Start with existing JSON details
+    return (
+        readJson(project, logger)
+            // Fill in defaults
+            .then(setDefaults.bind(null, config))
+            // Now prompt user to make changes
+            .then(promptUser.bind(null, logger))
+            // Set ignore based on the response
+            .spread(setIgnore.bind(null, config))
+            // Set dependencies based on the response
+            .spread(setDependencies.bind(null, project))
+            // All done!
+            .spread(saveJson.bind(null, project, logger))
+    );
+}
+
+function readJson(project, logger) {
+    return project.hasJson().then(function(json) {
+        if (json) {
+            logger.warn(
+                'existing',
+                'The existing ' +
+                    path.basename(json) +
+                    ' file will be used and filled in'
+            );
+        }
+
+        return project.getJson();
+    });
+}
+
+function saveJson(project, logger, json) {
+    // Cleanup empty props (null values, empty strings, objects and arrays)
+    mout.object.forOwn(json, function(value, key) {
+        if (!validConfigValue(value)) {
+            delete json[key];
+        }
+    });
+
+    logger.info('json', 'Generated json', { json: json });
+
+    // Confirm the json with the user
+    return Q.nfcall(logger.prompt.bind(logger), {
+        type: 'confirm',
+        message: 'Looks good?',
+        default: true
+    }).then(function(good) {
+        if (!good) {
+            return null;
+        }
+
+        // Save json (true forces file creation)
+        return project.saveJson(true);
+    });
+}
+
+// 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();
+
+    // Name
+    if (!json.name) {
+        json.name = path.basename(config.cwd);
+    }
+
+    // Main
+    if (!json.main) {
+        // Remove '.js' from the end of the package name if it is there
+        name = path.basename(json.name, '.js');
+
+        if (fs.existsSync(path.join(config.cwd, 'index.js'))) {
+            json.main = 'index.js';
+        } else if (fs.existsSync(path.join(config.cwd, name + '.js'))) {
+            json.main = name + '.js';
+        }
+    }
+
+    // Homepage
+    if (!json.homepage) {
+        // Set as GitHub homepage if it's a GitHub repository
+        promise = promise.then(function() {
+            return cmd('git', ['config', '--get', 'remote.origin.url'])
+                .spread(function(stdout) {
+                    var pair;
+
+                    stdout = stdout.trim();
+                    if (!stdout) {
+                        return;
+                    }
+
+                    pair = GitHubResolver.getOrgRepoPair(stdout);
+                    if (pair) {
+                        json.homepage =
+                            'https://github.com/' + pair.org + '/' + pair.repo;
+                    }
+                })
+                .fail(function() {});
+        });
+    }
+
+    if (!json.authors) {
+        promise = promise.then(function() {
+            // Get the user name configured in git
+            return cmd('git', [
+                'config',
+                '--get',
+                '--global',
+                'user.name'
+            ]).spread(
+                function(stdout) {
+                    var gitEmail;
+                    var gitName = stdout.trim();
+
+                    // Abort if no name specified
+                    if (!gitName) {
+                        return;
+                    }
+
+                    // Get the user email configured in git
+                    return cmd('git', [
+                        'config',
+                        '--get',
+                        '--global',
+                        'user.email'
+                    ])
+                        .spread(
+                            function(stdout) {
+                                gitEmail = stdout.trim();
+                            },
+                            function() {}
+                        )
+                        .then(function() {
+                            json.authors = gitName;
+                            json.authors += gitEmail
+                                ? ' <' + gitEmail + '>'
+                                : '';
+                        });
+                },
+                function() {}
+            );
+        });
+    }
+
+    return promise.then(function() {
+        return json;
+    });
+}
+
+function promptUser(logger, json) {
+    var questions = [
+        {
+            name: 'name',
+            message: 'name',
+            default: json.name,
+            type: 'input'
+        },
+        {
+            name: 'description',
+            message: 'description',
+            default: json.description,
+            type: 'input'
+        },
+        {
+            name: 'main',
+            message: 'main file',
+            default: json.main,
+            type: 'input'
+        },
+        {
+            name: 'keywords',
+            message: 'keywords',
+            default: json.keywords ? json.keywords.toString() : null,
+            type: 'input'
+        },
+        {
+            name: 'authors',
+            message: 'authors',
+            default: json.authors ? json.authors.toString() : null,
+            type: 'input'
+        },
+        {
+            name: 'license',
+            message: 'license',
+            default: json.license || 'MIT',
+            type: 'input'
+        },
+        {
+            name: 'homepage',
+            message: 'homepage',
+            default: json.homepage,
+            type: 'input'
+        },
+        {
+            name: 'dependencies',
+            message: 'set currently installed components as dependencies?',
+            default:
+                !mout.object.size(json.dependencies) &&
+                !mout.object.size(json.devDependencies),
+            type: 'confirm'
+        },
+        {
+            name: 'ignore',
+            message: 'add commonly ignored files to ignore list?',
+            default: true,
+            type: 'confirm'
+        },
+        {
+            name: 'private',
+            message:
+                'would you like to mark this package as private which prevents it from being accidentally published to the registry?',
+            default: !!json.private,
+            type: 'confirm'
+        }
+    ];
+
+    return Q.nfcall(logger.prompt.bind(logger), questions).then(function(
+        answers
+    ) {
+        json.name = answers.name;
+        json.description = answers.description;
+        json.main = answers.main;
+        json.keywords = toArray(answers.keywords);
+        json.authors = toArray(answers.authors, ',');
+        json.license = answers.license;
+        json.homepage = answers.homepage;
+        json.private = answers.private || null;
+
+        return [json, answers];
+    });
+}
+
+function toArray(value, splitter) {
+    var arr = value.split(splitter || /[\s,]/);
+
+    // Trim values
+    arr = arr.map(function(item) {
+        return item.trim();
+    });
+
+    // Filter empty values
+    arr = arr.filter(function(item) {
+        return !!item;
+    });
+
+    return arr.length ? arr : null;
+}
+
+function setIgnore(config, json, answers) {
+    if (answers.ignore) {
+        json.ignore = mout.array.combine(json.ignore || [], [
+            '**/.*',
+            'node_modules',
+            'bower_components',
+            config.directory,
+            'test',
+            'tests'
+        ]);
+    }
+
+    return [json, answers];
+}
+
+function setDependencies(project, json, answers) {
+    if (answers.dependencies) {
+        return project.getTree().spread(function(tree, flattened, extraneous) {
+            if (extraneous.length) {
+                json.dependencies = {};
+
+                // Add extraneous as dependencies
+                extraneous.forEach(function(extra) {
+                    var jsonEndpoint;
+
+                    // Skip linked packages
+                    if (extra.linked) {
+                        return;
+                    }
+
+                    jsonEndpoint = endpointParser.decomposed2json(
+                        extra.endpoint
+                    );
+                    mout.object.mixIn(json.dependencies, jsonEndpoint);
+                });
+            }
+
+            return [json, answers];
+        });
+    }
+
+    return [json, answers];
+}
+
+// -------------------
+
+init.readOptions = function(argv) {
+    return [];
+};
+
+module.exports = init;

lib/commands/install.js

@@ -15,7 +15,14 @@ function install(logger, endpoints, options, config) {
 
     // Convert endpoints to decomposed endpoints
     endpoints = endpoints || [];
-    decEndpoints = endpoints.map(function (endpoint) {
+    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);
     });
 
@@ -24,16 +31,19 @@ function install(logger, endpoints, options, config) {
 
 // -------------------
 
-install.readOptions = function (argv) {
+install.readOptions = function(argv) {
     var cli = require('../util/cli');
 
-    var options = cli.readOptions({
-        'force-latest': { type: Boolean, shorthand: 'F'},
-        'production': { type: Boolean, shorthand: 'p' },
-        'save': { type: Boolean, shorthand: 'S' },
-        'save-dev': { type: Boolean, shorthand: 'D' },
-        'save-exact': { type: Boolean, shorthand: 'E' }
-    }, argv);
+    var options = cli.readOptions(
+        {
+            'force-latest': { type: Boolean, shorthand: 'F' },
+            production: { type: Boolean, shorthand: 'p' },
+            save: { type: Boolean, shorthand: 'S' },
+            'save-dev': { type: Boolean, shorthand: 'D' },
+            'save-exact': { type: Boolean, shorthand: 'E' }
+        },
+        argv
+    );
 
     var packages = options.argv.remain.slice(1);
 

lib/commands/link.js

@@ -20,23 +20,24 @@ function linkSelf(logger, config) {
     config = defaultConfig(config);
     project = new Project(config, logger);
 
-    return project.getJson()
-    .then(function (json) {
+    return project.getJson().then(function(json) {
         var src = config.cwd;
         var dst = path.join(config.storage.links, json.name);
 
         // Delete previous link if any
-        return Q.nfcall(rimraf, dst)
-        // Link globally
-        .then(function () {
-            return createLink(src, dst);
-        })
-        .then(function () {
-            return {
-                src: src,
-                dst: dst
-            };
-        });
+        return (
+            Q.nfcall(rimraf, dst)
+                // Link globally
+                .then(function() {
+                    return createLink(src, dst);
+                })
+                .then(function() {
+                    return {
+                        src: src,
+                        dst: dst
+                    };
+                })
+        );
     });
 }
 
@@ -53,27 +54,29 @@ function linkTo(logger, name, localName, config) {
     dst = path.join(relativeToBaseDir(config.cwd)(config.directory), localName);
 
     // Delete destination folder if any
-    return Q.nfcall(rimraf, dst)
-    // Link locally
-    .then(function () {
-        return createLink(src, dst);
-    })
-    // Install linked package deps
-    .then(function () {
-        return project.update([localName]);
-    })
-    .then(function (installed) {
-        return {
-            src: src,
-            dst: dst,
-            installed: installed
-        };
-    });
+    return (
+        Q.nfcall(rimraf, dst)
+            // Link locally
+            .then(function() {
+                return createLink(src, dst);
+            })
+            // Install linked package deps
+            .then(function() {
+                return project.update([localName]);
+            })
+            .then(function(installed) {
+                return {
+                    src: src,
+                    dst: dst,
+                    installed: installed
+                };
+            })
+    );
 }
 
 // -------------------
 
-link.readOptions = function (argv) {
+link.readOptions = function(argv) {
     var cli = require('../util/cli');
     var options = cli.readOptions(argv);
     var name = options.argv.remain[1];

lib/commands/list.js

@@ -11,39 +11,48 @@ function list(logger, options, config) {
     options = options || {};
 
     // Make relative option true by default when used with paths
-    if (options.paths && options.relative == null)  {
+    if (options.paths && options.relative == null) {
         options.relative = true;
     }
 
     config = defaultConfig(config);
     project = new Project(config, logger);
 
-    return project.getTree(options)
-    .spread(function (tree, flattened) {
+    return project.getTree(options).spread(function(tree, flattened) {
         // Relativize paths
         // Also normalize paths on windows
-        project.walkTree(tree, function (node) {
-            if (node.missing) {
-                return;
-            }
+        project.walkTree(
+            tree,
+            function(node) {
+                if (node.missing) {
+                    return;
+                }
 
-            if (options.relative) {
-                node.canonicalDir = path.relative(config.cwd, node.canonicalDir);
-            }
-            if (options.paths) {
-                node.canonicalDir = normalize(node.canonicalDir);
-            }
-        }, true);
+                if (options.relative) {
+                    node.canonicalDir = path.relative(
+                        config.cwd,
+                        node.canonicalDir
+                    );
+                }
+                if (options.paths) {
+                    node.canonicalDir = normalize(node.canonicalDir);
+                }
+            },
+            true
+        );
 
         // Note that we need to to parse the flattened tree because it might
         // contain additional packages
-        mout.object.forOwn(flattened, function (node) {
+        mout.object.forOwn(flattened, function(node) {
             if (node.missing) {
                 return;
             }
 
             if (options.relative) {
-                node.canonicalDir = path.relative(config.cwd, node.canonicalDir);
+                node.canonicalDir = path.relative(
+                    config.cwd,
+                    node.canonicalDir
+                );
             }
             if (options.paths) {
                 node.canonicalDir = normalize(node.canonicalDir);
@@ -61,8 +70,7 @@ function list(logger, options, config) {
         }
 
         // Check for new versions
-        return checkVersions(project, tree, logger)
-        .then(function () {
+        return checkVersions(project, tree, logger).then(function() {
             return tree;
         });
     });
@@ -74,32 +82,40 @@ function checkVersions(project, tree, logger) {
     var repository = project.getPackageRepository();
 
     // Gather all nodes, ignoring linked nodes
-    project.walkTree(tree, function (node) {
-        if (!node.linked) {
-            nodes.push(node);
-        }
-    }, true);
+    project.walkTree(
+        tree,
+        function(node) {
+            if (!node.linked) {
+                nodes.push(node);
+            }
+        },
+        true
+    );
 
     if (nodes.length) {
-        logger.info('check-new', 'Checking for new versions of the project dependencies...');
+        logger.info(
+            'check-new',
+            'Checking for new versions of the project dependencies...'
+        );
     }
 
     // Check for new versions for each node
-    promises = nodes.map(function (node) {
+    promises = nodes.map(function(node) {
         var target = node.endpoint.target;
 
-        return repository.versions(node.endpoint.source)
-        .then(function (versions) {
-            node.versions = versions;
+        return repository
+            .versions(node.endpoint.source)
+            .then(function(versions) {
+                node.versions = versions;
 
-            // Do not check if node's target is not a valid semver one
-            if (versions.length && semver.validRange(target)) {
-                node.update = {
-                    target: semver.maxSatisfying(versions, target),
-                    latest: semver.maxSatisfying(versions, '*')
-                };
-            }
-        });
+                // Do not check if node's target is not a valid semver one
+                if (versions.length && semver.validRange(target)) {
+                    node.update = {
+                        target: semver.maxSatisfying(versions, target),
+                        latest: semver.maxSatisfying(versions, '*')
+                    };
+                }
+            });
     });
 
     // Set the versions also for the root node
@@ -111,7 +127,7 @@ function checkVersions(project, tree, logger) {
 function paths(flattened) {
     var ret = {};
 
-    mout.object.forOwn(flattened, function (pkg, name) {
+    mout.object.forOwn(flattened, function(pkg, name) {
         var main;
 
         if (pkg.missing) {
@@ -132,7 +148,7 @@ function paths(flattened) {
         }
 
         // Concatenate each main entry with the canonical dir
-        main = main.map(function (part) {
+        main = main.map(function(part) {
             return normalize(path.join(pkg.canonicalDir, part).trim());
         });
 
@@ -150,13 +166,16 @@ function normalize(src) {
 
 // -------------------
 
-list.readOptions = function (argv) {
+list.readOptions = function(argv) {
     var cli = require('../util/cli');
 
-    var options = cli.readOptions({
-        'paths': { type: Boolean, shorthand: 'p' },
-        'relative': { type: Boolean, shorthand: 'r' }
-    }, argv);
+    var options = cli.readOptions(
+        {
+            paths: { type: Boolean, shorthand: 'p' },
+            relative: { type: Boolean, shorthand: 'r' }
+        },
+        argv
+    );
 
     delete options.argv;
 

lib/commands/login.js

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

lib/commands/lookup.js

@@ -12,18 +12,21 @@ function lookup(logger, name, config) {
     var repository = new PackageRepository(config, logger);
     var registryClient = repository.getRegistryClient();
 
-    return Q.nfcall(registryClient.lookup.bind(registryClient), name)
-    .then(function (entry) {
-        return !entry ? null : {
-            name: name,
-            url: entry && entry.url
-        };
-    });
+    return Q.nfcall(registryClient.lookup.bind(registryClient), name).then(
+        function(entry) {
+            return !entry
+                ? null
+                : {
+                      name: name,
+                      url: entry.url
+                  };
+        }
+    );
 }
 
 // -------------------
 
-lookup.readOptions = function (argv) {
+lookup.readOptions = function(argv) {
     var cli = require('../util/cli');
     var options = cli.readOptions(argv);
     var name = options.argv.remain[1];

lib/commands/prune.js

@@ -0,0 +1,60 @@
+var mout = require('mout');
+var Project = require('../core/Project');
+var defaultConfig = require('../config');
+
+function prune(logger, options, config) {
+    var project;
+
+    options = options || {};
+    config = defaultConfig(config);
+    project = new Project(config, logger);
+
+    return clean(project, options);
+}
+
+function clean(project, options, removed) {
+    removed = removed || {};
+
+    // Continually call clean until there is no more extraneous
+    // dependencies to remove
+    return project
+        .getTree(options)
+        .spread(function(tree, flattened, extraneous) {
+            var names = extraneous.map(function(extra) {
+                return extra.endpoint.name;
+            });
+
+            // Uninstall extraneous
+            return project
+                .uninstall(names, options)
+                .then(function(uninstalled) {
+                    // Are we done?
+                    if (!mout.object.size(uninstalled)) {
+                        return removed;
+                    }
+
+                    // Not yet, recurse!
+                    mout.object.mixIn(removed, uninstalled);
+                    return clean(project, options, removed);
+                });
+        });
+}
+
+// -------------------
+
+prune.readOptions = function(argv) {
+    var cli = require('../util/cli');
+
+    var options = cli.readOptions(
+        {
+            production: { type: Boolean, shorthand: 'p' }
+        },
+        argv
+    );
+
+    delete options.argv;
+
+    return [options];
+};
+
+module.exports = prune;

lib/commands/register.js

@@ -0,0 +1,100 @@
+var Q = require('q');
+var chalk = require('chalk');
+var PackageRepository = require('../core/PackageRepository');
+var createError = require('../util/createError');
+var defaultConfig = require('../config');
+
+function register(logger, name, source, config) {
+    var repository;
+    var registryClient;
+    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;
+
+    name = (name || '').trim();
+    source = (source || '').trim();
+
+    url = source.match(githubSourceRegex) ? getGithubUrl(source) : source;
+
+    // Bypass any cache
+    config.offline = false;
+    config.force = true;
+
+    return Q.try(function() {
+        // Verify name and url
+        if (!name || !url) {
+            throw createError(
+                'Usage: bower register <name> <url>',
+                'EINVFORMAT'
+            );
+        }
+
+        // Attempt to resolve the package referenced by the URL to ensure
+        // everything is ok before registering
+        repository = new PackageRepository(config, logger);
+        return repository.fetch({ name: name, source: url, target: '*' });
+    })
+        .spread(function(canonicalDir, pkgMeta) {
+            if (pkgMeta.private) {
+                throw createError(
+                    'The package you are trying to register is marked as private',
+                    'EPRIV'
+                );
+            }
+
+            // If non interactive or user forced, bypass confirmation
+            if (!config.interactive || force) {
+                return true;
+            }
+
+            // Confirm if the user really wants to register
+            return Q.nfcall(logger.prompt.bind(logger), {
+                type: 'confirm',
+                message:
+                    'Registering a package will make it installable via the registry (' +
+                    chalk.cyan.underline(config.registry.register) +
+                    '), continue?',
+                default: true
+            });
+        })
+        .then(function(result) {
+            // If user response was negative, abort
+            if (!result) {
+                return;
+            }
+
+            // Register
+            registryClient = repository.getRegistryClient();
+
+            logger.action('register', url, {
+                name: name,
+                url: url
+            });
+
+            return Q.nfcall(
+                registryClient.register.bind(registryClient),
+                name,
+                url
+            );
+        });
+}
+
+// -------------------
+
+register.readOptions = function(argv) {
+    var cli = require('../util/cli');
+
+    var options = cli.readOptions(argv);
+    var name = options.argv.remain[1];
+    var url = options.argv.remain[2];
+
+    return [name, url];
+};
+
+module.exports = register;

lib/commands/search.js

@@ -27,7 +27,7 @@ function search(logger, name, config) {
 
 // -------------------
 
-search.readOptions = function (argv) {
+search.readOptions = function(argv) {
     var options = cli.readOptions(argv);
     var terms = options.argv.remain.slice(1);
 

lib/commands/uninstall.js

@@ -0,0 +1,132 @@
+var mout = require('mout');
+var Q = require('q');
+var Project = require('../core/Project');
+var defaultConfig = require('../config');
+
+function uninstall(logger, names, options, config) {
+    if (!names.length) {
+        return new Q();
+    }
+
+    var project;
+
+    options = options || {};
+    config = defaultConfig(config);
+    project = new Project(config, logger);
+
+    return project.getTree(options).spread(function(tree, flattened) {
+        // Uninstall nodes
+        return (
+            project
+                .uninstall(names, options)
+                // Clean out non-shared uninstalled dependencies
+                .then(function(uninstalled) {
+                    var names = Object.keys(uninstalled);
+                    var children = [];
+
+                    // Grab the dependencies of packages that were uninstalled
+                    mout.object.forOwn(flattened, function(node) {
+                        if (names.indexOf(node.endpoint.name) !== -1) {
+                            children.push.apply(
+                                children,
+                                mout.object.keys(node.dependencies)
+                            );
+                        }
+                    });
+
+                    // Clean them!
+                    return clean(project, children, uninstalled);
+                })
+        );
+    });
+}
+
+function clean(project, names, removed) {
+    removed = removed || {};
+
+    return project.getTree().spread(function(tree, flattened) {
+        var nodes = [];
+        var dependantsCounter = {};
+
+        // Grab the nodes of each specified name
+        mout.object.forOwn(flattened, function(node) {
+            if (names.indexOf(node.endpoint.name) !== -1) {
+                nodes.push(node);
+            }
+        });
+
+        // Walk the down the tree, gathering dependants of the packages
+        project.walkTree(
+            tree,
+            function(node, nodeName) {
+                if (names.indexOf(nodeName) !== -1) {
+                    dependantsCounter[nodeName] =
+                        dependantsCounter[nodeName] || 0;
+                    dependantsCounter[nodeName] += node.nrDependants;
+                }
+            },
+            true
+        );
+
+        // Filter out those that have no dependants
+        nodes = nodes.filter(function(node) {
+            return !dependantsCounter[node.endpoint.name];
+        });
+
+        // Are we done?
+        if (!nodes.length) {
+            return Q.resolve(removed);
+        }
+
+        // Grab the nodes after filtering
+        names = nodes.map(function(node) {
+            return node.endpoint.name;
+        });
+
+        // Uninstall them
+        return (
+            project
+                .uninstall(names)
+                // Clean out non-shared uninstalled dependencies
+                .then(function(uninstalled) {
+                    var children;
+
+                    mout.object.mixIn(removed, uninstalled);
+
+                    // Grab the dependencies of packages that were uninstalled
+                    children = [];
+                    nodes.forEach(function(node) {
+                        children.push.apply(
+                            children,
+                            mout.object.keys(node.dependencies)
+                        );
+                    });
+
+                    // Recurse!
+                    return clean(project, children, removed);
+                })
+        );
+    });
+}
+
+// -------------------
+
+uninstall.readOptions = function(argv) {
+    var cli = require('../util/cli');
+
+    var options = cli.readOptions(
+        {
+            save: { type: Boolean, shorthand: 'S' },
+            'save-dev': { type: Boolean, shorthand: 'D' }
+        },
+        argv
+    );
+
+    var names = options.argv.remain.slice(1);
+
+    delete options.argv;
+
+    return [names, options];
+};
+
+module.exports = uninstall;

lib/commands/unregister.js

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

lib/commands/update.js

@@ -18,13 +18,16 @@ function update(logger, names, options, config) {
 
 // -------------------
 
-update.readOptions = function (argv) {
+update.readOptions = function(argv) {
     var cli = require('../util/cli');
 
-    var options = cli.readOptions({
-        'force-latest': { type: Boolean, shorthand: 'F' },
-        'production': { type: Boolean, shorthand: 'p' }
-    }, argv);
+    var options = cli.readOptions(
+        {
+            'force-latest': { type: Boolean, shorthand: 'F' },
+            production: { type: Boolean, shorthand: 'p' }
+        },
+        argv
+    );
 
     var names = options.argv.remain.slice(1);
 

lib/commands/version.js

@@ -0,0 +1,210 @@
+var semver = require('semver');
+var which = require('which');
+var fs = require('../util/fs');
+var path = require('path');
+var Q = require('q');
+var execFile = require('child_process').execFile;
+var defaultConfig = require('../config');
+var createError = require('../util/createError');
+
+function version(logger, versionArg, options, config) {
+    options = options || {};
+
+    config = defaultConfig(config);
+
+    return bump(logger, config, versionArg, options.message);
+}
+
+function bump(logger, config, versionArg, message) {
+    var cwd = config.cwd || process.cwd();
+    var newVersion;
+
+    if (!versionArg) {
+        throw createError('No <version> agrument provided', 'EREADOPTIONS');
+    }
+
+    return driver
+        .check(cwd)
+        .then(function() {
+            return Q.all([driver.versions(cwd), driver.currentVersion(cwd)]);
+        })
+        .spread(function(versions, currentVersion) {
+            currentVersion = currentVersion || '0.0.0';
+
+            if (semver.valid(versionArg)) {
+                newVersion = semver.valid(versionArg);
+            } else {
+                newVersion = semver.inc(currentVersion, versionArg);
+
+                if (!newVersion) {
+                    throw createError(
+                        'Invalid <version> argument: ' + versionArg,
+                        'EINVALIDVERSION',
+                        { version: versionArg }
+                    );
+                }
+            }
+
+            newVersion =
+                currentVersion[0] === 'v' ? 'v' + newVersion : newVersion;
+
+            if (versions) {
+                versions.forEach(function(version) {
+                    if (semver.eq(version, newVersion)) {
+                        throw createError(
+                            'Version exists: ' + newVersion,
+                            'EVERSIONEXISTS',
+                            { versions: versions, newVersion: newVersion }
+                        );
+                    }
+                });
+            }
+
+            return driver.bump(cwd, newVersion, message).then(function() {
+                return {
+                    oldVersion: currentVersion,
+                    newVersion: newVersion
+                };
+            });
+        })
+        .then(function(result) {
+            logger.info(
+                'version',
+                'Bumped package version from ' +
+                    result.oldVersion +
+                    ' to ' +
+                    result.newVersion,
+                result
+            );
+
+            return result.newVersion;
+        });
+}
+
+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');
+
+    var options = cli.readOptions(
+        {
+            message: { type: String, shorthand: 'm' }
+        },
+        argv
+    );
+
+    return [options.argv.remain[1], options];
+};
+
+module.exports = version;

lib/config.js

@@ -22,26 +22,26 @@ function readCachedConfig(cwd, overwrites) {
 
     // If interactive is auto (null), guess its value
     if (config.interactive == null) {
-        config.interactive = (
-            process.bin === 'bower' &&
-            tty.isatty(1) &&
-            !process.env.CI
-        );
+        config.interactive =
+            process.bin === 'bower' && tty.isatty(1) && !process.env.CI;
     }
 
     // Merge common CLI options into the config
     if (process.bin === 'bower') {
         var cli = require('./util/cli');
 
-        object.mixIn(config, cli.readOptions({
-            force: { type: Boolean, shorthand: 'f' },
-            offline: { type: Boolean, shorthand: 'o' },
-            verbose: { type: Boolean, shorthand: 'V' },
-            quiet: { type: Boolean, shorthand: 'q' },
-            loglevel: { type: String, shorthand: 'l' },
-            json: { type: Boolean, shorthand: 'j' },
-            silent: { type: Boolean, shorthand: 's' }
-        }));
+        object.mixIn(
+            config,
+            cli.readOptions({
+                force: { type: Boolean, shorthand: 'f' },
+                offline: { type: Boolean, shorthand: 'o' },
+                verbose: { type: Boolean, shorthand: 'V' },
+                quiet: { type: Boolean, shorthand: 'q' },
+                loglevel: { type: String, shorthand: 'l' },
+                json: { type: Boolean, shorthand: 'j' },
+                silent: { type: Boolean, shorthand: 's' }
+            })
+        );
     }
 
     return config;

lib/core/PackageRepository.js

@@ -0,0 +1,304 @@
+var mout = require('mout');
+var Q = require('q');
+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;
+    this._logger = 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
+    this._resolveCache = new ResolveCache(this._config);
+}
+
+// -----------------
+
+PackageRepository.prototype.fetch = function(decEndpoint) {
+    var logger;
+    var that = this;
+    var isTargetable;
+    var info = {
+        decEndpoint: decEndpoint
+    };
+
+    // Create a new logger that pipes everything to ours that will be
+    // used to fetch
+    logger = this._logger.geminate();
+    // Intercept all logs, adding additional information
+    logger.intercept(function(log) {
+        that._extendLog(log, info);
+    });
+
+    return (
+        this._getResolver(decEndpoint, logger)
+            // Decide if we retrieve from the cache or not
+            // Also decide if we validate the cached entry or not
+            .then(function(resolver) {
+                info.resolver = resolver;
+                isTargetable = resolver.constructor.isTargetable;
+
+                if (!resolver.isCacheable()) {
+                    return that._resolve(resolver, logger);
+                }
+
+                // If force flag is used, bypass cache, but write to cache anyway
+                if (that._config.force) {
+                    logger.action(
+                        'resolve',
+                        resolver.getSource() + '#' + resolver.getTarget()
+                    );
+                    return that._resolve(resolver, logger);
+                }
+
+                // Note that we use the resolver methods to query the
+                // cache because transformations/normalisations can occur
+                return (
+                    that._resolveCache
+                        .retrieve(resolver.getSource(), resolver.getTarget())
+                        // Decide if we can use the one from the resolve cache
+                        .spread(function(canonicalDir, pkgMeta) {
+                            // If there's no package in the cache
+                            if (!canonicalDir) {
+                                // And the offline flag is passed, error out
+                                if (that._config.offline) {
+                                    throw createError(
+                                        'No cached version for ' +
+                                            resolver.getSource() +
+                                            '#' +
+                                            resolver.getTarget(),
+                                        'ENOCACHE',
+                                        {
+                                            resolver: resolver
+                                        }
+                                    );
+                                }
+
+                                // Otherwise, we have to resolve it
+                                logger.info(
+                                    'not-cached',
+                                    resolver.getSource() +
+                                        (resolver.getTarget()
+                                            ? '#' + resolver.getTarget()
+                                            : '')
+                                );
+                                logger.action(
+                                    'resolve',
+                                    resolver.getSource() +
+                                        '#' +
+                                        resolver.getTarget()
+                                );
+
+                                return that._resolve(resolver, logger);
+                            }
+
+                            info.canonicalDir = canonicalDir;
+                            info.pkgMeta = pkgMeta;
+
+                            logger.info(
+                                'cached',
+                                resolver.getSource() +
+                                    (pkgMeta._release
+                                        ? '#' + pkgMeta._release
+                                        : '')
+                            );
+
+                            // If offline flag is used, use directly the cached one
+                            if (that._config.offline) {
+                                return [canonicalDir, pkgMeta, isTargetable];
+                            }
+
+                            // Otherwise check for new contents
+                            logger.action(
+                                'validate',
+                                (pkgMeta._release
+                                    ? pkgMeta._release + ' against '
+                                    : '') +
+                                    resolver.getSource() +
+                                    (resolver.getTarget()
+                                        ? '#' + resolver.getTarget()
+                                        : '')
+                            );
+
+                            return resolver
+                                .hasNew(pkgMeta)
+                                .then(function(hasNew) {
+                                    // If there are no new contents, resolve to
+                                    // the cached one
+                                    if (!hasNew) {
+                                        return [
+                                            canonicalDir,
+                                            pkgMeta,
+                                            isTargetable
+                                        ];
+                                    }
+
+                                    // Otherwise resolve to the newest one
+                                    logger.info(
+                                        'new',
+                                        'version for ' +
+                                            resolver.getSource() +
+                                            '#' +
+                                            resolver.getTarget()
+                                    );
+                                    logger.action(
+                                        'resolve',
+                                        resolver.getSource() +
+                                            '#' +
+                                            resolver.getTarget()
+                                    );
+
+                                    return that._resolve(resolver, logger);
+                                });
+                        })
+                );
+            })
+            // If something went wrong, also extend the error
+            .fail(function(err) {
+                that._extendLog(err, info);
+                throw err;
+            })
+    );
+};
+
+PackageRepository.prototype.versions = function(source) {
+    // Resolve the source using the factory because the
+    // source can actually be a registry name
+    return this._getResolver({ source: source }).then(
+        function(resolver) {
+            // If offline, resolve using the cached versions
+            if (this._config.offline) {
+                return this._resolveCache.versions(resolver.getSource());
+            }
+
+            // Otherwise, fetch remotely
+            return resolver.constructor.versions(resolver.getSource());
+        }.bind(this)
+    );
+};
+
+PackageRepository.prototype.eliminate = function(pkgMeta) {
+    return Q.all([
+        this._resolveCache.eliminate(pkgMeta),
+        Q.nfcall(
+            this._registryClient.clearCache.bind(this._registryClient),
+            pkgMeta.name
+        )
+    ]);
+};
+
+PackageRepository.prototype.clear = function() {
+    return Q.all([
+        this._resolveCache.clear(),
+        Q.nfcall(this._registryClient.clearCache.bind(this._registryClient))
+    ]);
+};
+
+PackageRepository.prototype.reset = function() {
+    this._resolveCache.reset();
+    this._registryClient.resetCache();
+};
+
+PackageRepository.prototype.list = function() {
+    return this._resolveCache.list();
+};
+
+PackageRepository.prototype.getRegistryClient = function() {
+    return this._registryClient;
+};
+
+PackageRepository.prototype.getResolveCache = function() {
+    return this._resolveCache;
+};
+
+PackageRepository.clearRuntimeCache = function() {
+    ResolveCache.clearRuntimeCache();
+    RegistryClient.clearRuntimeCache();
+    resolverFactory.clearRuntimeCache();
+};
+
+// ---------------------
+
+PackageRepository.prototype._getResolver = function(decEndpoint, logger) {
+    logger = logger || this._logger;
+
+    // Get the appropriate resolver
+    return resolverFactory(
+        decEndpoint,
+        { config: this._config, logger: logger },
+        this._registryClient
+    );
+};
+
+PackageRepository.prototype._resolve = function(resolver, logger) {
+    var that = this;
+
+    // Resolve the resolver
+    return (
+        resolver
+            .resolve()
+            // Store in the cache
+            .then(function(canonicalDir) {
+                if (!resolver.isCacheable()) {
+                    return canonicalDir;
+                }
+
+                return that._resolveCache.store(
+                    canonicalDir,
+                    resolver.getPkgMeta()
+                );
+            })
+            // Resolve promise with canonical dir and package meta
+            .then(function(dir) {
+                var pkgMeta = resolver.getPkgMeta();
+
+                logger.info(
+                    'resolved',
+                    resolver.getSource() +
+                        (pkgMeta._release ? '#' + pkgMeta._release : '')
+                );
+                return [dir, pkgMeta, resolver.constructor.isTargetable()];
+            })
+    );
+};
+
+PackageRepository.prototype._extendLog = function(log, info) {
+    log.data = log.data || {};
+
+    // Store endpoint info in each log
+    if (info.decEndpoint) {
+        log.data.endpoint = mout.object.pick(info.decEndpoint, [
+            'name',
+            'source',
+            'target'
+        ]);
+    }
+
+    // Store the resolver info in each log
+    if (info.resolver) {
+        log.data.resolver = {
+            name: info.resolver.getName(),
+            source: info.resolver.getSource(),
+            target: info.resolver.getTarget()
+        };
+    }
+
+    // Store the canonical dir and its meta in each log
+    if (info.canonicalDir) {
+        log.data.canonicalDir = info.canonicalDir;
+        log.data.pkgMeta = info.pkgMeta;
+    }
+
+    return log;
+};
+
+module.exports = PackageRepository;

lib/core/ResolveCache.js

@@ -0,0 +1,440 @@
+var fs = require('../util/fs');
+var path = require('path');
+var mout = require('mout');
+var Q = require('q');
+var mkdirp = require('mkdirp');
+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');
+
+function ResolveCache(config) {
+    // TODO: Make some config entries, such as:
+    //       - Max MB
+    //       - Max versions per source
+    //       - Max MB per source
+    //       - etc..
+    this._config = config;
+    this._dir = this._config.storage.packages;
+    this._lockDir = this._config.storage.packages;
+
+    mkdirp.sync(this._lockDir);
+
+    // Cache is stored/retrieved statically to ensure singularity
+    // among instances
+    this._cache = this.constructor._cache.get(this._dir);
+    if (!this._cache) {
+        this._cache = new LRU({
+            max: 100,
+            maxAge: 60 * 5 * 1000 // 5 minutes
+        });
+        this.constructor._cache.set(this._dir, this._cache);
+    }
+
+    // Ensure dir is created
+    mkdirp.sync(this._dir);
+}
+
+// -----------------
+
+ResolveCache.prototype.retrieve = function(source, target) {
+    var sourceId = md5(source);
+    var dir = path.join(this._dir, sourceId);
+    var that = this;
+
+    target = target || '*';
+
+    return this._getVersions(sourceId)
+        .spread(function(versions) {
+            var suitable;
+
+            // If target is a semver, find a suitable version
+            if (semver.validRange(target)) {
+                suitable = semver.maxSatisfying(versions, target, true);
+
+                if (suitable) {
+                    return suitable;
+                }
+            }
+
+            // If target is '*' check if there's a cached '_wildcard'
+            if (target === '*') {
+                return mout.array.find(versions, function(version) {
+                    return version === '_wildcard';
+                });
+            }
+
+            // Otherwise check if there's an exact match
+            return mout.array.find(versions, function(version) {
+                return version === target;
+            });
+        })
+        .then(function(version) {
+            var canonicalDir;
+
+            if (!version) {
+                return [];
+            }
+
+            // Resolve with canonical dir and package meta
+            canonicalDir = path.join(dir, encodeURIComponent(version));
+            return that._readPkgMeta(canonicalDir).then(
+                function(pkgMeta) {
+                    return [canonicalDir, pkgMeta];
+                },
+                function() {
+                    // If there was an error, invalidate the in-memory cache,
+                    // delete the cached package and try again
+                    that._cache.del(sourceId);
+
+                    return Q.nfcall(rimraf, canonicalDir).then(function() {
+                        return that.retrieve(source, target);
+                    });
+                }
+            );
+        });
+};
+
+ResolveCache.prototype.store = function(canonicalDir, pkgMeta) {
+    var sourceId;
+    var release;
+    var dir;
+    var pkgLock;
+    var promise;
+    var that = this;
+
+    promise = pkgMeta ? Q.resolve(pkgMeta) : this._readPkgMeta(canonicalDir);
+
+    return promise
+        .then(function(pkgMeta) {
+            sourceId = md5(pkgMeta._source);
+            release = that._getPkgRelease(pkgMeta);
+            dir = path.join(that._dir, sourceId, release);
+            pkgLock = path.join(
+                that._lockDir,
+                sourceId + '-' + release + '.lock'
+            );
+
+            // Check if destination directory exists to prevent issuing lock at all times
+            return Q.nfcall(fs.stat, dir)
+                .fail(function(err) {
+                    var lockParams = { wait: 250, retries: 25, stale: 60000 };
+                    return Q.nfcall(lockFile.lock, pkgLock, lockParams)
+                        .then(function() {
+                            // Ensure other process didn't start copying files before lock was created
+                            return Q.nfcall(fs.stat, dir).fail(function(err) {
+                                // If stat fails, it is expected to return ENOENT
+                                if (err.code !== 'ENOENT') {
+                                    throw err;
+                                }
+
+                                // Create missing directory and copy files there
+                                return Q.nfcall(mkdirp, path.dirname(dir)).then(
+                                    function() {
+                                        return Q.nfcall(
+                                            fs.rename,
+                                            canonicalDir,
+                                            dir
+                                        ).fail(function(err) {
+                                            // If error is EXDEV it means that we are trying to rename
+                                            // across different drives, so we copy and remove it instead
+                                            if (err.code !== 'EXDEV') {
+                                                throw err;
+                                            }
+
+                                            return copy.copyDir(
+                                                canonicalDir,
+                                                dir
+                                            );
+                                        });
+                                    }
+                                );
+                            });
+                        })
+                        .finally(function() {
+                            lockFile.unlockSync(pkgLock);
+                        });
+                })
+                .finally(function() {
+                    // Ensure no tmp dir is left on disk.
+                    return Q.nfcall(rimraf, canonicalDir);
+                });
+        })
+        .then(function() {
+            var versions = that._cache.get(sourceId);
+
+            // Add it to the in memory cache
+            // and sort the versions afterwards
+            if (versions && versions.indexOf(release) === -1) {
+                versions.push(release);
+                that._sortVersions(versions);
+            }
+
+            // Resolve with the final location
+            return dir;
+        });
+};
+
+ResolveCache.prototype.eliminate = function(pkgMeta) {
+    var sourceId = md5(pkgMeta._source);
+    var release = this._getPkgRelease(pkgMeta);
+    var dir = path.join(this._dir, sourceId, release);
+    var that = this;
+
+    return Q.nfcall(rimraf, dir).then(function() {
+        var versions = that._cache.get(sourceId) || [];
+        mout.array.remove(versions, release);
+
+        // If this was the last package in the cache,
+        // delete the parent folder (source)
+        // For extra security, check against the file system
+        // if this was really the last package
+        if (!versions.length) {
+            that._cache.del(sourceId);
+
+            return that._getVersions(sourceId).spread(function(versions) {
+                if (!versions.length) {
+                    // Do not keep in-memory cache if it's completely
+                    // empty
+                    that._cache.del(sourceId);
+
+                    return Q.nfcall(rimraf, path.dirname(dir));
+                }
+            });
+        }
+    });
+};
+
+ResolveCache.prototype.clear = function() {
+    return Q.nfcall(rimraf, this._dir)
+        .then(
+            function() {
+                return Q.nfcall(fs.mkdir, this._dir);
+            }.bind(this)
+        )
+        .then(
+            function() {
+                this._cache.reset();
+            }.bind(this)
+        );
+};
+
+ResolveCache.prototype.reset = function() {
+    this._cache.reset();
+    return this;
+};
+
+ResolveCache.prototype.versions = function(source) {
+    var sourceId = md5(source);
+
+    return this._getVersions(sourceId).spread(function(versions) {
+        return versions.filter(function(version) {
+            return semver.valid(version);
+        });
+    });
+};
+
+ResolveCache.prototype.list = function() {
+    var promises;
+    var dirs = [];
+    var that = this;
+
+    // Get the list of directories
+    return (
+        Q.nfcall(fs.readdir, this._dir)
+            .then(function(sourceIds) {
+                promises = sourceIds.map(function(sourceId) {
+                    return Q.nfcall(
+                        fs.readdir,
+                        path.join(that._dir, sourceId)
+                    ).then(
+                        function(versions) {
+                            versions.forEach(function(version) {
+                                var dir = path.join(
+                                    that._dir,
+                                    sourceId,
+                                    version
+                                );
+                                dirs.push(dir);
+                            });
+                        },
+                        function(err) {
+                            // Ignore lurking files, e.g.: .DS_Store if the user
+                            // has navigated throughout the cache
+                            if (err.code === 'ENOTDIR' && err.path) {
+                                return Q.nfcall(rimraf, err.path);
+                            }
+
+                            throw err;
+                        }
+                    );
+                });
+
+                return Q.all(promises);
+            })
+            // Read every package meta
+            .then(function() {
+                promises = dirs.map(function(dir) {
+                    return that._readPkgMeta(dir).then(
+                        function(pkgMeta) {
+                            return {
+                                canonicalDir: dir,
+                                pkgMeta: pkgMeta
+                            };
+                        },
+                        function() {
+                            // If it fails to read, invalidate the in memory
+                            // cache for the source and delete the entry directory
+                            var sourceId = path.basename(path.dirname(dir));
+                            that._cache.del(sourceId);
+
+                            return Q.nfcall(rimraf, dir);
+                        }
+                    );
+                });
+
+                return Q.all(promises);
+            })
+            // Sort by name ASC & release ASC
+            .then(function(entries) {
+                // Ignore falsy entries due to errors reading
+                // package metas
+                entries = entries.filter(function(entry) {
+                    return !!entry;
+                });
+
+                return entries.sort(function(entry1, entry2) {
+                    var pkgMeta1 = entry1.pkgMeta;
+                    var pkgMeta2 = entry2.pkgMeta;
+                    var comp = pkgMeta1.name.localeCompare(pkgMeta2.name);
+
+                    // Sort by name
+                    if (comp) {
+                        return comp;
+                    }
+
+                    // Sort by version
+                    if (pkgMeta1.version && pkgMeta2.version) {
+                        return semver.compare(
+                            pkgMeta1.version,
+                            pkgMeta2.version
+                        );
+                    }
+                    if (pkgMeta1.version) {
+                        return -1;
+                    }
+                    if (pkgMeta2.version) {
+                        return 1;
+                    }
+
+                    // Sort by target
+                    return pkgMeta1._target.localeCompare(pkgMeta2._target);
+                });
+            })
+    );
+};
+
+// ------------------------
+
+ResolveCache.clearRuntimeCache = function() {
+    // Note that _cache refers to the static _cache variable
+    // that holds other caches per dir!
+    // Do not confuse it with the instance cache
+
+    // Clear cache of each directory
+    this._cache.forEach(function(cache) {
+        cache.reset();
+    });
+
+    // Clear root cache
+    this._cache.reset();
+};
+
+// ------------------------
+
+ResolveCache.prototype._getPkgRelease = function(pkgMeta) {
+    var release =
+        pkgMeta.version ||
+        (pkgMeta._target === '*' ? '_wildcard' : pkgMeta._target);
+
+    // Encode some dangerous chars such as / and \
+    release = encodeURIComponent(release);
+
+    return release;
+};
+
+ResolveCache.prototype._readPkgMeta = function(dir) {
+    var filename = path.join(dir, '.bower.json');
+
+    return readJson(filename).spread(function(json) {
+        return json;
+    });
+};
+
+ResolveCache.prototype._getVersions = function(sourceId) {
+    var dir;
+    var versions = this._cache.get(sourceId);
+    var that = this;
+
+    if (versions) {
+        return Q.resolve([versions, true]);
+    }
+
+    dir = path.join(this._dir, sourceId);
+    return Q.nfcall(fs.readdir, dir).then(
+        function(versions) {
+            // Sort and cache in memory
+            that._sortVersions(versions);
+            versions = versions.map(decodeURIComponent);
+            that._cache.set(sourceId, versions);
+            return [versions, false];
+        },
+        function(err) {
+            // If the directory does not exists, resolve
+            // as an empty array
+            if (err.code === 'ENOENT') {
+                versions = [];
+                that._cache.set(sourceId, versions);
+                return [versions, false];
+            }
+
+            throw err;
+        }
+    );
+};
+
+ResolveCache.prototype._sortVersions = function(versions) {
+    // Sort DESC
+    versions.sort(function(version1, version2) {
+        var validSemver1 = semver.valid(version1);
+        var validSemver2 = semver.valid(version2);
+
+        // If both are semvers, compare them
+        if (validSemver1 && validSemver2) {
+            return semver.rcompare(version1, version2);
+        }
+
+        // If one of them are semvers, give higher priority
+        if (validSemver1) {
+            return -1;
+        }
+        if (validSemver2) {
+            return 1;
+        }
+
+        // Otherwise they are considered equal
+        return 0;
+    });
+};
+
+// ------------------------
+
+ResolveCache._cache = new LRU({
+    max: 5,
+    maxAge: 60 * 30 * 1000 // 30 minutes
+});
+
+module.exports = ResolveCache;

lib/core/resolverFactory.js

@@ -0,0 +1,279 @@
+var Q = require('q');
+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('../version');
+
+    return getConstructor(decEndpoint, options, registryClient).spread(function(
+        ConcreteResolver,
+        decEndpoint
+    ) {
+        return new ConcreteResolver(
+            decEndpoint,
+            options.config,
+            options.logger
+        );
+    });
+}
+
+function getConstructor(decEndpoint, options, registryClient) {
+    var source = decEndpoint.source;
+    var config = options.config;
+
+    // Below we try a series of async tests to guess the type of resolver to use
+    // If a step was unable to guess the resolver, it returns undefined
+    // If a step can guess the resolver, it returns with constructor of resolver
+
+    var promise = Q.resolve();
+
+    var addResolver = function(resolverFactory) {
+        promise = promise.then(function(result) {
+            if (result === undefined) {
+                return resolverFactory(decEndpoint, options);
+            } else {
+                return result;
+            }
+        });
+    };
+
+    // Plugin resolvers.
+    //
+    // It requires each resolver defined in config.resolvers and calls
+    // its "match" to check if given resolves supports given decEndpoint
+    addResolver(function() {
+        var selectedResolver;
+        var resolverNames;
+
+        if (Array.isArray(config.resolvers)) {
+            resolverNames = config.resolvers;
+        } else if (!!config.resolvers) {
+            resolverNames = config.resolvers.split(',');
+        } else {
+            resolverNames = [];
+        }
+
+        var resolverPromises = resolverNames.map(function(resolverName) {
+            var resolver = resolvers[resolverName];
+
+            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) {
+                    var match = resolver.match.bind(resolver);
+
+                    return Q.fcall(match, source).then(function(result) {
+                        if (result) {
+                            return (selectedResolver = resolver);
+                        }
+                    });
+                } else {
+                    return selectedResolver;
+                }
+            };
+        });
+
+        return resolverPromises
+            .reduce(Q.when, new Q(undefined))
+            .then(function(resolver) {
+                if (resolver) {
+                    return Q.fcall(
+                        resolver.locate.bind(resolver),
+                        decEndpoint.source
+                    ).then(function(result) {
+                        if (result && result !== decEndpoint.source) {
+                            decEndpoint.source = result;
+                            decEndpoint.registry = true;
+                            return getConstructor(
+                                decEndpoint,
+                                options,
+                                registryClient
+                            );
+                        } else {
+                            return [resolver, decEndpoint];
+                        }
+                    });
+                }
+            });
+    });
+
+    // Git case: git git+ssh, git+http, git+https
+    //           .git at the end (probably ssh shorthand)
+    //           git@ at the start
+    addResolver(function() {
+        if (
+            /^git(\+(ssh|https?))?:\/\//i.test(source) ||
+            /\.git\/?$/i.test(source) ||
+            /^git@/i.test(source)
+        ) {
+            decEndpoint.source = source.replace(/^git\+/, '');
+
+            // If it's a GitHub repository, return the specialized resolver
+            if (resolvers.GitHub.getOrgRepoPair(source)) {
+                return [resolvers.GitHub, decEndpoint];
+            }
+
+            return [resolvers.GitRemote, decEndpoint];
+        }
+    });
+
+    // SVN case: svn, svn+ssh, svn+http, svn+https, svn+file
+    addResolver(function() {
+        if (/^svn(\+(ssh|https?|file))?:\/\//i.test(source)) {
+            return [resolvers.Svn, decEndpoint];
+        }
+    });
+
+    // URL case
+    addResolver(function() {
+        if (/^https?:\/\//i.exec(source)) {
+            return [resolvers.Url, decEndpoint];
+        }
+    });
+
+    // If source is ./ or ../ or an absolute path
+
+    addResolver(function() {
+        var absolutePath = path.resolve(config.cwd, source);
+
+        if (
+            /^\.\.?[\/\\]/.test(source) ||
+            /^~\//.test(source) ||
+            path.normalize(source).replace(/[\/\\]+$/, '') === absolutePath
+        ) {
+            return (
+                Q.nfcall(fs.stat, path.join(absolutePath, '.git'))
+                    .then(function(stats) {
+                        decEndpoint.source = absolutePath;
+
+                        if (stats.isDirectory()) {
+                            return Q.resolve([resolvers.GitFs, decEndpoint]);
+                        }
+
+                        throw new Error('Not a Git repository');
+                    })
+                    // If not, check if source is a valid Subversion repository
+                    .fail(function() {
+                        return Q.nfcall(
+                            fs.stat,
+                            path.join(absolutePath, '.svn')
+                        ).then(function(stats) {
+                            decEndpoint.source = absolutePath;
+
+                            if (stats.isDirectory()) {
+                                return Q.resolve([resolvers.Svn, decEndpoint]);
+                            }
+
+                            throw new Error('Not a Subversion repository');
+                        });
+                    })
+                    // If not, check if source is a valid file/folder
+                    .fail(function() {
+                        return Q.nfcall(fs.stat, absolutePath).then(function() {
+                            decEndpoint.source = absolutePath;
+
+                            return Q.resolve([resolvers.Fs, decEndpoint]);
+                        });
+                    })
+            );
+        }
+    });
+
+    // Check if is a shorthand and expand it
+    addResolver(function() {
+        // Check if the shorthandResolver is falsy
+        if (!config.shorthandResolver) {
+            return;
+        }
+
+        // Skip ssh and/or URL with auth
+        if (/[:@]/.test(source)) {
+            return;
+        }
+
+        // Ensure exactly only one "/"
+        var parts = source.split('/');
+        if (parts.length === 2) {
+            decEndpoint.source = mout.string.interpolate(
+                config.shorthandResolver,
+                {
+                    shorthand: source,
+                    owner: parts[0],
+                    package: parts[1]
+                }
+            );
+
+            return getConstructor(decEndpoint, options, registryClient);
+        }
+    });
+
+    // As last resort, we try the registry
+    addResolver(function() {
+        if (!registryClient) {
+            return;
+        }
+
+        return Q.nfcall(
+            registryClient.lookup.bind(registryClient),
+            source
+        ).then(function(entry) {
+            if (!entry) {
+                throw createError(
+                    'Package ' + source + ' not found',
+                    'ENOTFOUND'
+                );
+            }
+
+            decEndpoint.registry = true;
+
+            if (!decEndpoint.name) {
+                decEndpoint.name = decEndpoint.source;
+            }
+
+            decEndpoint.source = entry.url;
+
+            return getConstructor(decEndpoint, options);
+        });
+    });
+
+    addResolver(function() {
+        throw createError(
+            'Could not find appropriate resolver for ' + source,
+            'ENORESOLVER'
+        );
+    });
+
+    return promise;
+}
+
+function clearRuntimeCache() {
+    mout.object.values(resolvers).forEach(function(ConcreteResolver) {
+        ConcreteResolver.clearRuntimeCache();
+    });
+}
+
+module.exports = createInstance;
+module.exports.getConstructor = getConstructor;
+module.exports.clearRuntimeCache = clearRuntimeCache;

lib/core/resolvers/FsResolver.js

@@ -17,13 +17,19 @@ function FsResolver(decEndpoint, config, logger) {
 
     // If target was specified, simply reject the promise
     if (this._target !== '*') {
-        throw createError('File system sources can\'t resolve targets', 'ENORESTARGET');
+        throw createError(
+            "File system sources can't resolve targets",
+            'ENORESTARGET'
+        );
     }
 
     // If the name was guessed
     if (this._guessedName) {
         // Remove extension
-        this._name = this._name.substr(0, this._name.length - path.extname(this._name).length);
+        this._name = this._name.substr(
+            0,
+            this._name.length - path.extname(this._name).length
+        );
     }
 }
 
@@ -32,7 +38,7 @@ mout.object.mixIn(FsResolver, Resolver);
 
 // -----------------
 
-FsResolver.isTargetable = function () {
+FsResolver.isTargetable = function() {
     return false;
 };
 
@@ -42,19 +48,18 @@ FsResolver.isTargetable = function () {
 // TODO: There's room for improvement by using streams if the source
 //       is an archive file, by piping read stream to the zip extractor
 //       This will likely increase the complexity of code but might worth it
-FsResolver.prototype._resolve = function () {
+FsResolver.prototype._resolve = function() {
     return this._copy()
-    .then(this._extract.bind(this))
-    .then(this._rename.bind(this));
+        .then(this._extract.bind(this))
+        .then(this._rename.bind(this));
 };
 
 // -----------------
 
-FsResolver.prototype._copy = function () {
+FsResolver.prototype._copy = function() {
     var that = this;
 
-    return Q.nfcall(fs.stat, this._source)
-    .then(function (stat) {
+    return Q.nfcall(fs.stat, this._source).then(function(stat) {
         var dst;
         var copyOpts;
         var promise;
@@ -68,22 +73,24 @@ FsResolver.prototype._copy = function () {
 
             // Read the bower.json inside the folder, so that we
             // copy only the necessary files if it has ignore specified
-            promise = that._readJson(that._source)
-            .then(function (json) {
-                copyOpts.ignore = json.ignore;
-                return copy.copyDir(that._source, dst, copyOpts);
-            })
-            .then(function () {
-                // Resolve to null because it's a dir
-                return;
-            });
-        // Else it's a file
+            promise = that
+                ._readJson(that._source)
+                .then(function(json) {
+                    copyOpts.ignore = json.ignore;
+                    return copy.copyDir(that._source, dst, copyOpts);
+                })
+                .then(function() {
+                    // Resolve to null because it's a dir
+                    return;
+                });
+            // Else it's a file
         } else {
             dst = path.join(that._tempDir, path.basename(that._source));
-            promise = copy.copyFile(that._source, dst, copyOpts)
-            .then(function () {
-                return dst;
-            });
+            promise = copy
+                .copyFile(that._source, dst, copyOpts)
+                .then(function() {
+                    return dst;
+                });
         }
 
         that._logger.action('copy', that._source, {
@@ -95,7 +102,7 @@ FsResolver.prototype._copy = function () {
     });
 };
 
-FsResolver.prototype._extract = function (file) {
+FsResolver.prototype._extract = function(file) {
     if (!file || !extract.canExtract(file)) {
         return Q.resolve();
     }
@@ -108,30 +115,34 @@ FsResolver.prototype._extract = function (file) {
     return extract(file, this._tempDir);
 };
 
-FsResolver.prototype._rename = function () {
-    return Q.nfcall(fs.readdir, this._tempDir)
-    .then(function (files) {
-        var file;
-        var oldPath;
-        var newPath;
+FsResolver.prototype._rename = function() {
+    return Q.nfcall(fs.readdir, this._tempDir).then(
+        function(files) {
+            var file;
+            var oldPath;
+            var newPath;
 
-        // Remove any OS specific files from the files array
-        // before checking its length
-        files = files.filter(junk.isnt);
+            // Remove any OS specific files from the files array
+            // before checking its length
+            files = files.filter(junk.isnt);
 
-        // Only rename if there's only one file and it's not the json
-        if (files.length === 1 && !/^(bower|component)\.json$/.test(files[0])) {
-            file = files[0];
-            this._singleFile = 'index' + path.extname(file);
-            oldPath = path.join(this._tempDir, file);
-            newPath = path.join(this._tempDir, this._singleFile);
+            // Only rename if there's only one file and it's not the json
+            if (
+                files.length === 1 &&
+                !/^(bower|component)\.json$/.test(files[0])
+            ) {
+                file = files[0];
+                this._singleFile = 'index' + path.extname(file);
+                oldPath = path.join(this._tempDir, file);
+                newPath = path.join(this._tempDir, this._singleFile);
 
-            return Q.nfcall(fs.rename, oldPath, newPath);
-        }
-    }.bind(this));
+                return Q.nfcall(fs.rename, oldPath, newPath);
+            }
+        }.bind(this)
+    );
 };
 
-FsResolver.prototype._savePkgMeta = function (meta) {
+FsResolver.prototype._savePkgMeta = function(meta) {
     // Store main if is a single file
     if (this._singleFile) {
         meta.main = this._singleFile;

lib/core/resolvers/GitFsResolver.js

@@ -0,0 +1,102 @@
+var util = require('util');
+var Q = require('q');
+var mout = require('mout');
+var path = require('path');
+var GitResolver = require('./GitResolver');
+var copy = require('../../util/copy');
+var cmd = require('../../util/cmd');
+
+function GitFsResolver(decEndpoint, config, logger) {
+    GitResolver.call(this, decEndpoint, config, logger);
+
+    // Ensure absolute path
+    this._source = path.resolve(this._config.cwd, this._source);
+}
+
+util.inherits(GitFsResolver, GitResolver);
+mout.object.mixIn(GitFsResolver, GitResolver);
+
+// -----------------
+
+// Override the checkout function to work with the local copy
+GitFsResolver.prototype._checkout = function() {
+    var resolution = this._resolution;
+
+    // The checkout process could be similar to the GitRemoteResolver by prepending file:// to the source
+    // But from my performance measures, it's faster to copy the folder and just checkout in there
+    this._logger.action(
+        'checkout',
+        resolution.tag || resolution.branch || resolution.commit,
+        {
+            resolution: resolution,
+            to: this._tempDir
+        }
+    );
+
+    // Copy files to the temporary directory first
+    return (
+        this._copy()
+            .then(
+                cmd.bind(
+                    cmd,
+                    'git',
+                    [
+                        'checkout',
+                        '-f',
+                        resolution.tag || resolution.branch || resolution.commit
+                    ],
+                    { cwd: this._tempDir }
+                )
+            )
+            // Cleanup unstaged files
+            .then(
+                cmd.bind(cmd, 'git', ['clean', '-f', '-d'], {
+                    cwd: this._tempDir
+                })
+            )
+    );
+};
+
+GitFsResolver.prototype._copy = function() {
+    return copy.copyDir(this._source, this._tempDir);
+};
+
+// -----------------
+
+// Grab refs locally
+GitFsResolver.refs = function(source) {
+    var value;
+
+    // TODO: Normalize source because of the various available protocols?
+    value = this._cache.refs.get(source);
+    if (value) {
+        return Q.resolve(value);
+    }
+
+    value = cmd('git', ['show-ref', '--tags', '--heads'], {
+        cwd: source
+    }).spread(
+        function(stdout) {
+            var refs;
+
+            refs = stdout
+                .toString()
+                .trim() // Trim trailing and leading spaces
+                .replace(/[\t ]+/g, ' ') // Standardize spaces (some git versions make tabs, other spaces)
+                .split(/[\r\n]+/); // Split lines into an array
+
+            // Update the refs with the actual refs
+            this._cache.refs.set(source, refs);
+
+            return refs;
+        }.bind(this)
+    );
+
+    // Store the promise to be reused until it resolves
+    // to a specific value
+    this._cache.refs.set(source, value);
+
+    return value;
+};
+
+module.exports = GitFsResolver;

lib/core/resolvers/GitHubResolver.js

@@ -0,0 +1,191 @@
+var util = require('util');
+var path = require('path');
+var mout = require('mout');
+var Q = require('q');
+var GitRemoteResolver = require('./GitRemoteResolver');
+var download = require('../../util/download');
+var extract = require('../../util/extract');
+var createError = require('../../util/createError');
+
+function GitHubResolver(decEndpoint, config, logger) {
+    var pair;
+
+    GitRemoteResolver.call(this, decEndpoint, config, logger);
+
+    // Grab the org/repo
+    // /xxxxx/yyyyy.git or :xxxxx/yyyyy.git (.git is optional)
+    pair = GitHubResolver.getOrgRepoPair(this._source);
+    if (!pair) {
+        throw createError('Invalid GitHub URL', 'EINVEND', {
+            details: this._source + ' does not seem to be a valid GitHub URL'
+        });
+    }
+
+    this._org = pair.org;
+    this._repo = pair.repo;
+
+    // Ensure trailing for all protocols
+    if (!mout.string.endsWith(this._source, '.git')) {
+        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() {
+        return Q.resolve(true);
+    };
+}
+
+util.inherits(GitHubResolver, GitRemoteResolver);
+mout.object.mixIn(GitHubResolver, GitRemoteResolver);
+
+// -----------------
+
+GitHubResolver.prototype._checkout = function() {
+    var msg;
+    var name =
+        this._resolution.tag ||
+        this._resolution.branch ||
+        this._resolution.commit;
+    var tarballUrl =
+        'https://github.com/' +
+        this._org +
+        '/' +
+        this._repo +
+        '/archive/' +
+        name +
+        '.tar.gz';
+
+    var file = path.join(this._tempDir, 'archive.tar.gz');
+    var reqHeaders = {};
+    var that = this;
+
+    if (this._config.userAgent) {
+        reqHeaders['User-Agent'] = this._config.userAgent;
+    }
+
+    this._logger.action('download', tarballUrl, {
+        url: that._source,
+        to: file
+    });
+
+    // Download tarball
+    return download(tarballUrl, file, {
+        ca: this._config.ca.default,
+        strictSSL: this._config.strictSsl,
+        timeout: this._config.timeout,
+        headers: reqHeaders
+    })
+        .progress(function(state) {
+            // Retry?
+            if (state.retry) {
+                msg =
+                    'Download of ' +
+                    tarballUrl +
+                    ' failed with ' +
+                    state.error.code +
+                    ', ';
+                msg += 'retrying in ' + (state.delay / 1000).toFixed(1) + 's';
+                that._logger.debug('error', state.error.message, {
+                    error: state.error
+                });
+                return that._logger.warn('retry', msg);
+            }
+
+            // Progress
+            msg =
+                'received ' + (state.received / 1024 / 1024).toFixed(1) + 'MB';
+            if (state.total) {
+                msg +=
+                    ' of ' +
+                    (state.total / 1024 / 1024).toFixed(1) +
+                    'MB downloaded, ';
+                msg += state.percent + '%';
+            }
+            that._logger.info('progress', msg);
+        })
+        .then(
+            function() {
+                // Extract archive
+                that._logger.action('extract', path.basename(file), {
+                    archive: file,
+                    to: that._tempDir
+                });
+
+                return (
+                    extract(file, that._tempDir)
+                        // Fallback to standard git clone if extraction failed
+                        .fail(function(err) {
+                            msg =
+                                'Decompression of ' +
+                                path.basename(file) +
+                                ' failed' +
+                                (err.code ? ' with ' + err.code : '') +
+                                ', ';
+                            msg += 'trying with git..';
+                            that._logger.debug('error', err.message, {
+                                error: err
+                            });
+                            that._logger.warn('retry', msg);
+
+                            return that
+                                ._cleanTempDir()
+                                .then(
+                                    GitRemoteResolver.prototype._checkout.bind(
+                                        that
+                                    )
+                                );
+                        })
+                );
+                // Fallback to standard git clone if download failed
+            },
+            function(err) {
+                msg =
+                    'Download of ' +
+                    tarballUrl +
+                    ' failed' +
+                    (err.code ? ' with ' + err.code : '') +
+                    ', ';
+                msg += 'trying with git..';
+                that._logger.debug('error', err.message, { error: err });
+                that._logger.warn('retry', msg);
+
+                return that
+                    ._cleanTempDir()
+                    .then(GitRemoteResolver.prototype._checkout.bind(that));
+            }
+        );
+};
+
+GitHubResolver.prototype._savePkgMeta = function(meta) {
+    // Set homepage if not defined
+    if (!meta.homepage) {
+        meta.homepage = 'https://github.com/' + this._org + '/' + this._repo;
+    }
+
+    return GitRemoteResolver.prototype._savePkgMeta.call(this, meta);
+};
+
+// ----------------
+
+GitHubResolver.getOrgRepoPair = function(url) {
+    var match;
+
+    match = url.match(
+        /(?:@|:\/\/)github.com[:\/]([^\/\s]+?)\/([^\/\s]+?)(?:\.git)?\/?$/i
+    );
+    if (!match) {
+        return null;
+    }
+
+    return {
+        org: match[1],
+        repo: match[2]
+    };
+};
+
+module.exports = GitHubResolver;

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;
@@ -37,33 +37,37 @@ mout.object.mixIn(GitRemoteResolver, GitResolver);
 
 // -----------------
 
-GitRemoteResolver.prototype._checkout = function () {
+GitRemoteResolver.prototype._checkout = function() {
     var promise;
     var timer;
     var reporter;
     var that = this;
     var resolution = this._resolution;
 
-    this._logger.action('checkout', resolution.tag || resolution.branch || resolution.commit, {
-        resolution: resolution,
-        to: this._tempDir
-    });
+    this._logger.action(
+        'checkout',
+        resolution.tag || resolution.branch || resolution.commit,
+        {
+            resolution: resolution,
+            to: this._tempDir
+        }
+    );
 
     // If resolution is a commit, we need to clone the entire repo and check it out
     // Because a commit is not a named ref, there's no better solution
     if (resolution.type === 'commit') {
         promise = this._slowClone(resolution);
-    // Otherwise we are checking out a named ref so we can optimize it
+        // Otherwise we are checking out a named ref so we can optimize it
     } else {
         promise = this._fastClone(resolution);
     }
 
     // Throttle the progress reporter to 1 time each sec
-    reporter = mout.fn.throttle(function (data) {
+    reporter = mout.fn.throttle(function(data) {
         var lines;
 
         lines = data.split(/[\r\n]+/);
-        lines.forEach(function (line) {
+        lines.forEach(function(line) {
             if (/\d{1,3}\%/.test(line)) {
                 // TODO: There are some strange chars that appear once in a while (\u001b[K)
                 //       Trim also those?
@@ -73,94 +77,125 @@ GitRemoteResolver.prototype._checkout = function () {
     }, 1000);
 
     // Start reporting progress after a few seconds
-    timer = setTimeout(function () {
+    timer = setTimeout(function() {
         promise.progress(reporter);
     }, 8000);
 
-    return promise
-    // Add additional proxy information to the error if necessary
-    .fail(function (err) {
-        that._suggestProxyWorkaround(err);
-        throw err;
-    })
-    // Clear timer at the end
-    .fin(function () {
-        clearTimeout(timer);
-        reporter.cancel();
-    });
+    return (
+        promise
+            // Add additional proxy information to the error if necessary
+            .fail(function(err) {
+                that._suggestProxyWorkaround(err);
+                throw err;
+            })
+            // Clear timer at the end
+            .fin(function() {
+                clearTimeout(timer);
+                reporter.cancel();
+            })
+    );
 };
 
-GitRemoteResolver.prototype._findResolution = function (target) {
+GitRemoteResolver.prototype._findResolution = function(target) {
     var that = this;
 
     // Override this function to include a meaningful message related to proxies
     // if necessary
-    return GitResolver.prototype._findResolution.call(this, target)
-    .fail(function (err) {
-        that._suggestProxyWorkaround(err);
-        throw err;
-    });
+    return GitResolver.prototype._findResolution
+        .call(this, target)
+        .fail(function(err) {
+            that._suggestProxyWorkaround(err);
+            throw err;
+        });
 };
 
 // ------------------------------
 
-GitRemoteResolver.prototype._slowClone = function (resolution) {
-    return cmd('git', ['clone', this._source, this._tempDir, '--progress'])
-    .then(cmd.bind(cmd, 'git', ['checkout', resolution.commit], { cwd: this._tempDir }));
+GitRemoteResolver.prototype._slowClone = function(resolution) {
+    return cmd('git', [
+        'clone',
+        this._source,
+        this._tempDir,
+        '--progress'
+    ]).then(
+        cmd.bind(cmd, 'git', ['checkout', resolution.commit], {
+            cwd: this._tempDir
+        })
+    );
 };
 
-GitRemoteResolver.prototype._fastClone = function (resolution) {
+GitRemoteResolver.prototype._fastClone = function(resolution) {
     var branch,
         args,
         that = this;
 
     branch = resolution.tag || resolution.branch;
-    args = ['clone',  this._source, '-b', branch, '--progress', '.'];
+    args = ['clone', this._source, '-b', branch, '--progress', '.'];
 
-    return this._shallowClone().then(function (shallowCloningSupported) {
+    return this._shallowClone().then(function(shallowCloningSupported) {
         // If the host does not support shallow clones, we don't use --depth=1
-        if (shallowCloningSupported && !GitRemoteResolver._noShallow.get(that._host)) {
+        if (
+            shallowCloningSupported &&
+            !GitRemoteResolver._noShallow.get(that._host)
+        ) {
             args.push('--depth', 1);
         }
 
-        return cmd('git', args, { cwd: that._tempDir })
-        .spread(function (stdout, stderr) {
-            // Only after 1.7.10 --branch accepts tags
-            // Detect those cases and inform the user to update git otherwise it's
-            // a lot slower than newer versions
-            if (!/branch .+? not found/i.test(stderr)) {
-                return;
-            }
+        return cmd('git', args, { cwd: that._tempDir }).spread(
+            function(stdout, stderr) {
+                // Only after 1.7.10 --branch accepts tags
+                // Detect those cases and inform the user to update git otherwise it's
+                // a lot slower than newer versions
+                if (!/branch .+? not found/i.test(stderr)) {
+                    return;
+                }
 
-            that._logger.warn('old-git', 'It seems you are using an old version of git, it will be slower and propitious to errors!');
-            return cmd('git', ['checkout', resolution.commit], { cwd: that._tempDir });
-        }, function (err) {
-            // Some git servers do not support shallow clones
-            // When that happens, we mark this host and try again
-            if (!GitRemoteResolver._noShallow.has(that._source) &&
-                err.details &&
-                /(rpc failed|shallow|--depth)/i.test(err.details)
+                that._logger.warn(
+                    'old-git',
+                    'It seems you are using an old version of git, it will be slower and propitious to errors!'
+                );
+                return cmd('git', ['checkout', resolution.commit], {
+                    cwd: that._tempDir
+                });
+            },
+            function(err) {
+                // Some git servers do not support shallow clones
+                // When that happens, we mark this host and try again
+                if (
+                    !GitRemoteResolver._noShallow.has(that._source) &&
+                    err.details &&
+                    /(rpc failed|shallow|--depth)/i.test(err.details)
                 ) {
-                GitRemoteResolver._noShallow.set(that._host, true);
-                return that._fastClone(resolution);
-            }
+                    GitRemoteResolver._noShallow.set(that._host, true);
+                    return that._fastClone(resolution);
+                }
 
-            throw err;
-        });
+                throw err;
+            }
+        );
     });
 };
 
-GitRemoteResolver.prototype._suggestProxyWorkaround = function (err) {
-    if ((this._config.proxy || this._config.httpsProxy) &&
+GitRemoteResolver.prototype._suggestProxyWorkaround = function(err) {
+    if (
+        (this._config.proxy || this._config.httpsProxy) &&
         mout.string.startsWith(this._source, 'git://') &&
-        err.code === 'ECMDERR' && err.details
+        err.code === 'ECMDERR' &&
+        err.details
     ) {
         err.details = err.details.trim();
-        err.details += '\n\nWhen under a proxy, you must configure git to use https:// instead of git://.';
-        err.details += '\nYou can configure it for every endpoint or for this specific host as follows:';
+        err.details +=
+            '\n\nWhen under a proxy, you must configure git to use https:// instead of git://.';
+        err.details +=
+            '\nYou can configure it for every endpoint or for this specific host as follows:';
         err.details += '\ngit config --global url."https://".insteadOf git://';
-        err.details += '\ngit config --global url."https://' + this._host + '".insteadOf git://' + this._host;
-        err.details += 'Ignore this suggestion if you already have this configured.';
+        err.details +=
+            '\ngit config --global url."https://' +
+            this._host +
+            '".insteadOf git://' +
+            this._host;
+        err.details +=
+            'Ignore this suggestion if you already have this configured.';
     }
 };
 
@@ -182,7 +217,7 @@ GitRemoteResolver.prototype._suggestProxyWorkaround = function (err) {
 //      negotiation that needs to take place.
 //
 // The above should cover most cases, including BitBucket.
-GitRemoteResolver.prototype._supportsShallowCloning = function () {
+GitRemoteResolver.prototype._supportsShallowCloning = function() {
     var value = true;
 
     // Verify that the remote could be parsed and that a protocol is set
@@ -191,8 +226,11 @@ GitRemoteResolver.prototype._supportsShallowCloning = function () {
         return Q.resolve(false);
     }
 
-
-    if (!this._host || !this._config.shallowCloneHosts || this._config.shallowCloneHosts.indexOf(this._host) === -1) {
+    if (
+        !this._host ||
+        !this._config.shallowCloneHosts ||
+        this._config.shallowCloneHosts.indexOf(this._host) === -1
+    ) {
         return Q.resolve(false);
     }
 
@@ -200,34 +238,43 @@ GitRemoteResolver.prototype._supportsShallowCloning = function () {
     // HTTP or HTTPS, not for Git or SSH.
     // Also check for hosts that have been checked in a previous request and have been found to support
     // shallow cloning.
-    if (mout.string.startsWith(this._remote.protocol, 'http')
-            && !GitRemoteResolver._canShallow.get(this._host)) {
+    if (
+        mout.string.startsWith(this._remote.protocol, 'http') &&
+        !GitRemoteResolver._canShallow.get(this._host)
+    ) {
         // Provide GIT_CURL_VERBOSE=2 environment variable to capture curl output.
         // Calling ls-remote includes a call to the git-upload-pack service, which returns the content type in the response.
-        var processEnv = mout.object.merge(process.env, { 'GIT_CURL_VERBOSE': '2' });
+        var processEnv = mout.object.merge(process.env, {
+            GIT_CURL_VERBOSE: '2'
+        });
 
         value = cmd('git', ['ls-remote', '--heads', this._source], {
             env: processEnv
-        })
-        .spread(function (stdout, stderr) {
-            // Check stderr for content-type, ignore stdout
-            var isSmartServer;
+        }).spread(
+            function(stdout, stderr) {
+                // Check stderr for content-type, ignore stdout
+                var isSmartServer;
 
-            // If the content type is 'x-git', then the server supports shallow cloning
-            isSmartServer = mout.string.contains(stderr,
-                'Content-Type: application/x-git-upload-pack-advertisement');
+                // If the content type is 'x-git', then the server supports shallow cloning
+                isSmartServer = mout.string.contains(
+                    stderr,
+                    'Content-Type: application/x-git-upload-pack-advertisement'
+                );
 
-            this._logger.debug('detect-smart-git', 'Smart Git host detected: ' + isSmartServer);
+                this._logger.debug(
+                    'detect-smart-git',
+                    'Smart Git host detected: ' + isSmartServer
+                );
 
-            if (isSmartServer) {
-                // Cache this host
-                GitRemoteResolver._canShallow.set(this._host, true);
-            }
+                if (isSmartServer) {
+                    // Cache this host
+                    GitRemoteResolver._canShallow.set(this._host, true);
+                }
 
-            return isSmartServer;
-        }.bind(this));
-    }
-    else {
+                return isSmartServer;
+            }.bind(this)
+        );
+    } else {
         // One of the following cases:
         // * A non-HTTP/HTTPS protocol
         // * A host that has been checked before and that supports shallow cloning
@@ -240,7 +287,7 @@ GitRemoteResolver.prototype._supportsShallowCloning = function () {
 // ------------------------------
 
 // Grab refs remotely
-GitRemoteResolver.refs = function (source) {
+GitRemoteResolver.refs = function(source) {
     var value;
 
     // TODO: Normalize source because of the various available protocols?
@@ -250,20 +297,22 @@ GitRemoteResolver.refs = function (source) {
     }
 
     // Store the promise in the refs object
-    value = cmd('git', ['ls-remote', '--tags', '--heads', source])
-    .spread(function (stdout) {
-        var refs;
+    value = cmd('git', ['ls-remote', '--tags', '--heads', source]).spread(
+        function(stdout) {
+            var refs;
 
-        refs = stdout.toString()
-        .trim()                         // Trim trailing and leading spaces
-        .replace(/[\t ]+/g, ' ')        // Standardize spaces (some git versions make tabs, other spaces)
-        .split(/[\r\n]+/);              // Split lines into an array
+            refs = stdout
+                .toString()
+                .trim() // Trim trailing and leading spaces
+                .replace(/[\t ]+/g, ' ') // Standardize spaces (some git versions make tabs, other spaces)
+                .split(/[\r\n]+/); // Split lines into an array
 
-        // Update the refs with the actual refs
-        this._cache.refs.set(source, refs);
+            // Update the refs with the actual refs
+            this._cache.refs.set(source, refs);
 
-        return refs;
-    }.bind(this));
+            return refs;
+        }.bind(this)
+    );
 
     // Store the promise to be reused until it resolves
     // to a specific value

lib/core/resolvers/GitResolver.js

@@ -0,0 +1,434 @@
+var util = require('util');
+var path = require('path');
+var Q = require('q');
+var rimraf = require('../../util/rimraf');
+var mkdirp = require('mkdirp');
+var which = require('which');
+var LRU = require('lru-cache');
+var mout = require('mout');
+var Resolver = require('./Resolver');
+var semver = require('../../util/semver');
+var createError = require('../../util/createError');
+
+var hasGit;
+
+// Check if git is installed
+try {
+    which.sync('git');
+    hasGit = true;
+} catch (ex) {
+    hasGit = false;
+}
+
+function GitResolver(decEndpoint, config, logger) {
+    // Set template dir to the empty directory so that user templates are not run
+    // This environment variable is not multiple config aware but it's not documented
+    // anyway
+    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) {
+        throw createError('git is not installed or not in the PATH', 'ENOGIT');
+    }
+}
+
+util.inherits(GitResolver, Resolver);
+mout.object.mixIn(GitResolver, Resolver);
+
+// -----------------
+
+GitResolver.prototype._hasNew = function(pkgMeta) {
+    var oldResolution = pkgMeta._resolution || {};
+
+    return this._findResolution().then(function(resolution) {
+        // Check if resolution types are different
+        if (oldResolution.type !== resolution.type) {
+            return true;
+        }
+
+        // If resolved to a version, there is new content if the tags are not equal
+        if (
+            resolution.type === 'version' &&
+            semver.neq(resolution.tag, oldResolution.tag)
+        ) {
+            return true;
+        }
+
+        // As last check, we compare both commit hashes
+        return resolution.commit !== oldResolution.commit;
+    });
+};
+
+GitResolver.prototype._resolve = function() {
+    var that = this;
+
+    return this._findResolution().then(function() {
+        return (
+            that
+                ._checkout()
+                // Always run cleanup after checkout to ensure that .git is removed!
+                // If it's not removed, problems might arise when the "tmp" module attempts
+                // to delete the temporary folder
+                .fin(function() {
+                    return that._cleanup();
+                })
+        );
+    });
+};
+
+// -----------------
+
+// Abstract functions that should be implemented by concrete git resolvers
+GitResolver.prototype._checkout = function() {
+    throw new Error('_checkout not implemented');
+};
+
+GitResolver.refs = function(source) {
+    throw new Error('refs not implemented');
+};
+
+// -----------------
+
+GitResolver.prototype._findResolution = function(target) {
+    var err;
+    var self = this.constructor;
+    var that = this;
+
+    target = target || this._target || '*';
+
+    // Target is a commit, so it's a stale target (not a moving target)
+    // There's nothing to do in this case
+    if (/^[a-f0-9]{40}$/.test(target)) {
+        this._resolution = { type: 'commit', commit: target };
+        return Q.resolve(this._resolution);
+    }
+
+    // Target is a range/version
+    if (semver.validRange(target)) {
+        return self.versions(this._source, true).then(function(versions) {
+            var versionsArr, version, index;
+
+            // If there are no tags and target is *,
+            // fallback to the latest commit on master
+            if (!versions.length && target === '*') {
+                return that._findResolution('master');
+            }
+
+            versionsArr = versions.map(function(obj) {
+                return obj.version;
+            });
+            // Find a satisfying version, enabling strict match so that pre-releases
+            // have lower priority over normal ones when target is *
+            index = semver.maxSatisfyingIndex(versionsArr, target, true);
+            if (index !== -1) {
+                version = versions[index];
+                return (that._resolution = {
+                    type: 'version',
+                    tag: version.tag,
+                    commit: version.commit
+                });
+            }
+
+            // Check if there's an exact branch/tag with this name as last resort
+            return Q.all([
+                self.branches(that._source),
+                self.tags(that._source)
+            ]).spread(function(branches, tags) {
+                // Use hasOwn because a branch/tag could have a name like "hasOwnProperty"
+                if (mout.object.hasOwn(tags, target)) {
+                    return (that._resolution = {
+                        type: 'tag',
+                        tag: target,
+                        commit: tags[target]
+                    });
+                }
+                if (mout.object.hasOwn(branches, target)) {
+                    return (that._resolution = {
+                        type: 'branch',
+                        branch: target,
+                        commit: branches[target]
+                    });
+                }
+
+                throw createError(
+                    'No tag found that was able to satisfy ' + target,
+                    'ENORESTARGET',
+                    {
+                        details: !versions.length
+                            ? 'No versions found in ' + that._source
+                            : 'Available versions in ' +
+                              that._source +
+                              ': ' +
+                              versions
+                                  .map(function(version) {
+                                      return version.version;
+                                  })
+                                  .join(', ')
+                    }
+                );
+            });
+        });
+    }
+
+    // Otherwise, target is either a tag or a branch
+    return Q.all([self.branches(that._source), self.tags(that._source)]).spread(
+        function(branches, tags) {
+            // Use hasOwn because a branch/tag could have a name like "hasOwnProperty"
+            if (mout.object.hasOwn(tags, target)) {
+                return (that._resolution = {
+                    type: 'tag',
+                    tag: target,
+                    commit: tags[target]
+                });
+            }
+            if (mout.object.hasOwn(branches, target)) {
+                return (that._resolution = {
+                    type: 'branch',
+                    branch: target,
+                    commit: branches[target]
+                });
+            }
+
+            if (/^[a-f0-9]{4,40}$/.test(target)) {
+                if (target.length < 12) {
+                    that._logger.warn(
+                        'short-sha',
+                        'Consider using longer commit SHA to avoid conflicts'
+                    );
+                }
+
+                that._resolution = { type: 'commit', commit: target };
+                return that._resolution;
+            }
+
+            branches = Object.keys(branches);
+            tags = Object.keys(tags);
+
+            err = createError(
+                'Tag/branch ' + target + ' does not exist',
+                'ENORESTARGET'
+            );
+            err.details = !tags.length
+                ? 'No tags found in ' + that._source
+                : 'Available tags: ' + tags.join(', ');
+            err.details += '\n';
+            err.details += !branches.length
+                ? 'No branches found in ' + that._source
+                : 'Available branches: ' + branches.join(', ');
+
+            throw err;
+        }
+    );
+};
+
+GitResolver.prototype._cleanup = function() {
+    var gitFolder = path.join(this._tempDir, '.git');
+
+    return Q.nfcall(rimraf, gitFolder);
+};
+
+GitResolver.prototype._savePkgMeta = function(meta) {
+    var version;
+
+    if (this._resolution.type === 'version') {
+        version = semver.clean(this._resolution.tag);
+
+        // Warn if the package meta version is different than the resolved one
+        if (
+            typeof meta.version === 'string' &&
+            semver.valid(meta.version) &&
+            semver.neq(meta.version, version)
+        ) {
+            this._logger.warn(
+                'mismatch',
+                'Version declared in the json (' +
+                    meta.version +
+                    ') is different than the resolved one (' +
+                    version +
+                    ')',
+                {
+                    resolution: this._resolution,
+                    pkgMeta: meta
+                }
+            );
+        }
+
+        // Ensure package meta version is the same as the resolution
+        meta.version = version;
+    } else {
+        // If resolved to a target that is not a version,
+        // remove the version from the meta
+        delete meta.version;
+    }
+
+    // Save version/tag/commit in the release
+    // Note that we can't store branches because _release is supposed to be
+    // an unique id of this ref.
+    meta._release =
+        version ||
+        this._resolution.tag ||
+        this._resolution.commit.substr(0, 10);
+
+    // Save resolution to be used in hasNew later
+    meta._resolution = this._resolution;
+
+    return Resolver.prototype._savePkgMeta.call(this, meta);
+};
+
+// ------------------------------
+
+GitResolver.versions = function(source, extra) {
+    var value = this._cache.versions.get(source);
+
+    if (value) {
+        return Q.resolve(value).then(
+            function() {
+                var versions = this._cache.versions.get(source);
+
+                // If no extra information was requested,
+                // resolve simply with the versions
+                if (!extra) {
+                    versions = versions.map(function(version) {
+                        return version.version;
+                    });
+                }
+
+                return versions;
+            }.bind(this)
+        );
+    }
+
+    value = this.tags(source).then(
+        function(tags) {
+            var tag;
+            var version;
+            var versions = [];
+
+            // For each tag
+            for (tag in tags) {
+                version = semver.clean(tag);
+                if (version) {
+                    versions.push({
+                        version: version,
+                        tag: tag,
+                        commit: tags[tag]
+                    });
+                }
+            }
+
+            // Sort them by DESC order
+            versions.sort(function(a, b) {
+                return semver.rcompare(a.version, b.version);
+            });
+
+            this._cache.versions.set(source, versions);
+
+            // Call the function again to keep it DRY
+            return this.versions(source, extra);
+        }.bind(this)
+    );
+
+    // Store the promise to be reused until it resolves
+    // to a specific value
+    this._cache.versions.set(source, value);
+
+    return value;
+};
+
+GitResolver.tags = function(source) {
+    var value = this._cache.tags.get(source);
+
+    if (value) {
+        return Q.resolve(value);
+    }
+
+    value = this.refs(source).then(
+        function(refs) {
+            var tags = {};
+
+            // For each line in the refs, match only the tags
+            refs.forEach(function(line) {
+                var match = line.match(/^([a-f0-9]{40})\s+refs\/tags\/(\S+)/);
+
+                if (match && !mout.string.endsWith(match[2], '^{}')) {
+                    tags[match[2]] = match[1];
+                }
+            });
+
+            this._cache.tags.set(source, tags);
+
+            return tags;
+        }.bind(this)
+    );
+
+    // Store the promise to be reused until it resolves
+    // to a specific value
+    this._cache.tags.set(source, value);
+
+    return value;
+};
+
+GitResolver.branches = function(source) {
+    var value = this._cache.branches.get(source);
+
+    if (value) {
+        return Q.resolve(value);
+    }
+
+    value = this.refs(source).then(
+        function(refs) {
+            var branches = {};
+
+            // For each line in the refs, extract only the heads
+            // Organize them in an object where keys are branches and values
+            // the commit hashes
+            refs.forEach(function(line) {
+                var match = line.match(/^([a-f0-9]{40})\s+refs\/heads\/(\S+)/);
+
+                if (match) {
+                    branches[match[2]] = match[1];
+                }
+            });
+
+            this._cache.branches.set(source, branches);
+
+            return branches;
+        }.bind(this)
+    );
+
+    // Store the promise to be reused until it resolves
+    // to a specific value
+    this._cache.branches.set(source, value);
+
+    return value;
+};
+
+GitResolver.clearRuntimeCache = function() {
+    // Reset cache for branches, tags, etc
+    mout.object.forOwn(GitResolver._cache, function(lru) {
+        lru.reset();
+    });
+};
+
+GitResolver._cache = {
+    branches: new LRU({ max: 50, maxAge: 5 * 60 * 1000 }),
+    tags: new LRU({ max: 50, maxAge: 5 * 60 * 1000 }),
+    versions: new LRU({ max: 50, maxAge: 5 * 60 * 1000 }),
+    refs: new LRU({ max: 50, maxAge: 5 * 60 * 1000 })
+};
+
+module.exports = GitResolver;

lib/core/resolvers/Resolver.js

@@ -24,27 +24,27 @@ function Resolver(decEndpoint, config, logger) {
 
 // -----------------
 
-Resolver.prototype.getSource = function () {
+Resolver.prototype.getSource = function() {
     return this._source;
 };
 
-Resolver.prototype.getName = function () {
+Resolver.prototype.getName = function() {
     return this._name;
 };
 
-Resolver.prototype.getTarget = function () {
+Resolver.prototype.getTarget = function() {
     return this._target;
 };
 
-Resolver.prototype.getTempDir = function () {
+Resolver.prototype.getTempDir = function() {
     return this._tempDir;
 };
 
-Resolver.prototype.getPkgMeta = function () {
+Resolver.prototype.getPkgMeta = function() {
     return this._pkgMeta;
 };
 
-Resolver.prototype.hasNew = function (pkgMeta) {
+Resolver.prototype.hasNew = function(pkgMeta) {
     var promise;
     var that = this;
 
@@ -58,12 +58,12 @@ Resolver.prototype.hasNew = function (pkgMeta) {
     // Avoid reading the package meta if already given
     promise = this._hasNew(pkgMeta);
 
-    return promise.fin(function () {
+    return promise.fin(function() {
         that._working = false;
     });
 };
 
-Resolver.prototype.resolve = function () {
+Resolver.prototype.resolve = function() {
     var that = this;
 
     // If already working, error out
@@ -74,89 +74,104 @@ Resolver.prototype.resolve = function () {
     this._working = true;
 
     // Create temporary dir
-    return this._createTempDir()
-    // Resolve self
-    .then(this._resolve.bind(this))
-    // Read json, generating the package meta
-    .then(this._readJson.bind(this, null))
-    // Apply and save package meta
-    .then(function (meta) {
-        return that._applyPkgMeta(meta)
-        .then(that._savePkgMeta.bind(that, meta));
-    })
-    .then(function () {
-        // Resolve with the folder
-        return that._tempDir;
-    }, function (err) {
-        // If something went wrong, unset the temporary dir
-        that._tempDir = null;
-        throw err;
-    })
-    .fin(function () {
-        that._working = false;
-    });
+    return (
+        this._createTempDir()
+            // Resolve self
+            .then(this._resolve.bind(this))
+            // Read json, generating the package meta
+            .then(this._readJson.bind(this, null))
+            // Apply and save package meta
+            .then(function(meta) {
+                return that
+                    ._applyPkgMeta(meta)
+                    .then(that._savePkgMeta.bind(that, meta));
+            })
+            .then(
+                function() {
+                    // Resolve with the folder
+                    return that._tempDir;
+                },
+                function(err) {
+                    // If something went wrong, unset the temporary dir
+                    that._tempDir = null;
+                    throw err;
+                }
+            )
+            .fin(function() {
+                that._working = false;
+            })
+    );
 };
 
-Resolver.prototype.isCacheable = function () {
+Resolver.prototype.isCacheable = function() {
     // Bypass cache for local dependencies
-    if (this._source &&
+    if (
+        this._source &&
         /^(?:file:[\/\\]{2}|[A-Z]:)?\.?\.?[\/\\]/.test(this._source)
     ) {
         return false;
     }
 
     // We don't want to cache moving targets like branches
-    if (this._pkgMeta &&
+    if (
+        this._pkgMeta &&
         this._pkgMeta._resolution &&
-        this._pkgMeta._resolution.type === 'branch') {
+        this._pkgMeta._resolution.type === 'branch'
+    ) {
         return false;
     }
 
     return true;
 };
 
-
 // -----------------
 
 // Abstract functions that must be implemented by concrete resolvers
-Resolver.prototype._resolve = function () {
+Resolver.prototype._resolve = function() {
     throw new Error('_resolve not implemented');
 };
 
 // Abstract functions that can be re-implemented by concrete resolvers
 // as necessary
-Resolver.prototype._hasNew = function (pkgMeta) {
+Resolver.prototype._hasNew = function(pkgMeta) {
     return Q.resolve(true);
 };
 
-Resolver.isTargetable = function () {
+Resolver.isTargetable = function() {
     return true;
 };
 
-Resolver.versions = function (source) {
+Resolver.versions = function(source) {
     return Q.resolve([]);
 };
 
-Resolver.clearRuntimeCache = function () {};
+Resolver.clearRuntimeCache = function() {};
 
 // -----------------
 
-Resolver.prototype._createTempDir = function () {
+Resolver.prototype._createTempDir = function() {
     return Q.nfcall(mkdirp, this._config.tmp)
-    .then(function () {
-        return Q.nfcall(tmp.dir, {
-            template: path.join(this._config.tmp, md5(this._name) + '-' + process.pid + '-XXXXXX'),
-            mode: 0777 & ~process.umask(),
-            unsafeCleanup: true
-        });
-    }.bind(this))
-    .then(function (dir) {
-        // nfcall may return multiple callback arguments as an array
-        return this._tempDir = Array.isArray(dir) ? dir[0] : dir;
-    }.bind(this));
+        .then(
+            function() {
+                return Q.nfcall(tmp.dir, {
+                    template: path.join(
+                        this._config.tmp,
+                        md5(this._name) + '-' + process.pid + '-XXXXXX'
+                    ),
+                    mode: 0777 & ~process.umask(),
+                    unsafeCleanup: true
+                });
+            }.bind(this)
+        )
+        .then(
+            function(dir) {
+                // nfcall may return multiple callback arguments as an array
+                return (this._tempDir = Array.isArray(dir) ? dir[0] : dir);
+            }.bind(this)
+        );
 };
 
-Resolver.prototype._cleanTempDir = function () {
+Resolver.prototype._cleanTempDir = function() {
     var tempDir = this._tempDir;
 
     if (!tempDir) {
@@ -165,32 +180,37 @@ Resolver.prototype._cleanTempDir = function () {
 
     // Delete and create folder
     return Q.nfcall(rimraf, tempDir)
-    .then(function () {
-        return Q.nfcall(mkdirp, tempDir, 0777 & ~process.umask());
-    })
-    .then(function () {
-        return tempDir;
-    });
+        .then(function() {
+            return Q.nfcall(mkdirp, tempDir, 0777 & ~process.umask());
+        })
+        .then(function() {
+            return tempDir;
+        });
 };
 
-Resolver.prototype._readJson = function (dir) {
+Resolver.prototype._readJson = function(dir) {
     var that = this;
 
     dir = dir || this._tempDir;
     return readJson(dir, {
         assume: { name: this._name },
         logger: that._logger
-    })
-    .spread(function (json, deprecated) {
+    }).spread(function(json, deprecated) {
         if (deprecated) {
-            that._logger.warn('deprecated', 'Package ' + that._name + ' is using the deprecated ' + deprecated);
+            that._logger.warn(
+                'deprecated',
+                'Package ' +
+                    that._name +
+                    ' is using the deprecated ' +
+                    deprecated
+            );
         }
 
         return json;
     });
 };
 
-Resolver.prototype._applyPkgMeta = function (meta) {
+Resolver.prototype._applyPkgMeta = function(meta) {
     // Check if name defined in the json is different
     // If so and if the name was "guessed", assume the json name
     if (meta.name !== this._name && this._guessedName) {
@@ -204,13 +224,12 @@ Resolver.prototype._applyPkgMeta = function (meta) {
     }
 
     // Otherwise remove them from the temp dir
-    return removeIgnores(this._tempDir, meta)
-    .then(function () {
+    return removeIgnores(this._tempDir, meta).then(function() {
         return meta;
     });
 };
 
-Resolver.prototype._savePkgMeta = function (meta) {
+Resolver.prototype._savePkgMeta = function(meta) {
     var that = this;
     var contents;
 
@@ -221,9 +240,12 @@ Resolver.prototype._savePkgMeta = function (meta) {
     // Stringify contents
     contents = JSON.stringify(meta, null, 2);
 
-    return Q.nfcall(fs.writeFile, path.join(this._tempDir, '.bower.json'), contents)
-    .then(function () {
-        return that._pkgMeta = meta;
+    return Q.nfcall(
+        fs.writeFile,
+        path.join(this._tempDir, '.bower.json'),
+        contents
+    ).then(function() {
+        return (that._pkgMeta = meta);
     });
 };
 

lib/core/resolvers/SvnResolver.js

@@ -0,0 +1,491 @@
+var util = require('util');
+var Q = require('q');
+var which = require('which');
+var LRU = require('lru-cache');
+var mout = require('mout');
+var Resolver = require('./Resolver');
+var semver = require('../../util/semver');
+var createError = require('../../util/createError');
+var cmd = require('../../util/cmd');
+
+var hasSvn;
+
+// Check if svn is installed
+try {
+    which.sync('svn');
+    hasSvn = true;
+} catch (ex) {
+    hasSvn = false;
+}
+
+function SvnResolver(decEndpoint, config, logger) {
+    Resolver.call(this, decEndpoint, config, logger);
+
+    if (!hasSvn) {
+        throw createError('svn is not installed or not in the PATH', 'ENOSVN');
+    }
+}
+
+util.inherits(SvnResolver, Resolver);
+mout.object.mixIn(SvnResolver, Resolver);
+
+// -----------------
+
+SvnResolver.getSource = function(source) {
+    var uri = this._source || source;
+
+    return uri
+        .replace(/^svn\+(https?|file):\/\//i, '$1://') // Change svn+http or svn+https or svn+file to http(s), file respectively
+        .replace('svn://', 'http://') // Change svn to http
+        .replace(/\/+$/, ''); // Remove trailing slashes
+};
+
+SvnResolver.prototype._hasNew = function(pkgMeta) {
+    var oldResolution = pkgMeta._resolution || {};
+
+    return this._findResolution().then(function(resolution) {
+        // Check if resolution types are different
+        if (oldResolution.type !== resolution.type) {
+            return true;
+        }
+
+        // If resolved to a version, there is new content if the tags are not equal
+        if (
+            resolution.type === 'version' &&
+            semver.neq(resolution.tag, oldResolution.tag)
+        ) {
+            return true;
+        }
+
+        // As last check, we compare both commit hashes
+        return resolution.commit !== oldResolution.commit;
+    });
+};
+
+SvnResolver.prototype._resolve = function() {
+    var that = this;
+
+    return this._findResolution().then(function() {
+        return that._export();
+    });
+};
+
+// -----------------
+
+SvnResolver.prototype._export = function() {
+    var promise;
+    var timer;
+    var reporter;
+    var that = this;
+    var resolution = this._resolution;
+
+    this.source = SvnResolver.getSource(this._source);
+
+    this._logger.action(
+        'export',
+        resolution.tag || resolution.branch || resolution.commit,
+        {
+            resolution: resolution,
+            to: this._tempDir
+        }
+    );
+
+    if (resolution.type === 'commit') {
+        promise = cmd('svn', [
+            'export',
+            '--force',
+            '--non-interactive',
+            this._source + '/trunk',
+            '-r' + resolution.commit,
+            this._tempDir
+        ]);
+    } else if (resolution.type === 'branch' && resolution.branch === 'trunk') {
+        promise = cmd('svn', [
+            'export',
+            '--force',
+            '--non-interactive',
+            this._source + '/trunk',
+            this._tempDir
+        ]);
+    } else if (resolution.type === 'branch') {
+        promise = cmd('svn', [
+            'export',
+            '--force',
+            '--non-interactive',
+            this._source + '/branches/' + resolution.branch,
+            this._tempDir
+        ]);
+    } else {
+        promise = cmd('svn', [
+            'export',
+            '--force',
+            '--non-interactive',
+            this._source + '/tags/' + resolution.tag,
+            this._tempDir
+        ]);
+    }
+
+    // Throttle the progress reporter to 1 time each sec
+    reporter = mout.fn.throttle(function(data) {
+        var lines;
+
+        lines = data.split(/[\r\n]+/);
+        lines.forEach(function(line) {
+            if (/\d{1,3}\%/.test(line)) {
+                // TODO: There are some strange chars that appear once in a while (\u001b[K)
+                //       Trim also those?
+                that._logger.info('progress', line.trim());
+            }
+        });
+    }, 1000);
+
+    // Start reporting progress after a few seconds
+    timer = setTimeout(function() {
+        promise.progress(reporter);
+    }, 8000);
+
+    return (
+        promise
+            // Add additional proxy information to the error if necessary
+            .fail(function(err) {
+                throw err;
+            })
+            // Clear timer at the end
+            .fin(function() {
+                clearTimeout(timer);
+                reporter.cancel();
+            })
+    );
+};
+
+// -----------------
+
+SvnResolver.prototype._findResolution = function(target) {
+    var err;
+    var self = this.constructor;
+    var that = this;
+
+    target = target || this._target || '*';
+
+    this._source = SvnResolver.getSource(this._source);
+
+    // Target is a revision, so it's a stale target (not a moving target)
+    // There's nothing to do in this case
+    if (/^r\d+/.test(target)) {
+        target = target.split('r');
+
+        this._resolution = { type: 'commit', commit: target[1] };
+        return Q.resolve(this._resolution);
+    }
+
+    // Target is a range/version
+    if (semver.validRange(target)) {
+        return self.versions(this._source, true).then(function(versions) {
+            var versionsArr, version, index;
+
+            versionsArr = versions.map(function(obj) {
+                return obj.version;
+            });
+
+            // If there are no tags and target is *,
+            // fallback to the latest commit on trunk
+            if (!versions.length && target === '*') {
+                return that._findResolution('trunk');
+            }
+
+            versionsArr = versions.map(function(obj) {
+                return obj.version;
+            });
+            // Find a satisfying version, enabling strict match so that pre-releases
+            // have lower priority over normal ones when target is *
+            index = semver.maxSatisfyingIndex(versionsArr, target, true);
+            if (index !== -1) {
+                version = versions[index];
+                return (that._resolution = {
+                    type: 'version',
+                    tag: version.tag,
+                    commit: version.commit
+                });
+            }
+
+            // Check if there's an exact branch/tag with this name as last resort
+            return Q.all([
+                self.branches(that._source),
+                self.tags(that._source)
+            ]).spread(function(branches, tags) {
+                // Use hasOwn because a branch/tag could have a name like "hasOwnProperty"
+                if (mout.object.hasOwn(tags, target)) {
+                    return (that._resolution = {
+                        type: 'tag',
+                        tag: target,
+                        commit: tags[target]
+                    });
+                }
+                if (mout.object.hasOwn(branches, target)) {
+                    return (that._resolution = {
+                        type: 'branch',
+                        branch: target,
+                        commit: branches[target]
+                    });
+                }
+
+                throw createError(
+                    'No tag found that was able to satisfy ' + target,
+                    'ENORESTARGET',
+                    {
+                        details: !versions.length
+                            ? 'No versions found in ' + that._source
+                            : 'Available versions in ' +
+                              that._source +
+                              ': ' +
+                              versions
+                                  .map(function(version) {
+                                      return version.version;
+                                  })
+                                  .join(', ')
+                    }
+                );
+            });
+        });
+    }
+
+    // Otherwise, target is either a tag or a branch
+    return Q.all([self.branches(that._source), self.tags(that._source)]).spread(
+        function(branches, tags) {
+            // Use hasOwn because a branch/tag could have a name like "hasOwnProperty"
+            if (mout.object.hasOwn(tags, target)) {
+                return (that._resolution = {
+                    type: 'tag',
+                    tag: target,
+                    commit: tags[target]
+                });
+            }
+            if (mout.object.hasOwn(branches, target)) {
+                return (that._resolution = {
+                    type: 'branch',
+                    branch: target,
+                    commit: branches[target]
+                });
+            }
+
+            branches = Object.keys(branches);
+            tags = Object.keys(tags);
+
+            err = createError(
+                'target ' + target + ' does not exist',
+                'ENORESTARGET'
+            );
+            err.details = !tags.length
+                ? 'No tags found in ' + that._source
+                : 'Available tags: ' + tags.join(', ');
+            err.details += '\n';
+            err.details += !branches.length
+                ? 'No branches found in ' + that._source
+                : 'Available branches: ' + branches.join(', ');
+
+            throw err;
+        }
+    );
+};
+
+SvnResolver.prototype._savePkgMeta = function(meta) {
+    var version;
+
+    if (this._resolution.type === 'version') {
+        version = semver.clean(this._resolution.tag);
+
+        // Warn if the package meta version is different than the resolved one
+        if (
+            typeof meta.version === 'string' &&
+            semver.neq(meta.version, version)
+        ) {
+            this._logger.warn(
+                'mismatch',
+                'Version declared in the json (' +
+                    meta.version +
+                    ') is different than the resolved one (' +
+                    version +
+                    ')',
+                {
+                    resolution: this._resolution,
+                    pkgMeta: meta
+                }
+            );
+        }
+
+        // Ensure package meta version is the same as the resolution
+        meta.version = version;
+    } else {
+        // If resolved to a target that is not a version,
+        // remove the version from the meta
+        delete meta.version;
+    }
+
+    // Save version/tag/commit in the release
+    // Note that we can't store branches because _release is supposed to be
+    // an unique id of this ref.
+    meta._release = version || this._resolution.tag || this._resolution.commit;
+
+    // Save resolution to be used in hasNew later
+    meta._resolution = this._resolution;
+
+    return Resolver.prototype._savePkgMeta.call(this, meta);
+};
+
+// ------------------------------
+
+SvnResolver.versions = function(source, extra) {
+    source = SvnResolver.getSource(source);
+
+    var value = this._cache.versions.get(source);
+
+    if (value) {
+        return Q.resolve(value).then(
+            function() {
+                var versions = this._cache.versions.get(source);
+
+                // If no extra information was requested,
+                // resolve simply with the versions
+                if (!extra) {
+                    versions = versions.map(function(version) {
+                        return version.version;
+                    });
+                }
+
+                return versions;
+            }.bind(this)
+        );
+    }
+
+    value = this.tags(source).then(
+        function(tags) {
+            var tag;
+            var version;
+            var versions = [];
+
+            // For each tag
+            for (tag in tags) {
+                version = semver.clean(tag);
+                if (version) {
+                    versions.push({
+                        version: version,
+                        tag: tag,
+                        commit: tags[tag]
+                    });
+                }
+            }
+
+            // Sort them by DESC order
+            versions.sort(function(a, b) {
+                return semver.rcompare(a.version, b.version);
+            });
+
+            this._cache.versions.set(source, versions);
+
+            // Call the function again to keep it DRY
+            return this.versions(source, extra);
+        }.bind(this)
+    );
+
+    // Store the promise to be reused until it resolves
+    // to a specific value
+    this._cache.versions.set(source, value);
+
+    return value;
+};
+
+SvnResolver.tags = function(source) {
+    source = SvnResolver.getSource(source);
+
+    var value = this._cache.tags.get(source);
+
+    if (value) {
+        return Q.resolve(value);
+    }
+
+    value = cmd('svn', [
+        'list',
+        source + '/tags',
+        '--verbose',
+        '--non-interactive'
+    ]).spread(
+        function(stout) {
+            var tags = SvnResolver.parseSubversionListOutput(stout.toString());
+
+            this._cache.tags.set(source, tags);
+            return tags;
+        }.bind(this)
+    );
+
+    // Store the promise to be reused until it resolves
+    // to a specific value
+    this._cache.tags.set(source, value);
+
+    return value;
+};
+
+SvnResolver.branches = function(source) {
+    source = SvnResolver.getSource(source);
+
+    var value = this._cache.branches.get(source);
+
+    if (value) {
+        return Q.resolve(value);
+    }
+
+    value = cmd('svn', [
+        'list',
+        source + '/branches',
+        '--verbose',
+        '--non-interactive'
+    ]).spread(
+        function(stout) {
+            var branches = SvnResolver.parseSubversionListOutput(
+                stout.toString()
+            );
+
+            // trunk is a branch!
+            branches.trunk = '*';
+
+            this._cache.branches.set(source, branches);
+            return branches;
+        }.bind(this)
+    );
+
+    // Store the promise to be reused until it resolves
+    // to a specific value
+    this._cache.branches.set(source, value);
+
+    return value;
+};
+
+SvnResolver.parseSubversionListOutput = function(stout) {
+    var entries = {};
+    var lines = stout.trim().split(/[\r\n]+/);
+
+    // For each line in the refs, match only the branches
+    lines.forEach(function(line) {
+        var match = line.match(/\s+([0-9]+)\s.+\s([\w.$-]+)\//i);
+
+        if (match && match[2] !== '.') {
+            entries[match[2]] = match[1];
+        }
+    });
+
+    return entries;
+};
+
+SvnResolver.clearRuntimeCache = function() {
+    // Reset cache for branches, tags, etc
+    mout.object.forOwn(SvnResolver._cache, function(lru) {
+        lru.reset();
+    });
+};
+
+SvnResolver._cache = {
+    branches: new LRU({ max: 50, maxAge: 5 * 60 * 1000 }),
+    tags: new LRU({ max: 50, maxAge: 5 * 60 * 1000 }),
+    versions: new LRU({ max: 50, maxAge: 5 * 60 * 1000 })
+};
+
+module.exports = SvnResolver;

lib/core/resolvers/UrlResolver.js

@@ -16,7 +16,7 @@ function UrlResolver(decEndpoint, config, logger) {
 
     // If target was specified, error out
     if (this._target !== '*') {
-        throw createError('URL sources can\'t resolve targets', 'ENORESTARGET');
+        throw createError("URL sources can't resolve targets", 'ENORESTARGET');
     }
 
     // If the name was guessed
@@ -24,7 +24,10 @@ function UrlResolver(decEndpoint, config, logger) {
         // Remove the ?xxx part
         this._name = this._name.replace(/\?.*$/, '');
         // Remove extension
-        this._name = this._name.substr(0, this._name.length - path.extname(this._name).length);
+        this._name = this._name.substr(
+            0,
+            this._name.length - path.extname(this._name).length
+        );
     }
 
     this._remote = url.parse(this._source);
@@ -35,11 +38,11 @@ mout.object.mixIn(UrlResolver, Resolver);
 
 // -----------------
 
-UrlResolver.isTargetable = function () {
+UrlResolver.isTargetable = function() {
     return false;
 };
 
-UrlResolver.prototype._hasNew = function (pkgMeta) {
+UrlResolver.prototype._hasNew = function(pkgMeta) {
     var oldCacheHeaders = pkgMeta._cacheHeaders || {};
     var reqHeaders = {};
 
@@ -54,61 +57,71 @@ UrlResolver.prototype._hasNew = function (pkgMeta) {
     }
 
     // Make an HEAD request to the source
-    return Q.nfcall(request.head, this._source, {
-        ca: this._config.ca.default,
-        strictSSL: this._config.strictSsl,
-        timeout: this._config.timeout,
-        headers: reqHeaders
-    })
-    // Compare new headers with the old ones
-    .spread(function (response) {
-        var cacheHeaders;
+    return (
+        Q.nfcall(request.head, this._source, {
+            ca: this._config.ca.default,
+            strictSSL: this._config.strictSsl,
+            timeout: this._config.timeout,
+            headers: reqHeaders
+        })
+            // Compare new headers with the old ones
+            .spread(
+                function(response) {
+                    var cacheHeaders;
 
-        // If the server responded with 303 then the resource
-        // still has the same ETag
-        if (response.statusCode === 304) {
-            return false;
-        }
+                    // If the server responded with 303 then the resource
+                    // still has the same ETag
+                    if (response.statusCode === 304) {
+                        return false;
+                    }
 
-        // If status code is not in the 2xx range,
-        // then just resolve to true
-        if (response.statusCode < 200 || response.statusCode >= 300) {
-            return true;
-        }
+                    // If status code is not in the 2xx range,
+                    // then just resolve to true
+                    if (
+                        response.statusCode < 200 ||
+                        response.statusCode >= 300
+                    ) {
+                        return true;
+                    }
 
-        // Fallback to comparing cache headers
-        cacheHeaders = this._collectCacheHeaders(response);
-        return !mout.object.equals(oldCacheHeaders, cacheHeaders);
-    }.bind(this), function () {
-        // Assume new contents if the request failed
-        // Note that we do not retry the request using the "request-replay" module
-        // because it would take too long
-        return true;
-    });
+                    // Fallback to comparing cache headers
+                    cacheHeaders = this._collectCacheHeaders(response);
+                    return !mout.object.equals(oldCacheHeaders, cacheHeaders);
+                }.bind(this),
+                function() {
+                    // Assume new contents if the request failed
+                    // Note that we do not retry the request using the "request-replay" module
+                    // because it would take too long
+                    return true;
+                }
+            )
+    );
 };
 
 // TODO: There's room for improvement by using streams if the URL
 //       is an archive file, by piping read stream to the zip extractor
 //       This will likely increase the complexity of code but might worth it
 
-UrlResolver.prototype._resolve = function () {
+UrlResolver.prototype._resolve = function() {
     // Download
-    return this._download()
-    // Parse headers
-    .spread(this._parseHeaders.bind(this))
-    // Extract file
-    .spread(this._extract.bind(this))
-    // Rename file to index
-    .then(this._rename.bind(this));
+    return (
+        this._download()
+            // Parse headers
+            .spread(this._parseHeaders.bind(this))
+            // Extract file
+            .spread(this._extract.bind(this))
+            // Rename file to index
+            .then(this._rename.bind(this))
+    );
 };
 
 // -----------------
 
-UrlResolver.prototype._parseSourceURL = function (_url) {
+UrlResolver.prototype._parseSourceURL = function(_url) {
     return url.parse(path.basename(_url)).pathname;
 };
 
-UrlResolver.prototype._download = function () {
+UrlResolver.prototype._download = function() {
     var fileName = this._parseSourceURL(this._source);
 
     if (!fileName) {
@@ -136,32 +149,43 @@ UrlResolver.prototype._download = function () {
         timeout: this._config.timeout,
         headers: reqHeaders
     })
-    .progress(function (state) {
-        var msg;
+        .progress(function(state) {
+            var msg;
 
-        // Retry?
-        if (state.retry) {
-            msg = 'Download of ' + that._source + ' failed' + (state.error.code ? ' with ' + state.error.code : '') + ', ';
-            msg += 'retrying in ' + (state.delay / 1000).toFixed(1) + 's';
-            that._logger.debug('error', state.error.message, { error: state.error });
-            return that._logger.warn('retry', msg);
-        }
+            // Retry?
+            if (state.retry) {
+                msg =
+                    'Download of ' +
+                    that._source +
+                    ' failed' +
+                    (state.error.code ? ' with ' + state.error.code : '') +
+                    ', ';
+                msg += 'retrying in ' + (state.delay / 1000).toFixed(1) + 's';
+                that._logger.debug('error', state.error.message, {
+                    error: state.error
+                });
+                return that._logger.warn('retry', msg);
+            }
 
-        // Progress
-        msg = 'received ' + (state.received / 1024 / 1024).toFixed(1) + 'MB';
-        if (state.total) {
-            msg += ' of ' + (state.total / 1024 / 1024).toFixed(1) + 'MB downloaded, ';
-            msg += state.percent + '%';
-        }
-        that._logger.info('progress', msg);
-    })
-    .then(function (response) {
-        that._response = response;
-        return [file, response];
-    });
+            // Progress
+            msg =
+                'received ' + (state.received / 1024 / 1024).toFixed(1) + 'MB';
+            if (state.total) {
+                msg +=
+                    ' of ' +
+                    (state.total / 1024 / 1024).toFixed(1) +
+                    'MB downloaded, ';
+                msg += state.percent + '%';
+            }
+            that._logger.info('progress', msg);
+        })
+        .then(function(response) {
+            that._response = response;
+            return [file, response];
+        });
 };
 
-UrlResolver.prototype._parseHeaders = function (file, response) {
+UrlResolver.prototype._parseHeaders = function(file, response) {
     var disposition;
     var newFile;
     var match;
@@ -196,20 +220,19 @@ UrlResolver.prototype._parseHeaders = function (file, response) {
 
     newFile = path.join(this._tempDir, newFile);
 
-    return Q.nfcall(fs.rename, file, newFile)
-    .then(function () {
+    return Q.nfcall(fs.rename, file, newFile).then(function() {
         return [newFile, response];
     });
 };
 
-UrlResolver.prototype._extract = function (file, response) {
+UrlResolver.prototype._extract = function(file, response) {
     var mimeType = response.headers['content-type'];
 
     if (mimeType) {
         // Clean everything after ; and trim the end result
         mimeType = mimeType.split(';')[0].trim();
         // Some servers add quotes around the content-type, so we trim that also
-        mimeType = mout.string.trim(mimeType, ['"', '\'']);
+        mimeType = mout.string.trim(mimeType, ['"', "'"]);
     }
 
     if (!extract.canExtract(file, mimeType)) {
@@ -226,36 +249,42 @@ UrlResolver.prototype._extract = function (file, response) {
     });
 };
 
-UrlResolver.prototype._rename = function () {
-    return Q.nfcall(fs.readdir, this._tempDir)
-    .then(function (files) {
-        var file;
-        var oldPath;
-        var newPath;
+UrlResolver.prototype._rename = function() {
+    return Q.nfcall(fs.readdir, this._tempDir).then(
+        function(files) {
+            var file;
+            var oldPath;
+            var newPath;
 
-        // Remove any OS specific files from the files array
-        // before checking its length
-        files = files.filter(junk.isnt);
+            // Remove any OS specific files from the files array
+            // before checking its length
+            files = files.filter(junk.isnt);
 
-        // Only rename if there's only one file and it's not the json
-        if (files.length === 1 && !/^(component|bower)\.json$/.test(files[0])) {
-            file = files[0];
-            this._singleFile = 'index' + path.extname(file);
-            oldPath = path.join(this._tempDir, file);
-            newPath = path.join(this._tempDir, this._singleFile);
+            // Only rename if there's only one file and it's not the json
+            if (
+                files.length === 1 &&
+                !/^(component|bower)\.json$/.test(files[0])
+            ) {
+                file = files[0];
+                this._singleFile = 'index' + path.extname(file);
+                oldPath = path.join(this._tempDir, file);
+                newPath = path.join(this._tempDir, this._singleFile);
 
-            return Q.nfcall(fs.rename, oldPath, newPath);
-        }
-    }.bind(this));
+                return Q.nfcall(fs.rename, oldPath, newPath);
+            }
+        }.bind(this)
+    );
 };
 
-UrlResolver.prototype._savePkgMeta = function (meta) {
+UrlResolver.prototype._savePkgMeta = function(meta) {
     // Store collected headers in the package meta
     meta._cacheHeaders = this._collectCacheHeaders(this._response);
 
     // Store ETAG under _release
     if (meta._cacheHeaders.ETag) {
-        meta._release = 'e-tag:' + mout.string.trim(meta._cacheHeaders.ETag.substr(0, 10), '"');
+        meta._release =
+            'e-tag:' +
+            mout.string.trim(meta._cacheHeaders.ETag.substr(0, 10), '"');
     }
 
     // Store main if is a single file
@@ -266,11 +295,11 @@ UrlResolver.prototype._savePkgMeta = function (meta) {
     return Resolver.prototype._savePkgMeta.call(this, meta);
 };
 
-UrlResolver.prototype._collectCacheHeaders = function (res) {
+UrlResolver.prototype._collectCacheHeaders = function(res) {
     var headers = {};
 
     // Collect cache headers
-    this.constructor._cacheHeaders.forEach(function (name) {
+    this.constructor._cacheHeaders.forEach(function(name) {
         var value = res.headers[name.toLowerCase()];
 
         if (value != null) {

lib/core/resolvers/pluginResolverFactory.js

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

lib/core/scripts.js

@@ -3,28 +3,36 @@ var cmd = require('../util/cmd');
 var Q = require('q');
 var shellquote = require('shell-quote');
 
-var orderByDependencies = function (packages, installed, json) {
+var orderByDependencies = function(packages, installed, json) {
     var ordered = [];
     installed = mout.object.keys(installed);
 
-    var depsSatisfied = function (packageName) {
-        return mout.array.difference(mout.object.keys(packages[packageName].dependencies), installed, ordered).length === 0;
+    var depsSatisfied = function(packageName) {
+        return (
+            mout.array.difference(
+                mout.object.keys(packages[packageName].dependencies),
+                installed,
+                ordered
+            ).length === 0
+        );
     };
 
-    var depsFromBowerJson = json && json.dependencies ? mout.object.keys(json.dependencies) : [];
+    var depsFromBowerJson =
+        json && json.dependencies ? mout.object.keys(json.dependencies) : [];
     var packageNames = mout.object.keys(packages);
 
     //get the list of the packages that are specified in bower.json in that order
     //its nice to maintain that order for users
     var desiredOrder = mout.array.intersection(depsFromBowerJson, packageNames);
     //then add to the end any remaining packages that werent in bower.json
-    desiredOrder = desiredOrder.concat(mout.array.difference(packageNames, desiredOrder));
+    desiredOrder = desiredOrder.concat(
+        mout.array.difference(packageNames, desiredOrder)
+    );
 
     //the desired order isn't necessarily a correct dependency specific order
     //so we ensure that below
     var resolvedOne = true;
     while (resolvedOne) {
-
         resolvedOne = false;
 
         for (var i = 0; i < desiredOrder.length; i++) {
@@ -43,17 +51,16 @@ var orderByDependencies = function (packages, installed, json) {
             //so lets just jam those names on the end
             ordered = ordered.concat(desiredOrder);
         }
-
     }
 
     return ordered;
 };
 
-var run = function (cmdString, action, logger, config) {
+var run = function(cmdString, action, logger, config) {
     logger.action(action, cmdString);
 
     //pass env + BOWER_PID so callees can identify a preinstall+postinstall from the same bower instance
-    var env = mout.object.mixIn({ 'BOWER_PID': process.pid }, process.env);
+    var env = mout.object.mixIn({ BOWER_PID: process.pid }, process.env);
     var args = shellquote.parse(cmdString, env);
     var cmdName = args[0];
     mout.array.remove(args, cmdName); //no rest() in mout
@@ -65,8 +72,8 @@ var run = function (cmdString, action, logger, config) {
 
     var promise = cmd(cmdName, args, options);
 
-    promise.progress(function (progress) {
-        progress.split('\n').forEach(function (line) {
+    promise.progress(function(progress) {
+        progress.split('\n').forEach(function(line) {
             if (line) {
                 logger.action(action, line);
             }
@@ -76,14 +83,32 @@ var run = function (cmdString, action, logger, config) {
     return promise;
 };
 
-var hook = function (action, ordered, config, logger, packages, installed, json) {
-    if (mout.object.keys(packages).length === 0 || !config.scripts || !config.scripts[action]) {
+var hook = function(
+    action,
+    ordered,
+    config,
+    logger,
+    packages,
+    installed,
+    json
+) {
+    if (
+        mout.object.keys(packages).length === 0 ||
+        !config.scripts ||
+        !config.scripts[action]
+    ) {
         return Q();
     }
 
-    var orderedPackages = ordered ? orderByDependencies(packages, installed, json) : mout.object.keys(packages);
+    var orderedPackages = ordered
+        ? orderByDependencies(packages, installed, json)
+        : mout.object.keys(packages);
     var placeholder = new RegExp('%', 'g');
-    var cmdString = mout.string.replace(config.scripts[action], placeholder, orderedPackages.join(' '));
+    var cmdString = mout.string.replace(
+        config.scripts[action],
+        placeholder,
+        orderedPackages.join(' ')
+    );
     return run(cmdString, action, logger, config);
 };
 

lib/renderers/JsonRenderer.js

@@ -7,7 +7,7 @@ function JsonRenderer() {
     this._nrLogs = 0;
 }
 
-JsonRenderer.prototype.end = function (data) {
+JsonRenderer.prototype.end = function(data) {
     if (this._nrLogs) {
         process.stderr.write(']\n');
     }
@@ -17,7 +17,7 @@ JsonRenderer.prototype.end = function (data) {
     }
 };
 
-JsonRenderer.prototype.error = function (err) {
+JsonRenderer.prototype.error = function(err) {
     var message = err.message;
     var stack;
 
@@ -32,13 +32,13 @@ JsonRenderer.prototype.error = function (err) {
 
     // Stack
     stack = err.fstream_stack || err.stack || 'N/A';
-    err.stacktrace = (Array.isArray(stack) ? stack.join('\n') : stack);
+    err.stacktrace = Array.isArray(stack) ? stack.join('\n') : stack;
 
     this.log(err);
     this.end();
 };
 
-JsonRenderer.prototype.log = function (log) {
+JsonRenderer.prototype.log = function(log) {
     if (!this._nrLogs) {
         process.stderr.write('[');
     } else {
@@ -49,12 +49,12 @@ JsonRenderer.prototype.log = function (log) {
     this._nrLogs++;
 };
 
-JsonRenderer.prototype.prompt = function (prompts) {
+JsonRenderer.prototype.prompt = function(prompts) {
     var promise = Q.resolve();
     var answers = {};
     var that = this;
 
-    prompts.forEach(function (prompt) {
+    prompts.forEach(function(prompt) {
         var opts;
         var funcName;
 
@@ -63,65 +63,68 @@ JsonRenderer.prototype.prompt = function (prompts) {
 
         // Prompt
         opts = {
-            silent: true,                                           // To not mess with JSON output
-            trim: false,                                            // To allow " " to not assume the default value
-            default: prompt.default == null ? '' : prompt.default,  // If default is null, make it '' so that it does not retry
-            validator: !prompt.validate ? null : function (value) {
-                var ret = prompt.validate(value);
+            silent: true, // To not mess with JSON output
+            trim: false, // To allow " " to not assume the default value
+            default: prompt.default == null ? '' : prompt.default, // If default is null, make it '' so that it does not retry
+            validator: !prompt.validate
+                ? null
+                : function(value) {
+                      var ret = prompt.validate(value);
 
-                if (typeof ret === 'string') {
-                    throw ret;
-                }
+                      if (typeof ret === 'string') {
+                          throw ret;
+                      }
 
-                return value;
-            },
+                      return value;
+                  }
         };
 
         // For now only "input", "confirm" and "password" are supported
         switch (prompt.type) {
-        case 'input':
-            funcName = 'prompt';
-            break;
-        case 'confirm':
-        case 'password':
-            funcName = prompt.type;
-            break;
-        case 'checkbox':
-            funcName = 'prompt';
-            break;
-        default:
-            promise = promise.then(function () {
-                throw createError('Unknown prompt type', 'ENOTSUP');
-            });
-            return;
+            case 'input':
+                funcName = 'prompt';
+                break;
+            case 'confirm':
+            case 'password':
+                funcName = prompt.type;
+                break;
+            case 'checkbox':
+                funcName = 'prompt';
+                break;
+            default:
+                promise = promise.then(function() {
+                    throw createError('Unknown prompt type', 'ENOTSUP');
+                });
+                return;
         }
 
-        promise = promise.then(function () {
+        promise = promise.then(function() {
             // Log
             prompt.level = 'prompt';
             that.log(prompt);
 
-            return Q.nfcall(promptly[funcName], '', opts)
-            .then(function (answer) {
+            return Q.nfcall(promptly[funcName], '', opts).then(function(
+                answer
+            ) {
                 answers[prompt.name] = answer;
             });
         });
 
         if (prompt.type === 'checkbox') {
-            promise = promise.then(function () {
+            promise = promise.then(function() {
                 answers[prompt.name] = answers[prompt.name].split(',');
             });
         }
     });
 
-    return promise.then(function () {
+    return promise.then(function() {
         return answers;
     });
 };
 
 // -------------------------
 
-JsonRenderer.prototype._stringify = function (log) {
+JsonRenderer.prototype._stringify = function(log) {
     // To json
     var str = JSON.stringify(log, null, '  ');
     // Remove colors in case some log has colors..

lib/renderers/StandardRenderer.js

@@ -11,9 +11,9 @@ var template = require('../util/template');
 
 function StandardRenderer(command, config) {
     this._sizes = {
-        id: 13,    // Id max chars
+        id: 13, // Id max chars
         label: 20, // Label max chars
-        sumup: 5   // Amount to sum when the label exceeds
+        sumup: 5 // Amount to sum when the label exceeds
     };
     this._colors = {
         warn: chalk.yellow,
@@ -32,7 +32,7 @@ function StandardRenderer(command, config) {
         this._compact = process.stdout.columns < 120;
     }
 
-    var exitOnPipeError = function (err) {
+    var exitOnPipeError = function(err) {
         if (err.code === 'EPIPE') {
             process.exit(0);
         }
@@ -43,7 +43,7 @@ function StandardRenderer(command, config) {
     process.stderr.on('error', exitOnPipeError);
 }
 
-StandardRenderer.prototype.end = function (data) {
+StandardRenderer.prototype.end = function(data) {
     var method = '_' + mout.string.camelCase(this._command);
 
     if (this[method]) {
@@ -51,7 +51,7 @@ StandardRenderer.prototype.end = function (data) {
     }
 };
 
-StandardRenderer.prototype.error = function (err) {
+StandardRenderer.prototype.error = function(err) {
     var str;
     var stack;
 
@@ -60,12 +60,19 @@ StandardRenderer.prototype.error = function (err) {
     err.id = err.code || 'error';
     err.level = 'error';
 
-    str = this._prefix(err) + ' ' + err.message.replace(/\r?\n/g, ' ').trim() + '\n';
+    str =
+        this._prefix(err) +
+        ' ' +
+        err.message.replace(/\r?\n/g, ' ').trim() +
+        '\n';
     this._write(process.stderr, 'bower ' + str);
 
     // Check if additional details were provided
     if (err.details) {
-        str = chalk.yellow('\nAdditional error details:\n') + err.details.trim() + '\n';
+        str =
+            chalk.yellow('\nAdditional error details:\n') +
+            err.details.trim() +
+            '\n';
         this._write(process.stderr, str);
     }
 
@@ -83,12 +90,18 @@ StandardRenderer.prototype.error = function (err) {
         // Print bower version, node version and system info.
         this._write(process.stderr, chalk.yellow('\nSystem info:\n'));
         this._write(process.stderr, 'Bower version: ' + version + '\n');
-        this._write(process.stderr, 'Node version: ' + process.versions.node + '\n');
-        this._write(process.stderr, 'OS: ' + os.type() + ' ' + os.release() + ' ' + os.arch() + '\n');
+        this._write(
+            process.stderr,
+            'Node version: ' + process.versions.node + '\n'
+        );
+        this._write(
+            process.stderr,
+            'OS: ' + os.type() + ' ' + os.release() + ' ' + os.arch() + '\n'
+        );
     }
 };
 
-StandardRenderer.prototype.log = function (log) {
+StandardRenderer.prototype.log = function(log) {
     var method = '_' + mout.string.camelCase(log.id) + 'Log';
 
     this._guessOrigin(log);
@@ -101,12 +114,12 @@ StandardRenderer.prototype.log = function (log) {
     }
 };
 
-StandardRenderer.prototype.prompt = function (prompts) {
+StandardRenderer.prototype.prompt = function(prompts) {
     var deferred;
 
     // Strip colors from the prompt if color is disabled
     if (!this._config.color) {
-        prompts.forEach(function (prompt) {
+        prompts.forEach(function(prompt) {
             prompt.message = chalk.stripColor(prompt.message);
         });
     }
@@ -121,7 +134,7 @@ StandardRenderer.prototype.prompt = function (prompts) {
 
 // -------------------------
 
-StandardRenderer.prototype._help = function (data) {
+StandardRenderer.prototype._help = function(data) {
     var str;
     var that = this;
     var specific;
@@ -136,60 +149,68 @@ StandardRenderer.prototype._help = function (data) {
         if (template.exists(specific)) {
             str = template.render(specific, data);
         } else {
-            str =  template.render('std/help-generic.std', data);
+            str = template.render('std/help-generic.std', data);
         }
 
         that._write(process.stdout, str);
     }
 };
 
-StandardRenderer.prototype._install = function (packages) {
+StandardRenderer.prototype._install = function(packages) {
     var str = '';
 
-    mout.object.forOwn(packages, function (pkg) {
-        var cliTree;
+    mout.object.forOwn(
+        packages,
+        function(pkg) {
+            var cliTree;
 
-        // List only 1 level deep dependencies
-        mout.object.forOwn(pkg.dependencies, function (dependency) {
-            dependency.dependencies = {};
-        });
-        // Make canonical dir relative
-        pkg.canonicalDir = path.relative(this._config.cwd, pkg.canonicalDir);
-        // Signal as root
-        pkg.root = true;
+            // List only 1 level deep dependencies
+            mout.object.forOwn(pkg.dependencies, function(dependency) {
+                dependency.dependencies = {};
+            });
+            // Make canonical dir relative
+            pkg.canonicalDir = path.relative(
+                this._config.cwd,
+                pkg.canonicalDir
+            );
+            // Signal as root
+            pkg.root = true;
 
-        cliTree = this._tree2archy(pkg);
-        str += '\n' + archy(cliTree);
-    }, this);
+            cliTree = this._tree2archy(pkg);
+            str += '\n' + archy(cliTree);
+        },
+        this
+    );
 
     if (str) {
         this._write(process.stdout, str);
     }
 };
 
-StandardRenderer.prototype._update = function (packages) {
+StandardRenderer.prototype._update = function(packages) {
     this._install(packages);
 };
 
-StandardRenderer.prototype._list = function (tree) {
+StandardRenderer.prototype._list = function(tree) {
     var cliTree;
 
     if (tree.pkgMeta) {
         tree.root = true;
         cliTree = archy(this._tree2archy(tree));
     } else {
-        cliTree = stringifyObject(tree, { indent: '  ' }).replace(/[{}]/g, '') + '\n';
+        cliTree =
+            stringifyObject(tree, { indent: '  ' }).replace(/[{}]/g, '') + '\n';
     }
 
     this._write(process.stdout, cliTree);
 };
 
-StandardRenderer.prototype._search = function (results) {
+StandardRenderer.prototype._search = function(results) {
     var str = template.render('std/search-results.std', results);
     this._write(process.stdout, str);
 };
 
-StandardRenderer.prototype._info = function (data) {
+StandardRenderer.prototype._info = function(data) {
     var str = '';
     var pkgMeta = data;
     var includeVersions = false;
@@ -212,7 +233,7 @@ StandardRenderer.prototype._info = function (data) {
         data.numPreReleases = 0;
         // If output isn't verbose, hide prereleases
         if (!this._config.verbose) {
-            data.versions = mout.array.filter(data.versions, function (version) {
+            data.versions = mout.array.filter(data.versions, function(version) {
                 version = semverUtils.parse(version);
                 if (!version.release && !version.build) {
                     return true;
@@ -227,13 +248,13 @@ StandardRenderer.prototype._info = function (data) {
     this._write(process.stdout, str);
 };
 
-StandardRenderer.prototype._lookup = function (data) {
+StandardRenderer.prototype._lookup = function(data) {
     var str = template.render('std/lookup.std', data);
 
     this._write(process.stdout, str);
 };
 
-StandardRenderer.prototype._link = function (data) {
+StandardRenderer.prototype._link = function(data) {
     this._sizes.id = 4;
 
     this.log({
@@ -248,7 +269,7 @@ StandardRenderer.prototype._link = function (data) {
     }
 };
 
-StandardRenderer.prototype._register = function (data) {
+StandardRenderer.prototype._register = function(data) {
     var str;
 
     // If no data passed, it means the user aborted
@@ -260,17 +281,20 @@ StandardRenderer.prototype._register = function (data) {
     this._write(process.stdout, str);
 };
 
-StandardRenderer.prototype._cacheList = function (entries) {
-    entries.forEach(function (entry) {
+StandardRenderer.prototype._cacheList = function(entries) {
+    entries.forEach(function(entry) {
         var pkgMeta = entry.pkgMeta;
         var version = pkgMeta.version || pkgMeta._target;
-        this._write(process.stdout, pkgMeta.name + '=' + pkgMeta._source + '#' + version + '\n');
+        this._write(
+            process.stdout,
+            pkgMeta.name + '=' + pkgMeta._source + '#' + version + '\n'
+        );
     }, this);
 };
 
 // -------------------------
 
-StandardRenderer.prototype._genericLog = function (log) {
+StandardRenderer.prototype._genericLog = function(log) {
     var stream;
     var str;
 
@@ -284,7 +308,7 @@ StandardRenderer.prototype._genericLog = function (log) {
     this._write(stream, 'bower ' + str);
 };
 
-StandardRenderer.prototype._checkoutLog = function (log) {
+StandardRenderer.prototype._checkoutLog = function(log) {
     if (this._compact) {
         log.message = log.origin.split('#')[0] + '#' + log.message;
     }
@@ -292,7 +316,7 @@ StandardRenderer.prototype._checkoutLog = function (log) {
     this._genericLog(log);
 };
 
-StandardRenderer.prototype._progressLog = function (log) {
+StandardRenderer.prototype._progressLog = function(log) {
     if (this._compact) {
         log.message = log.origin + ' ' + log.message;
     }
@@ -300,7 +324,7 @@ StandardRenderer.prototype._progressLog = function (log) {
     this._genericLog(log);
 };
 
-StandardRenderer.prototype._extractLog = function (log) {
+StandardRenderer.prototype._extractLog = function(log) {
     if (this._compact) {
         log.message = log.origin + ' ' + log.message;
     }
@@ -308,19 +332,23 @@ StandardRenderer.prototype._extractLog = function (log) {
     this._genericLog(log);
 };
 
-StandardRenderer.prototype._incompatibleLog = function (log) {
+StandardRenderer.prototype._incompatibleLog = function(log) {
     var str;
     var templatePath;
 
     // Generate dependants string for each pick
-    log.data.picks.forEach(function (pick) {
-        pick.dependants = pick.dependants.map(function (dependant) {
-            var release = dependant.pkgMeta._release;
-            return dependant.endpoint.name + (release ? '#' + release : '');
-        }).join(', ');
+    log.data.picks.forEach(function(pick) {
+        pick.dependants = pick.dependants
+            .map(function(dependant) {
+                var release = dependant.pkgMeta._release;
+                return dependant.endpoint.name + (release ? '#' + release : '');
+            })
+            .join(', ');
     });
 
-    templatePath = log.data.suitable ? 'std/conflict-resolved.std' : 'std/conflict.std';
+    templatePath = log.data.suitable
+        ? 'std/conflict-resolved.std'
+        : 'std/conflict.std';
     str = template.render(templatePath, log.data);
 
     this._write(process.stdout, '\n');
@@ -328,15 +356,18 @@ StandardRenderer.prototype._incompatibleLog = function (log) {
     this._write(process.stdout, '\n');
 };
 
-StandardRenderer.prototype._solvedLog = function (log) {
+StandardRenderer.prototype._solvedLog = function(log) {
     this._incompatibleLog(log);
 };
 
-StandardRenderer.prototype._jsonLog = function (log) {
-    this._write(process.stdout, '\n' + this._highlightJson(log.data.json) + '\n\n');
+StandardRenderer.prototype._jsonLog = function(log) {
+    this._write(
+        process.stdout,
+        '\n' + this._highlightJson(log.data.json) + '\n\n'
+    );
 };
 
-StandardRenderer.prototype._cachedEntryLog = function (log) {
+StandardRenderer.prototype._cachedEntryLog = function(log) {
     if (this._compact) {
         log.message = log.origin;
     }
@@ -346,7 +377,7 @@ StandardRenderer.prototype._cachedEntryLog = function (log) {
 
 // -------------------------
 
-StandardRenderer.prototype._guessOrigin = function (log) {
+StandardRenderer.prototype._guessOrigin = function(log) {
     var data = log.data;
 
     if (!data) {
@@ -354,7 +385,8 @@ StandardRenderer.prototype._guessOrigin = function (log) {
     }
 
     if (data.endpoint) {
-        log.origin = data.endpoint.name || (data.registry && data.endpoint.source);
+        log.origin =
+            data.endpoint.name || (data.registry && data.endpoint.source);
 
         // Resort to using the resolver name for unnamed endpoints
         if (!log.origin && data.resolver) {
@@ -373,7 +405,7 @@ StandardRenderer.prototype._guessOrigin = function (log) {
     }
 };
 
-StandardRenderer.prototype._prefix = function (log) {
+StandardRenderer.prototype._prefix = function(log) {
     var label;
     var length;
     var nrSpaces;
@@ -405,7 +437,7 @@ StandardRenderer.prototype._prefix = function (log) {
     return chalk.green(label) + mout.string.repeat(' ', nrSpaces) + idColor(id);
 };
 
-StandardRenderer.prototype._write = function (stream, str) {
+StandardRenderer.prototype._write = function(stream, str) {
     if (!this._config.color) {
         str = chalk.stripColor(str);
     }
@@ -413,18 +445,18 @@ StandardRenderer.prototype._write = function (stream, str) {
     stream.write(str);
 };
 
-StandardRenderer.prototype._highlightJson = function (json) {
+StandardRenderer.prototype._highlightJson = function(json) {
     var cardinal = require('cardinal');
 
     return cardinal.highlight(stringifyObject(json, { indent: '  ' }), {
         theme: {
             String: {
-                _default: function (str) {
+                _default: function(str) {
                     return chalk.cyan(str);
                 }
             },
             Identifier: {
-                _default: function (str) {
+                _default: function(str) {
                     return chalk.green(str);
                 }
             }
@@ -433,9 +465,11 @@ StandardRenderer.prototype._highlightJson = function (json) {
     });
 };
 
-StandardRenderer.prototype._tree2archy = function (node) {
+StandardRenderer.prototype._tree2archy = function(node) {
     var dependencies = mout.object.values(node.dependencies);
-    var version = !node.missing ? node.pkgMeta._release || node.pkgMeta.version : null;
+    var version = !node.missing
+        ? node.pkgMeta._release || node.pkgMeta.version
+        : null;
     var label = node.endpoint.name + (version ? '#' + version : '');
     var update;
 
@@ -458,7 +492,8 @@ StandardRenderer.prototype._tree2archy = function (node) {
     }
 
     if (node.incompatible) {
-        label += chalk.yellow(' incompatible') + ' with ' + node.endpoint.target;
+        label +=
+            chalk.yellow(' incompatible') + ' with ' + node.endpoint.target;
     } else if (node.extraneous) {
         label += chalk.green(' extraneous');
     }
@@ -472,7 +507,7 @@ StandardRenderer.prototype._tree2archy = function (node) {
         }
 
         if (node.update.latest !== node.update.target) {
-            update += (update ? ', ' : '');
+            update += update ? ', ' : '';
             update += 'latest is ' + node.update.latest;
         }
 
@@ -500,7 +535,7 @@ StandardRenderer._wideCommands = [
     'register'
 ];
 StandardRenderer._idMappings = {
-    'mutual': 'conflict',
+    mutual: 'conflict',
     'cached-entry': 'cached'
 };
 

lib/templates/helpers/colors.js

@@ -0,0 +1,13 @@
+var chalk = require('chalk');
+
+var templateColors = ['yellow', 'green', 'cyan', 'red', 'white', 'magenta'];
+
+function colors(Handlebars) {
+    templateColors.forEach(function(color) {
+        Handlebars.registerHelper(color, function(context) {
+            return chalk[color](context.fn(this));
+        });
+    });
+}
+
+module.exports = colors;

lib/templates/helpers/condense.js

@@ -1,9 +1,9 @@
 var mout = require('mout');
 var leadLinesRegExp = /^\r?\n/;
-var multipleLinesRegExp = /\r?\n(\r?\n)+/mg;
+var multipleLinesRegExp = /\r?\n(\r?\n)+/gm;
 
 function condense(Handlebars) {
-    Handlebars.registerHelper('condense', function (context) {
+    Handlebars.registerHelper('condense', function(context) {
         var str = context.fn(this);
 
         // Remove multiple lines

lib/templates/helpers/indent.js

@@ -1,7 +1,7 @@
 var mout = require('mout');
 
 function indent(Handlebars) {
-    Handlebars.registerHelper('indent', function (context) {
+    Handlebars.registerHelper('indent', function(context) {
         var hash = context.hash;
         var indentStr = mout.string.repeat(' ', parseInt(hash.level, 10));
 

lib/templates/helpers/rpad.js

@@ -1,7 +1,7 @@
 var mout = require('mout');
 
 function rpad(Handlebars) {
-    Handlebars.registerHelper('rpad', function (context) {
+    Handlebars.registerHelper('rpad', function(context) {
         var hash = context.hash;
         var minLength = parseInt(hash.minLength, 10);
         var chr = hash.char;

lib/templates/helpers/sum.js

@@ -1,5 +1,5 @@
 function sum(Handlebars) {
-    Handlebars.registerHelper('sum', function (val1, val2) {
+    Handlebars.registerHelper('sum', function(val1, val2) {
         return val1 + val2;
     });
 }

lib/templates/json/help.json

@@ -69,6 +69,10 @@
         {
             "flag":        "--no-color",
             "description": "Disable colors"
+        },
+        {
+            "flag":        "--config.interactive=false",
+            "description": "Disable prompts"
         }
     ]
 }

lib/util/abbreviations.js

@@ -5,7 +5,7 @@ function expandNames(obj, prefix, stack) {
     prefix = prefix || '';
     stack = stack || [];
 
-    mout.object.forOwn(obj, function (value, name) {
+    mout.object.forOwn(obj, function(value, name) {
         name = prefix + name;
 
         stack.push(name);
@@ -18,7 +18,7 @@ function expandNames(obj, prefix, stack) {
     return stack;
 }
 
-module.exports = function (commands) {
+module.exports = function(commands) {
     var abbreviations = abbrev(expandNames(commands));
 
     abbreviations.i = 'install';

lib/util/cli.js

@@ -15,10 +15,10 @@ function readOptions(options, argv) {
         options = options || {};
     }
 
-    types = mout.object.map(options, function (option) {
+    types = mout.object.map(options, function(option) {
         return option.type;
     });
-    mout.object.forOwn(options, function (option, name) {
+    mout.object.forOwn(options, function(option, name) {
         shorthands[option.shorthand] = '--' + name;
     });
 
@@ -26,7 +26,7 @@ function readOptions(options, argv) {
 
     // Filter only the specified options because nopt parses every --
     // Also make them camel case
-    mout.object.forOwn(noptOptions, function (value, key) {
+    mout.object.forOwn(noptOptions, function(value, key) {
         if (options[key]) {
             parsedOptions[mout.string.camelCase(key)] = value;
         }

lib/util/cmd.js

@@ -37,17 +37,17 @@ function getWindowsCommand(command) {
     try {
         fullCommand = which.sync(command);
     } catch (err) {
-        return winWhichCache[command] = command;
+        return (winWhichCache[command] = command);
     }
 
     extension = path.extname(fullCommand).toLowerCase();
 
     // Does it need to be converted?
     if (winBatchExtensions.indexOf(extension) === -1) {
-        return winWhichCache[command] = command;
+        return (winWhichCache[command] = command);
     }
 
-    return winWhichCache[command] = fullCommand;
+    return (winWhichCache[command] = fullCommand);
 }
 
 // Executes a shell command, buffering the stdout and stderr
@@ -67,25 +67,25 @@ function executeCmd(command, args, options) {
 
     // Buffer output, reporting progress
     process = cp.spawn(command, args, options);
-    process.stdout.on('data', function (data) {
+    process.stdout.on('data', function(data) {
         data = data.toString();
         deferred.notify(data);
         stdout += data;
     });
-    process.stderr.on('data', function (data) {
+    process.stderr.on('data', function(data) {
         data = data.toString();
         deferred.notify(data);
         stderr += data;
     });
 
     // If there is an error spawning the command, reject the promise
-    process.on('error', function (error) {
+    process.on('error', function(error) {
         return deferred.reject(error);
     });
 
     // Listen to the close event instead of exit
     // They are similar but close ensures that streams are flushed
-    process.on('close', function (code) {
+    process.on('close', function(code) {
         var fullCommand;
         var error;
 
@@ -99,10 +99,19 @@ function executeCmd(command, args, options) {
             fullCommand += args.length ? ' ' + args.join(' ') : '';
 
             // Build the error instance
-            error = createError('Failed to execute "' + fullCommand + '", exit code of #' + code + '\n' + stderr, 'ECMDERR', {
-                details: stderr,
-                exitCode: code
-            });
+            error = createError(
+                'Failed to execute "' +
+                    fullCommand +
+                    '", exit code of #' +
+                    code +
+                    '\n' +
+                    stderr,
+                'ECMDERR',
+                {
+                    details: stderr,
+                    exitCode: code
+                }
+            );
 
             return deferred.reject(error);
         }

lib/util/copy.js

@@ -26,18 +26,17 @@ function copy(reader, writer) {
     deferred = Q.defer();
 
     reader
-    .on('error', deferred.reject)
-    // Pipe to writer
-    .pipe(fstream.Writer(writer))
-    .on('error', deferred.reject)
-    .on('close', deferred.resolve);
+        .on('error', deferred.reject)
+        // Pipe to writer
+        .pipe(fstream.Writer(writer))
+        .on('error', deferred.reject)
+        .on('close', deferred.resolve);
 
     return deferred.promise;
 }
 
 function copyMode(src, dst) {
-    return Q.nfcall(fs.stat, src)
-    .then(function (stat) {
+    return Q.nfcall(fs.stat, src).then(function(stat) {
         return Q.nfcall(fs.chmod, dst, stat.mode);
     });
 }
@@ -68,14 +67,17 @@ function copyFile(src, dst, opts) {
 
     opts = parseOptions(opts);
 
-    promise = copy({
-        path: src,
-        type: 'File'
-    }, {
-        path: dst,
-        mode: opts.mode,
-        type: 'File'
-    });
+    promise = copy(
+        {
+            path: src,
+            type: 'File'
+        },
+        {
+            path: dst,
+            mode: opts.mode,
+            type: 'File'
+        }
+    );
 
     if (opts.copyMode) {
         promise = promise.then(copyMode.bind(copyMode, src, dst));
@@ -93,15 +95,18 @@ function copyDir(src, dst, opts) {
 
     opts = parseOptions(opts);
 
-    promise = copy({
-        path: src,
-        type: 'Directory',
-        ignore: opts.ignore
-    }, {
-        path: dst,
-        mode: opts.mode,
-        type: 'Directory'
-    });
+    promise = copy(
+        {
+            path: src,
+            type: 'Directory',
+            ignore: opts.ignore
+        },
+        {
+            path: dst,
+            mode: opts.mode,
+            type: 'Directory'
+        }
+    );
 
     if (opts.copyMode) {
         promise = promise.then(copyMode.bind(copyMode, src, dst));

lib/util/createLink.js

@@ -0,0 +1,64 @@
+var fs = require('./fs');
+var path = require('path');
+var Q = require('q');
+var mkdirp = require('mkdirp');
+var createError = require('./createError');
+
+var isWin = process.platform === 'win32';
+
+function createLink(src, dst, type) {
+    var dstDir = path.dirname(dst);
+
+    // Create directory
+    return (
+        Q.nfcall(mkdirp, dstDir)
+            // Check if source exists
+            .then(function() {
+                return Q.nfcall(fs.stat, src).fail(function(error) {
+                    if (error.code === 'ENOENT') {
+                        throw createError(
+                            'Failed to create link to ' + path.basename(src),
+                            'ENOENT',
+                            {
+                                details:
+                                    src +
+                                    ' does not exist or points to a non-existent file'
+                            }
+                        );
+                    }
+
+                    throw error;
+                });
+            })
+            // Create symlink
+            .then(function(stat) {
+                type = type || (stat.isDirectory() ? 'dir' : 'file');
+
+                return Q.nfcall(fs.symlink, src, dst, type).fail(function(err) {
+                    if (!isWin || err.code !== 'EPERM') {
+                        throw err;
+                    }
+
+                    // Try with type "junction" on Windows
+                    // Junctions behave equally to true symlinks and can be created in
+                    // non elevated terminal (well, not always..)
+                    return Q.nfcall(fs.symlink, src, dst, 'junction').fail(
+                        function(err) {
+                            throw createError(
+                                'Unable to create link to ' +
+                                    path.basename(src),
+                                err.code,
+                                {
+                                    details:
+                                        err.message.trim() +
+                                        '\n\nTry running this command in an elevated terminal (run as root/administrator).'
+                                }
+                            );
+                        }
+                    );
+                });
+            })
+    );
+}
+
+module.exports = createLink;

lib/util/download.js

@@ -0,0 +1,153 @@
+var progress = require('request-progress');
+var request = require('request');
+var Q = require('q');
+var mout = require('mout');
+var retry = require('retry');
+var createError = require('./createError');
+var createWriteStream = require('fs-write-stream-atomic');
+var destroy = require('destroy');
+
+var errorCodes = [
+    'EADDRINFO',
+    'ETIMEDOUT',
+    'ECONNRESET',
+    'ESOCKETTIMEDOUT',
+    'ENOTFOUND'
+];
+
+function download(url, file, options) {
+    var operation;
+    var deferred = Q.defer();
+    var progressDelay = 8000;
+
+    options = mout.object.mixIn(
+        {
+            retries: 5,
+            factor: 2,
+            minTimeout: 1000,
+            maxTimeout: 35000,
+            randomize: true,
+            progressDelay: progressDelay,
+            gzip: true
+        },
+        options || {}
+    );
+
+    // Retry on network errors
+    operation = retry.operation(options);
+
+    operation.attempt(function() {
+        Q.fcall(fetch, url, file, options)
+            .then(function(response) {
+                deferred.resolve(response);
+            })
+            .progress(function(status) {
+                deferred.notify(status);
+            })
+            .fail(function(error) {
+                // Save timeout before retrying to report
+                var timeout = operation._timeouts[0];
+
+                // Reject if error is not a network error
+                if (errorCodes.indexOf(error.code) === -1) {
+                    return deferred.reject(error);
+                }
+
+                // Next attempt will start reporting download progress immediately
+                progressDelay = 0;
+
+                // This will schedule next retry or return false
+                if (operation.retry(error)) {
+                    deferred.notify({
+                        retry: true,
+                        delay: timeout,
+                        error: error
+                    });
+                } else {
+                    deferred.reject(error);
+                }
+            });
+    });
+
+    return deferred.promise;
+}
+
+function fetch(url, file, options) {
+    var deferred = Q.defer();
+
+    var contentLength;
+    var bytesDownloaded = 0;
+
+    var reject = function(error) {
+        deferred.reject(error);
+    };
+
+    var req = progress(request(url, options), {
+        delay: options.progressDelay
+    })
+        .on('response', function(response) {
+            contentLength = Number(response.headers['content-length']);
+
+            var status = response.statusCode;
+
+            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

@@ -0,0 +1,278 @@
+var path = require('path');
+var fs = require('./fs');
+var zlib = require('zlib');
+var DecompressZip = require('decompress-zip');
+var tar = require('tar-fs');
+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
+zlib.Z_DEFAULT_CHUNK = 1024 * 8;
+
+var extractors;
+var extractorTypes;
+
+extractors = {
+    '.zip': extractZip,
+    '.tar': extractTar,
+    '.tar.gz': extractTarGz,
+    '.tgz': extractTarGz,
+    '.gz': extractGz,
+    'application/zip': extractZip,
+    'application/x-zip': extractZip,
+    'application/x-zip-compressed': extractZip,
+    'application/x-tar': extractTar,
+    'application/x-tgz': extractTarGz,
+    'application/x-gzip': extractGz
+};
+
+extractorTypes = Object.keys(extractors);
+
+function extractZip(archive, dst) {
+    var deferred = Q.defer();
+
+    new DecompressZip(archive)
+        .on('error', deferred.reject)
+        .on('extract', deferred.resolve.bind(deferred, dst))
+        .extract({
+            path: dst,
+            follow: false, // Do not follow symlinks (#699)
+            filter: filterSymlinks // Filter symlink files
+        });
+
+    return deferred.promise;
+}
+
+function extractTar(archive, dst) {
+    var deferred = Q.defer();
+
+    var stream = fs.createReadStream(archive);
+
+    var reject = function(error) {
+        destroy(stream);
+        deferred.reject(error);
+    };
+
+    stream
+        .on('error', reject)
+        .pipe(
+            tar.extract(dst, {
+                ignore: isSymlink, // Filter symlink files
+                dmode: 0555, // Ensure dirs are readable
+                fmode: 0444 // Ensure files are readable
+            })
+        )
+        .on('error', reject)
+        .on('finish', function(result) {
+            destroy(stream);
+            deferred.resolve(dst);
+        });
+
+    return deferred.promise;
+}
+
+function extractTarGz(archive, dst) {
+    var deferred = Q.defer();
+
+    var stream = fs.createReadStream(archive);
+
+    var reject = function(error) {
+        destroy(stream);
+        deferred.reject(error);
+    };
+
+    stream
+        .on('error', reject)
+        .pipe(zlib.createGunzip())
+        .on('error', reject)
+        .pipe(
+            tar.extract(dst, {
+                ignore: isSymlink, // Filter symlink files
+                dmode: 0555, // Ensure dirs are readable
+                fmode: 0444 // Ensure files are readable
+            })
+        )
+        .on('error', reject)
+        .on('finish', function(result) {
+            destroy(stream);
+            deferred.resolve(dst);
+        });
+
+    return deferred.promise;
+}
+
+function extractGz(archive, dst) {
+    var deferred = Q.defer();
+
+    var stream = fs.createReadStream(archive);
+
+    var reject = function(error) {
+        destroy(stream);
+        deferred.reject(error);
+    };
+    stream
+        .on('error', reject)
+        .pipe(zlib.createGunzip())
+        .on('error', reject)
+        .pipe(createWriteStream(dst))
+        .on('error', reject)
+        .on('finish', function(result) {
+            destroy(stream);
+            deferred.resolve(dst);
+        });
+
+    return deferred.promise;
+}
+
+function isSymlink(_, entry) {
+    return entry.type === 'symlink';
+}
+
+function filterSymlinks(entry) {
+    return entry.type !== 'SymbolicLink';
+}
+
+function getExtractor(archive) {
+    // Make the archive lower case to match against the types
+    // This ensures that upper-cased extensions work
+    archive = archive.toLowerCase();
+
+    var type = mout.array.find(extractorTypes, function(type) {
+        return mout.string.endsWith(archive, type);
+    });
+
+    return type ? extractors[type] : null;
+}
+
+function isSingleDir(dir) {
+    return Q.nfcall(fs.readdir, dir).then(function(files) {
+        var singleDir;
+
+        // Remove any OS specific files from the files array
+        // before checking its length
+        files = files.filter(junk.isnt);
+
+        if (files.length !== 1) {
+            return false;
+        }
+
+        singleDir = path.join(dir, files[0]);
+
+        return Q.nfcall(fs.stat, singleDir).then(function(stat) {
+            return stat.isDirectory() ? singleDir : false;
+        });
+    });
+}
+
+function moveDirectory(srcDir, destDir) {
+    return Q.nfcall(fs.readdir, srcDir)
+        .then(function(files) {
+            var promises = files.map(function(file) {
+                var src = path.join(srcDir, file);
+                var dst = path.join(destDir, file);
+
+                return Q.nfcall(fs.rename, src, dst);
+            });
+
+            return Q.all(promises);
+        })
+        .then(function() {
+            return Q.nfcall(fs.rmdir, srcDir);
+        });
+}
+
+// -----------------------------
+
+function canExtract(src, mimeType) {
+    if (mimeType && mimeType !== 'application/octet-stream') {
+        return !!getExtractor(mimeType);
+    }
+
+    return !!getExtractor(src);
+}
+
+// Available options:
+// - keepArchive: true to keep the archive afterwards (defaults to false)
+// - keepStructure: true to keep the extracted structure unchanged (defaults to false)
+function extract(src, dst, opts) {
+    var extractor;
+    var promise;
+
+    opts = opts || {};
+    extractor = getExtractor(src);
+
+    // Try to get extractor from mime type
+    if (!extractor && opts.mimeType) {
+        extractor = getExtractor(opts.mimeType);
+    }
+
+    // If extractor is null, then the archive type is unknown
+    if (!extractor) {
+        return Q.reject(
+            createError(
+                'File ' + src + ' is not a known archive',
+                'ENOTARCHIVE'
+            )
+        );
+    }
+
+    // Extract to a temporary directory in case of file name clashes
+    return Q.nfcall(tmp.dir, {
+        template: dst + '-XXXXXX',
+        mode: 0777 & ~process.umask()
+    })
+        .then(function(tempDir) {
+            // nfcall may return multiple callback arguments as an array
+            return Array.isArray(tempDir) ? tempDir[0] : tempDir;
+        })
+        .then(function(tempDir) {
+            // Check archive file size
+            promise = Q.nfcall(fs.stat, src).then(function(stat) {
+                if (stat.size <= 8) {
+                    throw createError(
+                        'File ' + src + ' is an invalid archive',
+                        'ENOTARCHIVE'
+                    );
+                }
+
+                // Extract archive
+                return extractor(src, tempDir);
+            });
+
+            // Remove archive
+            if (!opts.keepArchive) {
+                promise = promise.then(function() {
+                    return Q.nfcall(fs.unlink, src);
+                });
+            }
+
+            // Move contents from the temporary directory
+            // If the contents are a single directory (and we're not preserving structure),
+            // move its contents directly instead.
+            promise = promise
+                .then(function() {
+                    return isSingleDir(tempDir);
+                })
+                .then(function(singleDir) {
+                    if (singleDir && !opts.keepStructure) {
+                        return moveDirectory(singleDir, dst);
+                    } else {
+                        return moveDirectory(tempDir, dst);
+                    }
+                });
+
+            // Resolve promise to the dst dir
+            return promise.then(function() {
+                return dst;
+            });
+        });
+}
+
+module.exports = extract;
+module.exports.canExtract = canExtract;

lib/util/fs.js

@@ -5,14 +5,14 @@ var readdirSync = fs.readdirSync.bind(fs);
 
 module.exports = fs;
 
-module.exports.readdir = function (dir, callback) {
-    fs.stat(dir, function (err, stats) {
+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 + '\'');
+            var error = new Error("ENOTDIR, not a directory '" + dir + "'");
             error.code = 'ENOTDIR';
             error.path = dir;
             error.errono = -20;
@@ -21,7 +21,7 @@ module.exports.readdir = function (dir, callback) {
     });
 };
 
-module.exports.readdirSync = function (dir) {
+module.exports.readdirSync = function(dir) {
     var stats = fs.statSync(dir);
 
     if (stats.isDirectory()) {