v1.7.2

Lock fs-write-steam-atomic to 1.0.5
context: https://github.com/bower/bower/issues/2118#issuecomment-168097858 Fixes #2118
2026-04-24 03:00:19 -04:00 · 2015-12-30 21:05:20 -05:00 · 2015-12-30 21:02:12 -05:00
223 changed files with 1414 additions and 8956 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,52 +1,45 @@
-{
-  "env": {
-    "node": true,
-    "mocha": true
-  },
-  "rules": {
-    "no-bitwise": 0,
-    "curly": 0,
-    "eqeqeq": 0,
-    "guard-for-in": 0,
-    "no-use-before-define": 0,
-    "no-caller": 2,
-    "no-new": 2,
-    "no-plusplus": 0,
-    "no-undef": 2,
-    "no-unused-vars": 0,
-    "strict": 0,
-    "semi": 0,
-    "comma-spacing": 2,
-    "quote-props": [2, "consistent", { "keywords": true }],
-    "quotes": [2, "single", "avoid-escape"],
-    "indent": [2, 4],
-    "no-cond-assign": [ 2, "except-parens" ],
-    "no-debugger": 2,
-    "no-dupe-args": 2,
-    "no-dupe-keys": 2,
-    "no-duplicate-case": 2,
-    "no-unreachable": 2,
-    "valid-typeof": 2,
-    "no-fallthrough": 2,
-    "no-ex-assign": 2,
-    "no-eq-null": 0,
-    "no-eval": 0,
-    "no-unused-expressions": 0,
-    "block-scoped-var": 0,
-    "no-iterator": 0,
-    "no-loop-func": 2,
-    "no-script-url": 0,
-    "no-shadow": 0,
-    "no-new-func": 2,
-    "no-new-wrappers": 2,
-    "no-invalid-this": 0,
-    "space-before-blocks": [2, "always"],
-    "space-before-function-paren": [2, {"anonymous": "always", "named": "never"}],
-    "space-infix-ops": 2,
-    "keyword-spacing": 2,
-    "new-parens": 2,
-    "no-multiple-empty-lines": [2, { max: 2}],
-    "eol-last": 2,
-    "no-trailing-spaces": 2
-  }
-}
+env:
+  node: true
+
+# enable ECMAScript features
+ecmaFeatures:
+  arrowFunctions: true
+  binaryLiterals: true
+  blockBindings: true
+  classes: true
+  forOf: true
+  generators: true
+  objectLiteralShorthandMethods: true
+  objectLiteralShorthandProperties: true
+  octalLiterals: true
+  templateStrings: true
+
+rules:
+  no-debugger: 2
+  no-dupe-args: 2
+  no-dupe-keys: 2
+  no-duplicate-case: 2
+  no-ex-assign: 2
+  no-reserved-keys: 2
+  no-unreachable: 2
+  valid-typeof: 2
+  no-fallthrough: 2
+  quotes: [2, "single", "avoid-escape"]
+  indent: [2, 2]
+  comma-spacing: 2
+  semi: 2
+  space-infix-ops: 2
+  space-return-throw-case: 2
+  space-before-function-paren: [2, "never"]
+  space-before-blocks: [2, "always"]
+  new-parens: 2
+  max-len: [2, 80, 2]
+  no-multiple-empty-lines: [2, {max: 2}]
+  eol-last: 2
+  no-trailing-spaces: 2
+  space-after-keywords: 2
+
+  # ECMAScript 6
+  prefer-const: 2
+  strict: [2, "global"]
+  no-undef: 2
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,44 +0,0 @@
-<!--
-
-If you are reporting a new issue, make sure that we do not have any duplicates.
-You can ensure this by searching the issue list for this repository.
-
-You are welcome to open issues to discuss important general topics concerning Bower.
-However for support questions, please consider using http://stackoverflow.com or
-asking for help in our Discord channel: https://discordapp.com/invite/0fFM7QF0KpZaDeN9
-
-# BUG REPORT
-
-Use the commands below to provide key information to reproduce:
-You do NOT have to include this information if this is a FEATURE REQUEST OR DISCUSSION
-
-For more information about reporting bugs, see:
-https://github.com/bower/bower/wiki/Report-a-Bug
-
-->
-
-**Output of `bower -v && npm -v && node -v`:**
-
-```
-(paste your output here)
-```
-
-**Additional environment details (proxy, private registry, etc.):**
-
-
-
-**Steps to reproduce the issue:**
-
-1.
-2.
-3.
-
-**Describe the results you received:**
-
-
-
-**Describe the results you expected:**
-
-
-
-**Additional information:**
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,3 @@
 /bower.json
 /component.json
 /bower_components
-/test/sample
-!/test/sample/bower.json
-/npm-shrinkwrap.json
--- a/.jscsrc
+++ b/.jscsrc
@@ -0,0 +1,27 @@
+{
+ 'validateIndentation': 4,
+ 'requireCamelCaseOrUpperCaseIdentifiers': true,
+ 'requireParenthesesAroundIIFE': true,
+ 'requireCapitalizedConstructors': true,
+ 'disallowEmptyBlocks': false,
+ 'validateQuoteMarks': "'",
+ 'requireOperatorBeforeLineBreak': false,
+ 'requireCommaBeforeLineBreak': true,
+ 'disallowMultipleLineStrings': true,
+ 'requireDotNotation': true,
+ 'disallowTabs': true,
+ 'disallowNewlineBeforeBlockStatements': true,
+ 'disallowTrailingWhitespace': true,
+ 'disallowMixedSpacesAndTabs': true,
+ 'requireSpaceBeforeBinaryOperators': true,
+ 'requireSpaceBeforeBlockStatements': true,
+ 'requireSpaceBeforeObjectValues': true,
+ 'requireSpaceBetweenArguments': true,
+ 'requireSpacesInFunctionDeclaration': {
+   'beforeOpeningCurlyBrace': true
+ },
+ 'requireSpacesInNamedFunctionExpression': {
+   'beforeOpeningCurlyBrace': true,
+   'beforeOpeningRoundBrace': true
+ }
+}
--- a/packages/bower-config/.jshintrc
+++ b/packages/bower-config/.jshintrc
@@ -9,7 +9,6 @@
        "beforeEach"
    ],

-    "indent": 4,
    "node": true,
    "devel": true,

@@ -17,25 +16,19 @@
    "curly": false,
    "eqeqeq": true,
    "forin": false,
-    "immed": true,
    "latedef": false,
-    "newcap": true,
    "noarg": true,
-    "noempty": false,
    "nonew": true,
    "plusplus": false,
    "regexp": false,
    "undef": true,
-    "unused": true,
-    "quotmark": "single",
+    "unused": "vars",
    "strict": false,
-    "trailing": true,

    "asi": false,
    "boss": true,
    "debug": false,
    "eqnull": true,
-    "es5": false,
    "esnext": false,
    "evil": false,
    "expr": false,
@@ -43,16 +36,12 @@
    "globalstrict": false,
    "iterator": false,
    "lastsemic": false,
-    "laxbreak": true,
-    "laxcomma": false,
    "loopfunc": true,
-    "multistr": false,
    "onecase": true,
    "regexdash": false,
    "scripturl": false,
    "smarttabs": false,
    "shadow": false,
-    "sub": false,
    "supernew": true,
    "validthis": false,

--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,16 @@
 sudo: false

-language: node_js
-
-node_js:
-  - "0.10"
-  - "0.11"
-  - "0.12"
-  - "4.0"
-  - "4.1"
-  - "4.2"
-  - "5"
-  - "6"
+env:
+  - NODE_VERSION=0.10
+  - NODE_VERSION=0.11
+  - NODE_VERSION=0.12
+  - NODE_VERSION=4.0
+  - NODE_VERSION=5.0

 install:
+  - test $TRAVIS_OS_NAME = "osx" && brew install nvm && source $(brew --prefix nvm)/nvm.sh || test $TRAVIS_OS_NAME = "linux"
+  - nvm install $NODE_VERSION
+  - npm install -g npm@^2.0.0
  - node --version
  - npm --version
  - git --version
@@ -25,7 +23,6 @@ os:
  - linux

 matrix:
-  fast_finish: true
  allow_failures:
    - os: osx
    - env: "NODE_VERSION=0.11"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,76 +1,6 @@
 # Changelog

