diff options
author | Kat Marchán <kzm@sykosomatic.org> | 2016-07-01 14:35:20 -0700 |
---|---|---|
committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2016-07-04 09:55:33 +0200 |
commit | b3ec2432a1c814b9ff8ae9f74cd94a8ae93d70c2 (patch) | |
tree | 3df1f94b9263888f4a63cfbe9b1b7b834066e37b /deps/npm/node_modules | |
parent | fb4c022fbe0dd3182cfc6d19fe8710402d9697ca (diff) | |
download | android-node-v8-b3ec2432a1c814b9ff8ae9f74cd94a8ae93d70c2.tar.gz android-node-v8-b3ec2432a1c814b9ff8ae9f74cd94a8ae93d70c2.tar.bz2 android-node-v8-b3ec2432a1c814b9ff8ae9f74cd94a8ae93d70c2.zip |
deps: upgrade npm to 3.10.3
Contains the following npm release:
- https://github.com/npm/npm/releases/tag/v3.10.3
PR-URL: https://github.com/nodejs/node/pull/7515
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/node_modules')
27 files changed, 133 insertions, 532 deletions
diff --git a/deps/npm/node_modules/aproba/.npmignore b/deps/npm/node_modules/aproba/.npmignore deleted file mode 100644 index 24001896d6..0000000000 --- a/deps/npm/node_modules/aproba/.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -*~ -node_modules -.#* diff --git a/deps/npm/node_modules/aproba/README.md b/deps/npm/node_modules/aproba/README.md index 44e2263c2f..69e356eb6a 100644 --- a/deps/npm/node_modules/aproba/README.md +++ b/deps/npm/node_modules/aproba/README.md @@ -1,7 +1,7 @@ aproba ====== -A rediculously light-weight function argument validator +A ridiculously light-weight function argument validator ``` var validate = require("aproba") @@ -34,7 +34,11 @@ E | instanceof Error OR null Validation failures throw one of three exception types, distinguished by a `code` property of `EMISSINGARG`, `EINVALIDTYPE` or `ETOOMANYARGS`. -If an error argument is found and is not null then the remaining arguments will not be validated. +If you pass in an invalid type then it will throw with a code of +`EUNKNOWNTYPE`. + +If an error argument is found and is not null then the remaining arguments +will not be validated. ### Why this exists diff --git a/deps/npm/node_modules/aproba/index.js b/deps/npm/node_modules/aproba/index.js index 6d1c17ece9..bb5ac3cda6 100644 --- a/deps/npm/node_modules/aproba/index.js +++ b/deps/npm/node_modules/aproba/index.js @@ -1,8 +1,12 @@ 'use strict' +function isArguments (thingy) { + return typeof thingy === 'object' && thingy.hasOwnProperty('callee') +} + var types = { '*': ['any', function () { return true }], - A: ['array', function (thingy) { return (Array.isArray && Array.isArray(thingy)) || (typeof thingy === 'object' && thingy.hasOwnProperty('callee')) }], + A: ['array', function (thingy) { return Array.isArray(thingy) || isArguments(thingy) }], S: ['string', function (thingy) { return typeof thingy === 'string' }], N: ['number', function (thingy) { return typeof thingy === 'number' }], F: ['function', function (thingy) { return typeof thingy === 'function' }], diff --git a/deps/npm/node_modules/aproba/package.json b/deps/npm/node_modules/aproba/package.json index 56452c4067..b5e08a31c1 100644 --- a/deps/npm/node_modules/aproba/package.json +++ b/deps/npm/node_modules/aproba/package.json @@ -2,51 +2,55 @@ "_args": [ [ { - "name": "aproba", - "raw": "aproba@latest", - "rawSpec": "latest", + "raw": "aproba@~1.0.3", "scope": null, - "spec": "latest", - "type": "tag" + "escapedName": "aproba", + "name": "aproba", + "rawSpec": "~1.0.3", + "spec": ">=1.0.3 <1.1.0", + "type": "range" }, - "/Users/zkat/Documents/code/npm" + "/Users/rebecca/code/npm" ] ], - "_from": "aproba@latest", - "_id": "aproba@1.0.3", + "_from": "aproba@>=1.0.3 <1.1.0", + "_id": "aproba@1.0.4", "_inCache": true, "_installable": true, "_location": "/aproba", "_nodeVersion": "4.4.0", "_npmOperationalInternal": { "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/aproba-1.0.3.tgz_1463784729571_0.7574592484161258" + "tmp": "tmp/aproba-1.0.4.tgz_1466718885402_0.5348939662799239" }, "_npmUser": { - "email": "me@re-becca.org", - "name": "iarna" + "name": "iarna", + "email": "me@re-becca.org" }, - "_npmVersion": "3.9.2", + "_npmVersion": "3.10.2", "_phantomChildren": {}, "_requested": { - "name": "aproba", - "raw": "aproba@latest", - "rawSpec": "latest", + "raw": "aproba@~1.0.3", "scope": null, - "spec": "latest", - "type": "tag" + "escapedName": "aproba", + "name": "aproba", + "rawSpec": "~1.0.3", + "spec": ">=1.0.3 <1.1.0", + "type": "range" }, "_requiredBy": [ - "/" + "#USER", + "/", + "/npmlog/gauge" ], - "_resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.3.tgz", - "_shasum": "7fb6da3a72c70249db63fd9b5c64b31af718a94f", + "_resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz", + "_shasum": "2713680775e7614c8ba186c065d4e2e52d1072c0", "_shrinkwrap": null, - "_spec": "aproba@latest", - "_where": "/Users/zkat/Documents/code/npm", + "_spec": "aproba@~1.0.3", + "_where": "/Users/rebecca/code/npm", "author": { - "email": "me@re-becca.org", - "name": "Rebecca Turner" + "name": "Rebecca Turner", + "email": "me@re-becca.org" }, "bugs": { "url": "https://github.com/iarna/aproba/issues" @@ -54,17 +58,20 @@ "dependencies": {}, "description": "A rediculously light-weight argument validator", "devDependencies": { - "standard": "^7.1.0", - "tap": "^5.7.1" + "standard": "^7.1.2", + "tap": "^5.7.3" }, "directories": { "test": "test" }, "dist": { - "shasum": "7fb6da3a72c70249db63fd9b5c64b31af718a94f", - "tarball": "https://registry.npmjs.org/aproba/-/aproba-1.0.3.tgz" + "shasum": "2713680775e7614c8ba186c065d4e2e52d1072c0", + "tarball": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz" }, - "gitHead": "20cc4fc6589bbf870c3ca7bb8b9cb203af9d96a5", + "files": [ + "index.js" + ], + "gitHead": "c6c8f82d519b9ec3816f20f23a9101083c022200", "homepage": "https://github.com/iarna/aproba", "keywords": [ "argument", @@ -74,8 +81,8 @@ "main": "index.js", "maintainers": [ { - "email": "me@re-becca.org", - "name": "iarna" + "name": "iarna", + "email": "me@re-becca.org" } ], "name": "aproba", @@ -88,5 +95,5 @@ "scripts": { "test": "standard && tap test/*.js" }, - "version": "1.0.3" + "version": "1.0.4" } diff --git a/deps/npm/node_modules/aproba/test/index.js b/deps/npm/node_modules/aproba/test/index.js deleted file mode 100644 index b96fd4216e..0000000000 --- a/deps/npm/node_modules/aproba/test/index.js +++ /dev/null @@ -1,87 +0,0 @@ -'use strict' -var test = require('tap').test -var validate = require('../index.js') - -function thrown (t, code, msg, todo) { - validate('OSSF', arguments) - try { - todo() - t.fail(msg) - } catch (e) { - t.is(e.code, code, msg + e.message) - } -} - -function notThrown (t, msg, todo) { - validate('OSF', arguments) - try { - todo() - t.pass(msg) - } catch (e) { - t.fail(msg + '\n' + e.stack) - } -} - -test('general', function (t) { - t.plan(70) - var values = { - 'A': [], - 'S': 'test', - 'N': 123, - 'F': function () {}, - 'O': {}, - 'B': false, - 'E': new Error() - } - Object.keys(values).forEach(function (type) { - Object.keys(values).forEach(function (contraType) { - if (type === contraType) { - notThrown(t, type + ' matches ' + contraType, function () { - validate(type, [values[contraType]]) - }) - } else { - thrown(t, 'EINVALIDTYPE', type + ' does not match ' + contraType, function () { - validate(type, [values[contraType]]) - }) - } - }) - if (type === 'E') { - notThrown(t, 'null is ok for E', function () { - validate(type, [null]) - }) - } else { - thrown(t, 'EMISSINGARG', 'null not ok for ' + type, function () { - validate(type, [null]) - }) - } - }) - Object.keys(values).forEach(function (contraType) { - notThrown(t, '* matches ' + contraType, function () { - validate('*', [values[contraType]]) - }) - }) - thrown(t, 'EMISSINGARG', 'not enough args', function () { - validate('SNF', ['abc', 123]) - }) - thrown(t, 'ETOOMANYARGS', 'too many args', function () { - validate('SNF', ['abc', 123, function () {}, true]) - }) - notThrown(t, 'E matches null', function () { - validate('E', [null]) - }) - notThrown(t, 'E matches undefined', function () { - validate('E', [undefined]) - }) - notThrown(t, 'E w/ error requires nothing else', function () { - validate('ESN', [new Error(), 'foo']) - }) - thrown(t, 'EMISSINGARG', 'E w/o error works as usual', function () { - validate('ESN', [null, 'foo']) - }) - try { - validate('O', [[]]) - t.fail('object != array') - } catch (ex) { - t.match(ex.message, /Expected object but got array/, 'When reporting non-objects, uses aproba types') - } -}) diff --git a/deps/npm/node_modules/has-unicode/.npmignore b/deps/npm/node_modules/has-unicode/.npmignore deleted file mode 100644 index 7e17cf19b7..0000000000 --- a/deps/npm/node_modules/has-unicode/.npmignore +++ /dev/null @@ -1,32 +0,0 @@ -# Logs -logs -*.log - -# Runtime data -pids -*.pid -*.seed - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Compiled binary addons (http://nodejs.org/api/addons.html) -build/Release - -# Dependency directory -# Commenting this out is preferred by some people, see -# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git- -node_modules - -# Users Environment Variables -.lock-wscript - -# Editor temp files -*~ -.#* diff --git a/deps/npm/node_modules/has-unicode/index.js b/deps/npm/node_modules/has-unicode/index.js index 9bf537b1cd..9b0fe44540 100644 --- a/deps/npm/node_modules/has-unicode/index.js +++ b/deps/npm/node_modules/has-unicode/index.js @@ -10,12 +10,7 @@ var hasUnicode = module.exports = function () { // appropriate. if (os.type() == "Windows_NT") { return false } - var isUTF8 = /[.]UTF-8/ - if (isUTF8.test(process.env.LC_ALL) - || process.env.LC_CTYPE == 'UTF-8' - || isUTF8.test(process.env.LANG)) { - return true - } - - return false + var isUTF8 = /UTF-?8$/i + var ctype = process.env.LC_ALL || process.env.LC_CTYPE || process.env.LANG + return isUTF8.test(ctype) } diff --git a/deps/npm/node_modules/has-unicode/package.json b/deps/npm/node_modules/has-unicode/package.json index 924e3b7a09..4bfc95ee46 100644 --- a/deps/npm/node_modules/has-unicode/package.json +++ b/deps/npm/node_modules/has-unicode/package.json @@ -1,41 +1,57 @@ { "_args": [ [ - "has-unicode@2.0.0", + { + "raw": "has-unicode@~2.0.0", + "scope": null, + "escapedName": "has-unicode", + "name": "has-unicode", + "rawSpec": "~2.0.0", + "spec": ">=2.0.0 <2.1.0", + "type": "range" + }, "/Users/rebecca/code/npm" ] ], - "_from": "has-unicode@2.0.0", - "_id": "has-unicode@2.0.0", + "_from": "has-unicode@>=2.0.0 <2.1.0", + "_id": "has-unicode@2.0.1", "_inCache": true, "_installable": true, "_location": "/has-unicode", - "_nodeVersion": "4.2.2", + "_nodeVersion": "4.4.0", + "_npmOperationalInternal": { + "host": "packages-12-west.internal.npmjs.com", + "tmp": "tmp/has-unicode-2.0.1.tgz_1466719828333_0.48896647873334587" + }, "_npmUser": { - "email": "me@re-becca.org", - "name": "iarna" + "name": "iarna", + "email": "me@re-becca.org" }, - "_npmVersion": "2.14.7", + "_npmVersion": "3.10.2", "_phantomChildren": {}, "_requested": { - "name": "has-unicode", - "raw": "has-unicode@2.0.0", - "rawSpec": "2.0.0", + "raw": "has-unicode@~2.0.0", "scope": null, - "spec": "2.0.0", - "type": "version" + "escapedName": "has-unicode", + "name": "has-unicode", + "rawSpec": "~2.0.0", + "spec": ">=2.0.0 <2.1.0", + "type": "range" }, "_requiredBy": [ - "/" + "#USER", + "/", + "/node-gyp/npmlog/gauge", + "/npmlog/gauge" ], - "_resolved": "file:../has-unicode", - "_shasum": "a3cd96c307ba41d559c5a2ee408c12a11c4c2ec3", + "_resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "_shasum": "e0e6fe6a28cf51138855e086d1691e771de2a8b9", "_shrinkwrap": null, - "_spec": "has-unicode@2.0.0", + "_spec": "has-unicode@~2.0.0", "_where": "/Users/rebecca/code/npm", "author": { - "email": "me@re-becca.org", - "name": "Rebecca Turner" + "name": "Rebecca Turner", + "email": "me@re-becca.org" }, "bugs": { "url": "https://github.com/iarna/has-unicode/issues" @@ -48,14 +64,17 @@ }, "directories": {}, "dist": { - "shasum": "a3cd96c307ba41d559c5a2ee408c12a11c4c2ec3", - "tarball": "http://registry.npmjs.org/has-unicode/-/has-unicode-2.0.0.tgz" + "shasum": "e0e6fe6a28cf51138855e086d1691e771de2a8b9", + "tarball": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz" }, - "gitHead": "fdd5de141a5564bdb5bc991d951209da40f6a598", + "files": [ + "index.js" + ], + "gitHead": "0a05df154e8d89a7fb9798da60b68c78c2df6646", "homepage": "https://github.com/iarna/has-unicode", "keywords": [ - "terminal", - "unicode" + "unicode", + "terminal" ], "license": "ISC", "main": "index.js", @@ -75,5 +94,5 @@ "scripts": { "test": "tap test/*.js" }, - "version": "2.0.0" + "version": "2.0.1" } diff --git a/deps/npm/node_modules/has-unicode/test/index.js b/deps/npm/node_modules/has-unicode/test/index.js deleted file mode 100644 index cbdfda3350..0000000000 --- a/deps/npm/node_modules/has-unicode/test/index.js +++ /dev/null @@ -1,26 +0,0 @@ -"use strict" -var test = require("tap").test -var requireInject = require("require-inject") - -test("Windows", function (t) { - t.plan(1) - var hasUnicode = requireInject("../index.js", { - os: { type: function () { return "Windows_NT" } } - }) - t.is(hasUnicode(), false, "Windows is assumed NOT to be unicode aware") -}) -test("Unix Env", function (t) { - t.plan(3) - var hasUnicode = requireInject("../index.js", { - os: { type: function () { return "Linux" } }, - child_process: { exec: function (cmd,cb) { cb(new Error("not available")) } } - }) - process.env.LANG = "en_US.UTF-8" - process.env.LC_ALL = null - t.is(hasUnicode(), true, "Linux with a UTF8 language") - process.env.LANG = null - process.env.LC_ALL = "en_US.UTF-8" - t.is(hasUnicode(), true, "Linux with UTF8 locale") - process.env.LC_ALL = null - t.is(hasUnicode(), false, "Linux without UTF8 language or locale") -}) diff --git a/deps/npm/node_modules/read-package-tree/.travis.yml b/deps/npm/node_modules/read-package-tree/.travis.yml deleted file mode 100644 index e1bcee1acd..0000000000 --- a/deps/npm/node_modules/read-package-tree/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: node_js -before_script: npm install -g npm@latest -node_js: - - '0.8' - - '0.10' - - '0.12' - - 'iojs' diff --git a/deps/npm/node_modules/read-package-tree/package.json b/deps/npm/node_modules/read-package-tree/package.json index d1acb0ef06..5a376b39f8 100644 --- a/deps/npm/node_modules/read-package-tree/package.json +++ b/deps/npm/node_modules/read-package-tree/package.json @@ -2,51 +2,54 @@ "_args": [ [ { - "name": "read-package-tree", - "raw": "read-package-tree@~5.1.3", - "rawSpec": "~5.1.3", + "raw": "read-package-tree@~5.1.4", "scope": null, - "spec": ">=5.1.3 <5.2.0", + "escapedName": "read-package-tree", + "name": "read-package-tree", + "rawSpec": "~5.1.4", + "spec": ">=5.1.4 <5.2.0", "type": "range" }, "/Users/rebecca/code/npm" ] ], - "_from": "read-package-tree@>=5.1.3 <5.2.0", - "_id": "read-package-tree@5.1.4", + "_from": "read-package-tree@>=5.1.4 <5.2.0", + "_id": "read-package-tree@5.1.5", "_inCache": true, "_installable": true, "_location": "/read-package-tree", "_nodeVersion": "4.4.0", "_npmOperationalInternal": { - "host": "packages-16-east.internal.npmjs.com", - "tmp": "tmp/read-package-tree-5.1.4.tgz_1463682709793_0.6651253618765622" + "host": "packages-12-west.internal.npmjs.com", + "tmp": "tmp/read-package-tree-5.1.5.tgz_1466725442057_0.8425232821609825" }, "_npmUser": { - "email": "me@re-becca.org", - "name": "iarna" + "name": "iarna", + "email": "me@re-becca.org" }, - "_npmVersion": "3.9.2", + "_npmVersion": "3.10.2", "_phantomChildren": {}, "_requested": { - "name": "read-package-tree", - "raw": "read-package-tree@~5.1.3", - "rawSpec": "~5.1.3", + "raw": "read-package-tree@~5.1.4", "scope": null, - "spec": ">=5.1.3 <5.2.0", + "escapedName": "read-package-tree", + "name": "read-package-tree", + "rawSpec": "~5.1.4", + "spec": ">=5.1.4 <5.2.0", "type": "range" }, "_requiredBy": [ + "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.4.tgz", - "_shasum": "bb6e465f913d4259a9534c87b1d5c508fe8eb078", + "_resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.5.tgz", + "_shasum": "ace7e6381c7684f970aaa98fc7c5d2b666addab6", "_shrinkwrap": null, - "_spec": "read-package-tree@~5.1.3", + "_spec": "read-package-tree@~5.1.4", "_where": "/Users/rebecca/code/npm", "author": { - "email": "i@izs.me", "name": "Isaac Z. Schlueter", + "email": "i@izs.me", "url": "http://blog.izs.me/" }, "bugs": { @@ -69,21 +72,24 @@ "test": "test" }, "dist": { - "shasum": "bb6e465f913d4259a9534c87b1d5c508fe8eb078", - "tarball": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.4.tgz" + "shasum": "ace7e6381c7684f970aaa98fc7c5d2b666addab6", + "tarball": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.5.tgz" }, - "gitHead": "eb24d2508da745233af93769596ff1d963f801be", + "files": [ + "rpt.js" + ], + "gitHead": "5fcf957b01d3ce5ad3ffde51a5fd6d8178e23354", "homepage": "https://github.com/npm/read-package-tree", "license": "ISC", "main": "rpt.js", "maintainers": [ { - "email": "i@izs.me", - "name": "isaacs" + "name": "isaacs", + "email": "i@izs.me" }, { - "email": "me@re-becca.org", - "name": "iarna" + "name": "iarna", + "email": "me@re-becca.org" } ], "name": "read-package-tree", @@ -96,5 +102,5 @@ "scripts": { "test": "tap test/*.js" }, - "version": "5.1.4" + "version": "5.1.5" } diff --git a/deps/npm/node_modules/read-package-tree/rpt.js b/deps/npm/node_modules/read-package-tree/rpt.js index 5229897632..8a6a89b085 100644 --- a/deps/npm/node_modules/read-package-tree/rpt.js +++ b/deps/npm/node_modules/read-package-tree/rpt.js @@ -98,7 +98,10 @@ function loadNode (logical, physical, cache, cb) { var realpath function thenReadPackageJson (er, real) { - if (er) return cb(er) + if (er) { + var node = new Node(null, logical, physical, er, cache) + return cb(null, node) + } debug('realpath l=%j p=%j real=%j', dpath(logical), dpath(physical), dpath(real)) var pj = path.join(real, 'package.json') realpath = real diff --git a/deps/npm/node_modules/read-package-tree/test/basic.js b/deps/npm/node_modules/read-package-tree/test/basic.js deleted file mode 100644 index 0dcb538911..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/basic.js +++ /dev/null @@ -1,155 +0,0 @@ -var test = require('tap').test -var rpt = require('../rpt.js') -var path = require('path') -var fs = require('fs') -var archy = require('archy') -var fixtures = path.resolve(__dirname, 'fixtures') -var roots = [ 'root', 'other', 'selflink', 'noname' ] -var cwd = path.resolve(__dirname, '..') - -var symlinks = { - 'selflink/node_modules/@scope/z/node_modules/glob': - '../../../foo/node_modules/glob', - 'other/node_modules/glob': - '../../root/node_modules/@scope/x/node_modules/glob', - 'linkedroot': - 'root', - 'deep/root': - '../root', - 'deeproot': - 'deep' -} - -function cleanup () { - Object.keys(symlinks).forEach(function (s) { - var p = path.resolve(cwd, 'test/fixtures', s) - try { - fs.unlinkSync(p) - } catch (er) {} - }) -} - -test('setup symlinks', function (t) { - cleanup() - - Object.keys(symlinks).forEach(function (s) { - var p = path.resolve(cwd, 'test/fixtures', s) - fs.symlinkSync(symlinks [ s ], p, 'dir') - }) - - t.end() -}) - -roots.forEach(function (root) { - var dir = path.resolve(fixtures, root) - var expectedtxt = path.resolve(dir, 'archy.txt') - var expectedre = path.resolve(dir, 'archy.re') - - test(root, function (t) { - rpt(dir, function (er, d) { - if (er && er.code !== 'ENOENT') throw er - - var actual = archy(archyize(d)).trim() - // console . log ('----', dir) - console.log(actual) - // console . log (require ('util') . inspect (d, { - // depth: Infinity - // })) - try { - var expect = fs.readFileSync(expectedtxt, 'utf8').trim() - t.equal(actual, expect, root + ' tree') - } catch (e) { - var expect = new RegExp(fs.readFileSync(expectedre, 'utf8').trim()) - t.like(actual, expect, root + ' tree') - } - t.end() - }) - }) -}) - -test('linkedroot', function (t) { - var dir = path.resolve(fixtures, 'linkedroot') - var out = dir + '-archy.txt' - rpt(dir, function (er, d) { - if (er && er.code !== 'ENOENT') throw er - - var actual = archy(archyize(d)).trim() - console.log(actual) - var expect = fs.readFileSync(out, 'utf8').trim() - t.equal(actual, expect, 'linkedroot tree') - t.end() - }) -}) - -test('deeproot', function (t) { - var dir = path.resolve(fixtures, 'deeproot/root') - var out = path.resolve(fixtures, 'deep') + '-archy.txt' - rpt(dir, function (er, d) { - if (er && er.code !== 'ENOENT') throw er - - var actual = archy(archyize(d)).trim() - console.log(actual) - var expect = fs.readFileSync(out, 'utf8').trim() - t.equal(actual, expect, 'deeproot tree') - t.end() - }) -}) - -test('broken json', function (t) { - rpt(path.resolve(fixtures, 'bad'), function (er, d) { - t.ok(d.error, 'Got an error object') - t.equal(d.error && d.error.code, 'EJSONPARSE') - t.ok(d, 'Got a tree') - t.end() - }) -}) - -test('missing json does not obscure deeper errors', function (t) { - rpt(path.resolve(fixtures, 'empty'), function (er, d) { - var error = d.error - t.ok(error, 'Error reading json of top level') - t.equal(error && error.code, 'ENOENT') - var childError = d.children.length===1 && d.children[0].error - t.ok(childError, 'Error parsing JSON of child node') - t.equal(childError && childError.code, 'EJSONPARSE') - t.end() - }) -}) -test('missing folder', function (t) { - rpt(path.resolve(fixtures, 'does-not-exist'), function (er, d) { - t.ok(er, 'Got an error object') - t.equal(er && er.code, 'ENOENT') - t.ok(!d, 'No tree on top level error') - t.end() - }) -}) - - -function archyize (d, seen) { - seen = seen || {} - var path = d.path - if (d.target) { - path = d.target.path - } - - var label = d.package._id ? d.package._id + ' ' : - d.package.name ? d.package.name + (d.package.version ? '@' + d.package.version : '') + ' ' : - '' - label += path.substr(cwd.length + 1) - - if (d . target) { - return { label: label + ' (symlink)', nodes: [] } - } - - return { - label: label, - nodes: d.children.map(function (kid) { - return archyize(kid, seen) - }) - } -} - -test('cleanup', function (t) { - cleanup() - t.end() -}) diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/bad/package.json b/deps/npm/node_modules/read-package-tree/test/fixtures/bad/package.json deleted file mode 100644 index 21d815ec3b..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/bad/package.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "NOPE" diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/deep-archy.txt b/deps/npm/node_modules/read-package-tree/test/fixtures/deep-archy.txt deleted file mode 100644 index 630eab1a49..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/deep-archy.txt +++ /dev/null @@ -1,11 +0,0 @@ -root@1.2.3 test/fixtures/deeproot/root -├─┬ @scope/x@1.2.3 test/fixtures/deeproot/root/node_modules/@scope/x -│ └─┬ glob@4.0.5 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob -│ ├── graceful-fs@3.0.2 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob/node_modules/graceful-fs -│ ├── inherits@2.0.1 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob/node_modules/inherits -│ ├─┬ minimatch@1.0.0 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob/node_modules/minimatch -│ │ ├── lru-cache@2.5.0 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob/node_modules/minimatch/node_modules/lru-cache -│ │ └── sigmund@1.0.0 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob/node_modules/minimatch/node_modules/sigmund -│ └── once@1.3.0 test/fixtures/deeproot/root/node_modules/@scope/x/node_modules/glob/node_modules/once -├── @scope/y@1.2.3 test/fixtures/deeproot/root/node_modules/@scope/y -└── foo@1.2.3 test/fixtures/deeproot/root/node_modules/foo
\ No newline at end of file diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/deep/.keep b/deps/npm/node_modules/read-package-tree/test/fixtures/deep/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/deep/.keep +++ /dev/null diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/empty/node_modules/foo/package.json b/deps/npm/node_modules/read-package-tree/test/fixtures/empty/node_modules/foo/package.json deleted file mode 100644 index 98232c64fc..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/empty/node_modules/foo/package.json +++ /dev/null @@ -1 +0,0 @@ -{ diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/linkedroot-archy.txt b/deps/npm/node_modules/read-package-tree/test/fixtures/linkedroot-archy.txt deleted file mode 100644 index e34a460313..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/linkedroot-archy.txt +++ /dev/null @@ -1,11 +0,0 @@ -root@1.2.3 test/fixtures/linkedroot -├─┬ @scope/x@1.2.3 test/fixtures/linkedroot/node_modules/@scope/x -│ └─┬ glob@4.0.5 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob -│ ├── graceful-fs@3.0.2 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob/node_modules/graceful-fs -│ ├── inherits@2.0.1 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob/node_modules/inherits -│ ├─┬ minimatch@1.0.0 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob/node_modules/minimatch -│ │ ├── lru-cache@2.5.0 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob/node_modules/minimatch/node_modules/lru-cache -│ │ └── sigmund@1.0.0 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob/node_modules/minimatch/node_modules/sigmund -│ └── once@1.3.0 test/fixtures/linkedroot/node_modules/@scope/x/node_modules/glob/node_modules/once -├── @scope/y@1.2.3 test/fixtures/linkedroot/node_modules/@scope/y -└── foo@1.2.3 test/fixtures/linkedroot/node_modules/foo
\ No newline at end of file diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/noname/archy.txt b/deps/npm/node_modules/read-package-tree/test/fixtures/noname/archy.txt deleted file mode 100644 index 03d78dfc69..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/noname/archy.txt +++ /dev/null @@ -1,2 +0,0 @@ -test/fixtures/noname -└── test/fixtures/noname/node_modules/foo diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/noname/node_modules/foo/keep-alive b/deps/npm/node_modules/read-package-tree/test/fixtures/noname/node_modules/foo/keep-alive deleted file mode 100644 index e69de29bb2..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/noname/node_modules/foo/keep-alive +++ /dev/null diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/other/archy.txt b/deps/npm/node_modules/read-package-tree/test/fixtures/other/archy.txt deleted file mode 100644 index 23666226c9..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/other/archy.txt +++ /dev/null @@ -1,2 +0,0 @@ -test/fixtures/other -└── glob@4.0.5 test/fixtures/other/node_modules/glob (symlink)
\ No newline at end of file diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/other/node_modules/.bin b/deps/npm/node_modules/read-package-tree/test/fixtures/other/node_modules/.bin deleted file mode 100644 index e69de29bb2..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/other/node_modules/.bin +++ /dev/null diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/root/archy.txt b/deps/npm/node_modules/read-package-tree/test/fixtures/root/archy.txt deleted file mode 100644 index 1aacd3f0b7..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/root/archy.txt +++ /dev/null @@ -1,11 +0,0 @@ -root@1.2.3 test/fixtures/root -├─┬ @scope/x@1.2.3 test/fixtures/root/node_modules/@scope/x -│ └─┬ glob@4.0.5 test/fixtures/root/node_modules/@scope/x/node_modules/glob -│ ├── graceful-fs@3.0.2 test/fixtures/root/node_modules/@scope/x/node_modules/glob/node_modules/graceful-fs -│ ├── inherits@2.0.1 test/fixtures/root/node_modules/@scope/x/node_modules/glob/node_modules/inherits -│ ├─┬ minimatch@1.0.0 test/fixtures/root/node_modules/@scope/x/node_modules/glob/node_modules/minimatch -│ │ ├── lru-cache@2.5.0 test/fixtures/root/node_modules/@scope/x/node_modules/glob/node_modules/minimatch/node_modules/lru-cache -│ │ └── sigmund@1.0.0 test/fixtures/root/node_modules/@scope/x/node_modules/glob/node_modules/minimatch/node_modules/sigmund -│ └── once@1.3.0 test/fixtures/root/node_modules/@scope/x/node_modules/glob/node_modules/once -├── @scope/y@1.2.3 test/fixtures/root/node_modules/@scope/y -└── foo@1.2.3 test/fixtures/root/node_modules/foo
\ No newline at end of file diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/root/package.json b/deps/npm/node_modules/read-package-tree/test/fixtures/root/package.json deleted file mode 100644 index 010347cee6..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/root/package.json +++ /dev/null @@ -1,2 +0,0 @@ -{"name":"root", - "version":"1.2.3"}
\ No newline at end of file diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/selflink/archy.re b/deps/npm/node_modules/read-package-tree/test/fixtures/selflink/archy.re deleted file mode 100644 index 22e18109b1..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/selflink/archy.re +++ /dev/null @@ -1,13 +0,0 @@ -selflink@1[.]2[.]3 test/fixtures/selflink -├── @scope/y@1[.]2[.]3 test/fixtures/selflink/node_modules/@scope/y -├─┬ @scope/z@1[.]2[.]3 test/fixtures/selflink/node_modules/@scope/z -│ └── glob@4[.]0[.]5 test/fixtures/selflink/node_modules/foo/node_modules/glob [(]symlink[)] -└─┬ foo@1[.]2[.]3 test/fixtures/selflink/node_modules/foo - ├─┬ glob@4[.]0[.]5 test/fixtures/selflink/node_modules/foo/node_modules/glob - │ ├── graceful-fs@3[.]0[.]2 test/fixtures/selflink/node_modules/(foo|@scope/z)/node_modules/glob/node_modules/graceful-fs - │ ├── inherits@2[.]0[.]1 test/fixtures/selflink/node_modules/(foo|@scope/z)/node_modules/glob/node_modules/inherits - │ ├─┬ minimatch@1[.]0[.]0 test/fixtures/selflink/node_modules/(foo|@scope/z)/node_modules/glob/node_modules/minimatch - │ │ ├── lru-cache@2[.]5[.]0 test/fixtures/selflink/node_modules/(foo|@scope/z)/node_modules/glob/node_modules/minimatch/node_modules/lru-cache - │ │ └── sigmund@1[.]0[.]0 test/fixtures/selflink/node_modules/(foo|@scope/z)/node_modules/glob/node_modules/minimatch/node_modules/sigmund - │ └── once@1[.]3[.]0 test/fixtures/selflink/node_modules/(foo|@scope/z)/node_modules/glob/node_modules/once - └── selflink@1[.]2[.]3 test/fixtures/selflink [(]symlink[)] diff --git a/deps/npm/node_modules/read-package-tree/test/fixtures/selflink/package.json b/deps/npm/node_modules/read-package-tree/test/fixtures/selflink/package.json deleted file mode 100644 index 5bbf35e55b..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/fixtures/selflink/package.json +++ /dev/null @@ -1,2 +0,0 @@ -{"name":"selflink", - "version":"1.2.3"} diff --git a/deps/npm/node_modules/read-package-tree/test/symlinked-node-modules.js b/deps/npm/node_modules/read-package-tree/test/symlinked-node-modules.js deleted file mode 100644 index 31149240bd..0000000000 --- a/deps/npm/node_modules/read-package-tree/test/symlinked-node-modules.js +++ /dev/null @@ -1,70 +0,0 @@ -'use strict' -var path = require('path') -var test = require('tap').test -var rpt = require('../rpt.js') -var Tacks = require('tacks') -var File = Tacks.File -var Symlink = Tacks.Symlink -var Dir = Tacks.Dir - -var workdir = path.join(__dirname, path.basename(__filename, '.js')) -var fixture = new Tacks(Dir({ - bar: Dir({ - 'package.json': File({ - name: 'bar', - version: '1.0.0' - }) - }), - 'linked-node-modules': Dir({ - bar: Symlink('../bar'), - foo: Dir({ - 'package.json': File({ - name: 'foo', - version: '1.0.0' - }) - }) - }), - example: Dir({ - node_modules: Symlink('../linked-node-modules/'), - 'package.json': File({ - name: 'example', - version: '1.0.0', - }) - }) -})) - -function setup () { - cleanup() - fixture.create(workdir) -} - -function cleanup () { - fixture.remove(workdir) -} - -test('setup', function (t) { - setup() - t.done() -}) -test('symlinked-node-modules', function (t) { - rpt(path.join(workdir, 'example'), function (err, tree) { - t.ifError(err) - t.is(tree.children.length, 2) - var childrenShouldBe = { - 'foo': {isLink: false}, - 'bar': {isLink: true} - } - tree.children.forEach(function (child) { - var name = child.package.name - t.is(child.isLink, childrenShouldBe[name].isLink, - 'is' + (childrenShouldBe[name].isLink ? '' : 'Not') + 'Link ' + - path.relative(workdir, child.path) + " + " + - path.relative(workdir, child.realpath)) - }) - t.done() - }) -}) -test('cleanup', function (t) { - cleanup() - t.done() -})
\ No newline at end of file |