Fix adb invocations (#202)

lib/units/device/resources/minitouch.js

@@ -9,11 +9,13 @@ var pathutil = require('../../../util/pathutil')
 var devutil = require('../../../util/devutil')
 var streamutil = require('../../../util/streamutil')
 var Resource = require('./util/resource')
+var DeviceClient = require('@devicefarmer/adbkit/dist/src/adb/DeviceClient').default
 
 module.exports = syrup.serial()
   .dependency(require('../support/adb'))
   .dependency(require('../support/abi'))
   .define(function(options, adb, abi) {
+    var deviceClient = new DeviceClient(adb, options.serial)
     var log = logger.createLogger('device:resources:minitouch')
 
     var resources = {
@@ -35,7 +37,7 @@ module.exports = syrup.serial()
     }
 
     function removeResource(res) {
-      return adb.shell(options.serial, ['rm', '-f', res.dest])
+      return deviceClient.shell(['rm', '-f', res.dest])
         .timeout(10000)
         .then(function(out) {
           return streamutil.readAll(out)
@@ -44,7 +46,7 @@ module.exports = syrup.serial()
     }
 
     function pushResource(res) {
-      return adb.push(options.serial, res.src, res.dest, res.mode)
+      return deviceClient.push(res.src, res.dest, res.mode)
         .timeout(10000)
         .then(function(transfer) {
           return new Promise(function(resolve, reject) {
@@ -59,7 +61,7 @@ module.exports = syrup.serial()
       log.info('Installing "%s" as "%s"', res.src, res.dest)
 
       function checkExecutable(res) {
-        return adb.stat(options.serial, res.dest)
+        return deviceClient.stat(res.dest)
           .timeout(5000)
           .then(function(stats) {
             // Can't use fs.constants.S_IXUSR due to differences on Windows.
@@ -107,7 +109,7 @@ module.exports = syrup.serial()
         return {
           bin: resources.bin.dest
         , run: function(cmd) {
-            return adb.shell(options.serial, util.format(
+            return deviceClient.shell(util.format(
               'exec %s%s'
             , resources.bin.dest
             , cmd ? util.format(' %s', cmd) : ''