refactor; move streamToBuffer to a separate module

master
Jonathan Ong 11 years ago
parent e422636e81
commit c2c82f66e9
  1. 5
      History.md
  2. 5
      lib/command.js
  3. 21
      lib/utils.js
  4. 3
      package.json

@ -1,3 +1,8 @@
1.9.2
==================
* refactor; move `streamToBuffer` to a separate module
1.9.1 / 2012-05-07
==================

@ -9,6 +9,7 @@ var utils = require('./utils');
var debug = require('debug')('gm');
var series = require('array-series');
var through = require('through');
var streamToBuffer = require('stream-to-buffer');
/**
* Error messaging.
@ -130,7 +131,7 @@ module.exports = function (proto) {
return this.stream(format, function (err, stdout) {
if (err) return callback(err);
utils.streamToBuffer(stdout, callback);
streamToBuffer(stdout, callback);
})
}
@ -216,7 +217,7 @@ module.exports = function (proto) {
// we only need one
self._buffering = true;
utils.streamToBuffer(self.sourceStream, function (err, buffer) {
streamToBuffer(self.sourceStream, function (err, buffer) {
self.sourceBuffer = buffer;
self.sourceStream = null; // The stream is now dead
})

@ -20,25 +20,4 @@ exports.argsToArray = function (args) {
}
return arr;
}
exports.streamToBuffer = function (stream, callback) {
var buffers = [];
var done = false;
stream.on('data', function (chunk) {
buffers.push(chunk);
})
stream.on('error', function (err) {
done = true;
callback(err);
})
stream.on('end', function () {
if (done) return;
callback(null, Buffer.concat(buffers));
buffers = null;
})
}

@ -21,6 +21,7 @@
"debug": "0.7.0",
"array-series": "~0.1.0",
"array-parallel": "~0.1.0",
"through": "~2.3.1"
"through": "~2.3.1",
"stream-to-buffer": "~0.0.1"
}
}

Loading…
Cancel
Save