clean unuse

bin/macaca-client-doctor

@@ -15,15 +15,14 @@
 'use strict';
 
 var co = require('co');
-var os = require('os');
 var program = require('commander');
-var doctor = require('../lib').doctor;
+var Doctor = require('macaca-doctor');
+
 var _ = require('../lib/common/helper');
 var logger = require('../lib/common/logger');
 
 var options = {
-  verbose: false,
-  arch: os.arch()
+  verbose: false
 };
 
 program
@@ -32,4 +31,6 @@ program
 
 _.merge(options, _.getConfig(program));
 
-co(doctor, options);
+var doctor = new Doctor(options);
+
+co(doctor.check);

lib/common/helper.js

@@ -14,5 +14,71 @@
 'use strict';
 
 var _ = require('macaca-utils');
+let childProcess = require('child_process');
+
+_.exec = function(cmd, opts) {
+  return new Promise(function(resolve, reject) {
+    childProcess.exec(cmd, _.merge({
+      maxBuffer: 1024 * 512,
+      wrapArgs: false
+    }, opts || {}), function(err, stdout) {
+      if (err) {
+        return reject(err);
+      }
+      resolve(_.trim(stdout));
+    });
+  });
+};
+
+_.spawn = function() {
+  var args = Array.prototype.slice.call(arguments);
+  return new Promise(function(resolve, reject) {
+    var stdout = '';
+    var stderr = '';
+    var child = childProcess.spawn.apply(childProcess, args);
+
+    child.on('error', function(error) {
+      reject(error);
+    });
+
+    child.stdout.on('data', function(data) {
+      stdout += data;
+    });
+
+    child.stderr.on('data', function(data) {
+      stderr += data;
+    });
+
+    child.on('close', function(code) {
+      var error;
+      if (code) {
+        error = new Error(stderr);
+        error.code = code;
+        return reject(error);
+      }
+      resolve([stdout, stderr]);
+    });
+  });
+};
+
+_.sleep = function(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+};
+
+_.retry = function(func, interval, num) {
+  return new Promise((resolve, reject) => {
+    func().then(resolve, err => {
+      if (num > 0 || typeof num === 'undefined') {
+        _.sleep(interval).then(() => {
+          resolve(_.retry(func, interval, num - 1));
+        });
+      } else {
+        reject(err);
+      }
+    });
+  });
+};
 
 module.exports = _;

lib/index.js

@@ -15,4 +15,3 @@
 
 exports.Runner = require('./run');
 exports.server = require('./server');
-exports.doctor = require('./doctor');

lib/run/index.js

@@ -15,10 +15,11 @@
 
 var co = require('co');
 var util = require('util');
-var server = require('../server');
 var Mocha = require('macaca-mocha');
 var EventEmitter = require('events').EventEmitter;
 
+var server = require('../server');
+
 function Runner(options) {
   EventEmitter.call(this);
   this.options = options;
@@ -36,11 +37,10 @@ Runner.prototype.init = function() {
 };
 
 Runner.prototype.startServer = function() {
-  var that = this;
   co(server, {
     port: 3456
-  }, function(webdriverServer) {
-    that.initMocha(webdriverServer);
+  }, webdriverServer => {
+    this.initMocha(webdriverServer);
   });
 };
 
@@ -51,20 +51,20 @@ Runner.prototype.initMocha = function(webdriverServer) {
     colors: this.options.colors
   });
 
-  mocha.on('data', function(data) {
+  mocha.on('data', data => {
     this.emit('data', data);
-  }.bind(this));
+  });
 
-  mocha.on('error', function(data) {
+  mocha.on('error', data => {
     this.emit('error', data);
-  }.bind(this));
+  });
 
-  mocha.on('close', function(data) {
+  mocha.on('close', data => {
     this.emit('close', data);
     process.send({
       signal: 'kill'
     });
-  }.bind(this));
+  });
 
   this.mocha = mocha;
 };

lib/server/server.js

@@ -16,9 +16,10 @@
 var fs = require('fs');
 var path = require('path');
 var detect = require('detect-port');
-var logger = require('../common/logger');
 var Webdriver = require('webdriver-server');
 
+var logger = require('../common/logger');
+
 var file = path.join(__dirname, '..', '..', '.config.json');
 
 function *parseOptions(options) {

lib/server/signal.js

@@ -17,7 +17,6 @@ var fs = require('fs');
 var path = require('path');
 var server = require('../server');
 var logger = require('../common/logger');
-var spawn = require('../common/spawn-promise');
 
 var file = path.join(__dirname, '..', '..', '.config.json');
 
@@ -30,7 +29,7 @@ function killPorcess() {
       try {
         var options = JSON.parse(data);
         var pid = options.pid;
-        var kill = spawn('kill', ['-SIGKILL', pid])
+        var kill = _.spawn('kill', ['-SIGKILL', pid])
           .then(function() {
             logger.info('server process quit pid:%d', pid);
             return options;