node-simctl - npm Package Compare versions

Comparing version 3.1.0 to 3.1.1

build/lib/simctl.js

@@ -27,6 +27,7 @@ 'use strict';
 
-function simExec(command, timeout) {
+function simCommand(command, timeout) {
   var args = arguments.length <= 2 || arguments[2] === undefined ? [] : arguments[2];
   var env = arguments.length <= 3 || arguments[3] === undefined ? {} : arguments[3];
-  return _regeneratorRuntime.async(function simExec$(context$1$0) {
+  var executingFunction = arguments.length <= 4 || arguments[4] === undefined ? _teen_process.exec : arguments[4];
+  return _regeneratorRuntime.async(function simCommand$(context$1$0) {
     while (1) switch (context$1$0.prev = context$1$0.next) {
@@ -44,3 +45,3 @@ case 0:
         context$1$0.prev = 3;
-        return context$1$0.abrupt('return', (0, _teen_process.exec)('xcrun', args, { timeout: timeout, env: env }));
+        return context$1$0.abrupt('return', executingFunction('xcrun', args, { timeout: timeout, env: env }));
 
@@ -64,2 +65,47 @@ case 7:
 
+function simExec(command, timeout) {
+  var args = arguments.length <= 2 || arguments[2] === undefined ? [] : arguments[2];
+  var env = arguments.length <= 3 || arguments[3] === undefined ? {} : arguments[3];
+  return _regeneratorRuntime.async(function simExec$(context$1$0) {
+    while (1) switch (context$1$0.prev = context$1$0.next) {
+      case 0:
+        return context$1$0.abrupt('return', simCommand(command, timeout, args, env, function (c, a, ob) {
+          return (0, _teen_process.exec)(c, a, ob);
+        }));
+
+      case 1:
+      case 'end':
+        return context$1$0.stop();
+    }
+  }, null, this);
+}
+
+function simSubProcess(command, timeout) {
+  var args = arguments.length <= 2 || arguments[2] === undefined ? [] : arguments[2];
+  var env = arguments.length <= 3 || arguments[3] === undefined ? {} : arguments[3];
+  return _regeneratorRuntime.async(function simSubProcess$(context$1$0) {
+    var _this = this;
+
+    while (1) switch (context$1$0.prev = context$1$0.next) {
+      case 0:
+        return context$1$0.abrupt('return', simCommand(command, timeout, args, env, function callee$1$0(c, a, ob) {
+          return _regeneratorRuntime.async(function callee$1$0$(context$2$0) {
+            while (1) switch (context$2$0.prev = context$2$0.next) {
+              case 0:
+                return context$2$0.abrupt('return', new _teen_process.SubProcess(c, a, ob));
+
+              case 1:
+              case 'end':
+                return context$2$0.stop();
+            }
+          }, null, _this);
+        }));
+
+      case 1:
+      case 'end':
+        return context$1$0.stop();
+    }
+  }, null, this);
+}
+
 function installApp(udid, appPath) {
@@ -116,2 +162,5 @@ return _regeneratorRuntime.async(function installApp$(context$1$0) {
       case 2:
+        return context$1$0.abrupt('return', context$1$0.sent);
+
+      case 3:
       case 'end':
@@ -123,2 +172,20 @@ return context$1$0.stop();
 
+function spawnSubProcess(udid, executablePath) {
+  var env = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
+  return _regeneratorRuntime.async(function spawnSubProcess$(context$1$0) {
+    while (1) switch (context$1$0.prev = context$1$0.next) {
+      case 0:
+        context$1$0.next = 2;
+        return _regeneratorRuntime.awrap(simSubProcess('spawn', 0, [udid, executablePath], env));
+
+      case 2:
+        return context$1$0.abrupt('return', context$1$0.sent);
+
+      case 3:
+      case 'end':
+        return context$1$0.stop();
+    }
+  }, null, this);
+}
+
 function shutdown(udid) {
@@ -170,9 +237,26 @@ return _regeneratorRuntime.async(function shutdown$(context$1$0) {
 function deleteDevice(udid) {
+  var loopFn;
   return _regeneratorRuntime.async(function deleteDevice$(context$1$0) {
+    var _this2 = this;
+
     while (1) switch (context$1$0.prev = context$1$0.next) {
       case 0:
-        context$1$0.next = 2;
-        return _regeneratorRuntime.awrap(simExec('delete', 0, [udid]));
+        loopFn = function loopFn() {
+          return _regeneratorRuntime.async(function loopFn$(context$2$0) {
+            while (1) switch (context$2$0.prev = context$2$0.next) {
+              case 0:
+                context$2$0.next = 2;
+                return _regeneratorRuntime.awrap(simExec('delete', 0, [udid]));
 
-      case 2:
+              case 2:
+              case 'end':
+                return context$2$0.stop();
+            }
+          }, null, _this2);
+        };
+
+        context$1$0.next = 3;
+        return _regeneratorRuntime.awrap((0, _asyncbox.retryInterval)(5, 200, loopFn));
+
+      case 3:
       case 'end':
@@ -187,3 +271,3 @@ return context$1$0.stop();
   return _regeneratorRuntime.async(function eraseDevice$(context$1$0) {
-    var _this = this;
+    var _this3 = this;
 
@@ -203,3 +287,3 @@ while (1) switch (context$1$0.prev = context$1$0.next) {
             }
-          }, null, _this);
+          }, null, _this3);
         };
@@ -404,2 +488,3 @@
 exports.spawn = spawn;
+exports.spawnSubProcess = spawnSubProcess;
 exports.shutdown = shutdown;
@@ -411,2 +496,4 @@ exports.createDevice = createDevice;
 
+// retry delete with a sleep in between because it's flakey
+
 // retry erase with a sleep in between because it's flakey
@@ -434,2 +521,2 @@
 // otherwise return all the sdk -> device mappings.
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["lib/simctl.js"],"names":[],"mappings":"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","file":"lib/simctl.js","sourcesContent":["import { exec } from 'teen_process';\nimport { retryInterval } from 'asyncbox';\nimport { getLogger } from 'appium-logger';\nimport _ from 'lodash';\n\n\nconst log = getLogger('simctl');\n\nasync function simExec (command:string, timeout:number, args:Array = [],\n    env = {}) {\n  // run a particular simctl command\n  args = ['simctl', command, ...args];\n  log.info(`Executing: xcrun with args: ${args.join(' ')} and timeout: ${timeout}`);\n  // Prefix all passed in environment variables with 'SIMCTL_CHILD_', simctl\n  // will then pass these to the child (spawned) process.\n  env = _.defaults(_.mapKeys(env, function(value, key) {\n    return 'SIMCTL_CHILD_' + key;\n  }), process.env);\n\n  try {\n    return exec('xcrun', args, {timeout, env});\n  } catch (e) {\n    if (e.stderr) {\n      log.errorAndThrow(`simctl error: ${e.stderr.trim()}`);\n    } else {\n      log.errorAndThrow(e);\n    }\n  }\n}\n\nasync function installApp (udid:string, appPath:string):void {\n  await simExec('install', 0, [udid, appPath]);\n}\n\nasync function removeApp (udid:string, bundleId:string):void {\n  await simExec('uninstall', 0, [udid, bundleId]);\n}\n\nasync function launch (udid:string, bundleId:string):void {\n  await simExec('launch', 0, [udid, bundleId]);\n}\n\nasync function spawn (udid:string, executablePath:string, env = {}):void {\n  await simExec('spawn', 0, [udid, executablePath], env);\n}\n\nasync function shutdown (udid:string):void {\n  await simExec('shutdown', 0, [udid]);\n}\n\nasync function createDevice (name:string, deviceTypeId:string,\n    runtimeId:string):void {\n  let out;\n  try {\n    out = await simExec('create', 0, [name, deviceTypeId, runtimeId]);\n  } catch (e) {\n    log.errorAndThrow(`Could not create simulator. Reason: ${e.stderr.trim()}`);\n  }\n  return out.stdout.trim();\n}\n\nasync function deleteDevice (udid:string):void {\n  await simExec('delete', 0, [udid]);\n}\n\nasync function eraseDevice (udid:string):void {\n  let loopFn:Function = async () => {\n    await simExec('erase', 2000, [udid]);\n  };\n  // retry erase with a sleep in between because it's flakey\n  await retryInterval(5, 200, loopFn);\n}\n\nasync function getDevices (forSdk:string = null):Object {\n  // get the list of devices\n  let { stdout } = await simExec('list', 0, ['devices']);\n\n  // expect to get a listing like\n  // -- iOS 8.1 --\n  //     iPhone 4s (3CA6E7DD-220E-45E5-B716-1E992B3A429C) (Shutdown)\n  //     ...\n  // -- iOS 8.2 --\n  //     iPhone 4s (A99FFFC3-8E19-4DCF-B585-7D9D46B4C16E) (Shutdown)\n  //     ...\n  // so, get the `-- iOS X.X --` line to find the sdk (X.X)\n  // and the rest of the listing in order to later find the devices\n  let deviceSectionRe:RegExp = /-- iOS (.+) --(\\n    .+)*/mg;\n  let matches:Array = [];\n  let match:Object = deviceSectionRe.exec(stdout);\n\n  // make an entry for each sdk version\n  while (match !== null) {\n    matches.push(match);\n    match = deviceSectionRe.exec(stdout);\n  }\n  if (matches.length < 1) {\n    log.errorAndThrow('Could not find device section');\n  }\n\n  // get all the devices for each sdk\n  let devices:Object = {};\n  for (match of matches) {\n    let sdk:string = match[1];\n    devices[sdk] = [];\n    // split the full match into lines and remove the first\n    for (let line:string of match[0].split('\\n').slice(1)) {\n      // a line is something like\n      //    iPhone 4s (A99FFFC3-8E19-4DCF-B585-7D9D46B4C16E) (Shutdown)\n      // retrieve:\n      //   iPhone 4s\n      //   A99FFFC3-8E19-4DCF-B585-7D9D46B4C16E\n      //   Shutdown\n      let lineRe:RegExp = /^    ([^\\(]+) \\(([^\\)]+)\\) \\(([^\\)]+)\\)/;\n      let lineMatch:Object = lineRe.exec(line);\n      if (lineMatch === null) {\n        throw new Error('Could not match line');\n      }\n      // save the whole thing as ab object in the list for this sdk\n      devices[sdk].push({\n        name: lineMatch[1],\n        udid: lineMatch[2],\n        state: lineMatch[3],\n      });\n    }\n  }\n\n  // if a `forSdk` was passed in, return only the corresponding list\n  if (forSdk) {\n    if (!devices[forSdk]) {\n      throw new Error(`Sdk '${forSdk}' was not in list of simctl sdks`);\n    }\n    return devices[forSdk];\n  }\n\n  // otherwise return all the sdk -> device mappings.\n  return devices;\n}\n\nexport { installApp, removeApp, launch, spawn, shutdown, createDevice,\n         deleteDevice, eraseDevice, getDevices };\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["lib/simctl.js"],"names":[],"mappings":"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","file":"lib/simctl.js","sourcesContent":["import { exec, SubProcess } from 'teen_process';\nimport { retryInterval } from 'asyncbox';\nimport { getLogger } from 'appium-logger';\nimport _ from 'lodash';\n\n\nconst log = getLogger('simctl');\n\nasync function simCommand (command:string, timeout:number, args:Array = [], env = {}, executingFunction = exec) {\n  // run a particular simctl command\n  args = ['simctl', command, ...args];\n  log.info(`Executing: xcrun with args: ${args.join(' ')} and timeout: ${timeout}`);\n  // Prefix all passed in environment variables with 'SIMCTL_CHILD_', simctl\n  // will then pass these to the child (spawned) process.\n  env = _.defaults(_.mapKeys(env, function(value, key) {\n    return 'SIMCTL_CHILD_' + key;\n  }), process.env);\n\n  try {\n    return executingFunction('xcrun', args, {timeout, env});\n  } catch (e) {\n    if (e.stderr) {\n      log.errorAndThrow(`simctl error: ${e.stderr.trim()}`);\n    } else {\n      log.errorAndThrow(e);\n    }\n  }\n}\n\nasync function simExec (command:string, timeout:number, args:Array = [], env = {}) {\n  return simCommand(command, timeout, args, env, (c, a, ob) => {\n    return exec(c, a, ob);\n  });\n}\n\nasync function simSubProcess (command:string, timeout:number, args:Array = [], env = {}) {\n  return simCommand(command, timeout, args, env, async (c, a, ob) => {\n    return new SubProcess(c, a, ob);\n  });\n}\n\nasync function installApp (udid:string, appPath:string):void {\n  await simExec('install', 0, [udid, appPath]);\n}\n\nasync function removeApp (udid:string, bundleId:string):void {\n  await simExec('uninstall', 0, [udid, bundleId]);\n}\n\nasync function launch (udid:string, bundleId:string):void {\n  await simExec('launch', 0, [udid, bundleId]);\n}\n\nasync function spawn (udid:string, executablePath:string, env = {}):void {\n  return await simExec('spawn', 0, [udid, executablePath], env);\n}\n\nasync function spawnSubProcess (udid:string, executablePath:string, env = {}):void {\n  return await simSubProcess('spawn', 0, [udid, executablePath], env);\n}\n\nasync function shutdown (udid:string):void {\n  await simExec('shutdown', 0, [udid]);\n}\n\nasync function createDevice (name:string, deviceTypeId:string,\n    runtimeId:string):void {\n  let out;\n  try {\n    out = await simExec('create', 0, [name, deviceTypeId, runtimeId]);\n  } catch (e) {\n    log.errorAndThrow(`Could not create simulator. Reason: ${e.stderr.trim()}`);\n  }\n  return out.stdout.trim();\n}\n\nasync function deleteDevice (udid:string):void {\n  let loopFn:Function = async () => {\n    await simExec('delete', 0, [udid]);\n  };\n  // retry delete with a sleep in between because it's flakey\n  await retryInterval(5, 200, loopFn);\n}\n\nasync function eraseDevice (udid:string):void {\n  let loopFn:Function = async () => {\n    await simExec('erase', 2000, [udid]);\n  };\n  // retry erase with a sleep in between because it's flakey\n  await retryInterval(5, 200, loopFn);\n}\n\nasync function getDevices (forSdk:string = null):Object {\n  // get the list of devices\n  let { stdout } = await simExec('list', 0, ['devices']);\n\n  // expect to get a listing like\n  // -- iOS 8.1 --\n  //     iPhone 4s (3CA6E7DD-220E-45E5-B716-1E992B3A429C) (Shutdown)\n  //     ...\n  // -- iOS 8.2 --\n  //     iPhone 4s (A99FFFC3-8E19-4DCF-B585-7D9D46B4C16E) (Shutdown)\n  //     ...\n  // so, get the `-- iOS X.X --` line to find the sdk (X.X)\n  // and the rest of the listing in order to later find the devices\n  let deviceSectionRe:RegExp = /-- iOS (.+) --(\\n    .+)*/mg;\n  let matches:Array = [];\n  let match:Object = deviceSectionRe.exec(stdout);\n\n  // make an entry for each sdk version\n  while (match !== null) {\n    matches.push(match);\n    match = deviceSectionRe.exec(stdout);\n  }\n  if (matches.length < 1) {\n    log.errorAndThrow('Could not find device section');\n  }\n\n  // get all the devices for each sdk\n  let devices:Object = {};\n  for (match of matches) {\n    let sdk:string = match[1];\n    devices[sdk] = [];\n    // split the full match into lines and remove the first\n    for (let line:string of match[0].split('\\n').slice(1)) {\n      // a line is something like\n      //    iPhone 4s (A99FFFC3-8E19-4DCF-B585-7D9D46B4C16E) (Shutdown)\n      // retrieve:\n      //   iPhone 4s\n      //   A99FFFC3-8E19-4DCF-B585-7D9D46B4C16E\n      //   Shutdown\n      let lineRe:RegExp = /^    ([^\\(]+) \\(([^\\)]+)\\) \\(([^\\)]+)\\)/;\n      let lineMatch:Object = lineRe.exec(line);\n      if (lineMatch === null) {\n        throw new Error('Could not match line');\n      }\n      // save the whole thing as ab object in the list for this sdk\n      devices[sdk].push({\n        name: lineMatch[1],\n        udid: lineMatch[2],\n        state: lineMatch[3],\n      });\n    }\n  }\n\n  // if a `forSdk` was passed in, return only the corresponding list\n  if (forSdk) {\n    if (!devices[forSdk]) {\n      throw new Error(`Sdk '${forSdk}' was not in list of simctl sdks`);\n    }\n    return devices[forSdk];\n  }\n\n  // otherwise return all the sdk -> device mappings.\n  return devices;\n}\n\nexport { installApp, removeApp, launch, spawn, spawnSubProcess, shutdown, createDevice,\n         deleteDevice, eraseDevice, getDevices };\n"]}

lib/simctl.js

@@ -1,2 +0,2 @@
-import { exec } from 'teen_process';
+import { exec, SubProcess } from 'teen_process';
 import { retryInterval } from 'asyncbox';
@@ -9,4 +9,3 @@ import { getLogger } from 'appium-logger';
 
-async function simExec (command:string, timeout:number, args:Array = [],
-    env = {}) {
+async function simCommand (command:string, timeout:number, args:Array = [], env = {}, executingFunction = exec) {
   // run a particular simctl command
@@ -22,3 +21,3 @@ args = ['simctl', command, ...args];
   try {
-    return exec('xcrun', args, {timeout, env});
+    return executingFunction('xcrun', args, {timeout, env});
   } catch (e) {
@@ -33,2 +32,14 @@ if (e.stderr) {
 
+async function simExec (command:string, timeout:number, args:Array = [], env = {}) {
+  return simCommand(command, timeout, args, env, (c, a, ob) => {
+    return exec(c, a, ob);
+  });
+}
+
+async function simSubProcess (command:string, timeout:number, args:Array = [], env = {}) {
+  return simCommand(command, timeout, args, env, async (c, a, ob) => {
+    return new SubProcess(c, a, ob);
+  });
+}
+
 async function installApp (udid:string, appPath:string):void {
@@ -47,5 +58,9 @@ await simExec('install', 0, [udid, appPath]);
 async function spawn (udid:string, executablePath:string, env = {}):void {
-  await simExec('spawn', 0, [udid, executablePath], env);
+  return await simExec('spawn', 0, [udid, executablePath], env);
 }
 
+async function spawnSubProcess (udid:string, executablePath:string, env = {}):void {
+  return await simSubProcess('spawn', 0, [udid, executablePath], env);
+}
+
 async function shutdown (udid:string):void {
@@ -67,3 +82,7 @@ await simExec('shutdown', 0, [udid]);
 async function deleteDevice (udid:string):void {
-  await simExec('delete', 0, [udid]);
+  let loopFn:Function = async () => {
+    await simExec('delete', 0, [udid]);
+  };
+  // retry delete with a sleep in between because it's flakey
+  await retryInterval(5, 200, loopFn);
 }
@@ -144,3 +163,3 @@
 
-export { installApp, removeApp, launch, spawn, shutdown, createDevice,
+export { installApp, removeApp, launch, spawn, spawnSubProcess, shutdown, createDevice,
          deleteDevice, eraseDevice, getDevices };

package.json

@@ -9,3 +9,3 @@ {
   ],
-  "version": "3.1.0",
+  "version": "3.1.1",
   "author": "https://github.com/appium",
@@ -33,3 +33,4 @@ "license": "Apache-2.0",
     "source-map-support": "^0.2.8",
-    "teen_process": "^1.3.1"
+    "teen_process": "^1.3.1",
+    "lodash": "^3.10.1"
   },
@@ -44,5 +45,4 @@ "scripts": {
     "chai": "^3.2.0",
-    "gulp": "^3.9.0",
-    "lodash": "^3.10.1"
+    "gulp": "^3.9.0"
   }
 }

README.md

@@ -157,5 +157,14 @@ ## node-simctl
 
+`spawn(udid, executablePath, env)`
 
+ - spawns a process on the simulator specified by `udid` with given environment variable in `env`
+
+`spawnSubProcess(udid, executablePath, env)`
+
+ - spawns a process on the simulator specified by `udid` with given environment variable in `env`
+ - returns a (SubProcess)[https://github.com/appium/node-teen_process#teen_processsubprocess] object.
+
+
 ### Usage
 
 See [specs](test/simctl-specs.js) for examples of usage.

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

66273

increased by10.48%

Dev dependency count

3

decreased by-25%

Lines of code

813

increased by12.29%

Number of lines in readme file

170

increased by5.59%

Worsened metrics

Dependency count

6

increased by20%

Dependency changes

• + Addedlodash@^3.10.1

• + Addedlodash@3.10.1(transitive)