[Pkg-javascript-commits] [node-stream-combiner2] 38/41: merge patched into master

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-stream-combiner2.

commit 3e7087bd2cdc28d376c73732703fe7b235020a70
Merge: 8a0f1e2 0993897
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Sun Aug 27 23:12:33 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |   4 +-
 .../0001-Use-node-stream-instead-of-module.patch   |  37 ++++++++
 .../0002-Fix-testsuite-to-reduce-depends.patch     | 102 +++++++++++++++++++++
 debian/patches/series                              |   2 +
 index.js                                           |   4 +-
 package.json                                       |   3 +-
 test/index.js                                      |  80 ----------------
 7 files changed, 146 insertions(+), 86 deletions(-)

diff --cc debian/.git-dpm
index c13e8ed,0000000..c1c7fab
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 1943d22459c54b1f65753e08f0bfb2dfb95f114b
- 1943d22459c54b1f65753e08f0bfb2dfb95f114b
++0993897991d336b9d9434dd12f5b6b9e94ff65a4
++0993897991d336b9d9434dd12f5b6b9e94ff65a4
 +1943d22459c54b1f65753e08f0bfb2dfb95f114b
 +1943d22459c54b1f65753e08f0bfb2dfb95f114b
 +node-stream-combiner2_1.1.1.orig.tar.gz
 +46d27c54cc48b533e40bbb474176a56e52d974bf
 +2896
diff --cc debian/patches/0001-Use-node-stream-instead-of-module.patch
index 0000000,0000000..8ba2d47
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-node-stream-instead-of-module.patch
@@@ -1,0 -1,0 +1,37 @@@
++From e1187ae808ac4ff3fb5ca8b8b9fc10fffa9fbe92 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sun, 27 Aug 2017 23:04:12 +0200
++Subject: Use node stream instead of module
++
++Forwarded; no
++---
++ index.js     | 4 ++--
++ package.json | 3 +--
++ 2 files changed, 3 insertions(+), 4 deletions(-)
++
++diff --git a/index.js b/index.js
++index 1a279a3..d48f9c7 100644
++--- a/index.js
+++++ b/index.js
++@@ -1,5 +1,5 @@
++-var PassThrough = require('readable-stream').PassThrough
++-var Readable = require('readable-stream').Readable
+++var PassThrough = require('stream').PassThrough
+++var Readable = require('stream').Readable
++ var duplexer = require('duplexer2')
++ 
++ module.exports = function () {
++diff --git a/package.json b/package.json
++index 6faec8b..565c2d9 100644
++--- a/package.json
+++++ b/package.json
++@@ -7,8 +7,7 @@
++     "url": "git://github.com/substack/stream-combiner2.git"
++   },
++   "dependencies": {
++-    "duplexer2": "~0.1.0",
++-    "readable-stream": "^2.0.2"
+++    "duplexer2": "~0.1.0"
++   },
++   "devDependencies": {
++     "tape": "~2.3.0",
diff --cc debian/patches/0002-Fix-testsuite-to-reduce-depends.patch
index 0000000,0000000..23518ae
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fix-testsuite-to-reduce-depends.patch
@@@ -1,0 -1,0 +1,102 @@@
++From 0993897991d336b9d9434dd12f5b6b9e94ff65a4 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sun, 27 Aug 2017 23:12:10 +0200
++Subject: Fix testsuite to reduce depends
++
++Forwarded: no
++---
++ test/index.js | 80 -----------------------------------------------------------
++ 1 file changed, 80 deletions(-)
++
++diff --git a/test/index.js b/test/index.js
++index 79ee38a..49c3a15 100644
++--- a/test/index.js
+++++ b/test/index.js
++@@ -1,87 +1,7 @@
++-var es = require('event-stream')
++ var through = require('through2')
++ var combine = require('..')
++ var test = require('tape')
++ 
++-test('re-emit error object for old streams', function (test) {
++-  test.plan(1)
++-
++-  var expectedErr = new Error('asplode')
++-
++-  var pipe = combine(
++-    es.through(function(data) {
++-      return this.emit('error', expectedErr)
++-    })
++-  )
++-
++-  pipe.on('error', function (err) {
++-    test.equal(err, expectedErr)
++-  })
++-
++-  pipe.write('pow')
++-})
++-
++-test('do not duplicate errors', function (test) {
++-
++-  var errors = 0;
++-  var pipe = combine(
++-    es.through(function(data) {
++-      return this.emit('data', data);
++-    }),
++-    es.through(function(data) {
++-      return this.emit('error', new Error(data));
++-    })
++-  )
++-
++-  pipe.on('error', function(err) {
++-    errors++
++-    test.ok(errors, 'expected error count')
++-      process.nextTick(function () {
++-        return test.end();
++-      })
++-  })
++-
++-  return pipe.write('meh');
++-})
++-
++-test('3 pipe do not duplicate errors', function (test) {
++-
++-  var errors = 0;
++-  var pipe = combine(
++-    es.through(function(data) {
++-      return this.emit('data', data);
++-    }),
++-    es.through(function(data) {
++-      return this.emit('error', new Error(data));
++-    }),
++-    es.through()
++-  )
++-
++-  pipe.on('error', function(err) {
++-    errors++
++-    test.ok(errors, 'expected error count')
++-      process.nextTick(function () {
++-        return test.end();
++-      })
++-  })
++-
++-  return pipe.write('meh');
++-
++-})
++-
++-test('0 argument through stream', function (test) {
++-  test.plan(3)
++-  var pipe = combine()
++-   , expected = [ 'beep', 'boop', 'robots' ]
++-
++-  pipe.pipe(es.through(function(data) {
++-    test.equal(data.toString('utf8'), expected.shift())
++-  }))
++-  pipe.write('beep')
++-  pipe.write('boop')
++-  pipe.end('robots')
++-})
++-
++ test('object mode', function (test) {
++   test.plan(2)
++   var pipe = combine.obj()
diff --cc debian/patches/series
index 0000000,0000000..49f1f94
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++0001-Use-node-stream-instead-of-module.patch
++0002-Fix-testsuite-to-reduce-depends.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-stream-combiner2.git