[Pkg-javascript-commits] [node-tap-mocha-reporter] 131/137: 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-tap-mocha-reporter.

commit 3156ba2d80e9f9c1d666838a115959b26c94a0ef
Merge: 5d3712d a464a8d
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Tue Aug 22 23:39:54 2017 +0200

    merge patched into master

 debian/.git-dpm                                         |  4 ++--
 debian/patches/0002-Remove-depends-unicode-length.patch | 14 ++++++++------
 debian/patches/0003-Support-a-help-option.patch         |  2 +-
 package.json                                            |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --cc debian/.git-dpm
index ce73de4,0000000..076c29b
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
- ac320d19b68e01224f6d647004c7e6bc83ba5b2e
- ac320d19b68e01224f6d647004c7e6bc83ba5b2e
++a464a8deb8923943f27f49ba9084155074d19712
++a464a8deb8923943f27f49ba9084155074d19712
 +53e3b9e5adee4456fa850592cf7241797bc125e2
 +53e3b9e5adee4456fa850592cf7241797bc125e2
 +node-tap-mocha-reporter_3.0.6.orig.tar.gz
 +b3ac9908f45905ef7b69fbfa1e27ca50e549c384
 +38824
diff --cc debian/patches/0002-Remove-depends-unicode-length.patch
index fee70d8,0000000..37367de
mode 100644,000000..100644
--- a/debian/patches/0002-Remove-depends-unicode-length.patch
+++ b/debian/patches/0002-Remove-depends-unicode-length.patch
@@@ -1,41 -1,0 +1,43 @@@
- From 2b811a0c0783d15186dd8bf834498a3d99310d91 Mon Sep 17 00:00:00 2001
++From fd66fd147563cd9d6b26a87112cef9247645e9e2 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Mon, 21 Aug 2017 23:10:30 +0200
 +Subject: Remove depends unicode-length
 +
 +Not totally correct but it will change something only for 14 characters.
 +
 +Will revise when unicode-length will be packaged
 +
 +Forwarded: no
 +---
 + lib/reporters/classic.js | 3 ++-
-  package.json             | 1 -
-  2 files changed, 2 insertions(+), 2 deletions(-)
++ package.json             | 3 +--
++ 2 files changed, 3 insertions(+), 3 deletions(-)
 +
 +diff --git a/lib/reporters/classic.js b/lib/reporters/classic.js
 +index 2545227..d87fec3 100644
 +--- a/lib/reporters/classic.js
 ++++ b/lib/reporters/classic.js
 +@@ -9,7 +9,8 @@ var Base = require('./base')
 +   , ms = require('../ms.js')
 +   , diff = require('diff')
 +   , utils = require('../utils.js')
 +-  , uclen = require('unicode-length').get
 ++  , stripAnsi = require('strip-ansi')
 ++  , uclen = function(str) { return stripAnsi(str).length }
 +   , colorSupport = require('supports-color')
 + 
 + function repeat (n, c) {
 +diff --git a/package.json b/package.json
- index d5d9dea..20af6e8 100644
++index d5d9dea..05e9204 100644
 +--- a/package.json
 ++++ b/package.json
- @@ -24,7 +24,6 @@
++@@ -23,8 +23,7 @@
++     "escape-string-regexp": "^1.0.3",
 +     "glob": "^7.0.5",
 +     "js-yaml": "^3.3.1",
-      "tap-parser": "^5.1.0",
++-    "tap-parser": "^5.1.0",
 +-    "unicode-length": "^1.0.0"
+++    "tap-parser": "^5.1.0"
 +   },
 +   "devDependencies": {
 +     "tap": "^6.2.0"
diff --cc debian/patches/0003-Support-a-help-option.patch
index 21dc919,0000000..6fe053c
mode 100644,000000..100644
--- a/debian/patches/0003-Support-a-help-option.patch
+++ b/debian/patches/0003-Support-a-help-option.patch
@@@ -1,24 -1,0 +1,24 @@@
- From ac320d19b68e01224f6d647004c7e6bc83ba5b2e Mon Sep 17 00:00:00 2001
++From a464a8deb8923943f27f49ba9084155074d19712 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Tue, 22 Aug 2017 14:46:56 +0200
 +Subject: Support a --help option
 +
 +forwarded: yes, https://github.com/lyroyce/mocha-tap-reporter/issues/5
 +bug: https://github.com/lyroyce/mocha-tap-reporter/issues/5
 +---
 + index.js | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/index.js b/index.js
 +index 46c5663..8b2fc07 100755
 +--- a/index.js
 ++++ b/index.js
 +@@ -99,7 +99,7 @@ reporter.  (Note that some reporters write to files instead of stdout.)
 + 
 + if (require.main === module) {
 +   var type = process.argv[2]
 +-  if (!type)
 ++  if (!type || type == '--help' || type == '-h')
 +     return usage()
 + 
 +   process.stdin.pipe(new Formatter(type))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-tap-mocha-reporter.git