Repository: cordova-ios Updated Branches: refs/heads/master 48dfb42b9 -> 10bd67c22
Updated bundled iso-sim to 5.0.6 Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/10bd67c2 Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/10bd67c2 Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/10bd67c2 Branch: refs/heads/master Commit: 10bd67c220f7358bbe44a73c1f7b965232c30823 Parents: 48dfb42 Author: Shazron Abdullah <[email protected]> Authored: Wed Jan 6 17:17:42 2016 -0800 Committer: Shazron Abdullah <[email protected]> Committed: Wed Jan 6 17:17:42 2016 -0800 ---------------------------------------------------------------------- .../ios-sim/node_modules/simctl/README.md | 4 +-- .../simctl/lib/simctl-extensions.js | 19 ++++++++---- .../ios-sim/node_modules/simctl/package.json | 32 +++++--------------- bin/node_modules/ios-sim/package.json | 13 +++----- 4 files changed, 28 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/10bd67c2/bin/node_modules/ios-sim/node_modules/simctl/README.md ---------------------------------------------------------------------- diff --git a/bin/node_modules/ios-sim/node_modules/simctl/README.md b/bin/node_modules/ios-sim/node_modules/simctl/README.md index ded769b..b05a54b 100644 --- a/bin/node_modules/ios-sim/node_modules/simctl/README.md +++ b/bin/node_modules/ios-sim/node_modules/simctl/README.md @@ -1,3 +1,3 @@ -library for Xcode simctl utility on OS X +## library wrapper for Xcode's simctl utility on OS X -in experimental stage at the moment. \ No newline at end of file +Used by [ios-sim](https://www.npmjs.com/package/ios-sim) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/10bd67c2/bin/node_modules/ios-sim/node_modules/simctl/lib/simctl-extensions.js ---------------------------------------------------------------------- diff --git a/bin/node_modules/ios-sim/node_modules/simctl/lib/simctl-extensions.js b/bin/node_modules/ios-sim/node_modules/simctl/lib/simctl-extensions.js index 07c0e96..0a3e1a5 100644 --- a/bin/node_modules/ios-sim/node_modules/simctl/lib/simctl-extensions.js +++ b/bin/node_modules/ios-sim/node_modules/simctl/lib/simctl-extensions.js @@ -30,16 +30,23 @@ var shell = require('shelljs'), var extensions = { - start : function(deviceid) { + startByApp : function(appName, deviceid) { + var command = 'open -a "' + appName + '"'; if (!deviceid) { - var command = 'open -a "iOS Simulator"'; return shell.exec(command, { silent: true } ); } else { - var command = util.format('xcrun instruments -w "%s"', deviceid); + command += util.format(command + ' --args -CurrentDeviceUDID %s', deviceid); return shell.exec(command, { silent: true } ); } - }, - + }, + + start : function(deviceid) { + // try "iOS Simulator" first (Xcode 6), if that fails, try "Simulator" (Xcode 7) + if (extensions.startByApp('iOS Simulator', deviceid).code !== 0) { + extensions.startByApp('Simulator', deviceid); + } + }, + log : function(deviceid, filepath) { var tail = new Tail( path.join(process.env.HOME, 'Library/Logs/CoreSimulator', deviceid, 'system.log') @@ -61,7 +68,7 @@ var extensions = { tail.on("error", function(error) { console.error('ERROR: ', error); }); - + return tail; } }; http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/10bd67c2/bin/node_modules/ios-sim/node_modules/simctl/package.json ---------------------------------------------------------------------- diff --git a/bin/node_modules/ios-sim/node_modules/simctl/package.json b/bin/node_modules/ios-sim/node_modules/simctl/package.json index b07f754..9688441 100644 --- a/bin/node_modules/ios-sim/node_modules/simctl/package.json +++ b/bin/node_modules/ios-sim/node_modules/simctl/package.json @@ -1,6 +1,6 @@ { "name": "simctl", - "version": "0.0.6", + "version": "0.0.8", "description": "library for Xcode simctl utility on OS X", "repository": { "type": "git", @@ -19,31 +19,15 @@ "name": "Shazron Abdullah" }, "license": "MIT", - "gitHead": "0a13de1e055ee1f10985d5ee8cdba7cfa9227d6d", + "readme": "## library wrapper for Xcode's simctl utility on OS X\n\nUsed by [ios-sim](https://www.npmjs.com/package/ios-sim)", + "readmeFilename": "README.md", + "gitHead": "b8f7f570719961d9062bdab513fbb3cf8e295ff9", "bugs": { "url": "https://github.com/phonegap/simctl/issues"; }, - "homepage": "https://github.com/phonegap/simctl";, - "_id": "[email protected]", + "homepage": "https://github.com/phonegap/simctl#readme";, + "_id": "[email protected]", "scripts": {}, - "_shasum": "a7c820436bb42ad90cfbbeb19736a5d48688513f", - "_from": "simctl@>=0.0.6 <0.0.7", - "_npmVersion": "1.4.14", - "_npmUser": { - "name": "shazron", - "email": "[email protected]" - }, - "maintainers": [ - { - "name": "shazron", - "email": "[email protected]" - } - ], - "dist": { - "shasum": "a7c820436bb42ad90cfbbeb19736a5d48688513f", - "tarball": "http://registry.npmjs.org/simctl/-/simctl-0.0.6.tgz"; - }, - "directories": {}, - "_resolved": "https://registry.npmjs.org/simctl/-/simctl-0.0.6.tgz";, - "readme": "ERROR: No README data found!" + "_shasum": "94322d0270e45e08d732c232c913f8a8133af641", + "_from": "simctl@>=0.0.8 <0.0.9" } http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/10bd67c2/bin/node_modules/ios-sim/package.json ---------------------------------------------------------------------- diff --git a/bin/node_modules/ios-sim/package.json b/bin/node_modules/ios-sim/package.json index 2385282..a0e51df 100644 --- a/bin/node_modules/ios-sim/package.json +++ b/bin/node_modules/ios-sim/package.json @@ -1,9 +1,6 @@ { "name": "ios-sim", - "version": "5.0.3", - "os": [ - "darwin" - ], + "version": "5.0.6", "preferGlobal": "true", "description": "launch iOS apps into the iOS Simulator from the command line (Xcode 6.0+)", "main": "ios-sim.js", @@ -29,16 +26,16 @@ }, "license": "MIT", "dependencies": { - "simctl": "^0.0.6", + "simctl": "^0.0.8", "nopt": "1.0.9", "bplist-parser": "^0.0.6" }, "readme": "ios-sim\n=======\n\nSupports Xcode 6 only since version 3.x.\n\nThe ios-sim tool is a command-line utility that launches an iOS application on the iOS Simulator. This allows for niceties such as automated testing without having to open Xcode.\n\nFeatures\n--------\n\n* Choose the device family to simulate, i.e. iPhone or iPad. Run using \"showdevicetypes\" option to see available device types, and pass it in as the \"devicetypeid\" parameter.\n\nSee the `--help` option for more info.\n\nThe unimplemented options below are in the [backlog](https://github.com/phonegap/ios-sim/milestones/ios-sim%204.2.0)\n\nUsage\n-----\n\n```\n\n Usage: ios-sim <command> <options> [--args ...]\n \n Commands:\n showsdks List the available iOS SDK versions\n showdevicetypes List the available device types\n launch <application path> Launch the application at the specified path on the iOS Simulator\n start Launch iOS Simulator without an app\n install <application path> Install the application at the specified path on the iOS Simulator without launching the app\n\n Options:\n --version Print the version of ios-sim\n --help Show this help text\n --exit Exit after startup\n --log <log file path> The path where log of the app running in the Simulator will be redirected to\n --devicetypeid <device type> The id of the device type that should be simulated (Xcode6+). Use 'showdevicetypes' to list devices.\n e.g \"com.apple.CoreSimulator.SimDeviceType.Resizable-iPhone6, 8.0\"\n \n Removed in version 4.x:\n --stdout <stdout file path> The path where stdout of the simulator will be redirected to (defaults to stdout of ios-sim)\n --stderr <stderr file path> The path w here stderr of the simulator will be redirected to (defaults to stderr of ios-sim)\n --sdk <sdkversion> The iOS SDK version to run the application on (defaults to the latest)\n --family <device family> The device type that should be simulated (defaults to `iphone')\n --retina Start a retina device\n --tall In combination with --retina flag, start the tall version of the retina device (e.g. iPhone 5 (4-inch))\n --64bit In combination with --retina flag and the --tall flag, start the 64bit version of the tall retina device (e.g. iPhone 5S (4-inch 64bit))\n \n Unimplemented in this version:\n --verbose Set the output level to verbose\n --timeout <seconds> The timeout time to wait for a response from the Simulator. Default value: 30 seconds\n --args <...> All followin g arguments will be passed on to the application\n --env <environment file path> A plist file containing environment key-value pairs that should be set\n --setenv NAME=VALUE Set an environment variable\n \n```\n\nInstallation\n------------\n\nChoose one of the following installation methods.\n\n### Node JS\n\nInstall using node.js (at least 0.10.20):\n\n $ npm install ios-sim -g\n\n### Zip\n\nDownload a zip file:\n\n $ curl -L https://github.com/phonegap/ios-sim/archive/master.zip -o ios-sim.zip\n $ unzip ios-sim.zip\n\n### Git\n\nDownload using git clone:\n\n $ git clone git://github.com/phonegap/ios-sim.git\n\nTroubleshooting\n---------------\n\nMake sure you enable Developer Mode on your machine:\n\n $ DevToolsSecurity -enable\n\nMake sure multiple instances of launchd_sim are not running:\n\n $ killall launchd_sim\n\nLicense\n-------\n\nThis project is available under the MIT license. See [LICENSE][licens e].\n\n[license]: https://github.com/phonegap/ios-sim/blob/master/LICENSE\n";, "readmeFilename": "README.md", - "gitHead": "d0dd865bd9b35b0d324ab37dc93126735a309ffb", + "gitHead": "5ae111d494f547c301b00e068cbd8aef46cf3988", "homepage": "https://github.com/phonegap/ios-sim#readme";, - "_id": "[email protected]", + "_id": "[email protected]", "scripts": {}, - "_shasum": "152c724258f22e13cbfa9b67d55a5300e9920af1", + "_shasum": "15c8e34aa9ed79df9edea26260efbba803fae7c6", "_from": "ios-sim@*" } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
