diff options
author | Rebecca Turner <me@re-becca.org> | 2017-03-24 21:30:50 +0300 |
---|---|---|
committer | Rebecca Turner <me@re-becca.org> | 2017-03-25 01:13:42 +0300 |
commit | 30357ebc5691d7c9e9cdc6e0fe7dc6253220c9c2 (patch) | |
tree | 4e4457b57eb8b9976db8586603a4fb908dec5800 /node_modules/which | |
parent | 245e25315524b95c0a71c980223a27719392ba75 (diff) |
which@1.2.14
Internal changes only
Credit: @isaacs
Diffstat (limited to 'node_modules/which')
-rw-r--r-- | node_modules/which/CHANGELOG.md | 12 | ||||
-rw-r--r-- | node_modules/which/node_modules/isexe/README.md | 14 | ||||
-rw-r--r-- | node_modules/which/node_modules/isexe/access.js | 15 | ||||
-rw-r--r-- | node_modules/which/node_modules/isexe/index.js | 2 | ||||
-rw-r--r-- | node_modules/which/node_modules/isexe/mode.js | 10 | ||||
-rw-r--r-- | node_modules/which/node_modules/isexe/package.json | 67 | ||||
-rw-r--r-- | node_modules/which/node_modules/isexe/test/basic.js | 10 | ||||
-rw-r--r-- | node_modules/which/node_modules/isexe/windows.js | 14 | ||||
-rw-r--r-- | node_modules/which/package.json | 61 |
9 files changed, 100 insertions, 105 deletions
diff --git a/node_modules/which/CHANGELOG.md b/node_modules/which/CHANGELOG.md index 698e8edb0..c44cfbec5 100644 --- a/node_modules/which/CHANGELOG.md +++ b/node_modules/which/CHANGELOG.md @@ -1,6 +1,18 @@ # Changes +## v1.2.14 + +* appveyor: drop node 5 and 0.x +* travis-ci: add node 6, drop 0.x + +## v1.2.13 + +* test: Pass missing option to pass on windows +* update tap +* update isexe to 2.0.0 +* neveragain.tech pledge request + ## v1.2.12 * Removed unused require diff --git a/node_modules/which/node_modules/isexe/README.md b/node_modules/which/node_modules/isexe/README.md index 30995ad7d..35769e844 100644 --- a/node_modules/which/node_modules/isexe/README.md +++ b/node_modules/which/node_modules/isexe/README.md @@ -1,9 +1,9 @@ # isexe -Minimal module to check if a file is executable. +Minimal module to check if a file is executable, and a normal file. -Uses `fs.access` if available, and tests against the `PATHEXT` -environment variable on Windows. +Uses `fs.stat` and tests against the `PATHEXT` environment variable on +Windows. ## USAGE @@ -34,8 +34,8 @@ var isExe = isexe.sync('maybe-missing-file', { ignoreErrors: true }) Check if the path is executable. If no callback provided, and a global `Promise` object is available, then a Promise will be returned. -Will raise whatever errors may be raised by `fs.access` or `fs.stat`, -unless `options.ignoreErrors` is set to true. +Will raise whatever errors may be raised by `fs.stat`, unless +`options.ignoreErrors` is set to true. ### `isexe.sync(path, [options])` @@ -45,7 +45,7 @@ Same as `isexe` but returns the value and throws any errors raised. * `ignoreErrors` Treat all errors as "no, this is not executable", but don't raise them. -* `uid` Number to use as the user id when using the `mode` approach. -* `gid` Number to use as the group id when using the `mode` approach. +* `uid` Number to use as the user id +* `gid` Number to use as the group id * `pathExt` List of path extensions to use instead of `PATHEXT` environment variable on Windows. diff --git a/node_modules/which/node_modules/isexe/access.js b/node_modules/which/node_modules/isexe/access.js deleted file mode 100644 index e67b28bd6..000000000 --- a/node_modules/which/node_modules/isexe/access.js +++ /dev/null @@ -1,15 +0,0 @@ -module.exports = isexe -isexe.sync = sync - -var fs = require('fs') - -function isexe (path, _, cb) { - fs.access(path, fs.X_OK, function (er) { - cb(er, !er) - }) -} - -function sync (path, _) { - fs.accessSync(path, fs.X_OK) - return true -} diff --git a/node_modules/which/node_modules/isexe/index.js b/node_modules/which/node_modules/isexe/index.js index ff8ef113b..553fb32b1 100644 --- a/node_modules/which/node_modules/isexe/index.js +++ b/node_modules/which/node_modules/isexe/index.js @@ -2,8 +2,6 @@ var fs = require('fs') var core if (process.platform === 'win32' || global.TESTING_WINDOWS) { core = require('./windows.js') -} else if (typeof fs.access === 'function') { - core = require('./access.js') } else { core = require('./mode.js') } diff --git a/node_modules/which/node_modules/isexe/mode.js b/node_modules/which/node_modules/isexe/mode.js index 204428072..1995ea4a0 100644 --- a/node_modules/which/node_modules/isexe/mode.js +++ b/node_modules/which/node_modules/isexe/mode.js @@ -4,13 +4,17 @@ isexe.sync = sync var fs = require('fs') function isexe (path, options, cb) { - fs.stat(path, function (er, st) { - cb(er, er ? false : checkMode(st, options)) + fs.stat(path, function (er, stat) { + cb(er, er ? false : checkStat(stat, options)) }) } function sync (path, options) { - return checkMode(fs.statSync(path), options) + return checkStat(fs.statSync(path), options) +} + +function checkStat (stat, options) { + return stat.isFile() && checkMode(stat, options) } function checkMode (stat, options) { diff --git a/node_modules/which/node_modules/isexe/package.json b/node_modules/which/node_modules/isexe/package.json index 9f0f9d2ae..647f40177 100644 --- a/node_modules/which/node_modules/isexe/package.json +++ b/node_modules/which/node_modules/isexe/package.json @@ -1,45 +1,43 @@ { "_args": [ [ - "isexe@^1.1.1", + { + "raw": "isexe@^2.0.0", + "scope": null, + "escapedName": "isexe", + "name": "isexe", + "rawSpec": "^2.0.0", + "spec": ">=2.0.0 <3.0.0", + "type": "range" + }, "/Users/rebecca/code/npm/node_modules/which" ] ], - "_from": "isexe@>=1.1.1 <2.0.0", - "_id": "isexe@1.1.2", - "_inCache": true, - "_installable": true, + "_from": "isexe@^2.0.0", + "_hasShrinkwrap": false, + "_id": "isexe@2.0.0", "_location": "/which/isexe", - "_nodeVersion": "4.0.0", - "_npmOperationalInternal": { - "host": "packages-9-west.internal.npmjs.com", - "tmp": "tmp/isexe-1.1.2.tgz_1454992795963_0.7608721863944083" - }, - "_npmUser": { - "email": "i@izs.me", - "name": "isaacs" - }, - "_npmVersion": "3.7.0", "_phantomChildren": {}, "_requested": { - "name": "isexe", - "raw": "isexe@^1.1.1", - "rawSpec": "^1.1.1", + "raw": "isexe@^2.0.0", "scope": null, - "spec": ">=1.1.1 <2.0.0", + "escapedName": "isexe", + "name": "isexe", + "rawSpec": "^2.0.0", + "spec": ">=2.0.0 <3.0.0", "type": "range" }, "_requiredBy": [ "/which" ], - "_resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz", - "_shasum": "36f3e22e60750920f5e7241a476a8c6a42275ad0", + "_resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "_shasum": "e8fbf374dc556ff8947a10dcb0572d633f2cfa10", "_shrinkwrap": null, - "_spec": "isexe@^1.1.1", + "_spec": "isexe@^2.0.0", "_where": "/Users/rebecca/code/npm/node_modules/which", "author": { - "email": "i@izs.me", "name": "Isaac Z. Schlueter", + "email": "i@izs.me", "url": "http://blog.izs.me/" }, "bugs": { @@ -50,35 +48,32 @@ "devDependencies": { "mkdirp": "^0.5.1", "rimraf": "^2.5.0", - "tap": "^5.1.2" + "tap": "^10.3.0" }, "directories": { "test": "test" }, "dist": { - "shasum": "36f3e22e60750920f5e7241a476a8c6a42275ad0", - "tarball": "http://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz" + "shasum": "e8fbf374dc556ff8947a10dcb0572d633f2cfa10", + "tarball": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" }, - "gitHead": "1882eed72c2ba152f4dd1336d857b0755ae306d9", "homepage": "https://github.com/isaacs/isexe#readme", "keywords": [], "license": "ISC", "main": "index.js", - "maintainers": [ - { - "email": "i@izs.me", - "name": "isaacs" - } - ], "name": "isexe", "optionalDependencies": {}, - "readme": "ERROR: No README data found!", + "readme": "# isexe\n\nMinimal module to check if a file is executable, and a normal file.\n\nUses `fs.stat` and tests against the `PATHEXT` environment variable on\nWindows.\n\n## USAGE\n\n```javascript\nvar isexe = require('isexe')\nisexe('some-file-name', function (err, isExe) {\n if (err) {\n console.error('probably file does not exist or something', err)\n } else if (isExe) {\n console.error('this thing can be run')\n } else {\n console.error('cannot be run')\n }\n})\n\n// same thing but synchronous, throws errors\nvar isExe = isexe.sync('some-file-name')\n\n// treat errors as just \"not executable\"\nisexe('maybe-missing-file', { ignoreErrors: true }, callback)\nvar isExe = isexe.sync('maybe-missing-file', { ignoreErrors: true })\n```\n\n## API\n\n### `isexe(path, [options], [callback])`\n\nCheck if the path is executable. If no callback provided, and a\nglobal `Promise` object is available, then a Promise will be returned.\n\nWill raise whatever errors may be raised by `fs.stat`, unless\n`options.ignoreErrors` is set to true.\n\n### `isexe.sync(path, [options])`\n\nSame as `isexe` but returns the value and throws any errors raised.\n\n### Options\n\n* `ignoreErrors` Treat all errors as \"no, this is not executable\", but\n don't raise them.\n* `uid` Number to use as the user id\n* `gid` Number to use as the group id\n* `pathExt` List of path extensions to use instead of `PATHEXT`\n environment variable on Windows.\n", + "readmeFilename": "README.md", "repository": { "type": "git", "url": "git+https://github.com/isaacs/isexe.git" }, "scripts": { - "test": "tap test/*.js --branches=100 --statements=100 --functions=100 --lines=100" + "postpublish": "git push origin --all; git push origin --tags", + "postversion": "npm publish", + "preversion": "npm test", + "test": "tap test/*.js --100" }, - "version": "1.1.2" + "version": "2.0.0" } diff --git a/node_modules/which/node_modules/isexe/test/basic.js b/node_modules/which/node_modules/isexe/test/basic.js index 969fc9a0a..d926df64b 100644 --- a/node_modules/which/node_modules/isexe/test/basic.js +++ b/node_modules/which/node_modules/isexe/test/basic.js @@ -207,5 +207,15 @@ function runTest (t, options) { }) }) + t.test('directory is not executable', function (t) { + isexe(__dirname, options, function (er, is) { + if (er) { + throw er + } + t.notOk(is) + t.end() + }) + }) + t.end() } diff --git a/node_modules/which/node_modules/isexe/windows.js b/node_modules/which/node_modules/isexe/windows.js index aba8561f3..34996734d 100644 --- a/node_modules/which/node_modules/isexe/windows.js +++ b/node_modules/which/node_modules/isexe/windows.js @@ -24,13 +24,19 @@ function checkPathExt (path, options) { return false } +function checkStat (stat, path, options) { + if (!stat.isSymbolicLink() && !stat.isFile()) { + return false + } + return checkPathExt(path, options) +} + function isexe (path, options, cb) { - fs.stat(path, function (er, st) { - cb(er, er ? false : checkPathExt(path, options)) + fs.stat(path, function (er, stat) { + cb(er, er ? false : checkStat(stat, path, options)) }) } function sync (path, options) { - fs.statSync(path) - return checkPathExt(path, options) + return checkStat(fs.statSync(path), path, options) } diff --git a/node_modules/which/package.json b/node_modules/which/package.json index 0b19be4e3..8107d6789 100644 --- a/node_modules/which/package.json +++ b/node_modules/which/package.json @@ -2,52 +2,43 @@ "_args": [ [ { - "raw": "which@1.2.12", + "raw": "which@1.2.14", "scope": null, "escapedName": "which", "name": "which", - "rawSpec": "1.2.12", - "spec": "1.2.12", + "rawSpec": "1.2.14", + "spec": "1.2.14", "type": "version" }, - "/Users/rebecca/code/npm-latest" + "/Users/rebecca/code/npm" ] ], - "_from": "which@1.2.12", - "_id": "which@1.2.12", - "_inCache": true, + "_from": "which@1.2.14", + "_hasShrinkwrap": false, + "_id": "which@1.2.14", "_location": "/which", - "_nodeVersion": "6.5.0", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/which-1.2.12.tgz_1478902859933_0.6313941152766347" - }, - "_npmUser": { - "name": "isaacs", - "email": "i@izs.me" - }, - "_npmVersion": "3.10.9", "_phantomChildren": {}, "_requested": { - "raw": "which@1.2.12", + "raw": "which@1.2.14", "scope": null, "escapedName": "which", "name": "which", - "rawSpec": "1.2.12", - "spec": "1.2.12", + "rawSpec": "1.2.14", + "spec": "1.2.14", "type": "version" }, "_requiredBy": [ "#USER", "/", "/node-gyp", - "/tap/foreground-child/cross-spawn" + "/tap/foreground-child/cross-spawn", + "/update-notifier/boxen/term-size/execa/cross-spawn-async" ], - "_resolved": "https://registry.npmjs.org/which/-/which-1.2.12.tgz", - "_shasum": "de67b5e450269f194909ef23ece4ebe416fa1192", + "_resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", + "_shasum": "9a87c4378f03e827cecaf1acdf56c736c01c14e5", "_shrinkwrap": null, - "_spec": "which@1.2.12", - "_where": "/Users/rebecca/code/npm-latest", + "_spec": "which@1.2.14", + "_where": "/Users/rebecca/code/npm", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", @@ -60,36 +51,30 @@ "url": "https://github.com/isaacs/node-which/issues" }, "dependencies": { - "isexe": "^1.1.1" + "isexe": "^2.0.0" }, "description": "Like which(1) unix command. Find the first instance of an executable in the PATH.", "devDependencies": { "mkdirp": "^0.5.0", "rimraf": "^2.3.3", - "tap": "^5.1.1" + "tap": "^10.3.0" }, "directories": {}, "dist": { - "shasum": "de67b5e450269f194909ef23ece4ebe416fa1192", - "tarball": "https://registry.npmjs.org/which/-/which-1.2.12.tgz" + "shasum": "9a87c4378f03e827cecaf1acdf56c736c01c14e5", + "tarball": "https://registry.npmjs.org/which/-/which-1.2.14.tgz" }, "files": [ "which.js", "bin/which" ], - "gitHead": "5db2078bc2ec50d5c5f3d324e1ffcc2348b9cbbd", "homepage": "https://github.com/isaacs/node-which#readme", "license": "ISC", "main": "which.js", - "maintainers": [ - { - "name": "isaacs", - "email": "i@izs.me" - } - ], "name": "which", "optionalDependencies": {}, - "readme": "ERROR: No README data found!", + "readme": "# which\n\nLike the unix `which` utility.\n\nFinds the first instance of a specified executable in the PATH\nenvironment variable. Does not cache the results, so `hash -r` is not\nneeded when the PATH changes.\n\n## USAGE\n\n```javascript\nvar which = require('which')\n\n// async usage\nwhich('node', function (er, resolvedPath) {\n // er is returned if no \"node\" is found on the PATH\n // if it is found, then the absolute path to the exec is returned\n})\n\n// sync usage\n// throws if not found\nvar resolved = which.sync('node')\n\n// Pass options to override the PATH and PATHEXT environment vars.\nwhich('node', { path: someOtherPath }, function (er, resolved) {\n if (er)\n throw er\n console.log('found at %j', resolved)\n})\n```\n\n## CLI USAGE\n\nSame as the BSD `which(1)` binary.\n\n```\nusage: which [-as] program ...\n```\n\n## OPTIONS\n\nYou may pass an options object as the second argument.\n\n- `path`: Use instead of the `PATH` environment variable.\n- `pathExt`: Use instead of the `PATHEXT` environment variable.\n- `all`: Return all matches, instead of just the first one. Note that\n this means the function returns an array of strings instead of a\n single string.\n", + "readmeFilename": "README.md", "repository": { "type": "git", "url": "git://github.com/isaacs/node-which.git" @@ -99,5 +84,5 @@ "postversion": "npm run changelog && git add CHANGELOG.md && git commit -m 'update changelog - '${npm_package_version}", "test": "tap test/*.js --cov" }, - "version": "1.2.12" + "version": "1.2.14" } |