-## Unreleased
-
- Change default shorthand resolver for github from `git://` to `https://`
- Allow to type the entire version when conflict occured, #2243
- Allow `owner/reponame` shorthand for registering components, #2248
- Allow single-char repo names and package names, #2249
- Make `bower version` no longer honor `version` in bower.json, #2232
- Add `postinstall` hook, #2252
- Allow for `@` instead of `#` for `install` and `info` commands, #2322
- Upgrade all bundled modules
-
-## 1.7.9 - 2016-04-05
-
- Show warnings for invalid bower.json fields
- Update bower-json
-  - Less strict validation on package name (allow spaces, slashes, and "@")
-
-## 1.7.8 - 2016-04-04
-
- Don't ask for git credentials in non-interactive session, fixes #956 #1009
- Prevent swallowing exceptions with programmatic api, fixes #2187
- Update graceful-fs to 4.x in all dependences, fixes nodejs/node#5213
- Resolve pluggable resolvers using cwd and fallback to global modules, fixes #1919
- Upgrade handlebars to 4.0.5, closes #2195
- Replace all % chatacters in defined scripts, instead of only first one, fixes #2174
- Update opn package to fix issues with "bower open" command on Windows
- Update bower-config
-  - Do not interpolate environment variables in script hooks, fixes bower/config#47
- Update bower-json
-  - Validate package name more strictly and allow only latin letters, dots, dashes and underscores
- Add support for "save" and "save-exact" in .bowerrc, #2161
-
-## 1.7.7 - 2016-01-27
-
-Revert locations of all files while still packaging `node_modules`.
-
-It's because people are depending on internals of bower, like
-`bower/lib/renderers/StandardRenderer`. We want to preserve this
-implicit contract, but we discourage it. The only official way
-to use bower programmatically is through `require('bower')`.
-
-## 1.7.6 - 2016-01-27
-
- Revert location of "bin/bower" as developers are using it directly ([#2157](https://github.com/bower/bower/issues/2157))
-  Note: Correctly, you should use an alias created in `npm bin --global`.
-
-## 1.7.5 - 2016-01-26
-
- Remove analytics from Bower, fixes ([#2150](https://github.com/bower/bower/pull/2150))
- Default to ^ operator on `bower install --save` ([#2145](https://github.com/bower/bower/pull/2145))
- Support absolute path in .bowerrc directory option ([#2130](https://github.com/bower/bower/pull/2130))
- Display user's name upon `bower login` command ([#2133](https://github.com/bower/bower/pull/2133))
- Decompress gzip files ([#2092](https://github.com/bower/bower/pull/2092))
- Prevent name clashes in package extraction ([#2102](https://github.com/bower/bower/pull/2102))
- When strictSsl is false, set GIT_SSL_NO_VERIFY=true ([#2129](https://github.com/bower/bower/issues/2129))
- Distribute bower with npm@3 for better Windows support ([#2146](https://github.com/bower/bower/issues/2146))
- Update request to 2.67.0 and fs-write-stream-atomic to 1.0.8
- Documentation improvements
-
-## 1.7.4 - 2016-01-21
-
-Unpublished because of issue with npm distribution:
-https://github.com/npm/npm/issues/11227
-
-## 1.7.3 - 2016-01-20
-
-Unpublished because of issue with npm distribution:
-https://github.com/npm/npm/issues/11227
-
-## 1.7.2 - 2015-12-31
-
+## 1.7.2 - 2015-12-30
 - Lock "fs-write-stream-atomic" to 1.0.5

 ## 1.7.1 - 2015-12-11
@@ -94,7 +24,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

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing to Bower

-Bower is a large community project with many different developers contributing at all levels to the project. We're **actively** looking for more contributors right now. If you're interested in becoming a Bower maintainer or supporting in any way, please fill the following form: http://goo.gl/forms/P1ndzCNoiG. There is more information about [contributing](https://github.com/bower/bower/wiki/Contributor-Guidelines) in the Wiki.
+Bower is a large community project with many different developers contributing at all levels to the project. We're **actively** looking for more contributors right now. If you're interested in becoming Bower maintainer or supporting in in any way, please full the following form: http://goo.gl/forms/P1ndzCNoiG. There is more information about [contributing](https://github.com/bower/bower/wiki/Contributor-Guidelines) in the Wiki.

 <a name="bugs"></a>
 ## 🐛 [Bug reports](https://github.com/bower/bower/wiki/Report-a-Bug)
@@ -12,7 +12,7 @@ Bower is a large community project with many different developers contributing a

 ## High-impact Involvement

-* Maintaining the bower client.
+* Maintaining the bower client. 
  * Read [Architecture doc](https://github.com/bower/bower/wiki/Rewrite-architecture)
  * Triage, close, fix and resolve [issues](https://github.com/bower/bower/issues)

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

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

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

 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
--- a/README.md
+++ b/README.md
@@ -1,11 +1,13 @@
 # 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)
+> Bower needs resources for its maintenance. Please see [our blog](http://bower.io/blog/) if you think you can help.

-[![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)
+[![Build Status](https://travis-ci.org/bower/bower.svg?branch=master)](https://travis-ci.org/bower/bower)
+[![Windows Build](https://ci.appveyor.com/api/projects/status/jr6vfra8w84plh2g/branch/master?svg=true)](https://ci.appveyor.com/project/sheerun/bower/history)
 [![Coverage Status](https://img.shields.io/coveralls/bower/bower.svg)](https://coveralls.io/r/bower/bower?branch=master)
 [![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)

 <img align="right" height="300" src="http://bower.io/img/bower-logo.png">

@@ -101,6 +103,8 @@ Bower can be configured using JSON in a `.bowerrc` file. Read over available opt
 * [Discord chat](https://discord.gg/0fFM7QF0KpZRh2cY)
 * [StackOverflow](http://stackoverflow.com/questions/tagged/bower)
 * [Mailinglist](http://groups.google.com/group/twitter-bower) - twitter-bower@googlegroups.com
+* [\#bower](http://webchat.freenode.net/?channels=bower) on Freenode
+

 ## Contributing

@@ -119,6 +123,6 @@ git config --global core.autocrlf input

 ## License

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

 Licensed under the MIT License
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,6 @@
-# http://www.appveyor.com/docs/appveyor-yml
+# Thanks for Grunt for template of this file!

-# Set build version format here instead of in the admin panel.
-version: "{build}"
+# http://www.appveyor.com/docs/appveyor-yml

 # Fix line endings in Windows. (runs before repo cloning)
 init:
@@ -12,34 +11,33 @@ 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"
+    - nodejs_version: "4"

-# Finish on first failed build
+# Allow failing jobs for bleeding-edge Node.js versions.
 matrix:
-  fast_finish: true
+  allow_failures:
+    - nodejs_version: "0.10"
+    - nodejs_version: "5"

-# Install node, display versions, install dependencies
+# Install scripts. (runs after repo cloning)
 install:
+  # Get the latest stable version of Node 0.STABLE.latest
  - ps: Install-Product node $env:nodejs_version
-  - node --version && npm --version
-  - git --version && svn --version
+  # Output useful info for debugging.
+  - node --version
+  - npm --version
+  - git --version
+  - svn --version
+  # Install all dependencies
  - npm install

 # Post-install test scripts.
 test_script:
  - cmd: npm run ci

-# Make clone much faster
-shallow_clone: true
-
-# Disable Visual Studio build and deploy
+# Don't actually build.
 build: off
-deploy: off

-# Cache node modules, and refresh if package.json changes
-cache:
-  - node_modules -> package.json
+# Set build version format here instead of in the admin panel.
+version: "{build}"
--- a/bin/bower
+++ b/bin/bower
@@ -1,3 +1,152 @@
 #!/usr/bin/env node
+'use strict';

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

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

    return Q.promise(function (resolve) {
--- a/lib/commands/home.js
+++ b/lib/commands/home.js
@@ -40,7 +40,7 @@ function home(logger, name, config) {
            throw createError('No homepage set for ' + pkgMeta.name, 'ENOHOME');
        }

-        open(homepage, { wait: false });
+        open(homepage);
        return homepage;
    });
 }
--- a/lib/commands/index.js
+++ b/lib/commands/index.js
@@ -38,7 +38,7 @@ function commandFactory(id) {
        var logger = new Logger();

        Q.try(func, logger)
-        .done(function () {
+        .then(function () {
            config.restore();
            var args = [].slice.call(arguments);
            args.unshift('end');
--- a/lib/commands/info.js
+++ b/lib/commands/info.js
@@ -2,6 +2,7 @@ var mout = require('mout');
 var Q = require('q');
 var endpointParser = require('bower-endpoint-parser');
 var PackageRepository = require('../core/PackageRepository');
+var Tracker = require('../util/analytics').Tracker;
 var defaultConfig = require('../config');

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

-    // handle @ as version divider
-    endpoint = endpoint.replace('@', '#');
-
    var repository;
    var decEndpoint;
+    var tracker;

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

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

    return Q.all([
        getPkgMeta(repository, decEndpoint, property),
--- a/lib/commands/init.js
+++ b/lib/commands/init.js
@@ -186,6 +186,12 @@ function promptUser(logger, json) {
            'default': json.main,
            'type': 'input'
        },
+        {
+            'name': 'moduleType',
+            'message': 'what types of modules does this package expose?',
+            'type': 'checkbox',
+            'choices': ['amd', 'es6', 'globals', 'node', 'yui']
+        },
        {
            'name': 'keywords',
            'message': 'keywords',
@@ -235,6 +241,7 @@ function promptUser(logger, json) {
        json.name = answers.name;
        json.description = answers.description;
        json.main = answers.main;
+        json.moduleType = answers.moduleType;
        json.keywords = toArray(answers.keywords);
        json.authors = toArray(answers.authors, ',');
        json.license = answers.license;
--- a/lib/commands/install.js
+++ b/lib/commands/install.js
@@ -1,10 +1,12 @@
 var endpointParser = require('bower-endpoint-parser');
 var Project = require('../core/Project');
+var Tracker = require('../util/analytics').Tracker;
 var defaultConfig = require('../config');

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

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

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

    return project.install(decEndpoints, options, config);
 }
--- a/lib/commands/link.js
+++ b/lib/commands/link.js
@@ -4,7 +4,6 @@ var Q = require('q');
 var Project = require('../core/Project');
 var createLink = require('../util/createLink');
 var defaultConfig = require('../config');
-var relativeToBaseDir = require('../util/relativeToBaseDir');

 function link(logger, name, localName, config) {
    if (name) {
@@ -50,7 +49,7 @@ function linkTo(logger, name, localName, config) {

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

    // Delete destination folder if any
    return Q.nfcall(rimraf, dst)
--- a/lib/commands/login.js
+++ b/lib/commands/login.js
@@ -63,7 +63,6 @@ function login(logger, options, config) {

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

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

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

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

-    config = defaultConfig(config);
+    var registryClient;

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

    return Q.nfcall(registryClient.lookup.bind(registryClient), name)
    .then(function (entry) {
+        // TODO: Handle entry.type.. for now it's only 'alias'
+        //       When we got published packages, this needs to be adjusted
        return !entry ? null : {
            name: name,
            url: entry && entry.url
--- a/lib/commands/register.js
+++ b/lib/commands/register.js
@@ -1,26 +1,22 @@
 var Q = require('q');
 var chalk = require('chalk');
 var PackageRepository = require('../core/PackageRepository');
+var Tracker = require('../util/analytics').Tracker;
 var createError = require('../util/createError');
 var defaultConfig = require('../config');

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

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

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

    // Bypass any cache
    config.offline = false;
@@ -32,6 +28,8 @@ function register(logger, name, source, config) {
            throw createError('Usage: bower register <name> <url>', 'EINVFORMAT');
        }

+        tracker.track('register');
+
        // Attempt to resolve the package referenced by the URL to ensure
        // everything is ok before registering
        repository = new PackageRepository(config, logger);
--- a/lib/commands/search.js
+++ b/lib/commands/search.js
@@ -1,16 +1,21 @@
 var Q = require('q');
-var PackageRepository = require('../core/PackageRepository');
+var RegistryClient = require('bower-registry-client');
+var Tracker = require('../util/analytics').Tracker;
 var defaultConfig = require('../config');
 var cli = require('../util/cli');
-var createError = require('../util/createError');

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

+    var json = config ? config.json : undefined;
    config = defaultConfig(config);
+    config.json = config.json || json; // Hack until bower-config is fixed...
+    config.cache = config.storage.registry;

-    var repository = new PackageRepository(config, logger);
-    var registryClient = repository.getRegistryClient();
+    registryClient = new RegistryClient(config, logger);
+    tracker = new Tracker(config);
+    tracker.track('search', name);

    if (name) {
        return Q.nfcall(registryClient.search.bind(registryClient), name);
@@ -18,7 +23,7 @@ function search(logger, name, config) {
        // List all packages when in interactive mode + json enabled, and
        // always when in non-interactive mode
        if (config.interactive && !config.json) {
-            throw createError('no parameter to bower search', 'EREADOPTIONS');
+            throw cli.createReadOptionsError('search');
        }

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

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

    var project;
+    var tracker;

    options = options || {};
    config = defaultConfig(config);
    project = new Project(config, logger);
+    tracker = new Tracker(config);
+
+    tracker.trackNames('uninstall', names);

    return project.getTree(options)
    .spread(function (tree, flattened) {
--- a/lib/commands/unregister.js
+++ b/lib/commands/unregister.js
@@ -3,6 +3,7 @@ var Q = require('q');

 var defaultConfig = require('../config');
 var PackageRepository = require('../core/PackageRepository');
+var Tracker = require('../util/analytics').Tracker;
 var createError = require('../util/createError');

 function unregister(logger, name, config) {
@@ -13,10 +14,12 @@ function unregister(logger, name, config) {

    var repository;
    var registryClient;
+    var tracker;
    var force;

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

    // Bypass any cache
    config.offline = false;
@@ -27,6 +30,8 @@ function unregister(logger, name, config) {

    repository = new PackageRepository(config, logger);

+    tracker.track('unregister');
+
    if (!config.accessToken) {
        return logger.emit('error',
             createError('Use "bower login" with collaborator credentials', 'EFORBIDDEN')
@@ -59,6 +64,7 @@ function unregister(logger, name, config) {
        return Q.nfcall(registryClient.unregister.bind(registryClient), name);
    })
    .then(function (result) {
+        tracker.track('unregistered');
        logger.info('Package unregistered', name);

        return result;
--- a/lib/commands/version.js
+++ b/lib/commands/version.js
@@ -4,149 +4,116 @@ var fs = require('../util/fs');
 var path = require('path');
 var Q = require('q');
 var execFile = require('child_process').execFile;
+var Project = require('../core/Project');
 var defaultConfig = require('../config');
 var createError = require('../util/createError');

 function version(logger, versionArg, options, config) {
+    var project;
+
    options = options || {};
-
    config = defaultConfig(config);
+    project = new Project(config, logger);

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

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

-    if (!versionArg) {
-        throw createError('No <version> agrument provided', 'EREADOPTIONS');
-    }
-
-    return driver.check(cwd)
+    return checkGit(cwd)
+    .then(function (hasGit) {
+        doGitCommit = hasGit;
+    })
+    .then(project.getJson.bind(project))
+    .then(function (json) {
+        newVersion = getNewVersion(json.version, versionArg);
+        json.version = newVersion;
+    })
+    .then(project.saveJson.bind(project))
    .then(function () {
-        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 });
-            }
+        if (doGitCommit) {
+            return gitCommitAndTag(cwd, newVersion, message);
        }
-
-        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;
+    .then(function () {
+        console.log('v' + newVersion);
+        return newVersion;
    });
 }

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

+function checkGit(cwd) {
+    var gitDir = path.join(cwd, '.git');
+    return Q.nfcall(fs.stat, gitDir)
+    .then(function (stat) {
+        if (stat.isDirectory()) {
+            return checkGitStatus(cwd);
+        }
+        return false;
+    }, function () {
+        //Ignore not found .git directory
+        return false;
+    });
+}
+
+function checkGitStatus(cwd) {
+    return Q.nfcall(which, 'git')
+    .fail(function (err) {
+        err.code = 'ENOGIT';
+        throw err;
+    })
+    .then(function () {
+        return Q.nfcall(execFile, 'git', ['status', '--porcelain'], {env: process.env, cwd: cwd});
+    })
+    .then(function (value) {
+        var stdout = value[0];
+        var lines = filterModifiedStatusLines(stdout);
+        if (lines.length) {
+            throw createError('Git working directory not clean.\n' + lines.join('\n'), 'EWORKINGDIRECTORYDIRTY');
+        }
+        return true;
+    });
+}
+
+function filterModifiedStatusLines(stdout) {
+    return stdout.trim().split('\n')
+    .filter(function (line) {
+        return line.trim() && !line.match(/^\?\? /);
+    }).map(function (line) {
+        return line.trim();
+    });
+}
+
+function gitCommitAndTag(cwd, newVersion, message) {
+    var tag = 'v' + newVersion;
+    message = message || tag;
+    message = message.replace(/%s/g, newVersion);
+    return Q.nfcall(execFile, 'git', ['add', 'bower.json'], {env: process.env, cwd: cwd})
+    .then(function () {
+        return Q.nfcall(execFile, 'git', ['commit', '-m', message], {env: process.env, cwd: cwd});
+    })
+    .then(function () {
+        return Q.nfcall(execFile, 'git', ['tag', tag, '-am', message], {env: process.env, cwd: cwd});
+    });
+}
+
+// -------------------

 version.readOptions = function (argv) {
    var cli = require('../util/cli');
--- a/lib/config.js
+++ b/lib/config.js
@@ -20,6 +20,10 @@ function readCachedConfig(cwd, overwrites) {

    object.mixIn(config, configstore);

+    // Delete the json attribute because it is no longer supported
+    // and conflicts with --json
+    delete config.json;
+
    // If interactive is auto (null), guess its value
    if (config.interactive == null) {
        config.interactive = (
@@ -47,13 +51,13 @@ function readCachedConfig(cwd, overwrites) {
    return config;
 }

-function restoreConfig() {
+function restoreConfig () {
    if (current) {
        current.restore();
    }
 }

-function resetCache() {
+function resetCache () {
    restoreConfig();
    current = undefined;
 }
--- a/lib/core/Manager.js
+++ b/lib/core/Manager.js
@@ -10,7 +10,6 @@ var semver = require('../util/semver');
 var copy = require('../util/copy');
 var createError = require('../util/createError');
 var scripts = require('./scripts');
-var relativeToBaseDir = require('../util/relativeToBaseDir');

 function Manager(config, logger) {
    this._config = config;
@@ -27,7 +26,7 @@ Manager.prototype.configure = function (setup) {
    this._conflicted = {};

    // Targets - ignore those specified in ignoredDependencies
-    this._targets = mout.array.reject(setup.targets || [], function (target) {
+    this._targets = mout.array.reject(setup.targets || [], function(target) {
        return mout.array.contains(this._config.ignoredDependencies, target.name );
    }, this);

@@ -125,7 +124,7 @@ Manager.prototype.resolve = function () {

 Manager.prototype.preinstall = function (json) {
    var that = this;
-    var componentsDir = relativeToBaseDir(this._config.cwd)(this._config.directory);
+    var componentsDir = path.join(this._config.cwd, this._config.directory);

    // If nothing to install, skip the code bellow
    if (mout.lang.isEmpty(that._dissected)) {
@@ -142,7 +141,7 @@ Manager.prototype.preinstall = function (json) {

 Manager.prototype.postinstall = function (json) {
    var that = this;
-    var componentsDir = relativeToBaseDir(this._config.cwd)(this._config.directory);
+    var componentsDir = path.join(this._config.cwd, this._config.directory);

    // If nothing to install, skip the code bellow
    if (mout.lang.isEmpty(that._dissected)) {
@@ -172,7 +171,7 @@ Manager.prototype.install = function (json) {
        return Q.resolve({});
    }

-    componentsDir = relativeToBaseDir(this._config.cwd)(this._config.directory);
+    componentsDir = path.join(this._config.cwd, this._config.directory);
    return Q.nfcall(mkdirp, componentsDir)
    .then(function () {
        var promises = [];
@@ -386,7 +385,7 @@ Manager.prototype._onFetchSuccess = function (decEndpoint, canonicalDir, pkgMeta

    // If the package is not targetable, flag it
    // It will be needed later so that untargetable endpoints
-    // will not get * converted to ^version
+    // will not get * converted to ~version
    if (!isTargetable) {
        decEndpoint.untargetable = true;
    }
@@ -595,7 +594,7 @@ Manager.prototype._dissect = function () {
        // If they are not, the resolver is incapable of handling targets
        semvers.forEach(function (decEndpoint) {
            if (decEndpoint.newly && decEndpoint.target === '*' && !decEndpoint.untargetable) {
-                decEndpoint.target = '^' + decEndpoint.pkgMeta.version;
+                decEndpoint.target = '~' + decEndpoint.pkgMeta.version;
                decEndpoint.originalTarget = '*';
            }
        });
@@ -635,7 +634,7 @@ Manager.prototype._dissect = function () {
        }, this);

        // Filter only packages that need to be installed
-        componentsDir = relativeToBaseDir(this._config.cwd)(this._config.directory);
+        componentsDir = path.resolve(that._config.cwd, that._config.directory);
        this._dissected = mout.object.filter(suitables, function (decEndpoint, name) {
            var installedMeta = this._installed[name];
            var dst;
@@ -678,8 +677,6 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
    var save;
    var choices;
    var picks = [];
-    var versionRegex = /(?:[\d\w]\.){2}[\d\w](?:.)*/;
-    var picksReleases;

    // If there are both semver and non-semver, there's no way
    // to figure out the suitable one
@@ -835,21 +832,14 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
    });

    choices = picks.map(function (pick, index) { return index + 1; });
-    picksReleases = picks.map(function (pick) { return pick.pkgMeta._release; });
    return Q.nfcall(this._logger.prompt.bind(this._logger), {
        type: 'input',
        message: 'Answer',
        validate: function (choice) {
-            var invalidChoice = 'Invalid choice';
-
-            if (choice.match(versionRegex)) {
-                return picksReleases.indexOf(choice) != -1 ? true : invalidChoice;
-            }
-
            choice = Number(mout.string.trim(choice.trim(), '!'));

            if (!choice || choice < 1 || choice > picks.length) {
-                return invalidChoice;
+                return 'Invalid choice';
            }

            return true;
@@ -861,13 +851,8 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
        // Sanitize choice
        choice = choice.trim();
        save = /^!/.test(choice) || /!$/.test(choice);  // Save if prefixed or suffixed with !
-
-        if (choice.match(versionRegex)) {
-            pick = picks[picksReleases.indexOf(choice)];
-        } else {
-            choice = Number(mout.string.trim(choice, '!'));
-            pick = picks[choice - 1];
-        }
+        choice = Number(mout.string.trim(choice, '!'));
+        pick = picks[choice - 1];

        // Save resolution
        if (save) {
--- a/lib/core/PackageRepository.js
+++ b/lib/core/PackageRepository.js
@@ -1,12 +1,11 @@
 var mout = require('mout');
 var Q = require('q');
+var RegistryClient = require('bower-registry-client');
 var ResolveCache = require('./ResolveCache');
 var resolverFactory = require('./resolverFactory');
 var createError = require('../util/createError');
-var RegistryClient = require('bower-registry-client');

 function PackageRepository(config, logger) {
-
    var registryOptions;

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

    // Instantiate the resolve cache
@@ -89,7 +87,7 @@ PackageRepository.prototype.fetch = function (decEndpoint) {
            }

            // Otherwise check for new contents
-            logger.action('validate', (pkgMeta._release ? pkgMeta._release + ' against ' : '') +
+            logger.action('validate', (pkgMeta._release ? pkgMeta._release + ' against ': '') +
                                      resolver.getSource() + (resolver.getTarget() ? '#' + resolver.getTarget() : ''));

            return resolver.hasNew(pkgMeta)
--- a/lib/core/Project.js
+++ b/lib/core/Project.js
@@ -13,7 +13,6 @@ var createError = require('../util/createError');
 var readJson = require('../util/readJson');
 var validLink = require('../util/validLink');
 var scripts = require('./scripts');
-var relativeToBaseDir = require('../util/relativeToBaseDir');

 function Project(config, logger) {
    this._config = config;
@@ -45,7 +44,7 @@ Project.prototype.install = function (decEndpoints, options, config) {
    .spread(function (json, tree) {
        // It shows an error when issuing `bower install`
        // and no bower.json is present in current directory
-        if (!that._jsonFile && decEndpoints.length === 0 ) {
+        if(!that._jsonFile && decEndpoints.length === 0 ) {
            throw createError('No bower.json present', 'ENOENT');
        }

@@ -82,14 +81,14 @@ Project.prototype.install = function (decEndpoints, options, config) {
    })
    .then(function (installed) {
        // Handle save and saveDev options
-        if (that._options.save || that._options.saveDev || that._options.saveExact || that._config.save || that._config.saveExact) {
+        if (that._options.save || that._options.saveDev || that._options.saveExact) {
            // Cycle through the specified endpoints
            decEndpoints.forEach(function (decEndpoint) {
                var jsonEndpoint;

                jsonEndpoint = endpointParser.decomposed2json(decEndpoint);

-                if (that._options.saveExact || that._config.saveExact) {
+                if (that._options.saveExact) {
                    if (decEndpoint.name !== decEndpoint.source) {
                        jsonEndpoint[decEndpoint.name] = decEndpoint.source + '#' + decEndpoint.pkgMeta.version;
                    } else {
@@ -213,20 +212,6 @@ Project.prototype.update = function (names, options) {
    });
 };

-function resolveUrlNames(names, flattened)
-{
-    for (var i = 0; i < names.length; i++)
-        if (! flattened[names[i]])
-    {
-            var url = names[i].trim().replace(/\/$/, '');
-            var packName;
-            for (packName in flattened)
-                if (! ( !flattened[packName].source))
-                    if (url == flattened[packName].source.trim().replace(/\/$/, ''))
-                        names[i] = packName;
-        }
-}
-
 Project.prototype.uninstall = function (names, options) {
    var that = this;
    var packages = {};
@@ -244,7 +229,6 @@ Project.prototype.uninstall = function (names, options) {
    // Fill in the packages to be uninstalled
    .spread(function (json, tree, flattened) {
        var promise = Q.resolve();
-        resolveUrlNames(names, flattened);

        names.forEach(function (name) {
            var decEndpoint = flattened[name];
@@ -572,11 +556,11 @@ Project.prototype._readJson = function () {
        return Q.resolve(this._json);
    }

-    return Q.fcall(function () {
+    return Q.fcall(function() {
        // This will throw if package.json does not exist
        return fs.readFileSync(path.join(that._config.cwd, 'package.json'));
    })
-    .then(function (buffer) {
+    .then(function(buffer) {
        // If package.json exists, use it's values as defaults
        var defaults = {}, npm = JSON.parse(buffer.toString());

@@ -589,12 +573,12 @@ Project.prototype._readJson = function () {

        return defaults;
    })
-    .catch(function (err) {
+    .catch(function(err) {
        // Most likely no package.json so just set default name
        return { name: path.basename(that._config.cwd) || 'root' };
    })
-    .then(function (defaults) {
-        return that._json = readJson(that._config.cwd, { assume: defaults, logger: that._logger });
+    .then(function(defaults) {
+        return that._json = readJson(that._config.cwd, { assume: defaults });
    })
    .spread(function (json, deprecated, assumed) {
        var jsonStr;
@@ -623,7 +607,7 @@ Project.prototype._readInstalled = function () {

    // Gather all folders that are actual packages by
    // looking for the package metadata file
-    componentsDir = relativeToBaseDir(this._config.cwd)(this._config.directory);
+    componentsDir = path.join(this._config.cwd, this._config.directory);
    return this._installed = Q.nfcall(glob, '*/.bower.json', {
        cwd: componentsDir,
        dot: true
@@ -664,7 +648,7 @@ Project.prototype._readLinks = function () {
    var that = this;

    // Read directory, looking for links
-    componentsDir = relativeToBaseDir(this._config.cwd)(this._config.directory);
+    componentsDir = path.join(this._config.cwd, this._config.directory);
    return Q.nfcall(fs.readdir, componentsDir)
    .then(function (filenames) {
        var promises;
@@ -756,7 +740,7 @@ Project.prototype._removePackages = function (packages) {
            }

            // Remove from json only if successfully deleted
-            if ((that._options.save || that._config.save) && that._json.dependencies) {
+            if (that._options.save && that._json.dependencies) {
                promise = promise
                .then(function () {
                    delete that._json.dependencies[name];
@@ -779,9 +763,6 @@ Project.prototype._removePackages = function (packages) {
    .then(function () {
        return that.saveJson();
    })
-    // Run post-uninstall hook before resolving with removed packages.
-    .then(scripts.postuninstall.bind(
-        null, that._config, that._logger, packages, that._installed, that._json))
    // Resolve with removed packages
    .then(function () {
        return mout.object.filter(packages, function (dir) {
--- a/lib/core/resolverFactory.js
+++ b/lib/core/resolverFactory.js
@@ -1,17 +1,17 @@
+/*jshint laxbreak:true*/
 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');
+    options.version = require('../../package.json').version;

    return getConstructor(decEndpoint, options, registryClient)
    .spread(function (ConcreteResolver, decEndpoint) {
@@ -25,7 +25,7 @@ function getConstructor(decEndpoint, options, registryClient) {

    // Below we try a series of async tests to guess the type of resolver to use
    // If a step was unable to guess the resolver, it returns undefined
-    // If a step can guess the resolver, it returns with constructor of resolver
+    // If a step can guess the resolver, it returns with construcotor of resolver

    var promise = Q.resolve();

@@ -56,19 +56,8 @@ function getConstructor(decEndpoint, options, registryClient) {
        }

        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);
-            }
+            var resolver = resolvers[resolverName]
+                || pluginResolverFactory(require(resolverName), options);

            return function () {
                if (selectedResolver === undefined) {
@@ -103,7 +92,7 @@ function getConstructor(decEndpoint, options, registryClient) {
    // Git case: git git+ssh, git+http, git+https
    //           .git at the end (probably ssh shorthand)
    //           git@ at the start
-    addResolver(function () {
+    addResolver(function() {
        if (/^git(\+(ssh|https?))?:\/\//i.test(source) || /\.git\/?$/i.test(source) || /^git@/i.test(source)) {
            decEndpoint.source = source.replace(/^git\+/, '');

--- a/lib/core/resolvers/GitHubResolver.js
+++ b/lib/core/resolvers/GitHubResolver.js
@@ -29,13 +29,16 @@ function GitHubResolver(decEndpoint, config, logger) {
        this._source += '.git';
    }

+    // Check if it's public
+    this._public = mout.string.startsWith(this._source, 'git://');
+
    // Use https:// rather than git:// if on a proxy
    if (this._config.proxy || this._config.httpsProxy) {
        this._source = this._source.replace('git://', 'https://');
    }

    // Enable shallow clones for GitHub repos
-    this._shallowClone = function () {
+    this._shallowClone = function() {
        return Q.resolve(true);
    };
 }
@@ -46,10 +49,14 @@ 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';
+    // Only fully works with public repositories and tags
+    // Could work with https/ssh protocol but not with 100% certainty
+    if (!this._public || !this._resolution.tag) {
+        return GitRemoteResolver.prototype._checkout.call(this);
+    }

+    var msg;
+    var tarballUrl = 'https://github.com/' + this._org + '/' + this._repo + '/archive/' + this._resolution.tag + '.tar.gz';
    var file = path.join(this._tempDir, 'archive.tar.gz');
    var reqHeaders = {};
    var that = this;
@@ -114,6 +121,7 @@ GitHubResolver.prototype._checkout = function () {

        return that._cleanTempDir()
        .then(GitRemoteResolver.prototype._checkout.bind(that));
+
    });
 };

--- a/lib/core/resolvers/GitRemoteResolver.js
+++ b/lib/core/resolvers/GitRemoteResolver.js
@@ -1,3 +1,4 @@
+/*jshint laxbreak:true*/
 var util = require('util');
 var url = require('url');
 var Q = require('q');
--- a/lib/core/resolvers/GitResolver.js
+++ b/lib/core/resolvers/GitResolver.js
@@ -27,18 +27,6 @@ function GitResolver(decEndpoint, config, logger) {
    mkdirp.sync(config.storage.empty);
    process.env.GIT_TEMPLATE_DIR = config.storage.empty;

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

    if (!hasGit) {
@@ -216,7 +204,7 @@ GitResolver.prototype._savePkgMeta = function (meta) {
        version = semver.clean(this._resolution.tag);

        // Warn if the package meta version is different than the resolved one
-        if (typeof meta.version === 'string' && semver.valid(meta.version) && semver.neq(meta.version, version)) {
+        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
--- a/lib/core/resolvers/Resolver.js
+++ b/lib/core/resolvers/Resolver.js
@@ -178,8 +178,7 @@ Resolver.prototype._readJson = function (dir) {

    dir = dir || this._tempDir;
    return readJson(dir, {
-        assume: { name: this._name },
-        logger: that._logger
+        assume: { name: this._name }
    })
    .spread(function (json, deprecated) {
        if (deprecated) {
@@ -218,6 +217,15 @@ Resolver.prototype._savePkgMeta = function (meta) {
    meta._source = this._source;
    meta._target = this._target;

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

--- a/lib/core/resolvers/pluginResolverFactory.js
+++ b/lib/core/resolvers/pluginResolverFactory.js
@@ -52,7 +52,7 @@ function pluginResolverFactory(resolverFactory, bower) {
        return this._decEndpoint.target || '*';
    };

-    PluginResolver.prototype.getName = function () {
+    PluginResolver.prototype.getName = function() {
        if (!this._decEndpoint.name && typeof resolver.getName === 'function') {
            return resolver.getName.call(resolver, this.getSource());
        } else if (!this._decEndpoint.name) {
@@ -70,7 +70,7 @@ function pluginResolverFactory(resolverFactory, bower) {

    // Plugin Resolver is always considered potentially cacheable
    // The "resolve" method decides whether to use cached or fetch new version.
-    PluginResolver.prototype.isCacheable = function () {
+    PluginResolver.prototype.isCacheable = function() {
        return true;
    };

@@ -95,11 +95,11 @@ function pluginResolverFactory(resolverFactory, bower) {

        var that = this;

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

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

                if (semver.validRange(target)) {
@@ -109,7 +109,7 @@ function pluginResolverFactory(resolverFactory, bower) {
                            throw createError('Resolver did not provide releases of package.');
                        }

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

                        var versions = releases.filter(function (target) {
                            return semver.clean(target.version);
@@ -191,8 +191,7 @@ function pluginResolverFactory(resolverFactory, bower) {
        var that = this;

        return readJson(dir, {
-            assume: { name: that.getName() },
-            logger: bower.logger
+            assume: { name: that.getName() }
        })
        .spread(function (json, deprecated) {
            if (deprecated) {
@@ -276,7 +275,7 @@ function pluginResolverFactory(resolverFactory, bower) {
        });
    };

-    PluginResolver.isTargetable = function () {
+    PluginResolver.isTargetable = function() {
        // If resolver doesn't define versions function, it's not targetable..
        return typeof resolver.releases === 'function';
    };
--- a/lib/core/scripts.js
+++ b/lib/core/scripts.js
@@ -78,18 +78,17 @@ var run = function (cmdString, action, logger, config) {

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

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

 module.exports = {
    preuninstall: mout.function.partial(hook, 'preuninstall', false),
-    postuninstall: mout.function.partial(hook, 'postuninstall', false),
    preinstall: mout.function.partial(hook, 'preinstall', true),
    postinstall: mout.function.partial(hook, 'postinstall', true),
    //only exposed for test
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,6 +1,6 @@
 var commands = require('./commands');
-var version = require('./version');
-var abbreviations = require('./util/abbreviations')(commands);
+var pkg = require('../package.json');
+var abbreviations = require('./abbreviations')(commands);

 function clearRuntimeCache() {
    // Note that in edge cases, some architecture components instance's
@@ -11,7 +11,7 @@ function clearRuntimeCache() {
 }

 module.exports = {
-    version: version,
+    version: pkg.version,
    commands: commands,
    config: require('./config')(),
    abbreviations: abbreviations,
--- a/lib/renderers/JsonRenderer.js
+++ b/lib/renderers/JsonRenderer.js
@@ -31,8 +31,10 @@ JsonRenderer.prototype.error = function (err) {
    err.message = message;

    // Stack
+    // jscs:disable requireCamelCaseOrUpperCaseIdentifiers
    stack = err.fstream_stack || err.stack || 'N/A';
    err.stacktrace = (Array.isArray(stack) ? stack.join('\n') : stack);
+    // jscs:enable requireCamelCaseOrUpperCaseIdentifiers

    this.log(err);
    this.end();
--- a/lib/renderers/StandardRenderer.js
+++ b/lib/renderers/StandardRenderer.js
@@ -6,7 +6,7 @@ var Q = require('q');
 var stringifyObject = require('stringify-object');
 var os = require('os');
 var semverUtils = require('semver-utils');
-var version = require('../version');
+var pkg = require(path.join(__dirname, '../..', 'package.json'));
 var template = require('../util/template');

 function StandardRenderer(command, config) {
@@ -72,17 +72,19 @@ StandardRenderer.prototype.error = function (err) {
    // Print trace if verbose, the error has no code
    // or if the error is a node error
    if (this._config.verbose || !err.code || err.errno) {
+        // jscs:disable requireCamelCaseOrUpperCaseIdentifiers
        stack = err.fstream_stack || err.stack || 'N/A';
        str = chalk.yellow('\nStack trace:\n');
        str += (Array.isArray(stack) ? stack.join('\n') : stack) + '\n';
        str += chalk.yellow('\nConsole trace:\n');
+        // jscs:enable requireCamelCaseOrUpperCaseIdentifiers

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

        // Print bower version, node version and system info.
        this._write(process.stderr, chalk.yellow('\nSystem info:\n'));
-        this._write(process.stderr, 'Bower version: ' + version + '\n');
+        this._write(process.stderr, 'Bower version: ' + pkg.version + '\n');
        this._write(process.stderr, 'Node version: ' + process.versions.node + '\n');
        this._write(process.stderr, 'OS: ' + os.type() + ' ' + os.release() + ' ' + os.arch() + '\n');
    }
@@ -212,7 +214,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;
--- a/lib/templates/json/help-version.json
+++ b/lib/templates/json/help-version.json
@@ -1,14 +0,0 @@
-{
-    "command": "version",
-    "description": "Creates an empty version commit and tag, and fail if the repo is not clean.\n\nThe <version> argument should be a valid semver string, or one of following:\nbuild, patch, minor, major.\n\nIf supplied with --message (shorthand: -m) config option, bower will use it\nas a commit message when creating a version commit. If the message config\ncontains %s then that will be replaced with the resulting version number.\n\nFor example:\n\n    bower version patch -m \"Upgrade to %s for reasons\"",
-    "usage": [
-        "version [<version> | major | minor | patch]"
-    ],
-    "options": [
-        {
-            "shorthand":   "-m",
-            "flag":        "--message",
-            "description": "Custom git commit and tag message"
-        }
-    ]
-}
--- a/lib/util/analytics.js
+++ b/lib/util/analytics.js
@@ -0,0 +1,127 @@
+var Q = require('q');
+var mout = require('mout');
+
+var analytics = module.exports;
+
+var insight;
+
+var enableAnalytics = false;
+
+// Insight takes long to load, and often causes problems
+// in non-interactive environment, so we load it lazily
+//
+// Insight is used in two cases:
+//
+// 1. Read insight configuration (whether track user actions)
+// 2. Track user actions (Tracker.track method)
+//
+// We don't want to instantiate Insight in non-interactive mode
+// because it takes time to read config and configstore has concurrency issues:
+//
+// https://github.com/yeoman/configstore/issues/20
+
+function ensureInsight () {
+    if (!insight) {
+        var Insight = require('insight');
+
+        if (process.env.NODE_ENV === 'test') {
+            insight = new Insight({
+                trackingCode: 'UA-00000000-0',
+                pkg: {
+                    name: 'bower-test',
+                    version: '1.0.0'
+                }
+            });
+
+            insight.config.clear();
+        } else {
+            insight = new Insight({
+                trackingCode: 'UA-43531210-1',
+                pkg: require('../../package.json')
+            });
+        }
+    }
+}
+
+// Initializes the application-wide insight singleton and asks for the
+// permission on the CLI during the first run.
+//
+// This method is called only from bin/bower. Programmatic API skips it.
+analytics.setup = function setup (config) {
+    var deferred = Q.defer();
+
+    // No need for asking if analytics is set in bower config
+    if (config.analytics === undefined) {
+        ensureInsight();
+
+        // For non-interactive call from bin/bower we disable analytics
+        if (config.interactive) {
+            if (insight.optOut !== undefined) {
+                deferred.resolve(!insight.optOut);
+            } else {
+                insight.askPermission(null, function(err, optIn) {
+                    // optIn callback param was exactly opposite before 0.4.3
+                    // so we force at least insight@0.4.3 in package.json
+                    deferred.resolve(optIn);
+                });
+            }
+        } else {
+            // no specified value, no stored value, and can't prompt for one
+            // most likely CI environment; defaults to false to reduce data noise
+            deferred.resolve(false);
+        }
+    } else {
+        // use the specified value
+        deferred.resolve(config.analytics);
+    }
+
+    return deferred.promise.then(function (enabled) {
+        enableAnalytics = enabled;
+
+        return enabled;
+    });
+};
+
+var Tracker = analytics.Tracker = function Tracker (config) {
+    function analyticsEnabled () {
+        // Allow for overriding analytics default
+        if (config && config.analytics !== undefined) {
+            return config.analytics;
+        }
+
+        // TODO: let bower pass this variable from bin/bower instead closure
+        return enableAnalytics;
+    }
+
+    if (analyticsEnabled()) {
+        ensureInsight();
+    } else {
+        this.track = function noop () {};
+        this.trackDecomposedEndpoints = function noop () {};
+        this.trackPackages = function noop () {};
+        this.trackNames = function noop () {};
+    }
+};
+
+Tracker.prototype.track = function track () {
+    insight.track.apply(insight, arguments);
+};
+
+Tracker.prototype.trackDecomposedEndpoints = function trackDecomposedEndpoints (command, endpoints) {
+    endpoints.forEach(function (endpoint) {
+        this.track(command, endpoint.source, endpoint.target);
+    }.bind(this));
+};
+
+Tracker.prototype.trackPackages = function trackPackages (command, packages) {
+    mout.object.forOwn(packages, function (_package) {
+        var meta = _package.pkgMeta;
+        this.track(command, meta.name, meta.version);
+    }.bind(this));
+};
+
+Tracker.prototype.trackNames = function trackNames (command, names) {
+    names.forEach(function (name) {
+        this.track(command, name);
+    }.bind(this));
+};
--- a/lib/util/cli.js
+++ b/lib/util/cli.js
@@ -1,6 +1,9 @@
 var mout = require('mout');
 var nopt = require('nopt');
 var renderers = require('../renderers');
+var createError = require('./createError');
+
+var READ_OPTIONS_ERROR_CODE = 'EREADOPTIONS';

 function readOptions(options, argv) {
    var types;
@@ -37,6 +40,16 @@ function readOptions(options, argv) {
    return parsedOptions;
 }

+/**
+ * Creates an error for the case where a command has trouble parsing command
+ * line options.
+ **/
+function createReadOptionsError(commandName) {
+    var errorString = commandName + ' syntax error';
+
+    return createError(errorString, READ_OPTIONS_ERROR_CODE);
+}
+
 function getRenderer(command, json, config) {
    if (config.json || json) {
        return new renderers.Json(command, config);
@@ -47,3 +60,6 @@ function getRenderer(command, json, config) {

 module.exports.readOptions = readOptions;
 module.exports.getRenderer = getRenderer;
+
+module.exports.createReadOptionsError = createReadOptionsError;
+module.exports.READ_OPTIONS_ERROR_CODE = READ_OPTIONS_ERROR_CODE;
--- a/lib/util/download.js
+++ b/lib/util/download.js
@@ -26,8 +26,7 @@ function download(url, file, options) {
        minTimeout: 1000,
        maxTimeout: 35000,
        randomize: true,
-        progressDelay: progressDelay,
-        gzip: true
+        progressDelay: progressDelay
    }, options || {});

    // Retry on network errors
@@ -35,7 +34,7 @@ function download(url, file, options) {

    operation.attempt(function () {
        Q.fcall(fetch, url, file, options)
-        .then(function (response) {
+        .then(function(response) {
            deferred.resolve(response);
        })
        .progress(function (status) {
--- a/lib/util/extract.js
+++ b/lib/util/extract.js
@@ -9,7 +9,6 @@ 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
@@ -165,11 +164,15 @@ function isSingleDir(dir) {
    });
 }

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

            return Q.nfcall(fs.rename, src, dst);
@@ -178,7 +181,7 @@ function moveDirectory(srcDir, destDir) {
        return Q.all(promises);
    })
    .then(function () {
-        return Q.nfcall(fs.rmdir, srcDir);
+        return Q.nfcall(fs.rmdir, dir);
    });
 }

@@ -212,53 +215,44 @@ function extract(src, dst, opts) {
        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);
-            });
+    // 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');
        }

-        // Move contents from the temporary directory
-        // If the contents are a single directory (and we're not preserving structure),
-        // move its contents directly instead.
+        // Extract archive
+        return extractor(src, dst);
+    });
+
+    // TODO: There's an issue here if the src and dst are the same and
+    //       The zip name is the same as some of the zip file contents
+    //       Maybe create a temp directory inside dst, unzip it there,
+    //       unlink zip and then move contents
+
+    // Remove archive
+    if (!opts.keepArchive) {
        promise = promise
        .then(function () {
-            return isSingleDir(tempDir);
+            return Q.nfcall(fs.unlink, src);
+        });
+    }
+
+    // Move contents if a single directory was extracted
+    if (!opts.keepStructure) {
+        promise = promise
+        .then(function () {
+            return isSingleDir(dst);
        })
        .then(function (singleDir) {
-            if (singleDir && !opts.keepStructure) {
-                return moveDirectory(singleDir, dst);
-            } else {
-                return moveDirectory(tempDir, dst);
-            }
+            return singleDir ? moveSingleDirContents(singleDir) : null;
        });
+    }

-        // Resolve promise to the dst dir
-        return promise.then(function () {
-            return dst;
-        });
+    // Resolve promise to the dst dir
+    return promise.then(function () {
+        return dst;
    });
 }

--- a/lib/util/isPathAbsolute.js
+++ b/lib/util/isPathAbsolute.js
@@ -1,5 +0,0 @@
-function isPathAbsolute(filePath) {
-    return filePath.charAt(0) === '/';
-}
-
-module.exports = isPathAbsolute;
--- a/lib/util/readJson.js
+++ b/lib/util/readJson.js
@@ -17,16 +17,6 @@ function readJson(file, options) {
    .spread(function (json, jsonFile) {
        var deprecated;

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

--- a/lib/util/relativeToBaseDir.js
+++ b/lib/util/relativeToBaseDir.js
@@ -1,14 +0,0 @@
-var path = require('path');
-var isPathAbsolute = require('./isPathAbsolute');
-
-function relativeToBaseDir(baseDir) {
-    return function (filePath) {
-        if (isPathAbsolute(filePath)) {
-            return path.resolve(filePath);
-        } else {
-            return path.resolve(baseDir, filePath);
-        }
-    };
-}
-
-module.exports = relativeToBaseDir;
--- a/lib/util/resolve.js
+++ b/lib/util/resolve.js
@@ -1,22 +0,0 @@
-var requireg = require('requireg');
-var resolve = require('resolve');
-
-function startsWith(string, searchString, position) {
-    position = position || 0;
-    return string.substr(position, searchString.length) === searchString;
-};
-
-module.exports = function (id, options) {
-    var resolvedPath;
-
-    var cwd = (options || {}).cwd || process.cwd();
-
-    try {
-        resolvedPath = resolve.sync(id, { basedir: cwd });
-    } catch (e) {
-        // Fallback to global require
-        resolvedPath = requireg.resolve(id);
-    }
-
-    return resolvedPath;
-}
--- a/lib/util/rootCheck.js
+++ b/lib/util/rootCheck.js
@@ -1,3 +1,5 @@
+/*jshint multistr:true*/
+// jscs:disable disallowMultipleLineStrings
 'use strict';
 var isRoot = require('is-root');
 var createError = require('./createError');
--- a/lib/util/template.js
+++ b/lib/util/template.js
@@ -2,9 +2,9 @@ var path = require('path');
 var fs = require('./fs');
 var Handlebars = require('handlebars');
 var mout = require('mout');
-var helpers = require('../templates/helpers');
+var helpers = require('../../templates/helpers');

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

 // Register helpers
--- a/lib/util/userAgent.js
+++ b/lib/util/userAgent.js
@@ -1,3 +1,3 @@
-var version = require('../version');
+var pkg = require('../../package.json');

-module.exports = 'node/' + process.version + ' ' + process.platform + ' ' + process.arch + ' ' + ';Bower ' + version;
+module.exports = 'node/' + process.version + ' ' + process.platform + ' ' + process.arch + ' ' + ';Bower ' + pkg.version;
--- a/lib/version.js
+++ b/lib/version.js
@@ -1,3 +0,0 @@
-var findup = require('findup-sync');
-
-module.exports = require(findup('package.json', { cwd: __dirname })).version;
--- a/package.json
+++ b/package.json
@@ -1,12 +1,11 @@
 {
  "name": "bower",
-  "version": "1.7.9",
+  "version": "1.7.2",
  "description": "The browser package manager",
  "author": "Twitter",
  "license": "MIT",
  "repository": "bower/bower",
  "main": "lib",
-  "bin": "bin/bower",
  "homepage": "http://bower.io",
  "engines": {
    "node": ">=0.10.0"
@@ -17,26 +16,26 @@
  "dependencies": {
    "abbrev": "^1.0.5",
    "archy": "1.0.0",
-    "bower-config": "^1.4.0",
+    "bower-config": "^1.3.0",
    "bower-endpoint-parser": "^0.2.2",
-    "bower-json": "^0.8.1",
+    "bower-json": "^0.4.0",
    "bower-logger": "^0.2.2",
    "bower-registry-client": "^1.0.0",
    "cardinal": "0.4.4",
    "chalk": "^1.0.0",
    "chmodr": "^1.0.2",
-    "configstore": "^2.0.0",
-    "decompress-zip": "^0.2.1",
+    "configstore": "^0.3.2",
+    "decompress-zip": "^0.1.0",
    "destroy": "^1.0.3",
-    "findup-sync": "^0.3.0",
-    "fs-write-stream-atomic": "1.0.8",
+    "fs-write-stream-atomic": "1.0.5",
    "fstream": "^1.0.3",
    "fstream-ignore": "^1.0.2",
    "github": "^0.2.3",
    "glob": "^4.3.2",
-    "graceful-fs": "^4.1.3",
-    "handlebars": "^4.0.5",
+    "graceful-fs": "^3.0.5",
+    "handlebars": "^2.0.0",
    "inquirer": "0.10.0",
+    "insight": "^0.7.0",
    "is-root": "^1.0.0",
    "junk": "^1.0.0",
    "lockfile": "^1.0.0",
@@ -45,14 +44,12 @@
    "mkdirp": "0.5.0",
    "mout": "^0.11.0",
    "nopt": "^3.0.1",
-    "opn": "^4.0.0",
+    "opn": "^1.0.1",
    "p-throttler": "0.1.1",
    "promptly": "0.2.0",
    "q": "^1.1.2",
-    "request": "2.67.0",
+    "request": "2.53.0",
    "request-progress": "0.3.1",
-    "requireg": "^0.1.5",
-    "resolve": "^1.1.7",
    "retry": "0.6.1",
    "rimraf": "^2.2.8",
    "semver": "^2.3.0",
@@ -60,41 +57,88 @@
    "shell-quote": "^1.4.2",
    "stringify-object": "^1.0.0",
    "tar-fs": "^1.4.1",
-    "tmp": "0.0.28",
+    "tmp": "0.0.24",
    "update-notifier": "^0.6.0",
    "user-home": "^1.1.0",
    "which": "^1.0.8"
  },
  "devDependencies": {
-    "arr-diff": "^2.0.0",
-    "chai": "^3.5.0",
-    "coveralls": "^2.11.9",
+    "chai": "^1.10.0",
+    "coveralls": "^2.11.2",
    "expect.js": "^0.3.1",
-    "grunt": "^1.0.1",
-    "grunt-cli": "^1.1.0",
-    "grunt-contrib-watch": "^1.0.0",
-    "grunt-eslint": "^18.1.0",
-    "grunt-exec": "^0.4.7",
-    "grunt-simple-mocha": "^0.4.1",
-    "in-publish": "^2.0.0",
-    "istanbul": "^0.4.3",
-    "load-grunt-tasks": "^3.5.0",
-    "mocha": "^2.5.3",
+    "grunt": "^0.4.5",
+    "grunt-cli": "^0.1.13",
+    "grunt-contrib-jshint": "^0.10.0",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-exec": "^0.4.6",
+    "grunt-jscs": "^2.3.0",
+    "grunt-simple-mocha": "^0.4.0",
+    "istanbul": "^0.3.5",
+    "load-grunt-tasks": "^2.0.0",
+    "mocha": "^2.1.0",
    "multiline": "^1.0.2",
-    "nock": "^7.7.2",
-    "node-uuid": "^1.4.7",
-    "proxyquire": "^1.7.9",
-    "spawn-sync": "1.0.15",
-    "wrench": "^1.5.8"
+    "nock": "^3.1.0",
+    "node-uuid": "^1.4.2",
+    "proxyquire": "^1.3.0",
+    "spawn-sync": "1.0.13"
  },
+  "bundledDependencies": [
+    "abbrev",
+    "archy",
+    "bower-config",
+    "bower-endpoint-parser",
+    "bower-json",
+    "bower-logger",
+    "bower-registry-client",
+    "cardinal",
+    "chalk",
+    "chmodr",
+    "configstore",
+    "decompress-zip",
+    "destroy",
+    "fs-write-stream-atomic",
+    "fstream",
+    "fstream-ignore",
+    "github",
+    "glob",
+    "graceful-fs",
+    "handlebars",
+    "inquirer",
+    "insight",
+    "is-root",
+    "junk",
+    "lockfile",
+    "lru-cache",
+    "md5-hex",
+    "mkdirp",
+    "mout",
+    "nopt",
+    "opn",
+    "p-throttler",
+    "promptly",
+    "q",
+    "request",
+    "request-progress",
+    "retry",
+    "rimraf",
+    "semver",
+    "shell-quote",
+    "stringify-object",
+    "tar-fs",
+    "tmp",
+    "update-notifier",
+    "user-home",
+    "which"
+  ],
  "scripts": {
    "test": "grunt test",
    "ci": "grunt travis",
-    "coveralls": "coveralls",
-    "prepublish": "in-publish && echo 'You need to use \"grunt publish\" to publish bower' && false || not-in-publish"
+    "coveralls": "coveralls"
  },
+  "bin": "bin/bower",
  "files": [
    "bin",
-    "lib"
+    "lib",
+    "templates"
  ]
 }
--- a/packages/bower-config/.editorconfig
+++ b/packages/bower-config/.editorconfig
@@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
--- a/packages/bower-config/.gitignore
+++ b/packages/bower-config/.gitignore
@@ -1,7 +0,0 @@
-node_modules
-npm-debug.log
-
-test/assets/github-test-package
-test/assets/github-test-package-copy
-test/assets/temp
-test/reports
--- a/packages/bower-config/.travis.yml
+++ b/packages/bower-config/.travis.yml
@@ -1,9 +0,0 @@
-sudo: false
-language: node_js
-node_js:
-  - '5'
-  - '4'
-  - '0.12'
-  - '0.10'
-script:
-  - grunt travis
--- a/packages/bower-config/CHANGELOG.md
+++ b/packages/bower-config/CHANGELOG.md
@@ -1,103 +0,0 @@
-# Changelog
-
-## 1.4.0
-
- Change default shorthand resolver from git:// to https://
-
-## 1.3.1
-
- Ignore hook scripts for environment variable expansion
-
-## 1.3.0 - 2015-12-07
-
- Allow the use of environment variables in .bowerrc. Fixes [#41](https://github.com/bower/config/issues/41)
- Loads the .bowerrc file from the cwd specified on the command line. Fixes [bower/bower#1993](https://github.com/bower/bower/issues/1993)
- Allwow for array notation in ENV variables [#44](https://github.com/bower/config/issues/44)
-
-## 1.2.3 - 2015-11-27
-
- Restores env variables if they are undefined at the beginning
- Handles default setting for config.ca. Together with [bower/bower PR #1972](https://github.com/bower/bower/pull/1972), fixes downloading with `strict-ssl` using custom CA
- Displays an error message if .bowerrc is a directory instead of file. Fixes [bower/bower#2022](https://github.com/bower/bower/issues/2022)
-
-## 1.2.2 - 2015-10-16
- Fixes registry configurartion expanding [bower/bower#1950](https://github.com/bower/bower/issues/1950)
-
-## 1.2.1 - 2015-10-15
- Fixes case insenstivity HTTP_PROXY setting issue on Windows
-
-## 1.2.0 - 2015-09-28
- Prevent defaulting cwd to process.cwd()
-
-## 1.1.2 - 2015-09-27
- Performs only camel case normalisation before merging
-
-## 1.1.1 - 2015-09-27
- Fix: Merge extra options after camel-case normalisation, instead of before it
-
-## 1.1.0 - 2015-09-27
- Allow for overwriting options with .load(overwrites) / .read(cwd, overwrites)
-
-## 1.0.1 - 2015-09-27
- Update dependencies and relax "mout" version range
- Most significant changes:
-  - graceful-fs updated from 2.x version to 4.x
-  - osenv updated to from 0.0.x to 0.1.x, [tmp location changed](https://github.com/npm/osenv/commit/d6eddbc026538b09026b1dbd60fbc081a8c67e03)
-
-## 1.0.0 - 2015-09-27
- Support for no-proxy configuration variable
- Overwrite HTTP_PROXY, HTTPS_PROXY, and NO_PROXY env variables in load method
- Normalise paths to certificates with contents of them, [#28](https://github.com/bower/config/pull/28)
-
-## 0.6.1 - 2015-04-1
- Fixes merging .bowerrc files upward directory tree. [#25](https://github.com/bower/config/issues/25)
-
-## 0.6.0 - 2015-03-30
- Merge .bowerrc files upward directory tree (fixes [bower/bower#1689](https://github.com/bower/bower/issues/1689)) [#24](https://github.com/bower/config/pull/24)
- Allow NPM config variables (resolves [bower/bower#1711](https://github.com/bower/bower/issues/1711)) [#23](https://github.com/bower/config/pull/23)
-
-## 0.5.2 - 2014-06-09
- Fixes downloading of bower modules with ignores when .bowerrc is overridden with a relative tmp path. [#17](https://github.com/bower/config/issues/17) [bower/bower#1299](https://github.com/bower/bower/issues/1299)
-
-## 0.5.1 - 2014-05-21
- [perf] Uses the same mout version as bower
- [perf] Uses only relevant parts of mout. Related [bower/bower#1134](https://github.com/bower/bower/pull/1134)
-
-## 0.5.0 - 2013-08-30
- Adds a DEFAULT_REGISTRY key to the Config class that exposes the bower registry UR. [#6](https://github.com/bower/config/issues/6)
-
-## 0.4.5 - 2013-08-28
- Fixes crashing when home is not set
-
-## 0.4.4 - 2013-08-21
- Supports nested environment variables [#8](https://github.com/bower/config/issues/8)
-
-## 0.4.3 - 2013-08-19
- Improvement in argv.config parsing
-
-## 0.4.2 - 2013-08-18
- Sets interative to auto
-
-## 0.4.1 - 2013-08-18
- Generates a fake user instead of using 'unknown'
-
-## 0.4.0 - 2013-08-16
- Suffixes temp folder with the user and 'bower'
-
-## 0.3.5 - 2013-08-14
- Casts buffer to string
-
-## 0.3.4 - 2013-08-11
- Empty .bowerrc files no longer throw an error.
-
-## 0.3.3 - 2013-08-11
- Changes git folder to empty (was not being used anyway)
-
-## 0.3.2 - 2013-08-07
- Uses a known user agent by default when a proxy.
-
-## 0.3.1 - 2013-08-06
- Fixes Typo
-
-## 0.3.0 - 2013-08-06
- Appends the username when using the temporary folder.
--- a/packages/bower-config/Gruntfile.js
+++ b/packages/bower-config/Gruntfile.js
@@ -1,53 +0,0 @@
-'use strict';
-module.exports = function (grunt) {
-    require('load-grunt-tasks')(grunt);
-
-    grunt.initConfig({
-        jshint: {
-            options: {
-                jshintrc: '.jshintrc'
-            },
-            files: [
-                'Gruntfile.js',
-                'bin/*',
-                'lib/**/*.js',
-                'test/**/*.js',
-                '!test/assets/**/*',
-                '!test/reports/**/*',
-                '!test/tmp/**/*'
-            ]
-        },
-        simplemocha: {
-            options: {
-                reporter: 'spec',
-                timeout: '10000'
-            },
-            full: {
-                src: ['test/test.js']
-            },
-            short: {
-                options: {
-                    reporter: 'dot'
-                },
-                src: ['test/test.js']
-            }
-        },
-        exec: {
-            cover: {
-                command: 'STRICT_REQUIRE=1 node node_modules/istanbul/lib/cli.js cover --dir ./test/reports node_modules/mocha/bin/_mocha -- --timeout 30000 -R dot test/test.js'
-            },
-            coveralls: {
-                command: 'node node_modules/.bin/coveralls < test/reports/lcov.info'
-            }
-        },
-        watch: {
-            files: ['<%= jshint.files %>'],
-            tasks: ['jshint', 'simplemocha:short']
-        }
-    });
-
-    grunt.registerTask('test', ['jshint', 'simplemocha:full']);
-    grunt.registerTask('cover', 'exec:cover');
-    grunt.registerTask('travis', ['jshint', 'exec:cover', 'exec:coveralls']);
-    grunt.registerTask('default', 'test');
-};
--- a/packages/bower-config/LICENSE
+++ b/packages/bower-config/LICENSE
@@ -1,19 +0,0 @@
-Copyright (c) 2012 Twitter and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/packages/bower-config/README.md
+++ b/packages/bower-config/README.md
@@ -1,76 +0,0 @@
-# bower-config [![Build Status](https://secure.travis-ci.org/bower/config.png?branch=master)](http://travis-ci.org/bower/config)[![Coverage Status](https://coveralls.io/repos/bower/config/badge.svg?branch=master&service=github)](https://coveralls.io/github/bower/config?branch=master)
-
-> The Bower config (`.bowerrc`) reader and writer.
-
-[Bower](http://bower.io/) can be configured using JSON in a `.bowerrc` file. For example:
-
-    {
-      "directory": "app/components/",
-      "timeout": 120000,
-      "registry": {
-        "search": [
-          "http://localhost:8000",
-          "https://bower.herokuapp.com"
-        ]
-      }
-    }
-
-View the complete [.bowerrc specification](http://bower.io/docs/config/#bowerrc-specification) on the website for more details. Both the `bower.json` and `.bowerrc` specifications are maintained at [github.com/bower/spec](https://github.com/bower/spec).
-
-## Install
-
-```sh
-$ npm install --save bower-config
-```
-
-
-## Usage
-
-#### .load(overwrites)
-
-Loads the bower configuration from the configuration files.
-
-Configuration is overwritten (after camelcase normalisation) with `overwrites` argument.
-
-This method overwrites following environment variables:
-
- `HTTP_PROXY` with `proxy` configuration variable
- `HTTPS_PROXY` with `https-proxy` configuration variable
- `NO_PROXY` with `no-proxy` configuration variable
-
-It also clears `http_proxy`, `https_proxy`, and `no_proxy` environment variables.
-
-To restore those variables you can use `restore` method.
-
-#### restore()
-
-Restores environment variables overwritten by `.load` method.
-
-#### .toObject()
-
-Returns a deep copy of the underlying configuration object.
-The returned configuration is normalised.
-The object keys will be camelCase.
-
-
-#### #create(cwd)
-
-Obtains a instance where `cwd` is the current working directory (defaults to `process.cwd`);
-
-```js
-var config = require('bower-config').create();
-// You can also specify a working directory
-var config2 = require('bower-config').create('./some/path');
-```
-
-#### #read(cwd, overrides)
-
-Alias for:
-
-```js
-var configObject = (new Config(cwd)).load(overrides).toJson();
-```
-
-## License
-
-Released under the [MIT License](http://www.opensource.org/licenses/mit-license.php).
--- a/packages/bower-config/lib/Config.js
+++ b/packages/bower-config/lib/Config.js
@@ -1,109 +0,0 @@
-var lang = require('mout/lang');
-var object = require('mout/object');
-var rc = require('./util/rc');
-var expand = require('./util/expand');
-var EnvProxy = require('./util/proxy');
-var path = require('path');
-var fs = require('fs');
-
-function Config(cwd) {
-    this._cwd = cwd;
-    this._proxy = new EnvProxy();
-    this._config = {};
-}
-
-Config.prototype.load = function (overwrites) {
-    this._config = rc('bower', this._cwd);
-
-    this._config = object.merge(
-      expand(this._config || {}),
-      expand(overwrites || {})
-    );
-
-    this._config = normalise(this._config);
-
-    this._proxy.set(this._config);
-
-    return this;
-};
-
-Config.prototype.restore = function () {
-  this._proxy.restore();
-};
-
-function readCertFile(path) {
-    path = path || '';
-
-    var sep = '-----END CERTIFICATE-----';
-
-    var certificates;
-
-    if (path.indexOf(sep) === -1) {
-        certificates = fs.readFileSync(path, { encoding: 'utf8' });
-    } else {
-        certificates = path;
-    }
-
-    return certificates.
-      split(sep).
-      filter(function(s) { return !s.match(/^\s*$/); }).
-      map(function(s) { return s + sep; });
-}
-
-function loadCAs(caConfig) {
-    // If a ca file path has been specified, expand that here to the file's
-    // contents. As a user can specify these individually, we must load them
-    // one by one.
-    for (var p in caConfig) {
-        if (caConfig.hasOwnProperty(p)) {
-            var prop = caConfig[p];
-            if (Array.isArray(prop)) {
-                caConfig[p] = prop.map(function(s) {
-                    return readCertFile(s);
-                });
-            } else if (prop) {
-                caConfig[p] = readCertFile(prop);
-            }
-        }
-    }
-}
-
-Config.prototype.toObject = function () {
-    return lang.deepClone(this._config);
-};
-
-Config.create = function (cwd) {
-    return new Config(cwd);
-};
-
-Config.read = function (cwd, overrides) {
-    var config = Config.create(cwd);
-    return config.load(overrides).toObject();
-};
-
-function normalise(config) {
-    config = expand(config);
-
-    // Some backwards compatible things..
-    if (config.shorthandResolver) {
-      config.shorthandResolver = config.shorthandResolver
-        .replace(/\{\{\{/g, '{{')
-        .replace(/\}\}\}/g, '}}');
-    }
-
-    // Ensure that every registry endpoint does not end with /
-    config.registry.search = config.registry.search.map(function (url) {
-        return url.replace(/\/+$/, '');
-    });
-    config.registry.register = config.registry.register.replace(/\/+$/, '');
-    config.registry.publish = config.registry.publish.replace(/\/+$/, '');
-    config.tmp = path.resolve(config.tmp);
-
-    loadCAs(config.ca);
-
-    return config;
-}
-
-Config.DEFAULT_REGISTRY = require('./util/defaults').registry;
-
-module.exports = Config;
--- a/packages/bower-config/lib/util/defaults.js
+++ b/packages/bower-config/lib/util/defaults.js
@@ -1,45 +0,0 @@
-var path = require('path');
-var paths = require('./paths');
-
-// Guess proxy defined in the env
-var proxy = process.env.HTTP_PROXY
-    || process.env.http_proxy
-    || null;
-
-var httpsProxy = process.env.HTTPS_PROXY
-    || process.env.https_proxy
-    || proxy;
-
-var noProxy = process.env.NO_PROXY
-    || process.env.no_proxy;
-
-// Use a well known user agent (in this case, curl) when using a proxy,
-// to avoid potential filtering on many corporate proxies with blank or unknown agents
-var userAgent = !proxy && !httpsProxy
-    ? 'node/' + process.version + ' ' + process.platform + ' ' + process.arch
-    : 'curl/7.21.4 (universal-apple-darwin11.0) libcurl/7.21.4 OpenSSL/0.9.8r zlib/1.2.5';
-
-var defaults = {
-    'directory': 'bower_components',
-    'registry': 'https://bower.herokuapp.com',
-    'shorthand-resolver': 'https://github.com/{{owner}}/{{package}}.git',
-    'tmp': paths.tmp,
-    'proxy': proxy,
-    'https-proxy': httpsProxy,
-    'no-proxy': noProxy,
-    'timeout': 30000,
-    'ca': { search: [] },
-    'strict-ssl': true,
-    'user-agent': userAgent,
-    'color': true,
-    'interactive': null,
-    'storage': {
-        packages: path.join(paths.cache, 'packages'),
-        links: path.join(paths.data, 'links'),
-        completion: path.join(paths.data, 'completion'),
-        registry: path.join(paths.cache, 'registry'),
-        empty: path.join(paths.data, 'empty')  // Empty dir, used in GIT_TEMPLATE_DIR among others
-    }
-};
-
-module.exports = defaults;
--- a/packages/bower-config/lib/util/expand.js
+++ b/packages/bower-config/lib/util/expand.js
@@ -1,126 +0,0 @@
-var object = require('mout/object');
-var lang = require('mout/lang');
-var string = require('mout/string');
-
-function camelCase(config) {
-    var camelCased = {};
-
-    // Camel case
-    object.forOwn(config, function (value, key) {
-        // Ignore null values
-        if (value == null) {
-            return;
-        }
-
-        key = string.camelCase(key.replace(/_/g, '-'));
-        camelCased[key] = lang.isPlainObject(value) ? camelCase(value) : value;
-    });
-
-    return camelCased;
-}
-
-// Function to replace ${VAR} - style variables
-//  with values set in the environment
-// This function expects to be passed a string
-function doEnvReplaceStr (f) {
-
-  // Un-tildify
-  var untildify = require('untildify');
-  f = untildify(f);
-
-  // replace any ${ENV} values with the appropriate environ.
-  var envExpr = /(\\*)\$\{([^}]+)\}/g;
-  return f.replace(envExpr, function (orig, esc, name) {
-    esc = esc.length && esc.length % 2;
-    if (esc) return orig;
-    if (undefined === process.env[name]) {
-      throw new Error('Environment variable used in .bowerrc is not defined: ' + orig);
-    }
-
-    return process.env[name];
-});
-}
-
-function envReplace(config) {
-    var envReplaced = {};
-
-    object.forOwn(config, function (value, key) {
-
-        // Ignore null values
-        if (value == null) {
-            return;
-        }
-
-        // Ignore 'scripts'
-        // These hooks run within the shell
-        // environment variable expansion is not required
-        if ( key === 'scripts' && lang.isPlainObject(value) ){
-            envReplaced[key] = value;
-            return;
-        }
-
-        // Perform variable replacements based on var type
-        if ( lang.isPlainObject(value) ) {
-            envReplaced[key] = envReplace(value);
-        }
-        else if ( lang.isString(value) ) {
-            envReplaced[key] = doEnvReplaceStr(value);
-        }
-        else {
-            envReplaced[key] = value;
-        }
-    });
-
-    return envReplaced;
-}
-
-function expand(config) {
-    config = camelCase(config);
-    config = envReplace(config);
-
-    if (typeof config.registry === 'string') {
-        config.registry = {
-            default: config.registry,
-            search: [config.registry],
-            register: config.registry,
-            publish: config.registry
-        };
-    } else if (typeof config.registry === 'object') {
-        config.registry.default = config.registry.default || 'https://bower.herokuapp.com';
-
-        config.registry = {
-            default: config.registry.default,
-            search: config.registry.search || config.registry.default,
-            register: config.registry.register || config.registry.default,
-            publish: config.registry.publish || config.registry.default
-        };
-
-        if (config.registry.search && !Array.isArray(config.registry.search)) {
-            config.registry.search = [config.registry.search];
-        }
-    }
-
-    // CA
-    if (typeof config.ca === 'string') {
-        config.ca = {
-            default: config.ca,
-            search: [config.ca],
-            register: config.ca,
-            publish: config.ca
-        };
-    } else if (typeof config.ca === 'object') {
-        if (config.ca.search && !Array.isArray(config.ca.search)) {
-            config.ca.search = [config.ca.search];
-        }
-
-        if (config.ca.default) {
-            config.ca.search = config.ca.search || config.ca.default;
-            config.ca.register = config.ca.register || config.ca.default;
-            config.ca.publish = config.ca.publish || config.ca.default;
-        }
-    }
-
-    return config;
-}
-
-module.exports = expand;
--- a/packages/bower-config/lib/util/paths.js
+++ b/packages/bower-config/lib/util/paths.js
@@ -1,44 +0,0 @@
-var os = require('os');
-var path = require('path');
-var osenv = require('osenv');
-var crypto = require('crypto');
-
-function generateFakeUser() {
-    var uid = process.pid + '-' + Date.now() + '-' + Math.floor(Math.random() * 1000000);
-    return crypto.createHash('md5').update(uid).digest('hex');
-}
-
-// Assume XDG defaults
-// See: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-var paths = {
-    config: process.env.XDG_CONFIG_HOME,
-    data: process.env.XDG_DATA_HOME,
-    cache: process.env.XDG_CACHE_HOME
-};
-
-// Guess some needed properties based on the user OS
-var user = (osenv.user() || generateFakeUser()).replace(/\\/g, '-');
-var tmp = path.join(os.tmpdir ? os.tmpdir() : os.tmpDir(), user);
-var home = osenv.home();
-var base;
-
-// Fallbacks for windows
-if (process.platform === 'win32') {
-    base = path.resolve(process.env.LOCALAPPDATA || home || tmp);
-    base = path.join(base, 'bower');
-
-    paths.config = paths.config || path.join(base, 'config');
-    paths.data = paths.data || path.join(base, 'data');
-    paths.cache = paths.cache || path.join(base, 'cache');
-// Fallbacks for other operating systems
-} else {
-    base = path.resolve(home || tmp);
-
-    paths.config = paths.config || path.join(base, '.config/bower');
-    paths.data = paths.data || path.join(base, '.local/share/bower');
-    paths.cache = paths.cache || path.join(base, '.cache/bower');
-}
-
-paths.tmp = path.resolve(path.join(tmp, 'bower'));
-
-module.exports = paths;
--- a/packages/bower-config/lib/util/proxy.js
+++ b/packages/bower-config/lib/util/proxy.js
@@ -1,79 +0,0 @@
-// EnvProxy uses the proxy vaiables passed to it in set and sets the
-// process.env uppercase proxy variables to them with the ability
-// to restore the original values later
-var EnvProxy = function() {
-  this.restoreFrom = {};
-};
-
-EnvProxy.prototype.set = function (config) {
-  this.config = config;
-
-  // Override environment defaults if proxy config options are set
-  // This will make requests.js follow the proxies in config
-  if (Object.prototype.hasOwnProperty.call(config, 'noProxy')) {
-    this.restoreFrom.NO_PROXY = process.env.NO_PROXY;
-    this.restoreFrom.no_proxy = process.env.no_proxy;
-    delete process.env.no_proxy;
-    process.env.NO_PROXY = config.noProxy;
-  }
-
-  if (Object.prototype.hasOwnProperty.call(config, 'proxy')) {
-    this.restoreFrom.HTTP_PROXY = process.env.HTTP_PROXY;
-    this.restoreFrom.http_proxy = process.env.http_proxy;
-    delete process.env.http_proxy;
-    process.env.HTTP_PROXY = config.proxy;
-  }
-
-  if (Object.prototype.hasOwnProperty.call(config, 'httpsProxy')) {
-    this.restoreFrom.HTTPS_PROXY = process.env.HTTPS_PROXY;
-    this.restoreFrom.https_proxy = process.env.https_proxy;
-    delete process.env.https_proxy;
-    process.env.HTTPS_PROXY = config.httpsProxy;
-  }
-};
-
-EnvProxy.prototype.restore = function () {
-  if (Object.prototype.hasOwnProperty.call(this.config, 'noProxy')) {
-    if (this.restoreFrom.NO_PROXY !== undefined) {
-      process.env.NO_PROXY = this.restoreFrom.NO_PROXY;
-    } else {
-      delete process.env.NO_PROXY;
-    }
-
-    if (this.restoreFrom.no_proxy !== undefined) {
-      process.env.no_proxy = this.restoreFrom.no_proxy;
-    } else {
-      delete process.env.no_proxy;
-    }
-  }
-
-  if (Object.prototype.hasOwnProperty.call(this.config, 'proxy')) {
-    if (this.restoreFrom.HTTP_PROXY !== undefined) {
-      process.env.HTTP_PROXY = this.restoreFrom.HTTP_PROXY;
-    } else {
-      delete process.env.HTTP_PROXY;
-    }
-
-    if (this.restoreFrom.http_proxy !== undefined) {
-      process.env.http_proxy = this.restoreFrom.http_proxy;
-    } else {
-      delete process.env.http_proxy;
-    }
-  }
-
-  if (Object.prototype.hasOwnProperty.call(this.config, 'httpsProxy')) {
-    if (this.restoreFrom.HTTPS_PROXY !== undefined) {
-      process.env.HTTPS_PROXY = this.restoreFrom.HTTPS_PROXY;
-    } else {
-      delete process.env.HTTPS_PROXY;
-    }
-
-    if (this.restoreFrom.https_proxy !== undefined) {
-      process.env.https_proxy = this.restoreFrom.https_proxy;
-    } else {
-      delete process.env.https_proxy;
-    }
-  }
-};
-
-module.exports = EnvProxy;
--- a/packages/bower-config/lib/util/rc.js
+++ b/packages/bower-config/lib/util/rc.js
@@ -1,158 +0,0 @@
-var path = require('path');
-var fs = require('graceful-fs');
-var optimist = require('optimist');
-var osenv = require('osenv');
-var object = require('mout/object');
-var string = require('mout/string');
-var paths = require('./paths');
-var defaults = require('./defaults');
-
-var win = process.platform === 'win32';
-var home = osenv.home();
-
-function rc(name, cwd, argv) {
-    var argvConfig;
-
-    argv = argv || optimist.argv;
-
-    // Parse --config.foo=false
-    argvConfig = object.map(argv.config || {}, function (value) {
-        return value === 'false' ? false : value;
-    });
-
-    // If we have specified a cwd then use this as the base for getting config.
-    cwd = argvConfig.cwd ? argvConfig.cwd : cwd;
-
-    if (cwd) {
-        return object.deepMixIn.apply(null, [
-            {},
-            defaults,
-            { cwd: cwd },
-            win ? {} : json(path.join('/etc', name + 'rc')),
-            !home ? {} : json(path.join(home, '.' + name + 'rc')),
-            json(path.join(paths.config, name + 'rc')),
-            json(find('.' + name + 'rc', cwd)),
-            env('npm_package_config_' + name + '_'),
-            env(name + '_'),
-            argvConfig
-        ]);
-    } else {
-        return object.deepMixIn.apply(null, [
-            {},
-            defaults,
-            win ? {} : json(path.join('/etc', name + 'rc')),
-            !home ? {} : json(path.join(home, '.' + name + 'rc')),
-            json(path.join(paths.config, name + 'rc')),
-            env('npm_package_config_' + name + '_'),
-            env(name + '_'),
-            argvConfig
-        ]);
-    }
-}
-
-function parse(content, file) {
-    var error;
-
-    if (!content.trim().length) {
-        return {};
-    }
-
-    try {
-        return JSON.parse(content);
-    } catch (e) {
-        if (file) {
-            error = new Error('Unable to parse ' + file + ': ' + e.message);
-        } else {
-            error = new Error('Unable to parse rc config: ' + e.message);
-        }
-
-        error.details = content;
-        error.code = 'EMALFORMED';
-        throw error;
-    }
-}
-
-function json(file) {
-    var content = {};
-    if (!Array.isArray(file)) {
-        try {
-            content = fs.readFileSync(file).toString();
-        } catch (err) {
-            return null;
-        }
-
-        return parse(content, file);
-    } else {
-        // This is multiple json files
-        file.forEach(function(filename) {
-            if (fs.statSync(filename).isDirectory()) {
-                var error;
-                error = new Error(filename + ' should not be a directory');
-                error.code = 'EFILEISDIR';
-                throw error;
-            }
-            var json = fs.readFileSync(filename).toString();
-            json = parse(json, filename);
-            content = object.merge(content, json);
-        });
-
-        return content;
-    }
-}
-
-function env(prefix) {
-    var obj = {};
-    var prefixLength = prefix.length;
-
-    prefix = prefix.toLowerCase();
-
-    object.forOwn(process.env, function (value, key) {
-        key = key.toLowerCase();
-
-        if (string.startsWith(key, prefix)) {
-            var parsedKey = key
-                           .substr(prefixLength)
-                           .replace(/__/g, '.')   // __ is used for nesting
-                           .replace(/_/g, '-');   // _ is used as a - separator
-
-            //use a convention patern to accept array from process.env
-            //e.g. export bower_registry__search='["http://abc.com","http://def.com"]'
-            var match = /\[([^\]]*)\]/g.exec(value);
-            var targetValue;
-            if (!match || match.length === 0) {
-                targetValue = value;
-            } else {
-                targetValue = match[1].split(',')
-                    .map(function(m) {
-                        return m.trim();
-                    });
-            }
-            object.set(obj, parsedKey, targetValue);
-        }
-    });
-
-    return obj;
-}
-
-function find(filename, dir) {
-    var files = [];
-
-    var walk = function (filename, dir) {
-        var file = path.join(dir, filename);
-        var parent = path.dirname(dir);
-
-        if (fs.existsSync(file)) {
-            files.push(file);
-        }
-
-        if (parent !== dir) {
-            walk(filename, parent);
-        }
-    };
-
-    walk(filename, dir);
-    files.reverse();
-    return files;
-}
-
-module.exports = rc;
--- a/packages/bower-config/package.json
+++ b/packages/bower-config/package.json
@@ -1,45 +0,0 @@
-{
-  "name": "bower-config",
-  "version": "1.4.0",
-  "description": "The Bower config reader and writer.",
-  "author": "Twitter",
-  "license": "MIT",
-  "repository": "https://github.com/bower/bower/tree/master/packages/bower-config",
-  "main": "lib/Config",
-  "homepage": "http://bower.io",
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "dependencies": {
-    "graceful-fs": "^4.1.3",
-    "mout": "^1.0.0",
-    "optimist": "^0.6.1",
-    "osenv": "^0.1.3",
-    "untildify": "^2.1.0"
-  },
-  "devDependencies": {
-    "coveralls": "^2.11.4",
-    "expect.js": "^0.3.1",
-    "glob": "^4.5.3",
-    "grunt": "^0.4.5",
-    "grunt-cli": "^0.1.13",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-coveralls": "^1.0.0",
-    "grunt-exec": "^0.4.6",
-    "grunt-simple-mocha": "^0.4.0",
-    "istanbul": "^0.4.1",
-    "load-grunt-tasks": "^2.0.0",
-    "mkdirp": "^0.5.0",
-    "mocha": "~1.12.0",
-    "node-uuid": "^1.4.3",
-    "q": "^1.2.0",
-    "rimraf": "^2.3.2"
-  },
-  "scripts": {
-    "test": "grunt test"
-  },
-  "files": [
-    "lib"
-  ]
-}
--- a/packages/bower-config/test/assets/custom-ca-embed/.bowerrc
+++ b/packages/bower-config/test/assets/custom-ca-embed/.bowerrc
@@ -1,3 +0,0 @@
-{
-    "ca": "Equifax Secure CA\n=================\n-----BEGIN CERTIFICATE-----\nMIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE\nChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5\nMB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT\nB0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB\nnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR\nfM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW\n8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG\nA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE\nCxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG\nA1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS\nspXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB\nAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961\nzgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB\nBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95\n70+sB3c4\n-----END CERTIFICATE-----\n\nGlobalSign Root CA\n==================\n-----BEGIN CERTIFICATE-----\nMIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx\nGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds\nb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV\nBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD\nVQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa\nDuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc\nTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb\nKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP\nc1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX\ngzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV\nHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF\nAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj\nY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG\nj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH\nhm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC\nX4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==\n-----END CERTIFICATE-----"
-}
--- a/packages/bower-config/test/assets/custom-ca/.bowerrc
+++ b/packages/bower-config/test/assets/custom-ca/.bowerrc
@@ -1,3 +0,0 @@
-{
-    "ca": "test/assets/custom-ca/ca-bundle.crt"
-}
--- a/packages/bower-config/test/assets/custom-ca/ca-bundle.crt
+++ b/packages/bower-config/test/assets/custom-ca/ca-bundle.crt
@@ -1,40 +0,0 @@
-Equifax Secure CA
-=================
-----BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE
-ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT
-B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR
-fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW
-8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG
-A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE
-CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG
-A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS
-spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB
-Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961
-zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB
-BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
-70+sB3c4
-----END CERTIFICATE-----
-
-GlobalSign Root CA
-==================
-----BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
-GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
-b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
-BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
-VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
-DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
-THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
-Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
-c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
-gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
-AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
-Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
-j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
-hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
-X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
-----END CERTIFICATE-----
--- a/packages/bower-config/test/assets/env-variables-values/.bowerrc
+++ b/packages/bower-config/test/assets/env-variables-values/.bowerrc
@@ -1,10 +0,0 @@
-{
-   "scripts" : {
-      "postinstall" : "${_myshellvar}"
-   },
-   "storage" : {
-      "packages" : "${_BOWERRC_MY_PACKAGES}",
-      "registry" : "~/.bower-test/registry"
-   },
-   "tmp" : "${_BOWERRC_MY_TMP}"
-}
--- a/packages/bower-config/test/assets/env-variables/.bowerrc
+++ b/packages/bower-config/test/assets/env-variables/.bowerrc
@@ -1,5 +0,0 @@
-{
-  "proxy": "http://HTTP_PROXY",
-  "https-proxy": "http://HTTPS_PROXY",
-  "no-proxy": "google.com"
-}
--- a/packages/bower-config/test/helpers.js
+++ b/packages/bower-config/test/helpers.js
@@ -1,126 +0,0 @@
-var Q = require('q');
-var mkdirp = require('mkdirp');
-var rimraf = require('rimraf');
-var uuid = require('node-uuid');
-var object = require('mout/object');
-var fs = require('fs');
-var glob = require('glob');
-var os = require('os');
-var path = require('path');
-
-// For better promise errors
-Q.longStackSupport = true;
-
-var tmpLocation = path.join(
-    os.tmpdir ? os.tmpdir() : os.tmpDir(),
-    'bower-config-tests',
-    uuid.v4().slice(0, 8)
-);
-
-after(function () {
-    rimraf.sync(tmpLocation);
-});
-
-exports.TempDir = (function() {
-    function TempDir (defaults) {
-        this.path = path.join(tmpLocation, uuid.v4());
-        this.defaults = defaults;
-    }
-
-    TempDir.prototype.create = function (files, defaults) {
-        var that = this;
-
-        defaults = defaults || this.defaults || {};
-        files = object.merge(files || {}, defaults);
-
-        this.meta = function(tag) {
-            if (tag) {
-                return files[tag]['bower.json'];
-            } else {
-                return files['bower.json'];
-            }
-        };
-
-        if (files) {
-            object.forOwn(files, function (contents, filepath) {
-                if (typeof contents === 'object') {
-                    contents = JSON.stringify(contents, null, ' ') + '\n';
-                }
-
-                var fullPath = path.join(that.path, filepath);
-                mkdirp.sync(path.dirname(fullPath));
-                fs.writeFileSync(fullPath, contents);
-            });
-        }
-
-        return this;
-    };
-
-    TempDir.prototype.prepare = function (files) {
-        rimraf.sync(this.path);
-        mkdirp.sync(this.path);
-        this.create(files);
-
-        return this;
-    };
-
-    // TODO: Rewrite to synchronous form
-    TempDir.prototype.prepareGit = function (revisions) {
-        var that = this;
-
-        revisions = object.merge(revisions || {}, this.defaults);
-
-        rimraf.sync(that.path);
-
-        mkdirp.sync(that.path);
-
-        var promise = new Q();
-
-        object.forOwn(revisions, function (files, tag) {
-            promise = promise.then(function () {
-                return that.git('init');
-            }).then(function () {
-                that.glob('./!(.git)').map(function (removePath) {
-                    var fullPath = path.join(that.path, removePath);
-
-                    rimraf.sync(fullPath);
-                });
-
-                that.create(files, {});
-            }).then(function () {
-                return that.git('add', '-A');
-            }).then(function () {
-                return that.git('commit', '-m"commit"');
-            }).then(function () {
-                return that.git('tag', tag);
-            });
-        });
-
-        return promise;
-    };
-
-    TempDir.prototype.glob = function (pattern) {
-        return glob.sync(pattern, {
-            cwd: this.path,
-            dot: true
-        });
-    };
-
-    TempDir.prototype.getPath = function (name) {
-        return path.join(this.path, name);
-    };
-
-    TempDir.prototype.read = function (name) {
-        return fs.readFileSync(this.getPath(name), 'utf8');
-    };
-
-    TempDir.prototype.readJson = function (name) {
-        return JSON.parse(this.read(name));
-    };
-
-    TempDir.prototype.exists = function (name) {
-        return fs.existsSync(path.join(this.path, name));
-    };
-
-    return TempDir;
-})();
--- a/packages/bower-config/test/test.js
+++ b/packages/bower-config/test/test.js
@@ -1,245 +0,0 @@
-var assert = require('assert');
-var path = require('path');
-
-describe('NPM Config on package.json', function () {
-    beforeEach(function () {
-        delete process.env.npm_package_config_bower_directory;
-        delete process.env.npm_package_config_bower_colors;
-        delete process.env.npm_package_config_bower_resolvers;
-    });
-
-    it('defaults registry entries to default registry', function () {
-        var config = require('../lib/Config').read(null, {});
-
-        assert.deepEqual(config.registry, {
-          'default': 'https://bower.herokuapp.com',
-          'search': [
-            'https://bower.herokuapp.com'
-          ],
-          'register': 'https://bower.herokuapp.com',
-          'publish': 'https://bower.herokuapp.com'
-        });
-    });
-
-    it('can change default registry', function () {
-        var config = require('../lib/Config').read(null, { registry: 'https://foobar' });
-
-        assert.deepEqual(config.registry, {
-          'default': 'https://foobar',
-          'search': [
-            'https://foobar',
-          ],
-          'register': 'https://foobar',
-          'publish': 'https://foobar'
-        });
-    });
-
-    it('can override single entries in registry configuration', function () {
-        var config = require('../lib/Config').read(null, { registry: { search: 'https://foobar' } });
-
-        assert.deepEqual(config.registry, {
-          'default': 'https://bower.herokuapp.com',
-          'search': [
-            'https://foobar',
-          ],
-          'register': 'https://bower.herokuapp.com',
-          'publish': 'https://bower.herokuapp.com'
-        });
-    });
-
-    it('can override single entries in registry configuration and defaults', function () {
-        var config = require('../lib/Config').read(null, { registry: { default: 'https://fizfuz', search: 'https://foobar' } });
-
-        assert.deepEqual(config.registry, {
-          'default': 'https://fizfuz',
-          'search': [
-            'https://foobar',
-          ],
-          'register': 'https://fizfuz',
-          'publish': 'https://fizfuz'
-        });
-    });
-
-    it('allows for not providing cwd', function () {
-        var config = require('../lib/Config').read();
-
-        config.tmp = '/foo/bar';
-        config.userAgent = 'firefox';
-        delete config.storage;
-
-        assert.deepEqual(config, {
-          'directory': 'bower_components',
-          'registry': {
-            'default': 'https://bower.herokuapp.com',
-            'search': [
-              'https://bower.herokuapp.com'
-            ],
-            'register': 'https://bower.herokuapp.com',
-            'publish': 'https://bower.herokuapp.com'
-          },
-          'shorthandResolver': 'https://github.com/{{owner}}/{{package}}.git',
-          'tmp': '/foo/bar',
-          'timeout': 30000,
-          'ca': {
-            'search': []
-          },
-          'strictSsl': true,
-          'userAgent': 'firefox',
-          'color': true
-        });
-    });
-
-    function assertCAContents(caData, name) {
-        var r = /-----BEGIN CERTIFICATE-----[a-zA-Z0-9+\/=\n\r]+-----END CERTIFICATE-----/;
-
-        assert(caData, name + ' should be set');
-        assert(Array.isArray(caData), name + ' should be an array');
-        assert.equal(2, caData.length);
-        caData.forEach(function(c, i) {
-            assert(c.match(r),
-                   name + '[' + i + '] should contain a certificate. Given: ' + JSON.stringify(c));
-        });
-    }
-
-    describe('Setting process.env.npm_package_config', function () {
-        process.env.npm_package_config_bower_directory = 'npm-path';
-        process.env.npm_package_config_bower_colors = 'false';
-        process.env.npm_package_config_bower_resolvers = '[foo,bar,baz]';
-
-        var config = require('../lib/Config').read();
-
-        it('should return "npm-path" for "bower_directory"', function () {
-            assert.equal('npm-path', config.directory);
-        });
-        it('should return "false" for "bower_colors"', function () {
-            assert.equal('false', config.colors);
-        });
-        it('should expand array "false" for "bower_resolvers"', function () {
-            assert.deepEqual(['foo', 'bar', 'baz'], config.resolvers);
-        });
-    });
-
-    describe('Specifying custom CA', function() {
-
-        it('should read the CA file', function() {
-            var config = require('../lib/Config')
-                .read(path.resolve('test/assets/custom-ca'));
-
-            ['register', 'publish', 'default'].forEach(function (p) {
-                assertCAContents(config.ca[p], 'config.ca.' + p);
-            });
-
-            assert(Array.isArray(config.ca.search),
-                    'ca property search should be an array');
-
-            config.ca.search.forEach(function(c, i) {
-                assertCAContents(c, 'config.ca.search[' + i + ']');
-            });
-        });
-
-        it('should backward-support certificate inside .bowerrc', function() {
-            var config = require('../lib/Config')
-                .read(path.resolve('test/assets/custom-ca-embed'));
-
-            ['register', 'publish', 'default'].forEach(function (p) {
-                assertCAContents(config.ca[p], 'config.ca.' + p);
-            });
-
-            assert(Array.isArray(config.ca.search),
-                    'ca property search should be an array');
-            config.ca.search.forEach(function(c, i) {
-                assertCAContents(c, 'config.ca.search[' + i + ']');
-            });
-        });
-    });
-
-    describe('setting ENV variables', function () {
-        beforeEach(function () {
-            delete process.env.no_proxy;
-            delete process.env.http_proxy;
-            delete process.env.https_proxy;
-            delete process.env.NO_PROXY;
-            delete process.env.HTTP_PROXY;
-            delete process.env.HTTPS_PROXY;
-        });
-
-        it('sets env variables', function () {
-            require('../lib/Config').read('test/assets/env-variables');
-
-            assert.equal(process.env.HTTP_PROXY, 'http://HTTP_PROXY');
-            assert.equal(process.env.HTTPS_PROXY, 'http://HTTPS_PROXY');
-            assert.equal(process.env.NO_PROXY, 'google.com');
-
-            assert.equal(process.env.http_proxy, undefined);
-            assert.equal(process.env.https_proxy, undefined);
-            assert.equal(process.env.no_proxy, undefined);
-        });
-
-        it('restores env variables', function () {
-            process.env.HTTP_PROXY = 'a';
-            process.env.HTTPS_PROXY = 'b';
-            process.env.NO_PROXY = 'c';
-            process.env.http_proxy = 'd';
-            process.env.https_proxy = 'e';
-            process.env.no_proxy = 'f';
-
-            var config = require('../lib/Config').create('test/assets/env-variables').load();
-            config.restore();
-
-            assert.equal(process.env.HTTP_PROXY, 'a');
-            assert.equal(process.env.HTTPS_PROXY, 'b');
-            assert.equal(process.env.NO_PROXY, 'c');
-
-            assert.equal(process.env.http_proxy, 'd');
-            assert.equal(process.env.https_proxy, 'e');
-            assert.equal(process.env.no_proxy, 'f');
-        });
-
-        it('restores env variables if they are undefined', function () {
-            var config = require('../lib/Config').create('test/assets/env-variables').load();
-            config.restore();
-
-            assert.equal(process.env.HTTP_PROXY, undefined);
-            assert.equal(process.env.HTTPS_PROXY, undefined);
-            assert.equal(process.env.NO_PROXY, undefined);
-
-            assert.equal(process.env.http_proxy, undefined);
-            assert.equal(process.env.https_proxy, undefined);
-            assert.equal(process.env.no_proxy, undefined);
-        });
-
-        it('allows for overriding options', function () {
-            require('../lib/Config').read('test/assets/env-variables', {
-                httpsProxy: 'http://other-proxy.local'
-            });
-
-            assert.equal(process.env.HTTP_PROXY, 'http://HTTP_PROXY');
-            assert.equal(process.env.HTTPS_PROXY, 'http://other-proxy.local');
-        });
-    });
-});
-
-describe('Allow ${ENV} variables in .bowerrc', function() {
-
-    it('sets values from process.env', function() {
-        process.env._BOWERRC_MY_PACKAGES = 'a';
-        process.env._BOWERRC_MY_TMP = '/tmp/b';
-
-        var config = require('../lib/Config').read('test/assets/env-variables-values');
-        assert.equal('a', config.storage.packages);
-        assert.equal('/tmp/b', config.tmp);
-        assert.equal('${_myshellvar}', config.scripts.postinstall);
-    });
-});
-
-describe('untildify paths in .bowerrc', function() {
-
-    it('resolve ~/ in .bowerrc', function() {
-        var config = require('../lib/Config').read('test/assets/env-variables-values');
-        var untildify = require('untildify');
-
-        assert.equal(untildify('~/.bower-test/registry') , config.storage.registry);
-    });
-});
-
-require('./util/index');
--- a/packages/bower-config/test/util/index.js
+++ b/packages/bower-config/test/util/index.js
@@ -1,3 +0,0 @@
-describe('util', function () {
-    require('./rc');
-});
--- a/packages/bower-config/test/util/rc.js
+++ b/packages/bower-config/test/util/rc.js
@@ -1,84 +0,0 @@
-var expect = require('expect.js');
-var helpers = require('../helpers');
-
-describe('rc', function() {
-    var tempDir = new helpers.TempDir();
-    var tempDirBowerrc = new helpers.TempDir();
-
-    var rc = require('../../lib/util/rc');
-
-    tempDir.prepare({
-        '.bowerrc': {
-            key: 'value'
-        },
-        'child/.bowerrc': {
-            key2: 'value2'
-        },
-        'child2/.bowerrc': {
-            key: 'valueShouldBeOverwriteParent'
-        },
-        'child3/bower.json': {
-            name: 'without-bowerrc'
-        },
-        'other_dir/.bowerrc': {
-            key: 'othervalue'
-        }
-    });
-
-    tempDirBowerrc.prepare({
-        '.bowerrc/foo': {
-            key: 'bar'
-        }
-
-    });
-
-    it('correctly reads .bowerrc files', function() {
-        var config = rc('bower', tempDir.path);
-
-        expect(config.key).to.eql('value');
-        expect(config.key2).to.eql(undefined);
-    });
-
-    it('correctly reads .bowerrc files from child', function() {
-        var config = rc('bower', tempDir.path + '/child/');
-
-        expect(config.key).to.eql('value');
-        expect(config.key2).to.eql('value2');
-    });
-
-    it('correctly reads .bowerrc files from child2', function() {
-        var config = rc('bower', tempDir.path + '/child2/');
-
-        expect(config.key).to.eql('valueShouldBeOverwriteParent');
-        expect(config.key2).to.eql(undefined);
-    });
-
-    it('correctly reads .bowerrc files from child3', function() {
-        var config = rc('bower', tempDir.path + '/child3/');
-
-        expect(config.key).to.eql('value');
-        expect(config.key2).to.eql(undefined);
-    });
-
-    it('loads the .bowerrc file from the cwd specified on the command line', function(){
-        var argv = {
-            'config': {
-                'cwd': tempDir.path + '/other_dir/'
-            }
-        };
-
-        var config = rc('bower', tempDir.path, argv);
-
-        expect(config.key).to.eql('othervalue');
-
-    });
-
-    it('throws an easy to understand error if .bowerrc is a dir', function() {
-        // Gotta wrap this to catch the error
-        var config = function () {
-            rc('bower', tempDirBowerrc.path);
-        };
-
-        expect(config).to.throwError(/should not be a directory/);
-    });
-});
--- a/packages/bower-endpoint-parser/.editorconfig
+++ b/packages/bower-endpoint-parser/.editorconfig
@@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
--- a/packages/bower-endpoint-parser/.gitignore
+++ b/packages/bower-endpoint-parser/.gitignore
@@ -1,2 +0,0 @@
-/node_modules
-/npm-debug.*
--- a/packages/bower-endpoint-parser/.jshintrc
+++ b/packages/bower-endpoint-parser/.jshintrc
@@ -1,61 +0,0 @@
-{
-    "predef": [
-        "console",
-        "describe",
-        "it",
-        "after",
-        "afterEach",
-        "before",
-        "beforeEach"
-    ],
-
-    "indent": 4,
-    "node": true,
-    "devel": true,
-
-    "bitwise": false,
-    "curly": false,
-    "eqeqeq": true,
-    "forin": false,
-    "immed": true,
-    "latedef": false,
-    "newcap": true,
-    "noarg": true,
-    "noempty": false,
-    "nonew": true,
-    "plusplus": false,
-    "regexp": false,
-    "undef": true,
-    "unused": true,
-    "quotmark": "single",
-    "strict": false,
-    "trailing": true,
-    "camelcase": true,
-
-    "asi": false,
-    "boss": true,
-    "debug": false,
-    "eqnull": true,
-    "esnext": false,
-    "evil": false,
-    "expr": true,
-    "funcscope": false,
-    "globalstrict": false,
-    "iterator": false,
-    "lastsemic": false,
-    "laxbreak": true,
-    "laxcomma": false,
-    "loopfunc": true,
-    "multistr": false,
-    "onecase": true,
-    "regexdash": false,
-    "scripturl": false,
-    "smarttabs": false,
-    "shadow": false,
-    "sub": false,
-    "supernew": true,
-    "validthis": false,
-
-    "nomen": false,
-    "white": true
-}
--- a/packages/bower-endpoint-parser/.travis.yml
+++ b/packages/bower-endpoint-parser/.travis.yml
@@ -1,4 +0,0 @@
-language: node_js
-node_js:
-  - "0.10"
-  - "0.8"
--- a/packages/bower-endpoint-parser/LICENSE
+++ b/packages/bower-endpoint-parser/LICENSE
@@ -1,19 +0,0 @@
-Copyright (c) 2012 Twitter and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/packages/bower-endpoint-parser/README.md
+++ b/packages/bower-endpoint-parser/README.md
@@ -1,102 +0,0 @@
-# endpoint-parser [![Build Status](https://secure.travis-ci.org/bower/endpoint-parser.png?branch=master)](http://travis-ci.org/bower/endpoint-parser)
-
-Little module that helps with endpoints parsing.
-
-
-## API
-
-### .decompose(endpoint)
-
-Decomposes a endpoint into `name`, `source` and `target`.
-
-```js
-var endpointParser = require('bower-endpoint-parser');
-
-endpointParser.decompose('jquery#~2.0.0');
-// { name: '', source: 'jquery', target: '~2.0.0' }
-
-endpointParser.decompose('backbone=backbone-amd#~1.0.0');
-// { name: 'backbone', source: 'backbone-amd', target: '~1.0.0' }
-
-endpointParser.decompose('http://twitter.github.io/bootstrap/assets/bootstrap.zip');
-// { name: '', source: 'http://twitter.github.io/bootstrap/assets/bootstrap', target: '*' }
-
-endpointParser.decompose('bootstrap=http://twitter.github.io/bootstrap/assets/bootstrap.zip');
-// { name: 'bootstrap', source: 'http://twitter.github.io/bootstrap/assets/bootstrap', target: '*' }
-```
-
-### .compose(decEndpoint)
-
-Inverse of `decompose()`.   
-Takes a decomposed endpoint and composes it back into a string.
-
-```js
-var endpointParser = require('bower-endpoint-parser');
-
-endpointParser.compose({ name: '', source: 'jquery', target: '~2.0.0' });
-// jquery#~2.0.0
-
-endpointParser.compose({ name: 'backbone', source: 'backbone-amd', target: '~1.0.0' });
-// backbone=backbone-amd#~1.0.0
-
-endpointParser.compose({ name: '', source: 'http://twitter.github.io/bootstrap/assets/bootstrap', target: '*' });
-// http://twitter.github.io/bootstrap/assets/bootstrap.zip
-
-endpointParser.compose({ name: 'bootstrap', source: 'http://twitter.github.io/bootstrap/assets/bootstrap', target: '*' });
-// bootstrap=http://twitter.github.io/bootstrap/assets/bootstrap.zip
-```
-
-### .json2decomposed(key, value)
-
-Similar to `decompose()` but specially designed to be used when parsing `bower.json` dependencies.
-For instance, in a `bower.json` like this:
-
-```js
-{
-    "name": "foo",
-    "version": "0.1.0",
-    "dependencies": {
-        "jquery": "~1.9.1",
-        "backbone": "backbone-amd#~1.0.0",
-        "bootstrap": "http://twitter.github.io/bootstrap/assets/bootstrap"
-    }
-}
-```
-
-You would call `json2decomposed` like so:
-
-```js
-endpointParser.json2decomposed('jquery', '~1.9.1');
-// { name: 'jquery', source: 'jquery', target: '~1.9.1' }
-
-endpointParser.json2decomposed('backbone', 'backbone-amd#~1.0.0');
-// { name: 'backbone', source: 'backbone-amd', target: '~1.0.0' }
-
-endpointParser.json2decomposed('bootstrap', 'http://twitter.github.io/bootstrap/assets/bootstrap');
-// { name: 'bootstrap', source: 'http://twitter.github.io/bootstrap/assets/bootstrap', target: '*' }
-```
-
-### .decomposed2json(decEndpoint)
-
-Inverse of `json2decomposed()`.   
-Takes a decomposed endpoint and composes it to be saved to `bower.json`.
-
-```js
-var endpointParser = require('bower-endpoint-parser');
-
-endpointParser.decomposed2json({ name: 'jquery', source: 'jquery', target: '~2.0.0' });
-// { jquery: '~2.0.0' }
-
-endpointParser.decomposed2json({ name: 'backbone', source: 'backbone-amd', target: '~1.0.0' });
-// { backbone: 'backbone-amd#~2.0.0' }
-
-endpointParser.decomposed2json({ name: 'bootstrap', source: 'http://twitter.github.io/bootstrap/assets/bootstrap', target: '*' });
-// { bootstrap: 'http://twitter.github.io/bootstrap/assets/bootstrap' }
-```
-
-This function throws an exception if the `name` from the decomposed endpoint is empty.
-
-
-## License
-
-Released under the [MIT License](http://www.opensource.org/licenses/mit-license.php).
--- a/packages/bower-endpoint-parser/index.js
+++ b/packages/bower-endpoint-parser/index.js
@@ -1,128 +0,0 @@
-function decompose(endpoint) {
-    // Note that we allow spaces in targets and sources but they are trimmed
-    var regExp = /^(?:([\w\-]|(?:[\w\.\-]+[\w\-])?)=)?([^\|#]+)(?:#(.*))?$/;
-    var matches = endpoint.match(regExp);
-    var target;
-    var error;
-
-    if (!matches) {
-        error = new Error('Invalid endpoint: ' + endpoint);
-        error.code = 'EINVEND';
-        throw error;
-    }
-
-    target = trim(matches[3]);
-
-    return {
-        name: trim(matches[1]),
-        source: trim(matches[2]),
-        target: isWildcard(target) ? '*' : target
-    };
-}
-
-function compose(decEndpoint) {
-    var name = trim(decEndpoint.name);
-    var source = trim(decEndpoint.source);
-    var target = trim(decEndpoint.target);
-    var composed = '';
-
-    if (name) {
-        composed += name + '=';
-    }
-
-    composed += source;
-
-    if (!isWildcard(target)) {
-        composed += '#' + target;
-    }
-
-    return composed;
-}
-
-function json2decomposed(key, value) {
-    var endpoint;
-    var split;
-    var error;
-
-    key = trim(key);
-    value = trim(value);
-
-    if (!key) {
-        error = new Error('The key must be specified');
-        error.code = 'EINVEND';
-        throw error;
-    }
-
-    endpoint = key + '=';
-    split = value.split('#').map(trim);
-
-    // If # was found, the source was specified
-    if (split.length > 1) {
-        endpoint += (split[0] || key) + '#' + split[1];
-    // Check if value looks like a source
-    } else if (isSource(value)) {
-        endpoint += value + '#*';
-    // Otherwise use the key as the source
-    } else {
-        endpoint += key + '#' + split[0];
-    }
-
-    return decompose(endpoint);
-}
-
-function decomposed2json(decEndpoint) {
-    var error;
-    var name = trim(decEndpoint.name);
-    var source = trim(decEndpoint.source);
-    var target = trim(decEndpoint.target);
-    var value = '';
-    var ret = {};
-
-    if (!name) {
-        error = new Error('Decomposed endpoint must have a name');
-        error.code = 'EINVEND';
-        throw error;
-    }
-
-    // Add source only if different than the name
-    if  (source !== name) {
-        value += source;
-    }
-
-    // If value is empty, we append the target always
-    if (!value) {
-        if (isWildcard(target)) {
-            value += '*';
-        } else {
-            if (target.indexOf('/') !== -1) {
-                value += '#' + target;
-            } else {
-                value += target;
-            }
-        }
-    // Otherwise append only if not a wildcard or source does not look like a source
-    } else if (!isWildcard(target) || !isSource(source)) {
-        value += '#' + (target || '*');
-    }
-
-    ret[name] = value;
-
-    return ret;
-}
-
-function trim(str) {
-    return str ? str.trim() : '';
-}
-
-function isWildcard(target) {
-    return !target || target === '*' || target === 'latest';
-}
-
-function isSource(value) {
-    return (/[\/\\@]/).test(value);
-}
-
-module.exports.decompose = decompose;
-module.exports.compose = compose;
-module.exports.json2decomposed = json2decomposed;
-module.exports.decomposed2json = decomposed2json;
--- a/packages/bower-endpoint-parser/package.json
+++ b/packages/bower-endpoint-parser/package.json
@@ -1,25 +0,0 @@
-{
-  "name": "bower-endpoint-parser",
-  "version": "0.2.2",
-  "description": "Little module that helps with endpoints parsing.",
-  "author": "Twitter",
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://github.com/bower/endpoint-parser/blob/master/LICENSE"
-    }
-  ],
-  "repository": "https://github.com/bower/bower/tree/master/packages/bower-endpoint-parser",
-  "main": "index.js",
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "devDependencies": {
-    "expect.js": "~0.2.0",
-    "mocha": "~1.12.0",
-    "mout": "~0.9.0"
-  },
-  "scripts": {
-    "test": "mocha -R spec"
-  }
-}
--- a/packages/bower-endpoint-parser/test/test.js
+++ b/packages/bower-endpoint-parser/test/test.js
@@ -1,263 +0,0 @@
-var expect = require('expect.js');
-var lang = require('mout/lang');
-var object = require('mout/object');
-var endpointParser = require('../');
-
-describe('endpoint-parser', function () {
-    describe('.decompose', function () {
-        it('should decompose endpoints correctly', function () {
-            var suite = {
-                'jquery#~2.0.0': { name: '', source: 'jquery', target: '~2.0.0' },
-                'jquery#*': { name: '', source: 'jquery', target: '*' },
-                'jquery#latest': { name: '', source: 'jquery', target: '*' },
-                'jquery#3dc50c62fe2d2d01afc58e7ad42236a35acff4d8': { name: '', source: 'jquery', target: '3dc50c62fe2d2d01afc58e7ad42236a35acff4d8' },
-                'jquery#master': { name: '', source: 'jquery', target: 'master' },
-                'backbone=backbone-amd#~1.0.0': { name: 'backbone', source: 'backbone-amd', target: '~1.0.0' },
-                'backbone=backbone-amd#latest': { name: 'backbone', source: 'backbone-amd', target: '*' },
-                'backbone=backbone-amd#*': { name: 'backbone', source: 'backbone-amd', target: '*' },
-                'http://twitter.github.io/bootstrap/assets/bootstrap.zip': { name: '', source: 'http://twitter.github.io/bootstrap/assets/bootstrap.zip', target: '*' },
-                'bootstrap=http://twitter.github.io/bootstrap/assets/bootstrap.zip': { name: 'bootstrap', source: 'http://twitter.github.io/bootstrap/assets/bootstrap.zip', target: '*' },
-                'bootstrap=http://twitter.github.io/bootstrap/assets/bootstrap.zip#latest': { name: 'bootstrap', source: 'http://twitter.github.io/bootstrap/assets/bootstrap.zip', target: '*' }
-            };
-
-            object.forOwn(suite, function (decEndpoint, endpoint) {
-                expect(endpointParser.decompose(endpoint)).to.eql(decEndpoint);
-            });
-        });
-
-        it('should trim sources and targets', function () {
-            var decEndpoint = endpointParser.decompose('foo= source # ~1.0.2 ');
-            expect(decEndpoint.source).to.equal('source');
-            expect(decEndpoint.target).to.equal('~1.0.2');
-
-            decEndpoint = endpointParser.decompose('foo= source # latest');
-            expect(decEndpoint.source).to.equal('source');
-            expect(decEndpoint.target).to.equal('*');
-
-            decEndpoint = endpointParser.decompose('foo= source # *');
-            expect(decEndpoint.source).to.equal('source');
-            expect(decEndpoint.target).to.equal('*');
-        });
-    });
-
-    describe('.compose', function () {
-        it('should compose endpoints correctly', function () {
-            var suite = {
-                'jquery#~2.0.0': { name: '', source: 'jquery', target: '~2.0.0' },
-                'jquery': [{ name: '', source: 'jquery', target: '*' }, { name: '', source: 'jquery', target: 'latest' }, { name: '', source: 'jquery', target: '' }],
-                'jquery#3dc50c62fe2d2d01afc58e7ad42236a35acff4d8': { name: '', source: 'jquery', target: '3dc50c62fe2d2d01afc58e7ad42236a35acff4d8' },
-                'jquery#master': { name: '', source: 'jquery', target: 'master' },
-                'backbone=backbone-amd#~1.0.0': { name: 'backbone', source: 'backbone-amd', target: '~1.0.0' },
-                'backbone=backbone-amd': [{ name: 'backbone', source: 'backbone-amd', target: '*' }, { name: 'backbone', source: 'backbone-amd', target: '*' }, { name: 'backbone', source: 'backbone-amd', target: '' }],
-                'http://twitter.github.io/bootstrap/assets/bootstrap.zip': { name: '', source: 'http://twitter.github.io/bootstrap/assets/bootstrap.zip', target: '*' },
-                'bootstrap=http://twitter.github.io/bootstrap/assets/bootstrap.zip': { name: 'bootstrap', source: 'http://twitter.github.io/bootstrap/assets/bootstrap.zip', target: '*' }
-            };
-
-            object.forOwn(suite, function (decEndpoints, endpoint) {
-                decEndpoints = lang.toArray(decEndpoints);
-                decEndpoints.forEach(function (decEndpoint) {
-                    expect(endpointParser.compose(decEndpoint)).to.equal(endpoint);
-                });
-            });
-        });
-
-        it('should trim values', function () {
-            expect(endpointParser.compose({
-                name: ' foo ',
-                source: ' bar ',
-                target: ' ~1.0.2 '
-            })).to.equal('foo=bar#~1.0.2');
-
-            expect(endpointParser.compose({
-                name: ' foo ',
-                source: ' foo ',
-                target: ' ~1.0.2 '
-            })).to.equal('foo=foo#~1.0.2');
-
-            expect(endpointParser.compose({
-                name: ' foo ',
-                source: ' foo ',
-                target: ' * '
-            })).to.equal('foo=foo');
-
-            expect(endpointParser.compose({
-                name: ' foo ',
-                source: ' foo ',
-                target: ' * '
-            })).to.equal('foo=foo');
-
-            expect(endpointParser.compose({
-                name: ' ',
-                source: ' foo ',
-                target: ''
-            })).to.equal('foo');
-        });
-    });
-
-    describe('.json2decomposed', function () {
-        var expected = [
-            { name: 'jquery', source: 'jquery', target: '~1.9.1' },
-            { name: 'foo', source: 'foo', target: '*' },
-            { name: 'bar', source: 'bar', target: '*' },
-            { name: 'baz', source: 'baz', target: '~0.2.0' },
-            { name: 'backbone', source: 'backbone-amd', target: '~1.0.0' },
-            { name: 'backbone2', source: 'backbone=backbone-amd', target: '~1.0.0' },
-            { name: 'bootstrap', source: 'http://twitter.github.io/bootstrap/assets/bootstrap', target: '*' },
-            { name: 'bootstrap2', source: 'http://twitter.github.io/bootstrap/assets/bootstrap', target: '*' },
-            { name: 'ssh', source: 'git@example.com', target: '*' },
-            { name: 'git', source: 'git://example.com', target: '*' },
-            { name: 'path', source: '/foo', target: '*' },
-            { name: 'winpath', source: 'c:\\foo', target: '*' }
-        ];
-
-        it('should decompose json endpoints correctly', function () {
-            var dependencies = {
-                jquery: '~1.9.1',
-                foo: 'latest',
-                bar: '*',
-                baz: '#~0.2.0',
-                backbone: 'backbone-amd#~1.0.0',
-                backbone2: 'backbone=backbone-amd#~1.0.0',
-                bootstrap: 'http://twitter.github.io/bootstrap/assets/bootstrap',
-                bootstrap2: 'http://twitter.github.io/bootstrap/assets/bootstrap#*',
-                ssh: 'git@example.com',
-                git: 'git://example.com',
-                path: '/foo',
-                winpath: 'c:\\foo'
-            };
-            var x = 0;
-
-            object.forOwn(dependencies, function (value, key) {
-                expect(endpointParser.json2decomposed(key, value)).to.eql(expected[x]);
-                x += 1;
-            });
-        });
-
-        it('should trim values', function () {
-            var dependencies = {
-                ' jquery ': ' ~1.9.1 ',
-                ' foo ': ' latest ',
-                ' bar ': ' * ',
-                ' baz ': '# ~0.2.0 ',
-                ' backbone ': ' backbone-amd#~1.0.0 ',
-                ' backbone2 ': ' backbone=backbone-amd # ~1.0.0 ',
-                ' bootstrap ': ' http://twitter.github.io/bootstrap/assets/bootstrap',
-                ' bootstrap2 ': ' http://twitter.github.io/bootstrap/assets/bootstrap # *',
-                ' ssh ': ' git@example.com ',
-                ' git ': ' git://example.com ',
-                ' path ': ' /foo ',
-                ' winpath ': ' c:\\foo '
-            };
-            var x = 0;
-
-            object.forOwn(dependencies, function (value, key) {
-                expect(endpointParser.json2decomposed(key, value)).to.eql(expected[x]);
-                x += 1;
-            });
-        });
-
-        it('should error out if key is not specified', function () {
-            try {
-                endpointParser.json2decomposed(null);
-                throw new Error('Should have failed');
-            } catch (e) {
-                expect(e.code).to.equal('EINVEND');
-                expect(e.message).to.contain('key must be specified');
-            }
-
-            try {
-                endpointParser.json2decomposed('');
-                throw new Error('Should have failed');
-            } catch (e) {
-                expect(e.code).to.equal('EINVEND');
-                expect(e.message).to.contain('key must be specified');
-            }
-        });
-    });
-
-    describe('.decomposed2json', function () {
-        var expected = [
-            { jquery: '~1.9.1' },
-            { foo: '*' },
-            { bar: '*' },
-            { baz: '*' },
-            { jqueryx: 'jquery#~1.9.1' },
-            { jqueryy: 'jquery-x#*' },
-            { jqueryy: 'jquery-x#*' },
-            { backbone: 'backbone-amd#~1.0.0' },
-            { backbone : 'backbone=backbone-amd#~1.0.0' },
-            { bootstrap: 'http://twitter.github.io/bootstrap/assets/bootstrap' },
-            { bootstrap: 'http://twitter.github.io/bootstrap/assets/bootstrap' },
-            { ssh: 'git@example.com' },
-            { git: 'git://example.com' },
-            { ckeditor: '#full/4.3.3' }
-        ];
-
-        it('should compose endpoints to json correctly', function () {
-            var decEndpoints = [
-                { name: 'jquery', source: 'jquery', target: '~1.9.1' },
-                { name: 'foo', source: 'foo', target: 'latest' },
-                { name: 'bar', source: 'bar', target: '*' },
-                { name: 'baz', source: 'baz', target: '' },
-                { name: 'jqueryx', source: 'jquery', target: '~1.9.1' },
-                { name: 'jqueryy', source: 'jquery-x', target: '' },
-                { name: 'jqueryy', source: 'jquery-x', target: '*' },
-                { name: 'backbone', source: 'backbone-amd', target: '~1.0.0' },
-                { name: 'backbone', source: 'backbone=backbone-amd', target: '~1.0.0' },
-                { name: 'bootstrap', source: 'http://twitter.github.io/bootstrap/assets/bootstrap', target: '' },
-                { name: 'bootstrap', source: 'http://twitter.github.io/bootstrap/assets/bootstrap', target: '*' },
-                { name: 'ssh', source: 'git@example.com', target: '*' },
-                { name: 'git', source: 'git://example.com', target: '*' },
-                { name: 'ckeditor', source: 'ckeditor', target: 'full/4.3.3' }
-            ];
-            var x = 0;
-
-            decEndpoints.forEach(function (decEndpoint) {
-                expect(endpointParser.decomposed2json(decEndpoint)).to.eql(expected[x]);
-                x += 1;
-            });
-        });
-
-        it('should trim values', function () {
-            var decEndpoints = [
-                { name: ' jquery ', source: ' jquery ', target: ' ~1.9.1 ' },
-                { name: 'foo', source: ' foo', target: ' latest ' },
-                { name: 'bar', source: 'bar ', target: ' * ' },
-                { name: 'baz ', source: 'baz', target: ' ' },
-                { name: ' jqueryx ', source: ' jquery ', target: ' ~1.9.1 ' },
-                { name: ' jqueryy ', source: ' jquery-x ', target: ' ' },
-                { name: ' jqueryy ', source: ' jquery-x ', target: ' * ' },
-                { name: ' backbone ', source: ' backbone-amd ', target: ' ~1.0.0 ' },
-                { name: ' backbone ', source: ' backbone=backbone-amd ', target: ' ~1.0.0 ' },
-                { name: ' bootstrap ', source: ' http://twitter.github.io/bootstrap/assets/bootstrap ', target: ' ' },
-                { name: ' bootstrap ', source: ' http://twitter.github.io/bootstrap/assets/bootstrap ', target: ' * ' },
-                { name: ' ssh ', source: ' git@example.com ', target: ' * ' },
-                { name: ' git ', source: ' git://example.com ', target: ' * ' }
-            ];
-            var x = 0;
-
-            decEndpoints.forEach(function (decEndpoint) {
-                expect(endpointParser.decomposed2json(decEndpoint)).to.eql(expected[x]);
-                x += 1;
-            });
-        });
-
-        it('should throw an error if name is empty', function () {
-            try {
-                endpointParser.decomposed2json({ name: '', source: 'jquery', target: '*' });
-                throw new Error('Should have failed');
-            } catch (e) {
-                expect(e.code).to.equal('EINVEND');
-                expect(e.message).to.contain('must have a name');
-            }
-
-            try {
-                endpointParser.decomposed2json({ name: ' ', source: 'jquery', target: '*' });
-                throw new Error('Should have failed');
-            } catch (e) {
-                expect(e.code).to.equal('EINVEND');
-                expect(e.message).to.contain('must have a name');
-            }
-        });
-    });
-});
--- a/packages/bower-json/.editorconfig
+++ b/packages/bower-json/.editorconfig
@@ -1,12 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
--- a/packages/bower-json/.gitignore
+++ b/packages/bower-json/.gitignore
@@ -1,4 +0,0 @@
-/node_modules
-/npm-debug.*
-
-/test/reports
--- a/packages/bower-json/.jshintrc
+++ b/packages/bower-json/.jshintrc
@@ -1,48 +0,0 @@
-{
-    "indent": 4,
-    "node": true,
-    "devel": true,
-    "mocha": true,
-
-    "bitwise": false,
-    "curly": false,
-    "eqeqeq": true,
-    "forin": false,
-    "immed": true,
-    "latedef": false,
-    "newcap": true,
-    "noarg": true,
-    "noempty": false,
-    "nonew": true,
-    "plusplus": false,
-    "regexp": false,
-    "undef": true,
-    "unused": true,
-    "quotmark": "single",
-    "strict": false,
-    "camelcase": true,
-
-    "asi": false,
-    "boss": true,
-    "debug": false,
-    "eqnull": true,
-    "es5": false,
-    "esnext": false,
-    "evil": false,
-    "expr": false,
-    "funcscope": false,
-    "globalstrict": false,
-    "iterator": false,
-    "lastsemic": false,
-    "laxbreak": true,
-    "laxcomma": false,
-    "loopfunc": true,
-    "multistr": false,
-    "onecase": true,
-    "regexdash": false,
-    "scripturl": false,
-    "shadow": false,
-    "sub": false,
-    "supernew": true,
-    "validthis": false
-}
--- a/packages/bower-json/.travis.yml
+++ b/packages/bower-json/.travis.yml
@@ -1,10 +0,0 @@
-sudo: false
-language: node_js
-node_js:
-  - '5'
-  - '4'
-  - '0.12'
-  - '0.10'
-
-script:
-  - grunt travis
--- a/packages/bower-json/CHANGELOG.md
+++ b/packages/bower-json/CHANGELOG.md
@@ -1,17 +0,0 @@
-# 0.8.1
-
- Revert strict name validations and allow @, spaces and slashes
-
-# 0.8.0
-
- Update graceful-fs to 4.x
- Add name validations that reflect what's happening in registry
-
-# 0.7.1
-
- Unpublished
-
-# 0.7.0
-
- Add getIssues function to retrieve all errors and warnings
- Add readSync and findSync functions for synchronous read
--- a/packages/bower-json/Gruntfile.js
+++ b/packages/bower-json/Gruntfile.js
@@ -1,60 +0,0 @@
-'use strict';
-
-module.exports = function (grunt) {
-    require('load-grunt-tasks')(grunt);
-    // Project configuration.
-    grunt.initConfig({
-
-        jshint: {
-            files: [
-                'Gruntfile.js',
-                'lib/**/*.js',
-                'test/**/*.js',
-                '!test/reports/**/*'
-            ],
-            options: {
-                jshintrc: '.jshintrc'
-            }
-        },
-
-        simplemocha: {
-            options: {
-                reporter: 'spec'
-            },
-            full: { src: ['test/test.js'] },
-            short: {
-                options: {
-                    reporter: 'dot'
-                },
-                src: ['test/test.js']
-            },
-            build: {
-                options: {
-                    reporter: 'tap'
-                },
-                src: ['test/test.js']
-            }
-        },
-
-        exec: {
-            cover: {
-                command: 'STRICT_REQUIRE=1 node node_modules/istanbul/lib/cli.js cover --dir ./test/reports node_modules/mocha/bin/_mocha -- --timeout 30000 -R dot test/test.js'
-            },
-            coveralls: {
-                command: 'node node_modules/.bin/coveralls < test/reports/lcov.info'
-            }
-        },
-
-
-        watch: {
-            files: ['<%= jshint.files %>'],
-            tasks: ['jshint', 'simplemocha:short']
-        }
-
-    });
-
-    // Default task.
-    grunt.registerTask('test', ['simplemocha:full']);
-    grunt.registerTask('default', ['jshint', 'test']);
-    grunt.registerTask('travis', ['jshint', 'exec:cover', 'exec:coveralls']);
-};
--- a/packages/bower-json/LICENSE
+++ b/packages/bower-json/LICENSE
@@ -1,19 +0,0 @@
-Copyright (c) 2016 Twitter and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/packages/bower-json/README.md
+++ b/packages/bower-json/README.md
@@ -1,159 +0,0 @@
-# bower-json [![Build Status](https://secure.travis-ci.org/bower/json.png?branch=master)](http://travis-ci.org/bower/json) [![Coverage Status](https://coveralls.io/repos/bower/json/badge.svg?branch=master&service=github)](https://coveralls.io/github/bower/json?branch=master)
-
-Read `bower.json` files with semantics, normalisation, defaults and validation.
-
-Install via [npm](https://www.npmjs.org/package/bower-json): `npm install --save bower-json`
-
-## Usage
-
-#### .read(file, options, callback)
-#### .readSync(file, options)
-
-Reads `file` and applies normalisation, defaults and validation according to the `bower.json` spec.
-If the passed `file` does not exist, the callback is called with `error.code` equal to `ENOENT`.
-If the passed `file` contents are not valid JSON, the callback is called with `error.code` equal to `EMALFORMED`.
-If the `json` does not comply with the `bower.json` spec, the callback is called with `error.code` equal to `EINVALID`.
-
-If `file` is a directory, `find()` will be used to search for the json file.
-The `options` argument is optional and can be omitted. These options will be passed to `parse` method.
-
-
-```js
-var bowerJson = require('bower-json');
-
-// Can also be used by simply calling bowerJson()
-bowerJson.read('/path/to/bower.json', function (err, json) {
-    if (err) {
-        console.error('There was an error reading the file');
-        console.error(err.message);
-        return;
-    }
-
-    console.log('JSON: ', json);
-});
-```
-
-
-#### .parse(json, options)
-
-Parses an object. Useful when you want to apply normalisation and validation directly to an object.
-If the `json` does not comply with the `bower.json` spec, an error is thrown with `error.code` equal to `EINVALID`.
-
-The `options` arguments is optional and can be omitted. Available options:
-
- validate: Apply validation, defaults to `true`
- normalize: Apply normalisation, defaults to `false`
- clone: clone, use and return the passed in `json` object instead of using it directly, defaults to `false`
-
-
-```js
-var bowerJson = require('bower-json');
-
-var json = {
-    name: 'my-package',
-    version: '0.0.1'
-};
-
-try {
-    bowerJson.parse(json);
-} catch (err) {
-    console.error('There was an error parsing the object');
-    console.error(err.message);
-}
-```
-
-#### .getIssues(json) - DEPRECATED
-
-Validates the passed `json` object.
-
-Returns an object with errors and warnings of this bower.json contents.
-
-```js
-var bowerJson = require('bower-json');
-
-var json = {
-    name: 'myPackage',
-    version: '0.0.1',
-    main: {}
-};
-
-var issues = bowerJson.getIssues(json);
-
-expect(issues).toEqual({
-  errors: ['The "main" field has to be either an Array or a String'],
-  warnings: ['The "name" must be lowercase']
-});
-
-#### .validate(json)
-
-Validates the passed `json` object.
-
-Throws an error with `error.code` equal to `EINVALID` if it does not comply with the spec.
-
-```js
-var bowerJson = require('bower-json');
-
-var json = {
-    name: 'myPackage',
-    version: '0.0.1'
-};
-
-try {
-    bowerJson.validate(json);
-} catch (err) {
-    console.error('There was an error validating the object');
-    console.error(err.message);
-}
-```
-
-#### .normalize(json)
-
-```js
-var bowerJson = require('bower-json');
-
-var json = {
-    name: 'my-package',
-    version: '0.0.1',
-    main: 'foo.js,bar.js'
-};
-
-bowerJson.normalize(json);
-json.main // ['foo.js', 'bar.js']
-```
-
-
-#### .find(folder, callback)
-#### .findSync(folder)
-
-Finds the `json` filename inside a folder.
-Checks if a `bower.json` exists, falling back to `component.json` (deprecated) and `.bower.json`.
-If no file was found, the callback is called with a `error.code` of `ENOENT`.
-
-```js
-var bowerJson = require('bower-json');
-
-bowerJson.find('/path/to/folder', function (err, filename) {
-    if (err) {
-        console.error('There is no json file in the folder');
-        return;
-    }
-
-    console.log('Filename: ', filename);
-
-    // Now that we got the filename, we can read its contents
-    bowerJson.read(filename, function (err, json) {
-        if (err) {
-            console.error('There was an error reading the file');
-            console.error(err.message);
-            return;
-        }
-
-        console.log('JSON: ', json);
-    });
-});
-```
-
-
-## License
-
-Released under the [MIT License](http://www.opensource.org/licenses/mit-license.php).
--- a/packages/bower-json/lib/json.js
+++ b/packages/bower-json/lib/json.js
@@ -1,297 +0,0 @@
-var fs = require('graceful-fs');
-var path = require('path');
-var deepExtend = require('deep-extend');
-var isAsset = require('./util/isAsset');
-var isComponent = require('./util/isComponent');
-var createError = require('./util/createError');
-
-var possibleJsons = ['bower.json', 'component.json', '.bower.json'];
-
-function read(file, options, callback) {
-    if (typeof options === 'function') {
-        callback = options;
-        options = {};
-    }
-
-    // Check if file is a directory
-    fs.stat(file, function (err, stat) {
-        if (err) {
-            return callback(err);
-        }
-
-        // It's a directory, so we find the json inside it
-        if (stat.isDirectory()) {
-            return find(file, function (err, file) {
-                if (err) {
-                    return callback(err);
-                }
-
-                read(file, options, callback);
-            });
-        }
-
-        // Otherwise read it
-        fs.readFile(file, function (err, contents) {
-            var json;
-
-            if (err) {
-                return callback(err);
-            }
-
-            try {
-                json = JSON.parse(contents.toString());
-            } catch (err) {
-                err.file = path.resolve(file);
-                err.code = 'EMALFORMED';
-                return callback(err);
-            }
-
-            // Parse it
-            try {
-                json = parse(json, options);
-            } catch (err) {
-                err.file = path.resolve(file);
-                return callback(err);
-            }
-
-            callback(null, json, file);
-        });
-    });
-}
-
-function readSync(file, options) {
-    var stat;
-    var filename;
-    var contents;
-    var json;
-
-    if (!options) {
-        options = {};
-    }
-    try {
-        stat = fs.statSync(file);
-    } catch (err) {
-        return err;
-    }
-    if (stat.isDirectory()) {
-        filename = findSync(file);
-        return readSync(filename);
-    }
-
-    contents = fs.readFileSync(file);
-
-    try {
-        json = JSON.parse(contents.toString());
-    } catch (err) {
-        err.file = path.resolve(file);
-        err.code = 'EMALFORMED';
-        return err;
-    }
-
-    try {
-        json = parse(json, options);
-    } catch (err) {
-        err.file = path.resolve(file);
-        return err;
-    }
-
-    return json;
-}
-
-function parse(json, options) {
-    options = deepExtend({
-        normalize: false,
-        validate: true,
-        clone: false
-    }, options || {});
-
-    // Clone
-    if (options.clone) {
-        json = deepExtend({}, json);
-    }
-
-    // Validate
-    if (options.validate) {
-        validate(json);
-    }
-
-    // Normalize
-    if (options.normalize) {
-        normalize(json);
-    }
-
-    return json;
-}
-
-// This function implements:
-//
-// https://github.com/bower/bower.json-spec
-function getIssues(json) {
-    // For things that shouldn't happen
-    var errors = [];
-
-    // For things that happen but they shoudn't
-    var warnings = [];
-
-    if (!json.name) {
-        errors.push('No "name" property set');
-    } else {
-        if (!/^[a-zA-Z0-9_@][a-zA-Z0-9_@\.\- \/]*$/.test(json.name)) {
-            errors.push('Name must be lowercase, can contain digits, dots, dashes, "@" or spaces');
-        }
-
-        if (json.name.length > 50) {
-            warnings.push('The "name" is too long, the limit is 50 characters');
-        }
-
-        if (!/^[a-z0-9_][a-z0-9_\.\-]*$/.test(json.name)) {
-            warnings.push('The "name" is recommended to be lowercase, can contain digits, dots, dashes');
-        }
-
-        if (/^[\.-]/.test(json.name)) {
-            warnings.push('The "name" cannot start with dot or dash');
-        }
-
-        if (/[\.-]$/.test(json.name)) {
-            warnings.push('The "name" cannot end with dot or dash');
-        }
-    }
-
-    if (json.description && json.description.length > 140) {
-        warnings.push('The "description" is too long, the limit is 140 characters');
-    }
-
-    if (json.main !== undefined) {
-        var main = json.main;
-        if (typeof main === 'string') {
-            main = [main];
-        }
-        if (!(main instanceof Array)) {
-            errors.push('The "main" field has to be either an Array or a String');
-        } else {
-            var ext2files = {};
-            main.forEach(function (filename) {
-                if (typeof filename !== 'string') {
-                    errors.push('The "main" Array has to contain only Strings');
-                }
-                if (/[*]/.test(filename)) {
-                    warnings.push('The "main" field cannot contain globs (example: "*.js")');
-                }
-                if (/[.]min[.][^/]+$/.test(filename)) {
-                    warnings.push('The "main" field cannot contain minified files');
-                }
-                if (isAsset(filename)) {
-                    warnings.push('The "main" field cannot contain font, image, audio, or video files');
-                }
-                var ext = path.extname(filename);
-                if (ext.length >= 2) {
-                    var files = ext2files[ext];
-                    if (!files) {
-                        files = ext2files[ext] = [];
-                    }
-                    files.push(filename);
-                }
-            });
-            Object.keys(ext2files).forEach(function (ext) {
-                var files = ext2files[ext];
-                if (files.length > 1) {
-                    warnings.push('The "main" field has to contain only 1 file per filetype; found multiple ' + ext + ' files: ' + JSON.stringify(files));
-                }
-            });
-        }
-    }
-
-    return {
-        errors: errors,
-        warnings: warnings
-    };
-}
-
-// For backward compatibility, it throws first error
-function validate(json) {
-    var issues = getIssues(json);
-
-    if (issues.errors && issues.errors.length > 0) {
-        throw createError(issues.errors[0], 'EINVALID');
-    }
-}
-
-function normalize(json) {
-    if (typeof json.main === 'string') {
-        json.main = [json.main];
-    }
-
-    return json;
-}
-
-function find(folder, files, callback) {
-    var err;
-    var file;
-
-    if (typeof files === 'function') {
-        callback = files;
-        files = possibleJsons;
-    }
-
-    if (!files.length) {
-        err = createError('None of ' + possibleJsons.join(', ') + ' were found in ' + folder, 'ENOENT');
-        return callback(err);
-    }
-
-    file = path.resolve(path.join(folder, files[0]));
-    fs.exists(file, function (exists) {
-        if (!exists) {
-            return find(folder, files.slice(1), callback);
-        }
-
-        if (files[0] !== 'component.json') {
-            return callback(null, file);
-        }
-
-        // If the file is component.json, check it it's a component(1) file
-        // If it is, we ignore it and keep searching
-        isComponent(file, function (is) {
-            if (is) {
-                return find(folder, files.slice(1), callback);
-            }
-
-            callback(null, file);
-        });
-    });
-}
-
-function findSync(folder, files) {
-    var file;
-    var exists;
-
-    if (files === undefined) {
-        files = possibleJsons;
-    }
-
-    if (!files.length) {
-        return createError('None of ' + possibleJsons.join(', ') + ' were found in ' + folder, 'ENOENT');
-    }
-
-    file = path.resolve(path.join(folder, files[0]));
-    try{
-        exists = fs.statSync(file);
-    }
-    catch (err) {
-        exists = false;
-    }
-    if (exists && exists.isFile()) {
-        return file;
-    } else {
-        return findSync(folder, files.slice(1));
-    }
-}
-
-module.exports = read;
-module.exports.read = read;
-module.exports.readSync = readSync;
-module.exports.parse = parse;
-module.exports.getIssues = getIssues;
-module.exports.validate = validate;
-module.exports.normalize = normalize;
-module.exports.find = find;
-module.exports.findSync = findSync;
--- a/packages/bower-json/lib/util/createError.js
+++ b/packages/bower-json/lib/util/createError.js
@@ -1,8 +0,0 @@
-function createError(msg, code) {
-    var err = new Error(msg);
-    err.code = code;
-
-    return err;
-}
-
-module.exports = createError;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vlad Filippov	a2f21e2703	v1.7.2	2015-12-30 21:05:20 -05:00
Sam Saccone	4eac914ad0	Lock fs-write-steam-atomic to 1.0.5 context: https://github.com/bower/bower/issues/2118#issuecomment-168097858 Fixes #2118	2015-12-30 21:02:12 -05:00