[Pkg-javascript-commits] [node-tap-mocha-reporter] 128/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 5d3712dcf8a94460273f6b39eb75e3baf3831ba2
Merge: 4b7b4b9 ac320d1
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Tue Aug 22 23:38:37 2017 +0200

    merge patched into master

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

diff --cc debian/.git-dpm
index 870bd6a,0000000..ce73de4
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
- e2e575b7be11151ee1c6ef869186505a9a23dd7e
- e2e575b7be11151ee1c6ef869186505a9a23dd7e
++ac320d19b68e01224f6d647004c7e6bc83ba5b2e
++ac320d19b68e01224f6d647004c7e6bc83ba5b2e
 +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 3fa91e0,0000000..fee70d8
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,41 @@@
- From b2a53e8c98c0216201252570c913338921e93ab6 Mon Sep 17 00:00:00 2001
++From 2b811a0c0783d15186dd8bf834498a3d99310d91 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(-)
 +
 +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
 +--- a/package.json
 ++++ b/package.json
 +@@ -24,7 +24,6 @@
 +     "glob": "^7.0.5",
 +     "js-yaml": "^3.3.1",
 +     "tap-parser": "^5.1.0",
 +-    "unicode-length": "^1.0.0"
 +   },
 +   "devDependencies": {
 +     "tap": "^6.2.0"
diff --cc debian/patches/0003-Support-a-help-option.patch
index d0b5f11,0000000..21dc919
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 e2e575b7be11151ee1c6ef869186505a9a23dd7e Mon Sep 17 00:00:00 2001
++From ac320d19b68e01224f6d647004c7e6bc83ba5b2e 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