update "fstream" to v0.1.22

This commit is contained in:
Nathan Rajlich 2013-03-21 09:14:49 -10:00
parent 69da815c6f
commit bdacb6a5b8
5 changed files with 26 additions and 22 deletions

View file

@ -1,4 +1,4 @@
Copyright (c) Isaac Z. Schlueter Copyright (c) Isaac Z. Schlueter ("Author")
All rights reserved. All rights reserved.
The BSD License The BSD License
@ -6,20 +6,22 @@ The BSD License
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
are met: are met:
1. Redistributions of source code must retain the above copyright 1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
POSSIBILITY OF SUCH DAMAGE. IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

View file

@ -36,12 +36,15 @@ FileWriter.prototype._create = function () {
me._stream = fs.createWriteStream(me._path, so) me._stream = fs.createWriteStream(me._path, so)
me._stream.on("open", function (fd) { me._stream.on("open", function (fd) {
// console.error("FW open", me._buffer, me._path)
me.ready = true me.ready = true
me._buffer.forEach(function (c) { me._buffer.forEach(function (c) {
if (c === EOF) me._stream.end() if (c === EOF) me._stream.end()
else me._stream.write(c) else me._stream.write(c)
}) })
me.emit("ready") me.emit("ready")
// give this a kick just in case it needs it.
me.emit("drain")
}) })
me._stream.on("drain", function () { me.emit("drain") }) me._stream.on("drain", function () { me.emit("drain") })
@ -58,6 +61,8 @@ FileWriter.prototype.write = function (c) {
me._bytesWritten += c.length me._bytesWritten += c.length
if (!me.ready) { if (!me.ready) {
if (!Buffer.isBuffer(c) && typeof c !== 'string')
throw new Error('invalid write data')
me._buffer.push(c) me._buffer.push(c)
return false return false
} }

View file

@ -71,7 +71,7 @@ ProxyWriter.prototype._addProxy = function (proxy) {
var calls = me._buffer var calls = me._buffer
calls.forEach(function (c) { calls.forEach(function (c) {
// console.error("~~ ~~ proxy buffered call", c[0], c[1]) // console.error("~~ ~~ proxy buffered call", c[0], c[1])
proxy[c[0]].call(proxy, c[1]) proxy[c[0]].apply(proxy, c[1])
}) })
me._buffer.length = 0 me._buffer.length = 0
if (me._needsDrain) me.emit("drain") if (me._needsDrain) me.emit("drain")
@ -102,7 +102,7 @@ ProxyWriter.prototype.write = function (c) {
ProxyWriter.prototype.end = function (c) { ProxyWriter.prototype.end = function (c) {
// console.error("~~ proxy end") // console.error("~~ proxy end")
if (!this._proxy) { if (!this._proxy) {
this._buffer.push(["end", c]) this._buffer.push(["end", [c]])
return false return false
} }
return this._proxy.end(c) return this._proxy.end(c)

5
node_modules/fstream/lib/writer.js generated vendored
View file

@ -290,13 +290,13 @@ Writer.prototype._finish = function () {
return return
function setProps (current) { function setProps (current) {
todo += 3
endChmod(me, me.props, current, me._path, next("chmod")) endChmod(me, me.props, current, me._path, next("chmod"))
endChown(me, me.props, current, me._path, next("chown")) endChown(me, me.props, current, me._path, next("chown"))
endUtimes(me, me.props, current, me._path, next("chown")) endUtimes(me, me.props, current, me._path, next("utimes"))
} }
function next (what) { function next (what) {
todo ++
return function (er) { return function (er) {
// console.error(" W Finish", what, todo) // console.error(" W Finish", what, todo)
if (errState) return if (errState) return
@ -387,4 +387,3 @@ function objectToString (d) {
function isDate(d) { function isDate(d) {
return typeof d === 'object' && objectToString(d) === '[object Date]'; return typeof d === 'object' && objectToString(d) === '[object Date]';
} }

12
node_modules/fstream/package.json generated vendored
View file

@ -6,7 +6,7 @@
}, },
"name": "fstream", "name": "fstream",
"description": "Advanced file system stream things", "description": "Advanced file system stream things",
"version": "0.1.19", "version": "0.1.22",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/isaacs/fstream.git" "url": "git://github.com/isaacs/fstream.git"
@ -18,7 +18,7 @@
"dependencies": { "dependencies": {
"rimraf": "2", "rimraf": "2",
"mkdirp": "0.3", "mkdirp": "0.3",
"graceful-fs": "~1.1.2", "graceful-fs": "~1.2.0",
"inherits": "~1.0.0" "inherits": "~1.0.0"
}, },
"devDependencies": { "devDependencies": {
@ -29,9 +29,7 @@
}, },
"license": "BSD", "license": "BSD",
"readme": "Like FS streams, but with stat on them, and supporting directories and\nsymbolic links, as well as normal files. Also, you can use this to set\nthe stats on a file, even if you don't change its contents, or to create\na symlink, etc.\n\nSo, for example, you can \"write\" a directory, and it'll call `mkdir`. You\ncan specify a uid and gid, and it'll call `chown`. You can specify a\n`mtime` and `atime`, and it'll call `utimes`. You can call it a symlink\nand provide a `linkpath` and it'll call `symlink`.\n\nNote that it won't automatically resolve symbolic links. So, if you\ncall `fstream.Reader('/some/symlink')` then you'll get an object\nthat stats and then ends immediately (since it has no data). To follow\nsymbolic links, do this: `fstream.Reader({path:'/some/symlink', follow:\ntrue })`.\n\nThere are various checks to make sure that the bytes emitted are the\nsame as the intended size, if the size is set.\n\n## Examples\n\n```javascript\nfstream\n .Writer({ path: \"path/to/file\"\n , mode: 0755\n , size: 6\n })\n .write(\"hello\\n\")\n .end()\n```\n\nThis will create the directories if they're missing, and then write\n`hello\\n` into the file, chmod it to 0755, and assert that 6 bytes have\nbeen written when it's done.\n\n```javascript\nfstream\n .Writer({ path: \"path/to/file\"\n , mode: 0755\n , size: 6\n , flags: \"a\"\n })\n .write(\"hello\\n\")\n .end()\n```\n\nYou can pass flags in, if you want to append to a file.\n\n```javascript\nfstream\n .Writer({ path: \"path/to/symlink\"\n , linkpath: \"./file\"\n , SymbolicLink: true\n , mode: \"0755\" // octal strings supported\n })\n .end()\n```\n\nIf isSymbolicLink is a function, it'll be called, and if it returns\ntrue, then it'll treat it as a symlink. If it's not a function, then\nany truish value will make a symlink, or you can set `type:\n'SymbolicLink'`, which does the same thing.\n\nNote that the linkpath is relative to the symbolic link location, not\nthe parent dir or cwd.\n\n```javascript\nfstream\n .Reader(\"path/to/dir\")\n .pipe(fstream.Writer(\"path/to/other/dir\"))\n```\n\nThis will do like `cp -Rp path/to/dir path/to/other/dir`. If the other\ndir exists and isn't a directory, then it'll emit an error. It'll also\nset the uid, gid, mode, etc. to be identical. In this way, it's more\nlike `rsync -a` than simply a copy.\n", "readme": "Like FS streams, but with stat on them, and supporting directories and\nsymbolic links, as well as normal files. Also, you can use this to set\nthe stats on a file, even if you don't change its contents, or to create\na symlink, etc.\n\nSo, for example, you can \"write\" a directory, and it'll call `mkdir`. You\ncan specify a uid and gid, and it'll call `chown`. You can specify a\n`mtime` and `atime`, and it'll call `utimes`. You can call it a symlink\nand provide a `linkpath` and it'll call `symlink`.\n\nNote that it won't automatically resolve symbolic links. So, if you\ncall `fstream.Reader('/some/symlink')` then you'll get an object\nthat stats and then ends immediately (since it has no data). To follow\nsymbolic links, do this: `fstream.Reader({path:'/some/symlink', follow:\ntrue })`.\n\nThere are various checks to make sure that the bytes emitted are the\nsame as the intended size, if the size is set.\n\n## Examples\n\n```javascript\nfstream\n .Writer({ path: \"path/to/file\"\n , mode: 0755\n , size: 6\n })\n .write(\"hello\\n\")\n .end()\n```\n\nThis will create the directories if they're missing, and then write\n`hello\\n` into the file, chmod it to 0755, and assert that 6 bytes have\nbeen written when it's done.\n\n```javascript\nfstream\n .Writer({ path: \"path/to/file\"\n , mode: 0755\n , size: 6\n , flags: \"a\"\n })\n .write(\"hello\\n\")\n .end()\n```\n\nYou can pass flags in, if you want to append to a file.\n\n```javascript\nfstream\n .Writer({ path: \"path/to/symlink\"\n , linkpath: \"./file\"\n , SymbolicLink: true\n , mode: \"0755\" // octal strings supported\n })\n .end()\n```\n\nIf isSymbolicLink is a function, it'll be called, and if it returns\ntrue, then it'll treat it as a symlink. If it's not a function, then\nany truish value will make a symlink, or you can set `type:\n'SymbolicLink'`, which does the same thing.\n\nNote that the linkpath is relative to the symbolic link location, not\nthe parent dir or cwd.\n\n```javascript\nfstream\n .Reader(\"path/to/dir\")\n .pipe(fstream.Writer(\"path/to/other/dir\"))\n```\n\nThis will do like `cp -Rp path/to/dir path/to/other/dir`. If the other\ndir exists and isn't a directory, then it'll emit an error. It'll also\nset the uid, gid, mode, etc. to be identical. In this way, it's more\nlike `rsync -a` than simply a copy.\n",
"_id": "fstream@0.1.19", "readmeFilename": "README.md",
"dist": { "_id": "fstream@0.1.22",
"shasum": "419e209fab5f1f8edb880e147ca43534795e350e" "_from": "fstream@0"
},
"_from": "fstream@0.1.19"
} }