summaryrefslogtreecommitdiff
path: root/deps/npm/node_modules/mississippi/node_modules/pump
diff options
context:
space:
mode:
Diffstat (limited to 'deps/npm/node_modules/mississippi/node_modules/pump')
-rw-r--r--deps/npm/node_modules/mississippi/node_modules/pump/.npmignore1
-rw-r--r--deps/npm/node_modules/mississippi/node_modules/pump/README.md9
-rw-r--r--deps/npm/node_modules/mississippi/node_modules/pump/index.js4
-rw-r--r--deps/npm/node_modules/mississippi/node_modules/pump/package.json31
-rw-r--r--deps/npm/node_modules/mississippi/node_modules/pump/test-browser.js16
-rw-r--r--deps/npm/node_modules/mississippi/node_modules/pump/test.js (renamed from deps/npm/node_modules/mississippi/node_modules/pump/test-node.js)13
6 files changed, 27 insertions, 47 deletions
diff --git a/deps/npm/node_modules/mississippi/node_modules/pump/.npmignore b/deps/npm/node_modules/mississippi/node_modules/pump/.npmignore
new file mode 100644
index 0000000000..3c3629e647
--- /dev/null
+++ b/deps/npm/node_modules/mississippi/node_modules/pump/.npmignore
@@ -0,0 +1 @@
+node_modules
diff --git a/deps/npm/node_modules/mississippi/node_modules/pump/README.md b/deps/npm/node_modules/mississippi/node_modules/pump/README.md
index 4c81471a0e..5029b27d68 100644
--- a/deps/npm/node_modules/mississippi/node_modules/pump/README.md
+++ b/deps/npm/node_modules/mississippi/node_modules/pump/README.md
@@ -47,15 +47,6 @@ pump(source, transform, anotherTransform, dest, function(err) {
If `source`, `transform`, `anotherTransform` or `dest` closes all of them will be destroyed.
-Similarly to `stream.pipe()`, `pump()` returns the last stream passed in, so you can do:
-
-```
-return pump(s1, s2) // returns s2
-```
-
-If you want to return a stream that combines *both* s1 and s2 to a single stream use
-[pumpify](https://github.com/mafintosh/pumpify) instead.
-
## License
MIT
diff --git a/deps/npm/node_modules/mississippi/node_modules/pump/index.js b/deps/npm/node_modules/mississippi/node_modules/pump/index.js
index c15059f176..060ce5f4fd 100644
--- a/deps/npm/node_modules/mississippi/node_modules/pump/index.js
+++ b/deps/npm/node_modules/mississippi/node_modules/pump/index.js
@@ -3,14 +3,12 @@ var eos = require('end-of-stream')
var fs = require('fs') // we only need fs to get the ReadStream and WriteStream prototypes
var noop = function () {}
-var ancient = /^v?\.0/.test(process.version)
var isFn = function (fn) {
return typeof fn === 'function'
}
var isFS = function (stream) {
- if (!ancient) return false // newer node version do not need to care about fs is a special way
if (!fs) return false // browser
return (stream instanceof (fs.ReadStream || noop) || stream instanceof (fs.WriteStream || noop)) && isFn(stream.close)
}
@@ -39,7 +37,7 @@ var destroyer = function (stream, reading, writing, callback) {
if (destroyed) return
destroyed = true
- if (isFS(stream)) return stream.close(noop) // use close for fs streams to avoid fd leaks
+ if (isFS(stream)) return stream.close() // use close for fs streams to avoid fd leaks
if (isRequest(stream)) return stream.abort() // request.destroy just do .end - .abort is what we want
if (isFn(stream.destroy)) return stream.destroy()
diff --git a/deps/npm/node_modules/mississippi/node_modules/pump/package.json b/deps/npm/node_modules/mississippi/node_modules/pump/package.json
index 6e62ee06cd..2ec8b797bc 100644
--- a/deps/npm/node_modules/mississippi/node_modules/pump/package.json
+++ b/deps/npm/node_modules/mississippi/node_modules/pump/package.json
@@ -1,31 +1,33 @@
{
- "_from": "pump@^3.0.0",
- "_id": "pump@3.0.0",
- "_inBundle": false,
- "_integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+ "_from": "pump@^1.0.0",
+ "_id": "pump@1.0.2",
+ "_integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=",
"_location": "/mississippi/pump",
"_phantomChildren": {},
"_requested": {
"type": "range",
"registry": true,
- "raw": "pump@^3.0.0",
+ "raw": "pump@^1.0.0",
"name": "pump",
"escapedName": "pump",
- "rawSpec": "^3.0.0",
+ "rawSpec": "^1.0.0",
"saveSpec": null,
- "fetchSpec": "^3.0.0"
+ "fetchSpec": "^1.0.0"
},
"_requiredBy": [
- "/mississippi"
+ "/mississippi",
+ "/mississippi/pumpify"
],
- "_resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
- "_shasum": "b4a2116815bde2f4e1ea602354e8c75565107a64",
- "_spec": "pump@^3.0.0",
+ "_resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
+ "_shasum": "3b3ee6512f94f0e575538c17995f9f16990a5d51",
+ "_shrinkwrap": null,
+ "_spec": "pump@^1.0.0",
"_where": "/Users/zkat/Documents/code/npm/node_modules/mississippi",
"author": {
"name": "Mathias Buus Madsen",
"email": "mathiasbuus@gmail.com"
},
+ "bin": null,
"browser": {
"fs": false
},
@@ -39,6 +41,7 @@
},
"deprecated": false,
"description": "pipe streams together and close all of them if one of them closes",
+ "devDependencies": {},
"homepage": "https://github.com/mafintosh/pump#readme",
"keywords": [
"streams",
@@ -48,12 +51,14 @@
],
"license": "MIT",
"name": "pump",
+ "optionalDependencies": {},
+ "peerDependencies": {},
"repository": {
"type": "git",
"url": "git://github.com/mafintosh/pump.git"
},
"scripts": {
- "test": "node test-browser.js && node test-node.js"
+ "test": "node test.js"
},
- "version": "3.0.0"
+ "version": "1.0.2"
}
diff --git a/deps/npm/node_modules/mississippi/node_modules/pump/test-browser.js b/deps/npm/node_modules/mississippi/node_modules/pump/test-browser.js
index 9a06c8a4cc..80e852c7dc 100644
--- a/deps/npm/node_modules/mississippi/node_modules/pump/test-browser.js
+++ b/deps/npm/node_modules/mississippi/node_modules/pump/test-browser.js
@@ -30,10 +30,7 @@ var rsClosed = false
var callbackCalled = false
var check = function () {
- if (wsClosed && rsClosed && callbackCalled) {
- console.log('test-browser.js passes')
- clearTimeout(timeout)
- }
+ if (wsClosed && rsClosed && callbackCalled) console.log('done')
}
ws.on('finish', function () {
@@ -46,21 +43,16 @@ rs.on('end', function () {
check()
})
-var res = pump(rs, toHex(), toHex(), toHex(), ws, function () {
+pump(rs, toHex(), toHex(), toHex(), ws, function () {
callbackCalled = true
check()
})
-if (res !== ws) {
- throw new Error('should return last stream')
-}
-
setTimeout(function () {
rs.push(null)
rs.emit('close')
}, 1000)
-var timeout = setTimeout(function () {
- check()
- throw new Error('timeout')
+setTimeout(function () {
+ if (!check()) throw new Error('timeout')
}, 5000)
diff --git a/deps/npm/node_modules/mississippi/node_modules/pump/test-node.js b/deps/npm/node_modules/mississippi/node_modules/pump/test.js
index 561251a082..64e772ca5b 100644
--- a/deps/npm/node_modules/mississippi/node_modules/pump/test-node.js
+++ b/deps/npm/node_modules/mississippi/node_modules/pump/test.js
@@ -19,10 +19,7 @@ var rsClosed = false
var callbackCalled = false
var check = function () {
- if (wsClosed && rsClosed && callbackCalled) {
- console.log('test-node.js passes')
- clearTimeout(timeout)
- }
+ if (wsClosed && rsClosed && callbackCalled) process.exit(0)
}
ws.on('close', function () {
@@ -35,19 +32,15 @@ rs.on('close', function () {
check()
})
-var res = pump(rs, toHex(), toHex(), toHex(), ws, function () {
+pump(rs, toHex(), toHex(), toHex(), ws, function () {
callbackCalled = true
check()
})
-if (res !== ws) {
- throw new Error('should return last stream')
-}
-
setTimeout(function () {
rs.destroy()
}, 1000)
-var timeout = setTimeout(function () {
+setTimeout(function () {
throw new Error('timeout')
}, 5000)