Skip to content

[TIMOB-23636] Fixed device pairing for Xcode 8. Also updated node-ios… #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 29, 2016
Merged

[TIMOB-23636] Fixed device pairing for Xcode 8. Also updated node-ios… #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ac8ea9
[TIMOB-23636] Fixed device pairing for Xcode 8. Also updated node-ios…
cb1kenobi Jul 28, 2016
538181d
Updated unit test to not check devicePairs since it was removed.
cb1kenobi Jul 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 60 additions & 48 deletions lib/simulator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,27 +80,27 @@ const deviceStateNames = exports.deviceStateNames = {
* what Watch Simulator. It's a mystery!
*/
const devicePairCompatiblity = exports.devicePairCompatiblity = {
'>=6.2 <7.0': { // Xcode 6.2, 6.3, 6.4
'>=8.2 <9.0': { // iOS 8.2, 8.3, 8.4
'1.x': true // watchOS 1.0
'>=6.2 <7.0': { // Xcode 6.2, 6.3, 6.4
'>=8.2 <9.0': { // iOS 8.2, 8.3, 8.4
'1.x': true // watchOS 1.0
}
},
'7.x': { // Xcode 7.0
'>=8.2 <9.0': { // iOS 8.2, 8.3, 8.4
'1.x': true // watchOS 1.0
'7.x': { // Xcode 7.x
'>=8.2 <9.0': { // iOS 8.2, 8.3, 8.4
'1.x': true // watchOS 1.0
},
'9.x': { // iOS 9.0
'2.x': true // watchOS 2.0
'9.x': { // iOS 9.x
'2.x': true // watchOS 2.x
}
},
'8.x': {
'9.x': {
'2.x': true,
'3.x': true
'8.x': { // Xcode 8.x
'9.x': { // iOS 9.x
'2.x': true, // watchOS 2.x
'3.x': true // watchOS 3.x
},
'10.x': {
'2.x': true,
'3.x': true
'10.x': { // iOS 10.x
'2.x': true, // watchOS 2.x
'3.x': true // watchOS 3.x
}
}
};
Expand Down Expand Up @@ -165,7 +165,6 @@ function detect(options, callback) {
simulators: {
ios: {},
watchos: {},
devicePairs: {},
crashDir: appc.fs.resolvePath('~/Library/Logs/DiagnosticReports'),
},
issues: []
Expand Down Expand Up @@ -296,17 +295,6 @@ function detect(options, callback) {
});
});

// load the device pairs
var deviceSetPlist = readPlist(path.join(coreSimDir, 'device_set.plist'));
if (deviceSetPlist && deviceSetPlist.DevicePairs) {
Object.keys(deviceSetPlist.DevicePairs).forEach(function (udid) {
results.simulators.devicePairs[udid] = {
phone: deviceSetPlist.DevicePairs[udid].companion,
watch: deviceSetPlist.DevicePairs[udid].gizmo
};
});
}

// the cache must be a clean copy that we'll clone for subsequent detect() calls
// because we can't allow the cache to be modified by reference
cache = JSON.parse(JSON.stringify(results));
Expand Down Expand Up @@ -1133,31 +1121,54 @@ function launch(simHandleOrUDID, options, callback) {
return next();
}

// we need to pair, check if we're already paired
if (Object.keys(simInfo.simulators.devicePairs).some(function (udid) { var dp = simInfo.simulators.devicePairs[udid]; return dp.phone === simHandle.udid && dp.watch === watchSimHandle.udid; })) {
// already paired!
emitter.emit('log-debug', __('iOS and watchOS simulators already paired'));
return next();
}
emitter.emit('log-debug', __('Running: %s', selectedXcode.executables.simctl + ' list pairs --json'));
appc.subprocess.run(selectedXcode.executables.simctl, ['list', 'pairs', '--json'], function (code, out, err) {
if (code) {
return next(code ? new Error(err.trim()) : null);
}

var devicePairs;
try {
devicePairs = JSON.parse(out.substring(out.indexOf('{'))).pairs;
} catch (e) {
return next(e);
}

// we need to pair, check if we're already paired
if (Object.keys(devicePairs).some(function (udid) {
var dp = devicePairs[udid];
return dp.phone.udid === simHandle.udid && dp.watch.udid === watchSimHandle.udid;
})) {
// already paired!
emitter.emit('log-debug', __('iOS and watchOS simulators already paired'));
return next();
}

// check if we need to unpair
async.eachSeries(Object.keys(devicePairs), function (udid, next) {
var dp = devicePairs[udid];
if (dp.phone.udid !== simHandle.udid && dp.watch.udid !== watchSimHandle.udid) {
return next();
}

// check if we need to unpair
async.eachSeries(Object.keys(simInfo.simulators.devicePairs), function (udid, next) {
var dp = simInfo.simulators.devicePairs[udid];
if (dp.phone === simHandle.udid || dp.watch === watchSimHandle.udid) {
emitter.emit('log-debug', __('Unpairing iOS and watchOS simulator pair: %s', udid));
var args = ['unpair', udid];
emitter.emit('log-debug', __('Running: %s', selectedXcode.executables.simctl + ' ' + args.join(' ')));
appc.subprocess.run(selectedXcode.executables.simctl, args, next);
} else {
next();
}
}, function () {
// pair!
emitter.emit('log-debug', __('Pairing iOS and watchOS simulator pair: %s -> %s', watchSimHandle.udid, simHandle.udid));
var args = ['pair', watchSimHandle.udid, simHandle.udid];
emitter.emit('log-debug', __('Running: %s', selectedXcode.executables.simctl + ' ' + args.join(' ')));
appc.subprocess.run(selectedXcode.executables.simctl, args, function (code, out, err) {
next(code);
appc.subprocess.run(selectedXcode.executables.simctl, args, function (code, out, err) {
next(code ? new Error(err.trim()) : null);
});
}, function (err) {
if (err) {
return next(err);
}

// pair!
emitter.emit('log-debug', __('Pairing iOS and watchOS simulator pair: %s -> %s', watchSimHandle.udid, simHandle.udid));
var args = ['pair', watchSimHandle.udid, simHandle.udid];
emitter.emit('log-debug', __('Running: %s', selectedXcode.executables.simctl + ' ' + args.join(' ')));
appc.subprocess.run(selectedXcode.executables.simctl, args, function (code, out, err) {
next(code ? new Error(err.trim()) : null);
});
});
});
},
Expand Down Expand Up @@ -1334,6 +1345,7 @@ function launch(simHandleOrUDID, options, callback) {
}
], function (err) {
if (err) {
emitter.emit('error', err);
return callback(err);
}

Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
},
"dependencies": {
"always-tail": "0.2.0",
"async": "1.5.2",
"async": "2.0.1",
"bplist-parser": "0.1.1",
"mkdirp": "0.5.1",
"node-appc": "0.2.36",
"node-ios-device": "0.9.5"
"node-ios-device": "0.10.1"
},
"devDependencies": {
"mocha": "^2.5.3",
"should": "^9.0.2"
"should": "^10.0.0"
},
"scripts": {
"test": "mocha --require test/init --reporter spec --check-leaks test/",
Expand Down
12 changes: 1 addition & 11 deletions test/test-simulator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ describe('simulator', function () {
should(results).have.keys('simulators', 'issues');

should(results.simulators).be.an.Object;
should(results.simulators).have.keys('ios', 'watchos', 'devicePairs', 'crashDir');
should(results.simulators).have.keys('ios', 'watchos', 'crashDir');

should(results.simulators.ios).be.an.Object;
Object.keys(results.simulators.ios).forEach(function (ver) {
Expand All @@ -184,16 +184,6 @@ describe('simulator', function () {
checkSims(results.simulators.watchos[ver]);
});

should(results.simulators.devicePairs).be.an.Object;
Object.keys(results.simulators.devicePairs).forEach(function (udid) {
should(results.simulators.devicePairs[udid]).be.an.Object;
should(results.simulators.devicePairs[udid]).have.keys('phone', 'watch');
should(results.simulators.devicePairs[udid].phone).be.a.String;
should(results.simulators.devicePairs[udid].phone).not.equal('');
should(results.simulators.devicePairs[udid].watch).be.a.String;
should(results.simulators.devicePairs[udid].watch).not.equal('');
});

should(results.simulators.crashDir).be.a.String;
should(results.simulators.crashDir).not.equal('');
if (fs.existsSync(results.simulators.crashDir)) {
Expand Down