init-package-json@1.7.0

* get rid of redundant property on errors (@watilde)
* new tap (@isaacs)
* lowercase default name (@quarterto)
* use validate-package-license@2.0.0 with its rules:
  * accept UNLICENSED | UNLICENCED
  * accept "SEE LICENSE IN <file>"

PR-URL: https://github.com/npm/init-package-json/pull/46
PR-URL: https://github.com/npm/init-package-json/pull/45
PR-URL: https://github.com/npm/init-package-json/pull/48
PR-URL: https://github.com/npm/init-package-json/pull/49

20 files changed, 563 insertions, 137 deletions

diff --git a/node_modules/init-package-json/.travis.yml b/node_modules/init-package-json/.travis.yml
index 05d299e67..991d04b6e 100644
--- a/node_modules/init-package-json/.travis.yml
+++ b/node_modules/init-package-json/.travis.yml
@@ -1,4 +1,5 @@
 language: node_js
 node_js:
-  - "0.10"
-  - "0.11"
+  - '0.10'
+  - '0.12'
+  - 'iojs'
diff --git a/node_modules/init-package-json/default-input.js b/node_modules/init-package-json/default-input.js
index 886291dce..ef5161e79 100644
--- a/node_modules/init-package-json/default-input.js
+++ b/node_modules/init-package-json/default-input.js
@@ -12,7 +12,7 @@ function isTestPkg (p) {
 }
 
 function niceName (n) {
-  return n.replace(/^node-|[.-]js$/g, '')
+  return n.replace(/^node-|[.-]js$/g, '').toLowerCase()
 }
 
 function readDeps (test) { return function (cb) {
@@ -72,7 +72,6 @@ exports.version = yes ?
     if (semver.valid(version)) return version
     var er = new Error('Invalid version: "' + version + '"')
     er.notValid = true
-    er.again = true
     return er
   })
 
