From 534a5548c9ebd59f0dd90e9ccca148ed8946efa6 Mon Sep 17 00:00:00 2001 From: isaacs Date: Wed, 14 Aug 2019 12:46:04 -0700 Subject: [PATCH] read-cmd-shim@1.0.3 --- node_modules/read-cmd-shim/.npmignore | 3 -- node_modules/read-cmd-shim/LICENSE | 14 +++++++ node_modules/read-cmd-shim/README.md | 1 + node_modules/read-cmd-shim/index.js | 2 +- node_modules/read-cmd-shim/package.json | 37 +++++++++---------- .../read-cmd-shim/test/integration.js | 8 ++-- package-lock.json | 6 +-- package.json | 2 +- 8 files changed, 42 insertions(+), 31 deletions(-) delete mode 100644 node_modules/read-cmd-shim/.npmignore create mode 100644 node_modules/read-cmd-shim/LICENSE diff --git a/node_modules/read-cmd-shim/.npmignore b/node_modules/read-cmd-shim/.npmignore deleted file mode 100644 index ac50549639a97..0000000000000 --- a/node_modules/read-cmd-shim/.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -.#* -*~ -node_modules diff --git a/node_modules/read-cmd-shim/LICENSE b/node_modules/read-cmd-shim/LICENSE new file mode 100644 index 0000000000000..f4be44d881b2d --- /dev/null +++ b/node_modules/read-cmd-shim/LICENSE @@ -0,0 +1,14 @@ +Copyright (c) 2015, Rebecca Turner + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + diff --git a/node_modules/read-cmd-shim/README.md b/node_modules/read-cmd-shim/README.md index 2f0b5f6cc671e..b139ea7ff638c 100644 --- a/node_modules/read-cmd-shim/README.md +++ b/node_modules/read-cmd-shim/README.md @@ -14,6 +14,7 @@ readCmdShim('/path/to/shim.cmd', function (er, destination) { }) var destination = readCmdShim.sync('/path/to/shim.cmd') +``` ### readCmdShim(path, callback) diff --git a/node_modules/read-cmd-shim/index.js b/node_modules/read-cmd-shim/index.js index 6a2265449af26..f565ababe4e03 100644 --- a/node_modules/read-cmd-shim/index.js +++ b/node_modules/read-cmd-shim/index.js @@ -10,7 +10,7 @@ function extractPath (path, cmdshimContents) { } function extractPathFromCmd (cmdshimContents) { - var matches = cmdshimContents.match(/"%~dp0\\([^"]+?)"\s+%[*]/) + var matches = cmdshimContents.match(/"%(?:~dp0|dp0%)\\([^"]+?)"\s+%[*]/) return matches && matches[1] } diff --git a/node_modules/read-cmd-shim/package.json b/node_modules/read-cmd-shim/package.json index 8df095488f91b..d706e652c1a16 100644 --- a/node_modules/read-cmd-shim/package.json +++ b/node_modules/read-cmd-shim/package.json @@ -1,33 +1,29 @@ { - "_args": [ - [ - "read-cmd-shim@1.0.1", - "/Users/rebecca/code/npm" - ] - ], - "_from": "read-cmd-shim@1.0.1", - "_id": "read-cmd-shim@1.0.1", + "_from": "read-cmd-shim@1.0.3", + "_id": "read-cmd-shim@1.0.3", "_inBundle": false, - "_integrity": "sha1-LV0Vd4ajfAVdIgd8MsU/gynpHHs=", + "_integrity": "sha512-HUHb2imlZ8xBJjiZZRx0Ag9JfZ3jxQRfORMQXWCDeHE6PCCnpQrMq6LhyNqEPnMXhMDDIyq/BK7pBbhNy9zDDA==", "_location": "/read-cmd-shim", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "read-cmd-shim@1.0.1", + "raw": "read-cmd-shim@1.0.3", "name": "read-cmd-shim", "escapedName": "read-cmd-shim", - "rawSpec": "1.0.1", + "rawSpec": "1.0.3", "saveSpec": null, - "fetchSpec": "1.0.1" + "fetchSpec": "1.0.3" }, "_requiredBy": [ + "#USER", "/", "/gentle-fs" ], - "_resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz", - "_spec": "1.0.1", - "_where": "/Users/rebecca/code/npm", + "_resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.3.tgz", + "_shasum": "b246608c8e76e332a99be7811c096a4baf60015a", + "_spec": "read-cmd-shim@1.0.3", + "_where": "/Users/isaacs/dev/npm/cli", "author": { "name": "Rebecca Turner", "email": "me@re-becca.org", @@ -36,15 +32,17 @@ "bugs": { "url": "https://github.com/npm/read-cmd-shim/issues" }, + "bundleDependencies": false, "dependencies": { "graceful-fs": "^4.1.2" }, + "deprecated": false, "description": "Figure out what a cmd-shim is pointing at. This acts as the equivalent of fs.readlink.", "devDependencies": { - "cmd-shim": "^2.0.1", + "cmd-shim": "^3.0.0", "rimraf": "^2.4.3", "standard": "^5.2.2", - "tap": "^1.4.1" + "tap": "^12.7.0" }, "homepage": "https://github.com/npm/read-cmd-shim#readme", "license": "ISC", @@ -55,7 +53,8 @@ "url": "git+https://github.com/npm/read-cmd-shim.git" }, "scripts": { - "test": "standard && tap test/*.js" + "pretest": "standard", + "test": "tap test/*.js --100" }, - "version": "1.0.1" + "version": "1.0.3" } diff --git a/node_modules/read-cmd-shim/test/integration.js b/node_modules/read-cmd-shim/test/integration.js index 269f964727cd6..0cfa84bf6b25e 100644 --- a/node_modules/read-cmd-shim/test/integration.js +++ b/node_modules/read-cmd-shim/test/integration.js @@ -28,7 +28,7 @@ test('async-read-no-shbang', function (t) { t.plan(2) readCmdShim(testShimCmd, function (er, dest) { t.error(er) - t.is(dest, '..\\basic.js') + t.is(dest, '..\\integration.js') t.done() }) }) @@ -36,7 +36,7 @@ test('async-read-no-shbang', function (t) { test('sync-read-no-shbang', function (t) { t.plan(1) var dest = readCmdShim.sync(testShimCmd) - t.is(dest, '..\\basic.js') + t.is(dest, '..\\integration.js') t.done() }) @@ -60,7 +60,7 @@ test('async-read-no-shbang-cygwin', function (t) { t.plan(2) readCmdShim(testShim, function (er, dest) { t.error(er) - t.is(dest, '../basic.js') + t.is(dest, '../integration.js') t.done() }) }) @@ -68,7 +68,7 @@ test('async-read-no-shbang-cygwin', function (t) { test('sync-read-no-shbang-cygwin', function (t) { t.plan(1) var dest = readCmdShim.sync(testShim) - t.is(dest, '../basic.js') + t.is(dest, '../integration.js') t.done() }) diff --git a/package-lock.json b/package-lock.json index aa9606eb1a7cc..a71b1709807b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4813,9 +4813,9 @@ } }, "read-cmd-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz", - "integrity": "sha1-LV0Vd4ajfAVdIgd8MsU/gynpHHs=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.3.tgz", + "integrity": "sha512-HUHb2imlZ8xBJjiZZRx0Ag9JfZ3jxQRfORMQXWCDeHE6PCCnpQrMq6LhyNqEPnMXhMDDIyq/BK7pBbhNy9zDDA==", "requires": { "graceful-fs": "^4.1.2" } diff --git a/package.json b/package.json index c054ea09736d0..252bc684ac7fc 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "query-string": "^6.8.2", "qw": "~1.0.1", "read": "~1.0.7", - "read-cmd-shim": "~1.0.1", + "read-cmd-shim": "^1.0.3", "read-installed": "~4.0.3", "read-package-json": "^2.1.0", "read-package-tree": "^5.3.1",