Skip to content

Commit

Permalink
Merge pull request #6136 from cb1kenobi/timob-17601
Browse files Browse the repository at this point in the history
[TIMOB-17601] Updated to the latest ioslib which includes a hack for mak...
  • Loading branch information
skypanther committed Sep 22, 2014
2 parents 346c3e0 + 6c1c8ac commit 0347682
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 24 deletions.
23 changes: 17 additions & 6 deletions iphone/cli/hooks/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ exports.init = function (logger, config, cli) {
logger.info(__('Launching iOS Simulator'));

var simStarted = false,
relaunched = false,
startLogTxt = __('Start simulator log'),
endLogTxt = __('End simulator log'),
endLog = function () {
Expand All @@ -44,13 +45,23 @@ exports.init = function (logger, config, cli) {
logFilename: builder.tiapp.guid + '.log',
simType: builder.iosSimType,
simVersion: builder.iosSimVersion,
killIfRunning: true
}).on('app-started', function (simHandle) {
finished && finished();
finished = null;
simStarted = true;
logger.log(('-- ' + startLogTxt + ' ' + (new Array(75 - startLogTxt.length)).join('-')).grey);
killIfRunning: true,
relaunchIfStartFail: true,
relaunchMaxFailures: config.get('ios.relaunchMaxFailures')
}).on('relaunch', function (syslog) {
relaunched = true;
logger.debug(__('App failed to properly start, retrying...'));
syslog && syslog.split('\n').forEach(function (line) {
logger.trace(line);
});
}).on('log-file', function (line) {
if (!simStarted) {
finished && finished();
finished = null;
simStarted = true;
relaunched && logger.log();
logger.log(('-- ' + startLogTxt + ' ' + (new Array(75 - startLogTxt.length)).join('-')).grey);
}
var m = line.match(logLevelRE);
if (m) {
lastLogger = m[2].toLowerCase();
Expand Down
74 changes: 66 additions & 8 deletions node_modules/ioslib/lib/simulator.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions node_modules/ioslib/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"ejs": "~0.8.4",
"fields": "~0.1.16",
"humanize": "~0.0.9",
"ioslib": "0.2.4",
"ioslib": "0.2.5",
"moment": "~2.4.0",
"node-appc": "0.2.17",
"node-uuid": "~1.4.1",
Expand Down

0 comments on commit 0347682

Please sign in to comment.