appium-instruments
Advanced tools
Comparing version 1.4.6 to 1.4.7
@@ -93,3 +93,3 @@ // Wrapper around Apple's Instruments app | ||
var opts = {timeout: INST_STALL_TIMEOUT}; | ||
exec(instrumentsPath + " -s devices", opts, function (err, stdout) { | ||
exec("'" + instrumentsPath + "' -s devices", opts, function (err, stdout) { | ||
if (err) return cb(err); | ||
@@ -329,4 +329,12 @@ var devices = []; | ||
var thirdpartyPath = path.resolve(__dirname, "../thirdparty"); | ||
var isXcode4 = this.xcodeVersion !== null && this.xcodeVersion[0] === '4'; | ||
var iwdPath = path.resolve(thirdpartyPath, isXcode4 ? "iwd4" : "iwd"); | ||
var xcodeVer = parseInt(this.xcodeVersion, 10); | ||
var iwdPath; | ||
if (xcodeVer === 4) { | ||
iwdPath = path.resolve(thirdpartyPath, "iwd4"); | ||
} else if (xcodeVer === 5) { | ||
iwdPath = path.resolve(thirdpartyPath, "iwd5"); | ||
} else { | ||
iwdPath = path.resolve(thirdpartyPath, "iwd"); | ||
} | ||
iwdPath = path.resolve(thirdpartyPath, iwdPath); | ||
env.CA_DEBUG_TRANSACTIONS = 1; | ||
@@ -337,4 +345,10 @@ if (this.withoutDelay && !this.udid) { | ||
} | ||
logger.debug("Spawning instruments with command: " + this.instrumentsPath + | ||
" " + args.join(" ")); | ||
var logArgs = [this.instrumentsPath].concat(_.clone(args)); | ||
logArgs = _.map(logArgs, function (arg) { | ||
if (arg.indexOf(" ") !== -1) { | ||
return '"' + arg + '"'; | ||
} | ||
return arg; | ||
}); | ||
logger.debug("Spawning instruments with command: " + logArgs.join(" ")); | ||
logger.debug("And extra without-delay env: " + JSON.stringify({ | ||
@@ -438,2 +452,3 @@ DYLD_INSERT_LIBRARIES: env.DYLD_INSERT_LIBRARIES, | ||
} | ||
output = output.replace(/\n$/m, ""); | ||
var logMsg = ("[INST STDERR] " + output); | ||
@@ -440,0 +455,0 @@ logMsg = logMsg.yellow; |
{ | ||
"name": "appium-instruments", | ||
"version": "1.4.6", | ||
"version": "1.4.7", | ||
"description": "IOS Instruments + instruments-without-delay launcher used by Appium", | ||
@@ -5,0 +5,0 @@ "main": "lib/main.js", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
991267
86
801
22