[Pkg-javascript-commits] [node-tap] 05/186: classify spawn

[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 e2110f2edd3ab52a08d2b4d107342d7dc4a2fbc3
Author: isaacs <i at izs.me>
Date:   Thu Jul 6 15:20:06 2017 -0700

    classify spawn
---
 lib/spawn.js | 219 ++++++++++++++++++++++++++++-------------------------------
 1 file changed, 104 insertions(+), 115 deletions(-)

diff --git a/lib/spawn.js b/lib/spawn.js
index e0c27c7..f48c83e 100644
--- a/lib/spawn.js
+++ b/lib/spawn.js
@@ -3,139 +3,128 @@ const Base = require('./base.js')
 
 const assert = require('assert')
 const util = require('util')
-util.inherits(Spawn, Base)
 const ownOr = require('own-or')
 const path = require('path')
 const cleanYamlObject = require('./clean-yaml-object.js')
 
-module.exports = Spawn
 
 const cp = require('child_process')
 const spawn = cp.spawn
 
-function Spawn (options) {
-  options = options || {}
-  if (!(this instanceof Spawn))
-    return new Spawn(options)
-
-  Base.call(this, options)
-
-  this.command = options.command
-
-  if (!this.command)
-    throw new TypeError('no command provided')
-
-  this.args = options.args
-  // stdout must be a pipe
-  if (options.stdio) {
-    if (typeof options.stdio === 'string')
-      this.stdio = [ options.stdio, 'pipe', options.stdio ]
-    else
-      this.stdio = options.stdio.slice(0)
-  } else
-    this.stdio = [ 0, 'pipe', 2 ]
-
-  this.stdio[1] = 'pipe'
-  const env = options.env || process.env
-  this.env = Object.keys(env).reduce(function (e, k) {
-    e[k] = env[k]
-    return e
-  }, {})
-
-  this.env.TAP = '1'
-  if (this.bail)
-    this.env.TAP_BAIL = '1'
-
-  this.cwd = ownOr(options, 'cwd', process.cwd())
-  options.cwd = this.cwd
-  if (!this.name) {
-    if (this.command === process.execPath) {
-      this.name = path.basename(process.execPath) + ' ' +
-        this.args.map(function (a) {
-          if (a.indexOf(this.cwd) === 0) {
-            return './' +
-              a.substr(this.cwd.length + 1).replace(/\\/g, '/')
-          } else {
-            return a
-          }
-        }, this).join(' ')
-    } else {
-      this.name = this.command + ' ' + this.args.join(' ')
+class Spawn extends Base {
+  constructor (options) {
+    options = options || {}
+    super(options)
+
+    this.command = options.command
+
+    if (!this.command)
+      throw new TypeError('no command provided')
+
+    this.args = options.args
+    // stdout must be a pipe
+    if (options.stdio) {
+      if (typeof options.stdio === 'string')
+        this.stdio = [ options.stdio, 'pipe', options.stdio ]
+      else
+        this.stdio = options.stdio.slice(0)
+    } else
+      this.stdio = [ 0, 'pipe', 2 ]
+
+    this.stdio[1] = 'pipe'
+    const env = options.env || process.env
+    this.env = Object.assign({}, env)
+
+    this.env.TAP = '1'
+    if (this.bail)
+      this.env.TAP_BAIL = '1'
+
+    this.cwd = ownOr(options, 'cwd', process.cwd())
+    options.cwd = this.cwd
+    if (!this.name) {
+      if (this.command === process.execPath) {
+        this.name = path.basename(process.execPath) + ' ' +
+          this.args.map(a =>
+            a.indexOf(this.cwd) === 0 ?
+              './' + a.substr(this.cwd.length + 1).replace(/\\/g, '/')
+            : a).join(' ')
+      } else {
+        this.name = this.command + ' ' + this.args.join(' ')
+      }
     }
-  }
 
-  this.proc = null
-}
+    this.proc = null
+  }
 
-Spawn.prototype.endAll = function () {
-  if (this.proc)
-    this.proc.kill('SIGKILL')
-  this.parser.abort('test unfinished')
-  this.cb()
-}
+  endAll () {
+    if (this.proc)
+      this.proc.kill('SIGKILL')
+    this.parser.abort('test unfinished')
+    this.cb()
+  }
 
-Spawn.prototype.main = function (cb) {
-  this.cb = cb
-  this.setTimeout(this.options.timeout)
-  const options = Object.keys(this.options).reduce(function (o, k) {
-    o[k] = this.options[k]
-    return o
-  }.bind(this), {
-    cwd: this.cwd,
-    env: this.env,
-    stdio: this.stdio
-  })
-  try {
-    const proc = this.proc = spawn(this.command, this.args, options)
-    proc.stdout.pipe(this.parser)
-    proc.on('close', this.onprocclose.bind(this))
-    proc.on('error', this.threw.bind(this))
-  } catch (er) {
-    this.threw(er)
+  main (cb) {
+    this.cb = cb
+    this.setTimeout(this.options.timeout)
+    const options = Object.assign({
+      cwd: this.cwd,
+      env: this.env,
+      stdio: this.stdio
+    }, this.options)
+    try {
+      const proc = this.proc = spawn(this.command, this.args, options)
+      proc.stdout.pipe(this.parser)
+      proc.on('close', this.onprocclose.bind(this))
+      proc.on('error', this.threw.bind(this))
+    } catch (er) {
+      this.threw(er)
+    }
   }
-}
 
-Spawn.prototype.threw = function (er, extra, proxy) {
-  extra = Base.prototype.threw.call(this, er, extra, proxy)
-  extra = cleanYamlObject(extra)
-  // unhook entirely
-  this.parser.abort(er.message, extra)
-  if (this.proc) {
-    this.proc.stdout.removeAllListeners('data')
-    this.proc.stdout.removeAllListeners('end')
-    this.proc.removeAllListeners('close')
-    this.proc.kill('SIGKILL')
+  threw (er, extra, proxy) {
+    extra = Base.prototype.threw.call(this, er, extra, proxy)
+    extra = cleanYamlObject(extra)
+    // unhook entirely
+    this.parser.abort(er.message, extra)
+    if (this.proc) {
+      this.proc.stdout.removeAllListeners('data')
+      this.proc.stdout.removeAllListeners('end')
+      this.proc.removeAllListeners('close')
+      this.proc.kill('SIGKILL')
+    }
+    this.cb()
   }
-  this.cb()
-}
 
-Spawn.prototype.onprocclose = function (code, signal) {
-  this.debug('SPAWN close %j %s', code, signal)
-  this.options.exitCode = code
-  if (signal)
-    this.options.signal = signal
-  this.results = this.results || {}
+  onprocclose (code, signal) {
+    this.debug('SPAWN close %j %s', code, signal)
+    this.options.exitCode = code
+    if (signal)
+      this.options.signal = signal
+    this.results = this.results || {}
 
-  // spawn closing with no tests is treated as a skip.
-  if (this.results.plan && this.results.plan.skipAll && !code && !signal)
-    this.options.skip = this.results.plan.skipReason || true
+    // spawn closing with no tests is treated as a skip.
+    if (this.results.plan && this.results.plan.skipAll && !code && !signal)
+      this.options.skip = this.results.plan.skipReason || true
 
-  if (code || signal) {
-    this.results.ok = false
-    this.parser.ok = false
+    if (code || signal) {
+      this.results.ok = false
+      this.parser.ok = false
+    }
+    return this.cb()
   }
-  return this.cb()
-}
 
-Spawn.prototype.timeout = function (extra) {
-  if (this.proc)
-    this.proc.kill('SIGTERM')
-  const t = setTimeout(function () {
-    if (!this.options.signal && this.options.exitCode === undefined) {
-      Base.prototype.timeout.call(this, extra)
-      this.proc.kill('SIGKILL')
-    }
-  }.bind(this), 1000)
-  if (t.unref)
-    t.unref()
+  timeout (extra) {
+    if (this.proc)
+      this.proc.kill('SIGTERM')
+    const t = setTimeout(() => {
+      if (!this.options.signal && this.options.exitCode === undefined) {
+        Base.prototype.timeout.call(this, extra)
+        this.proc.kill('SIGKILL')
+      }
+    }, 1000)
+    if (t.unref)
+      t.unref()
+  }
 }
+
+module.exports = Spawn

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