diff --git a/node_modules/init-package-json/node_modules/promzard/package.json b/node_modules/init-package-json/node_modules/promzard/package.json
index 1007cdde4..1407e97be 100644
--- a/node_modules/init-package-json/node_modules/promzard/package.json
+++ b/node_modules/init-package-json/node_modules/promzard/package.json
@@ -8,7 +8,7 @@
   "description": "prompting wizardly",
   "version": "0.3.0",
   "repository": {
-    "url": "git://github.com/isaacs/promzard"
+    "url": "git://github.com/isaacs/promzard.git"
   },
   "dependencies": {
     "read": "1"
diff --git a/node_modules/init-package-json/node_modules/validate-npm-package-license/LICENSE b/node_modules/init-package-json/node_modules/validate-npm-package-license/LICENSE
new file mode 100644
index 000000000..a5e905d55
--- /dev/null
+++ b/node_modules/init-package-json/node_modules/validate-npm-package-license/LICENSE
@@ -0,0 +1,174 @@
+SPDX:Apache-2.0
+
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and 
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the 
+copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other 
+entities that control, are controlled by, or are under common control 
+with that entity. For the purposes of this definition, "control" means 
+(i) the power, direct or indirect, to cause the direction or management 
+of such entity, whether by contract or otherwise, or (ii) ownership of 
+fifty percent (50%) or more of the outstanding shares, or (iii) 
+beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising 
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, 
+including but not limited to software source code, documentation source, 
+and configuration files.
+
+"Object" form shall mean any form resulting from mechanical 
+transformation or translation of a Source form, including but not 
+limited to compiled object code, generated documentation, and 
+conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object 
+form, made available under the License, as indicated by a copyright 
+notice that is included in or attached to the work (an example is 
+provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object 
+form, that is based on (or derived from) the Work and for which the 
+editorial revisions, annotations, elaborations, or other modifications 
+represent, as a whole, an original work of authorship. For the purposes 
+of this License, Derivative Works shall not include works that remain 
+separable from, or merely link (or bind by name) to the interfaces of, 
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original 
+version of the Work and any modifications or additions to that Work or 
+Derivative Works thereof, that is intentionally submitted to Licensor 
+for inclusion in the Work by the copyright owner or by an individual or 
+Legal Entity authorized to submit on behalf of the copyright owner. For 
+the purposes of this definition, "submitted" means any form of 
+electronic, verbal, or written communication sent to the Licensor or its 
+representatives, including but not limited to communication on 
+electronic mailing lists, source code control systems, and issue 
+tracking systems that are managed by, or on behalf of, the Licensor for 
+the purpose of discussing and improving the Work, but excluding 
+communication that is conspicuously marked or otherwise designated in 
+writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on 
+behalf of whom a Contribution has been received by Licensor and 
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of 
+this License, each Contributor hereby grants to You a perpetual, 
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright 
+license to reproduce, prepare Derivative Works of, publicly display, 
+publicly perform, sublicense, and distribute the Work and such 
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this 
+License, each Contributor hereby grants to You a perpetual, worldwide, 
+non-exclusive, no-charge, royalty-free, irrevocable (except as stated in 
+this section) patent license to make, have made, use, offer to sell, 
+sell, import, and otherwise transfer the Work, where such license 
+applies only to those patent claims licensable by such Contributor that 
+are necessarily infringed by their Contribution(s) alone or by 
+combination of their Contribution(s) with the Work to which such 
+Contribution(s) was submitted. If You institute patent litigation 
+against any entity (including a cross-claim or counterclaim in a 
+lawsuit) alleging that the Work or a Contribution incorporated within 
+the Work constitutes direct or contributory patent infringement, then 
+any patent licenses granted to You under this License for that Work 
+shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work 
+or Derivative Works thereof in any medium, with or without 
+modifications, and in Source or Object form, provided that You meet the 
+following conditions:
+
+(a) You must give any other recipients of the Work or Derivative Works a 
+copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices stating 
+that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works that You 
+distribute, all copyright, patent, trademark, and attribution notices 
+from the Source form of the Work, excluding those notices that do not 
+pertain to any part of the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its 
+distribution, then any Derivative Works that You distribute must include 
+a readable copy of the attribution notices contained within such NOTICE 
+file, excluding those notices that do not pertain to any part of the 
+Derivative Works, in at least one of the following places: within a 
+NOTICE text file distributed as part of the Derivative Works; within the 
+Source form or documentation, if provided along with the Derivative 
+Works; or, within a display generated by the Derivative Works, if and 
+wherever such third-party notices normally appear. The contents of the 
+NOTICE file are for informational purposes only and do not modify the 
+License. You may add Your own attribution notices within Derivative 
+Works that You distribute, alongside or as an addendum to the NOTICE 
+text from the Work, provided that such additional attribution notices 
+cannot be construed as modifying the License.
+
+You may add Your own copyright statement to Your modifications and may 
+provide additional or different license terms and conditions for use, 
+reproduction, or distribution of Your modifications, or for any such 
+Derivative Works as a whole, provided Your use, reproduction, and 
+distribution of the Work otherwise complies with the conditions stated 
+in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, 
+any Contribution intentionally submitted for inclusion in the Work by 
+You to the Licensor shall be under the terms and conditions of this 
+License, without any additional terms or conditions. Notwithstanding the 
+above, nothing herein shall supersede or modify the terms of any 
+separate license agreement you may have executed with Licensor regarding 
+such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade 
+names, trademarks, service marks, or product names of the Licensor, 
+except as required for reasonable and customary use in describing the 
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed 
+to in writing, Licensor provides the Work (and each Contributor provides 
+its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+OF ANY KIND, either express or implied, including, without limitation, 
+any warranties or conditions of TITLE, NON-INFRINGEMENT, 
+MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely 
+responsible for determining the appropriateness of using or 
+redistributing the Work and assume any risks associated with Your 
+exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, 
+whether in tort (including negligence), contract, or otherwise, unless 
+required by applicable law (such as deliberate and grossly negligent 
+acts) or agreed to in writing, shall any Contributor be liable to You 
+for damages, including any direct, indirect, special, incidental, or 
+consequential damages of any character arising as a result of this 
+License or out of the use or inability to use the Work (including but 
+not limited to damages for loss of goodwill, work stoppage, computer 
+failure or malfunction, or any and all other commercial damages or 
+losses), even if such Contributor has been advised of the possibility of 
+such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the 
+Work or Derivative Works thereof, You may choose to offer, and charge a 
+fee for, acceptance of support, warranty, indemnity, or other liability 
+obligations and/or rights consistent with this License. However, in 
+accepting such obligations, You may act only on Your own behalf and on 
+Your sole responsibility, not on behalf of any other Contributor, and 
+only if You agree to indemnify, defend, and hold each Contributor 
+harmless for any liability incurred by, or claims asserted against, such 
+Contributor by reason of your accepting any such warranty or additional 
+liability.
diff --git a/node_modules/init-package-json/node_modules/validate-npm-package-license/LICENSE.md b/node_modules/init-package-json/node_modules/validate-npm-package-license/LICENSE.md
deleted file mode 100644
index 2180a8c1a..000000000
--- a/node_modules/init-package-json/node_modules/validate-npm-package-license/LICENSE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright Kyle E. Mitchell
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
diff --git a/node_modules/init-package-json/node_modules/validate-npm-package-license/README.md b/node_modules/init-package-json/node_modules/validate-npm-package-license/README.md
index 904f74b9d..b71e26e06 100644
--- a/node_modules/init-package-json/node_modules/validate-npm-package-license/README.md
+++ b/node_modules/init-package-json/node_modules/validate-npm-package-license/README.md
@@ -1,29 +1,61 @@
-npm-validate-package-license
+validate-npm-package-license
 ============================
 
-Give me a string and I'll tell you if it's a valid npm package license.
-
-*This package is not endorsed or approved by npm. It is part of a proposal to add license field validation to the npm command-line interface.*
+Give me a string and I'll tell you if it's a valid npm package license string.
 
 <!-- js var valid = require('./'); -->
 
 ```js
-var validResult = {
+var noWarnings = {
   validForNewPackages: true,
   validForOldPackages: true
 };
 
-valid('Apache-2.0'); // => validResult
-valid('GPL-3.0 OR BSD-2-Clause'); // => validResult
+// SPDX license identifier for common open-source licenses
+valid('MIT'); // => noWarnings
+valid('BSD-2-Clause'); // => noWarnings
+valid('Apache-2.0'); // => noWarnings
+valid('ISC'); // => noWarnings
+
+// Simple SPDX license expression for dual licensing
+valid('(GPL-3.0 OR BSD-2-Clause)'); // => noWarnings
+
+// Refer to a non-standard license found in the package
+valid('SEE LICENSE IN LICENSE.txt'); // => noWarnings
+valid('SEE LICENSE IN license.md'); // => noWarnings
+
+// No license
+valid('UNLICENSED'); // => noWarnings
+valid('UNLICENCED'); // => noWarnings
+
+var warningsWithSuggestion = {
+  validForOldPackages: false,
+  validForNewPackages: false,
+  warnings: [
+    'license should be ' +
+    'a valid SPDX license expression without "LicenseRef", ' + 
+    '"UNLICENSED", or ' +
+    '"SEE LICENSE IN <filename>"',
+    'license is similar to the valid expression "Apache-2.0"'
+  ]
+};
+
+// Almost a valid SPDX license identifier
+valid('Apache 2.0'); // => warningsWithSuggestion
 
-var invalidResult = {
+var warningAboutLicenseRef = {
   validForOldPackages: false,
   validForNewPackages: false,
   warnings: [
-    'license should be a valid SPDX license expression',
-	'license is similar to the valid expression "Apache-2.0"'
+    'license should be ' +
+    'a valid SPDX license expression without "LicenseRef", ' + 
+    '"UNLICENSED", or ' +
+    '"SEE LICENSE IN <filename>"',
   ]
 };
 
-valid('Apache 2.0'); // => invalidResult
+// LicenseRef-* identifiers are valid SPDX expressions,
+// but not valid in package.json
+valid('LicenseRef-Made-Up'); // => warningAboutLicenseRef
+valid('(MIT OR LicenseRef-Made-Up)'); // => warningAboutLicenseRef
 ```
diff --git a/node_modules/init-package-json/node_modules/validate-npm-package-license/index.js b/node_modules/init-package-json/node_modules/validate-npm-package-license/index.js
index c8407a520..2e9bc195d 100644
--- a/node_modules/init-package-json/node_modules/validate-npm-package-license/index.js
+++ b/node_modules/init-package-json/node_modules/validate-npm-package-license/index.js
@@ -1,26 +1,74 @@
 var spdx = require('spdx');
 var correct = require('spdx-correct');
 
-module.exports = function(argument) {
-  if (spdx.valid(argument)) {
-    return {
-      validForNewPackages: true,
-      validForOldPackages: true
-    };
+var validResult = {
+  validForNewPackages: true,
+  validForOldPackages: true
+};
+
+var genericWarning = (
+  'license should be ' +
+  'a valid SPDX license expression without "LicenseRef", ' + 
+  '"UNLICENSED", or ' +
+  '"SEE LICENSE IN <filename>"'
+);
+
+var fileReferenceRE = /^SEE LICEN[CS]E IN (.+)$/;
+
+function startsWith(prefix, string) {
+  return string.slice(0, prefix.length) === prefix;
+}
+
+function usesLicenseRef(ast) {
+  if (ast.hasOwnProperty('license')) {
+    var license = ast.license;
+    return (
+      startsWith('LicenseRef', license) ||
+      startsWith('DocumentRef', license)
+    );
   } else {
-    var warnings = [
-      'license should be a valid SPDX license expression'
-    ];
-    var corrected = correct(argument);
-    if (corrected) {
-      warnings.push(
-        'license is similar to the valid expression "' + corrected + '"'
-      );
+    return (
+      usesLicenseRef(ast.left) ||
+      usesLicenseRef(ast.right)
+    );
+  }
+}
+
+module.exports = function(argument) {
+  var ast;
+
+  try {
+    ast = spdx.parse(argument);
+  } catch (e) {
+    if (
+      argument === 'UNLICENSED' ||
+      argument === 'UNLICENCED' ||
+      fileReferenceRE.test(argument)
+    ) {
+      return validResult;
+    } else {
+      var result = {
+        validForOldPackages: false,
+        validForNewPackages: false,
+        warnings: [genericWarning]
+      };
+      var corrected = correct(argument);
+      if (corrected) {
+        result.warnings.push(
+          'license is similar to the valid expression "' + corrected + '"'
+        );
+      }
+      return result;
     }
+  }
+
+  if (usesLicenseRef(ast)) {
     return {
-      validForOldPackages: false,
       validForNewPackages: false,
-      warnings: warnings
+      validForOldPackages: false,
+      warnings: [genericWarning]
     };
+  } else {
+    return validResult;
   }
 };
diff --git a/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/.npmignore b/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/.npmignore
deleted file mode 100644
index 5229acdc8..000000000
--- a/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/.npmignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.gitignore
-.jscsrc
-.jshintrc
-test
-.travis.yml
diff --git a/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/LICENSE b/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/LICENSE
new file mode 100644
index 000000000..a5e905d55
--- /dev/null
+++ b/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/LICENSE
@@ -0,0 +1,174 @@
+SPDX:Apache-2.0
+
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and 
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the 
+copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other 
+entities that control, are controlled by, or are under common control 
+with that entity. For the purposes of this definition, "control" means 
+(i) the power, direct or indirect, to cause the direction or management 
+of such entity, whether by contract or otherwise, or (ii) ownership of 
+fifty percent (50%) or more of the outstanding shares, or (iii) 
+beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising 
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, 
+including but not limited to software source code, documentation source, 
+and configuration files.
+
+"Object" form shall mean any form resulting from mechanical 
+transformation or translation of a Source form, including but not 
+limited to compiled object code, generated documentation, and 
+conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object 
+form, made available under the License, as indicated by a copyright 
+notice that is included in or attached to the work (an example is 
+provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object 
+form, that is based on (or derived from) the Work and for which the 
+editorial revisions, annotations, elaborations, or other modifications 
+represent, as a whole, an original work of authorship. For the purposes 
+of this License, Derivative Works shall not include works that remain 
+separable from, or merely link (or bind by name) to the interfaces of, 
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original 
+version of the Work and any modifications or additions to that Work or 
+Derivative Works thereof, that is intentionally submitted to Licensor 
+for inclusion in the Work by the copyright owner or by an individual or 
+Legal Entity authorized to submit on behalf of the copyright owner. For 
+the purposes of this definition, "submitted" means any form of 
+electronic, verbal, or written communication sent to the Licensor or its 
+representatives, including but not limited to communication on 
+electronic mailing lists, source code control systems, and issue 
+tracking systems that are managed by, or on behalf of, the Licensor for 
+the purpose of discussing and improving the Work, but excluding 
+communication that is conspicuously marked or otherwise designated in 
+writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on 
+behalf of whom a Contribution has been received by Licensor and 
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of 
+this License, each Contributor hereby grants to You a perpetual, 
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright 
+license to reproduce, prepare Derivative Works of, publicly display, 
+publicly perform, sublicense, and distribute the Work and such 
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this 
+License, each Contributor hereby grants to You a perpetual, worldwide, 
+non-exclusive, no-charge, royalty-free, irrevocable (except as stated in 
+this section) patent license to make, have made, use, offer to sell, 
+sell, import, and otherwise transfer the Work, where such license 
+applies only to those patent claims licensable by such Contributor that 
+are necessarily infringed by their Contribution(s) alone or by 
+combination of their Contribution(s) with the Work to which such 
+Contribution(s) was submitted. If You institute patent litigation 
+against any entity (including a cross-claim or counterclaim in a 
+lawsuit) alleging that the Work or a Contribution incorporated within 
+the Work constitutes direct or contributory patent infringement, then 
+any patent licenses granted to You under this License for that Work 
+shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work 
+or Derivative Works thereof in any medium, with or without 
+modifications, and in Source or Object form, provided that You meet the 
+following conditions:
+
+(a) You must give any other recipients of the Work or Derivative Works a 
+copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices stating 
+that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works that You 
+distribute, all copyright, patent, trademark, and attribution notices 
+from the Source form of the Work, excluding those notices that do not 
+pertain to any part of the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its 
+distribution, then any Derivative Works that You distribute must include 
+a readable copy of the attribution notices contained within such NOTICE 
+file, excluding those notices that do not pertain to any part of the 
+Derivative Works, in at least one of the following places: within a 
+NOTICE text file distributed as part of the Derivative Works; within the 
+Source form or documentation, if provided along with the Derivative 
+Works; or, within a display generated by the Derivative Works, if and 
+wherever such third-party notices normally appear. The contents of the 
+NOTICE file are for informational purposes only and do not modify the 
+License. You may add Your own attribution notices within Derivative 
+Works that You distribute, alongside or as an addendum to the NOTICE 
+text from the Work, provided that such additional attribution notices 
+cannot be construed as modifying the License.
+
+You may add Your own copyright statement to Your modifications and may 
+provide additional or different license terms and conditions for use, 
+reproduction, or distribution of Your modifications, or for any such 
+Derivative Works as a whole, provided Your use, reproduction, and 
+distribution of the Work otherwise complies with the conditions stated 
+in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, 
+any Contribution intentionally submitted for inclusion in the Work by 
+You to the Licensor shall be under the terms and conditions of this 
+License, without any additional terms or conditions. Notwithstanding the 
+above, nothing herein shall supersede or modify the terms of any 
+separate license agreement you may have executed with Licensor regarding 
+such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade 
+names, trademarks, service marks, or product names of the Licensor, 
+except as required for reasonable and customary use in describing the 
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed 
+to in writing, Licensor provides the Work (and each Contributor provides 
+its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+OF ANY KIND, either express or implied, including, without limitation, 
+any warranties or conditions of TITLE, NON-INFRINGEMENT, 
+MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely 
+responsible for determining the appropriateness of using or 
+redistributing the Work and assume any risks associated with Your 
+exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, 
+whether in tort (including negligence), contract, or otherwise, unless 
+required by applicable law (such as deliberate and grossly negligent 
+acts) or agreed to in writing, shall any Contributor be liable to You 
+for damages, including any direct, indirect, special, incidental, or 
+consequential damages of any character arising as a result of this 
+License or out of the use or inability to use the Work (including but 
+not limited to damages for loss of goodwill, work stoppage, computer 
+failure or malfunction, or any and all other commercial damages or 
+losses), even if such Contributor has been advised of the possibility of 
+such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the 
+Work or Derivative Works thereof, You may choose to offer, and charge a 
+fee for, acceptance of support, warranty, indemnity, or other liability 
+obligations and/or rights consistent with this License. However, in 
+accepting such obligations, You may act only on Your own behalf and on 
+Your sole responsibility, not on behalf of any other Contributor, and 
+only if You agree to indemnify, defend, and hold each Contributor 
+harmless for any liability incurred by, or claims asserted against, such 
+Contributor by reason of your accepting any such warranty or additional 
+liability.
diff --git a/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/package.json b/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/package.json
index 79b09062a..d0946e3e2 100644
--- a/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/package.json
+++ b/node_modules/init-package-json/node_modules/validate-npm-package-license/node_modules/spdx-correct/package.json
@@ -1,25 +1,25 @@
 {
   "name": "spdx-correct",
   "description": "correct invalid SPDX identifiers",
-  "version": "1.0.0-prerelease-3",
+  "version": "1.0.0",
   "author": {
-    "name": "Kyle Mitchell",
+    "name": "Kyle E. Mitchell",
     "email": "kyle@kemitchell.com",
     "url": "http://kemitchell.com"
   },
   "bugs": {
-    "url": "https://github.com/kemitchell/spdx-correct/issues"
+    "url": "https://github.com/kemitchell/spdx-correct.js/issues"
   },
   "dependencies": {
     "spdx": "^0.4.0"
   },
   "devDependencies": {
-    "jscs": "^1.13.0",
-    "jshint": "^2.7.0",
-    "jsmd": "^0.3.0",
-    "tap": "^0.7.1"
+    "jscs": "~1.13.1",
+    "jshint": "~2.8.0",
+    "jsmd": "~0.3.0",
+    "tape": "~4.0.0"
   },
-  "homepage": "https://github.com/kemitchell/spdx-correct",
+  "homepage": "https://github.com/kemitchell/spdx-correct.js",
   "keywords": [
     "SPDX",
     "law",
@@ -31,18 +31,19 @@
   "main": "spdx-correct.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/kemitchell/spdx-correct"
+    "url": "git+https://github.com/kemitchell/spdx-correct.js.git"
   },
   "scripts": {
     "lint": "jshint spdx-correct.js test && jscs spdx-correct.js test",
     "precommit": "npm run lint && npm run test",
-    "test": "jsmd README.md && tap test"
+    "test": "jsmd README.md && tape test/*.test.js"
   },
-  "gitHead": "0289b9068391d4a1db571137083e0beb18a2faef",
-  "_id": "spdx-correct@1.0.0-prerelease-3",
-  "_shasum": "5706cc6ce05b928a65564c76e1d6809ba033ac7e",
-  "_from": "spdx-correct@1.0.0-prerelease-3",
-  "_npmVersion": "1.4.28",
+  "gitHead": "eab00824e5a1281fd7c522f33f0498c7d1cedd13",
+  "_id": "spdx-correct@1.0.0",
+  "_shasum": "c2a8654a5a56d8b2d44ee82dfdfc24aaec6b702c",
+  "_from": "spdx-correct@>=1.0.0 <1.1.0",
+  "_npmVersion": "2.11.0",
+  "_nodeVersion": "2.2.1",
   "_npmUser": {
     "name": "kemitchell",
     "email": "kyle@kemitchell.com"
@@ -54,10 +55,10 @@
     }
   ],
   "dist": {
-    "shasum": "5706cc6ce05b928a65564c76e1d6809ba033ac7e",
-    "tarball": "http://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.0-prerelease-3.tgz"
+    "shasum": "c2a8654a5a56d8b2d44ee82dfdfc24aaec6b702c",
+    "tarball": "http://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.0.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.0-prerelease-3.tgz",
+  "_resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.0.tgz",
   "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/init-package-json/node_modules/validate-npm-package-license/package.json b/node_modules/init-package-json/node_modules/validate-npm-package-license/package.json
index 4483ede9e..fb61000ad 100644
--- a/node_modules/init-package-json/node_modules/validate-npm-package-license/package.json
+++ b/node_modules/init-package-json/node_modules/validate-npm-package-license/package.json
@@ -1,23 +1,23 @@
 {
   "name": "validate-npm-package-license",
-  "description": "Give me a string and I'll tell you if it's a valid npm package license",
-  "version": "1.0.0-prerelease-2",
+  "description": "Give me a string and I'll tell you if it's a valid npm package license string",
+  "version": "2.0.0",
   "author": {
     "name": "Kyle E. Mitchell",
     "email": "kyle@kemitchell.com",
     "url": "http://kemitchell.com"
   },
   "bugs": {
-    "url": "https://github.com/kemitchell/npm-valid-package-license/issues"
+    "url": "https://github.com/kemitchell/validate-npm-package-license.js/issues"
   },
   "dependencies": {
-    "spdx": "^0.4.0",
-    "spdx-correct": "1.0.0-prerelease-3"
+    "spdx": "~0.4.0",
+    "spdx-correct": "~1.0.0"
   },
   "devDependencies": {
-    "jsmd": "^0.3.0"
+    "jsmd": "~0.3.0"
   },
-  "homepage": "https://github.com/kemitchell/npm-valid-package-license",
+  "homepage": "https://github.com/kemitchell/validate-npm-package-license.js",
   "keywords": [
     "license",
     "npm",
@@ -28,17 +28,18 @@
   "main": "index.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/kemitchell/npm-valid-package-license"
+    "url": "git+https://github.com/kemitchell/validate-npm-package-license.js.git"
   },
   "scripts": {
     "precommit": "npm run test",
     "test": "jsmd README.md"
   },
-  "gitHead": "d6043c5bf03a71409daae8d584ba74281e3c55c3",
-  "_id": "validate-npm-package-license@1.0.0-prerelease-2",
-  "_shasum": "0f45adce1728091b289597035c1ad25a5ba549be",
-  "_from": "validate-npm-package-license@1.0.0-prerelease-2",
-  "_npmVersion": "1.4.28",
+  "gitHead": "24544d4688f7cc9ed9685a3f9f90bd3f3bed58c0",
+  "_id": "validate-npm-package-license@2.0.0",
+  "_shasum": "ce0a29300edfa07e6ac6ad52eed8d6dfd194e42b",
+  "_from": "validate-npm-package-license@>=2.0.0 <3.0.0",
+  "_npmVersion": "2.11.1",
+  "_nodeVersion": "2.3.0",
   "_npmUser": {
     "name": "kemitchell",
     "email": "kyle@kemitchell.com"
@@ -47,13 +48,17 @@
     {
       "name": "kemitchell",
       "email": "kyle@kemitchell.com"
+    },
+    {
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
     }
   ],
   "dist": {
-    "shasum": "0f45adce1728091b289597035c1ad25a5ba549be",
-    "tarball": "http://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-1.0.0-prerelease-2.tgz"
+    "shasum": "ce0a29300edfa07e6ac6ad52eed8d6dfd194e42b",
+    "tarball": "http://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-2.0.0.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-1.0.0-prerelease-2.tgz",
+  "_resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-2.0.0.tgz",
   "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/init-package-json/package.json b/node_modules/init-package-json/package.json
index 62d01c59d..05a2df56b 100644
--- a/node_modules/init-package-json/package.json
+++ b/node_modules/init-package-json/package.json
@@ -1,13 +1,13 @@
 {
   "name": "init-package-json",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "main": "init-package-json.js",
   "scripts": {
     "test": "tap test/*.js"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/isaacs/init-package-json"
+    "url": "git://github.com/isaacs/init-package-json.git"
   },
   "author": {
     "name": "Isaac Z. Schlueter",
@@ -23,13 +23,13 @@
     "read": "~1.0.1",
     "read-package-json": "1 || 2",
     "semver": "2.x || 3.x || 4",
-    "validate-npm-package-license": "1.0.0-prerelease-2",
+    "validate-npm-package-license": "^2.0.0",
     "validate-npm-package-name": "^2.0.1"
   },
   "devDependencies": {
     "npm": "^2",
     "rimraf": "^2.1.4",
-    "tap": "^0.7.1"
+    "tap": "^1.2.0"
   },
   "keywords": [
     "init",
@@ -41,38 +41,14 @@
     "prompt",
     "start"
   ],
-  "gitHead": "b747e9f71eb65b22bb9139e5252bf8efb23571e1",
+  "readme": "# init-package-json\n\nA node module to get your node module started.\n\n[![Build Status](https://secure.travis-ci.org/npm/init-package-json.svg)](http://travis-ci.org/npm/init-package-json)\n\n## Usage\n\n```javascript\nvar init = require('init-package-json')\nvar path = require('path')\n\n// a path to a promzard module.  In the event that this file is\n// not found, one will be provided for you.\nvar initFile = path.resolve(process.env.HOME, '.npm-init')\n\n// the dir where we're doin stuff.\nvar dir = process.cwd()\n\n// extra stuff that gets put into the PromZard module's context.\n// In npm, this is the resolved config object.  Exposed as 'config'\n// Optional.\nvar configData = { some: 'extra stuff' }\n\n// Any existing stuff from the package.json file is also exposed in the\n// PromZard module as the `package` object.  There will also be free\n// vars for:\n// * `filename` path to the package.json file\n// * `basename` the tip of the package dir\n// * `dirname` the parent of the package dir\n\ninit(dir, initFile, configData, function (er, data) {\n  // the data's already been written to {dir}/package.json\n  // now you can do stuff with it\n})\n```\n\nOr from the command line:\n\n```\n$ npm-init\n```\n\nSee [PromZard](https://github.com/isaacs/promzard) for details about\nwhat can go in the config file.\n",
+  "readmeFilename": "README.md",
+  "gitHead": "04acc558503c6a133a1704aeec276d817617fa12",
   "bugs": {
     "url": "https://github.com/isaacs/init-package-json/issues"
   },
-  "homepage": "https://github.com/isaacs/init-package-json",
-  "_id": "init-package-json@1.6.0",
-  "_shasum": "8c4c2561abca1ad30d88f5594ddb4159211a36ff",
-  "_from": "init-package-json@1.6.0",
-  "_npmVersion": "2.7.6",
-  "_nodeVersion": "1.6.2",
-  "_npmUser": {
-    "name": "iarna",
-    "email": "me@re-becca.org"
-  },
-  "dist": {
-    "shasum": "8c4c2561abca1ad30d88f5594ddb4159211a36ff",
-    "tarball": "http://registry.npmjs.org/init-package-json/-/init-package-json-1.6.0.tgz"
-  },
-  "maintainers": [
-    {
-      "name": "isaacs",
-      "email": "i@izs.me"
-    },
-    {
-      "name": "othiym23",
-      "email": "ogd@aoaioxxysz.net"
-    },
-    {
-      "name": "iarna",
-      "email": "me@re-becca.org"
-    }
-  ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-1.6.0.tgz"
+  "homepage": "https://github.com/isaacs/init-package-json#readme",
+  "_id": "init-package-json@1.7.0",
+  "_shasum": "dc573523777fa4f83eca808976735ce5d7cfac77",
+  "_from": "init-package-json@>=1.7.0 <1.8.0"
 }
diff --git a/node_modules/init-package-json/test/basic.js b/node_modules/init-package-json/test/basic.js
index f07f435bc..d67e0c3b1 100644
--- a/node_modules/init-package-json/test/basic.js
+++ b/node_modules/init-package-json/test/basic.js
@@ -6,6 +6,7 @@ var test = require('tap').test
 
 test('the basics', function (t) {
   var i = path.join(__dirname, 'basic.input')
+  rimraf.sync(__dirname + '/package.json')
   init(__dirname, i, { foo: 'bar' }, function (er, data) {
     if (er) throw er
     var expect = {
@@ -18,6 +19,7 @@ test('the basics', function (t) {
       config: { foo: 'bar' },
       package: {}
     }
+    console.log('')
     t.same(data, expect)
     t.end()
   })
diff --git a/node_modules/init-package-json/test/license.js b/node_modules/init-package-json/test/license.js
index 87333fbf8..8d8ae93dd 100644
--- a/node_modules/init-package-json/test/license.js
+++ b/node_modules/init-package-json/test/license.js
@@ -5,7 +5,9 @@ var common = require('./lib/common')
 
 test('license', function (t) {
   init(__dirname, '', {}, function (er, data) {
-    t.ok(!er, 'should not error')
+    if (er)
+      throw er
+
     var wanted = {
       name: 'the-name',
       version: '1.0.0',
@@ -15,7 +17,8 @@ test('license', function (t) {
       author: '',
       main: 'basic.js'
     }
-    t.same(data, wanted)
+    console.log('')
+    t.has(data, wanted)
     t.end()
   })
   common.drive([
diff --git a/node_modules/init-package-json/test/name-spaces.js b/node_modules/init-package-json/test/name-spaces.js
index dee974fc8..a395afb9a 100644
--- a/node_modules/init-package-json/test/name-spaces.js
+++ b/node_modules/init-package-json/test/name-spaces.js
@@ -4,8 +4,10 @@ var rimraf = require('rimraf')
 var common = require('./lib/common')
 
 test('spaces', function (t) {
+  rimraf.sync(__dirname + '/package.json')
   init(__dirname, '', {}, function (er, data) {
-    t.ok(!er, 'should not error')
+    if (er)
+      throw er
     var wanted = {
       name: 'the-name',
       version: '1.0.0',
@@ -15,7 +17,8 @@ test('spaces', function (t) {
       author: '',
       main: 'basic.js'
     }
-    t.same(data, wanted)
+    console.log('')
+    t.has(data, wanted)
     t.end()
   })
   common.drive([
diff --git a/node_modules/init-package-json/test/name-uppercase.js b/node_modules/init-package-json/test/name-uppercase.js
index ddedc30e5..d1623260a 100644
--- a/node_modules/init-package-json/test/name-uppercase.js
+++ b/node_modules/init-package-json/test/name-uppercase.js
@@ -5,7 +5,9 @@ var common = require('./lib/common')
 
 test('uppercase', function (t) {
   init(__dirname, '', {}, function (er, data) {
-    t.ok(!er, 'should not error')
+    if (er)
+      throw er
+
     var wanted = {
       name: 'the-name',
       version: '1.0.0',
@@ -15,7 +17,8 @@ test('uppercase', function (t) {
       author: '',
       main: 'basic.js'
     }
-    t.same(data, wanted)
+    console.log('')
+    t.has(data, wanted)
     t.end()
   })
   common.drive([
diff --git a/node_modules/init-package-json/test/scope-in-config-existing-name.js b/node_modules/init-package-json/test/scope-in-config-existing-name.js
new file mode 100644
index 000000000..39dc90f42
--- /dev/null
+++ b/node_modules/init-package-json/test/scope-in-config-existing-name.js
@@ -0,0 +1,30 @@
+var fs = require('fs')
+var path = require('path')
+
+var rimraf = require('rimraf')
+var tap = require('tap')
+
+var init = require('../')
+
+var json = {
+  name: '@already/scoped',
+  version: '1.0.0'
+}
+
+tap.test('with existing package.json', function (t) {
+  fs.writeFileSync(path.join(__dirname, 'package.json'), JSON.stringify(json, null, 2))
+  console.log(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf8'))
+  console.error('wrote json', json)
+  init(__dirname, __dirname, { yes: 'yes', scope: '@still' }, function (er, data) {
+    if (er) throw er
+
+    console.log('')
+    t.equal(data.name, '@still/scoped', 'new scope is added, basic name is kept')
+    t.end()
+  })
+})
+
+tap.test('teardown', function (t) {
+  rimraf.sync(path.join(__dirname, 'package.json'))
+  t.end()
+})
diff --git a/node_modules/init-package-json/test/scope-in-config.js b/node_modules/init-package-json/test/scope-in-config.js
index 1fa83d9c1..32bba16ed 100644
--- a/node_modules/init-package-json/test/scope-in-config.js
+++ b/node_modules/init-package-json/test/scope-in-config.js
@@ -21,22 +21,8 @@ tap.test('--yes with scope', function (t) {
   init(__dirname, __dirname, { yes: 'yes', scope: '@scoped' }, function (er, data) {
     if (er) throw er
 
-    t.same(EXPECT, data)
-    t.end()
-  })
-})
-
-var json = {
-  name: '@already/scoped',
-  version: '1.0.0'
-}
-
-tap.test('with existing package.json', function (t) {
-  fs.writeFileSync(path.join(__dirname, 'package.json'), JSON.stringify(json, null, 2))
-  init(__dirname, __dirname, { yes: 'yes', scope: '@still' }, function (er, data) {
-    if (er) throw er
-
-    t.equal(data.name, '@still/scoped', 'new scope is added, basic name is kept')
+    console.log('')
+    t.has(data, EXPECT)
     t.end()
   })
 })
diff --git a/node_modules/init-package-json/test/scope.js b/node_modules/init-package-json/test/scope.js
index 971916f2d..4fa064928 100644
--- a/node_modules/init-package-json/test/scope.js
+++ b/node_modules/init-package-json/test/scope.js
@@ -19,7 +19,8 @@ tap.test('the scope', function (t) {
   init(dir, i, {scope: '@foo'}, function (er, data) {
     if (er) throw er
 
-    t.same(EXPECT, data)
+    console.log('')
+    t.has(data, EXPECT)
     t.end()
   })
   setTimeout(function () {
diff --git a/node_modules/init-package-json/test/yes-defaults.js b/node_modules/init-package-json/test/yes-defaults.js
index 747ab38fd..f7cae28c5 100644
--- a/node_modules/init-package-json/test/yes-defaults.js
+++ b/node_modules/init-package-json/test/yes-defaults.js
@@ -17,7 +17,7 @@ tap.test('--yes defaults', function (t) {
   init(__dirname, __dirname, {yes: 'yes'}, function (er, data) {
     if (er) throw er
 
-    t.same(EXPECT, data, 'used the default data')
+    t.has(data, EXPECT, 'used the default data')
     t.end()
   })
 })