[Pkg-javascript-commits] [node-tap] 179/186: 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.

commit 8613d29a346f86b096b776c851b097bf252dc29a
Merge: a79b693 655eac1
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Dec 1 17:06:19 2017 +0100

    merge patched into master

 bin/run.js                                         | 22 +++++-
 debian/.git-dpm                                    |  4 +-
 .../patches/0013-Code-coverage-is-optional.patch   | 85 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 package.json                                       |  2 +-
 5 files changed, 108 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index f6d711c,0000000..3c97dac
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,16 -1,0 +1,16 @@@
 +# see git-dpm(1) from git-dpm package
- b42407e0ca7b8d0a718bbea7f1ac1dbafbd98e00
- b42407e0ca7b8d0a718bbea7f1ac1dbafbd98e00
++655eac1cc3c00012fe181b2c57987ce30d14c5e4
++655eac1cc3c00012fe181b2c57987ce30d14c5e4
 +4e308b15bb671b9b0aff67f3ac19957e4764a578
 +4e308b15bb671b9b0aff67f3ac19957e4764a578
 +node-tap_11.0.0+ds1.orig.tar.gz
 +a966e402d2576793be990eb4e19de6db3b2ff98c
 +142580
 +component:522a8693bbe5af81223646d1122b3c8c10d6c430:14390:node-tap_11.0.0+ds1.orig-module-bind-obj-methods.tar.gz
 +component:cf25554ca050dc49ae6656b41de42258989dcbce:1047:node-tap_11.0.0+ds1.orig-module-fs-exists-cached.tar.gz
 +component:696c8dcd7c39b57a271e7652f8155c4aca24f653:1813:node-tap_11.0.0+ds1.orig-module-function-loop.tar.gz
 +component:9ef920fc81e2e63cf59d41101258368cf4fca4fb:1571:node-tap_11.0.0+ds1.orig-module-own-or-env.tar.gz
 +component:4e877fbeda9a2ec8000fbc0bcae39645ee8bf8dc:1333:node-tap_11.0.0+ds1.orig-module-own-or.tar.gz
 +component:078874f788e3463819aababb8397ce021adbfa1a:1566:node-tap_11.0.0+ds1.orig-module-trivial-deferred.tar.gz
 +component:a200ae8bf612dae9e7aa5a81c69d43ab9dd1e5a8:14855:node-tap_11.0.0+ds1.orig-module-tsame.tar.gz
 +component:f693f29a315b50d9a9da2646a7a6645c96985b6a:1882:node-tap_11.0.0+ds1.orig-module-yapool.tar.gz
diff --cc debian/patches/0013-Code-coverage-is-optional.patch
index 0000000,0000000..8c574f2
new file mode 100644
--- /dev/null
+++ b/debian/patches/0013-Code-coverage-is-optional.patch
@@@ -1,0 -1,0 +1,85 @@@
++From 655eac1cc3c00012fe181b2c57987ce30d14c5e4 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sun, 10 Sep 2017 23:11:03 +0200
++Subject: Code coverage is optional
++
++Forwarded: no
++---
++ bin/run.js   | 22 +++++++++++++++++++---
++ package.json |  2 +-
++ 2 files changed, 20 insertions(+), 4 deletions(-)
++
++diff --git a/bin/run.js b/bin/run.js
++index 862fdc8..13a96ee 100755
++--- a/bin/run.js
+++++ b/bin/run.js
++@@ -45,13 +45,17 @@ if (coverageServiceTest)
++ // Currently only Coveralls is supported, but the infrastructure
++ // is left in place in case some noble soul fixes the codecov
++ // module in the future.  See https://github.com/tapjs/node-tap/issues/270
++-const coverageServices = [
+++var coverageServices = []
+++try {
+++coverageServices.push(
++   {
++     env: 'COVERALLS_REPO_TOKEN',
++     bin: require.resolve('coveralls/bin/coveralls.js'),
++     name: 'Coveralls'
++   }
++-]
+++);
+++}
+++catch(e) {}
++ 
++ const main = _ => {
++   const args = process.argv.slice(2)
++@@ -94,7 +98,14 @@ const main = _ => {
++   /* istanbul ignore next */
++   if ((options.coverageReport || options.checkCoverage) &&
++       options.files.length === 0)
+++    {
+++    try {
++     return runCoverageReport(options)
+++    }
+++    catch(e) {
+++        console.warn("Code coverage is disabled because some modules are missing")
+++    }
+++    }
++ 
++   if (options.files.length === 0) {
++     console.error('Reading TAP data from stdin (use "-" argument to suppress)')
++@@ -112,8 +123,13 @@ const main = _ => {
++   // By definition, the next block cannot be covered, because
++   // they are only relevant when coverage is turned off.
++   /* istanbul ignore next */
++-  if (options.coverage && !global.__coverage__) {
+++  if (options.coverage && !global.__coverage__)
+++  {
+++  try {
++     return respawnWithCoverage(options)
+++  } catch(e) {
+++    console.warn("Code coverage is disabled because some modules are missing")
+++  }
++   }
++ 
++   setupTapEnv(options)
++diff --git a/package.json b/package.json
++index c470236..6c80859 100644
++--- a/package.json
+++++ b/package.json
++@@ -16,7 +16,6 @@
++     "bluebird": "^3.5.1",
++     "clean-yaml-object": "^0.1.0",
++     "supports-color" : "^3",
++-    "coveralls": "^2.13.3",
++     "foreground-child": "^1.3.3",
++     "fs-exists-cached": "^1.0.0",
++     "function-loop": "^1.0.1",
++@@ -40,6 +39,7 @@
++   },
++   "optionalDependencies" : {
++     "nyc": "^11.3.0",
+++    "coveralls": "^2.13.3",
++     "opener": "^1.4.1"
++   },
++   "keywords": [
diff --cc debian/patches/series
index 061119e,0000000..f712bc7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,12 -1,0 +1,13 @@@
 +0001-Opener-could-be-optional.patch
 +0002-Replace-color-support-by-supports-color.patch
 +0003-Render-nyc-optional.patch
 +0004-Do-not-use-osHomedir.patch
 +0005-Remove-test-that-fail-due-to-timing.patch
 +0006-Disable-a-test-that-fail.patch
 +0007-Do-not-use-module-touch.patch
 +0008-Use-built-tap.patch
 +0009-Disable-bluebird-for-stack.patch
 +0010-Remove-minipass.patch
 +0011-Disable-bluebird-on-test.patch
 +0012-Disable-test-for-disabled-feature.patch
++0013-Code-coverage-is-optional.patch

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