Skip to content

Commit

Permalink
chore: v3.1.0
Browse files Browse the repository at this point in the history 
fix: Added new Xcode 11 simulator runtime and device types search paths.
feat: Added 'info' and 'reset-sims' commands to 'ioslib' CLI.
feat: Added 'coreSimulatorProfilesPaths' to Xcode info object. [DAEMON-250]
  • Loading branch information
@cb1kenobi
cb1kenobi committed Jul 8, 2019
1 parent 90e090b commit c170cf6
Show file tree
Hide file tree
Showing 4 changed files with 133 additions and 26 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
@@ -1,3 +1,10 @@
# 3.1.0 (Jul 8, 2019)

* fix: Added new Xcode 11 simulator runtime and device types search paths.
* feat: Added `info` and `reset-sims` commands to `ioslib` CLI.
* feat: Added `coreSimulatorProfilesPaths` to Xcode info object.
[(DAEMON-250)](https://jira.appcelerator.org/browse/DAEMON-250)

# 3.0.0 (Jul 2, 2019)

* BREAKING CHANGE: Dropped support for Node.js versions before v8.12.0.
Expand Down
142 changes: 117 additions & 25 deletions bin/ioslib
View file
Expand Up @@ -3,37 +3,75 @@
const CLI = require('cli-kit').CLI;
const ioslib = require('../dist/index');
const pkgJson = require('../package.json');
const { spawnSync } = require('child_process');

new CLI({
banner: `${pkgJson.name}, version ${pkgJson.version}`,
commands: {
'detect-device-pairs': {
action: detectDevicePairs,
args: [
{
name: 'xcode-path',
desc: 'The path to Xcode to use'
}
],
desc: 'Detects all valid iOS and watchOS simulator pairs'
},
devices: {
desc: 'lists connected devices',
async action() {
const devices = await ioslib.devices.getDevices();
console.log(JSON.stringify(devices, null, ' '));
}
},
desc: 'Lists connected devices'
},
info: {
async action({ argv }) {
const info = {};
const types = argv.types
? Array.from(new Set(argv.types.split(','))).filter(Boolean)
: [ 'certs', 'keychains', 'provisioning', 'simulator', 'teams', 'xcode' ];
for (const type of types) {
switch (type) {
case 'certs': info.certs = await ioslib.certs.getCerts(); break;
case 'keychains': info.keychains = await ioslib.keychains.getKeychains(); break;
case 'provisioning': info.provisioning = await ioslib.provisioning.getProvisioningProfiles(); break;
case 'simulator': info.simulator = await ioslib.simulator.getSimulators(); break;
case 'teams': info.teams = await ioslib.teams.getTeams(); break;
case 'xcode': info.xcode = await ioslib.xcode.getXcodes(); break;
}
}
console.log(JSON.stringify(info, null, ' '));
},
aliases: 'detect',
args: [
{
name: 'types',
desc: 'Comma-separated list of types to detect'
}
],
desc: 'Detects installed Xcode and iOS information'
},
'reset-sims': {
action: resetSims,
args: [
{
name: 'xcode-path',
desc: 'The path to Xcode to use'
}
],
desc: 'Removes all simulators and recreates them'
},
track: {
aliases: [ 'trackdevices', 'track-devices' ],
desc: 'listens for devices to be connected/disconnected',
async action() {
const handle = ioslib.devices.trackDevices();
handle.on('devices', devices => {
console.log(JSON.stringify(devices, null, ' '));
console.log();
});
}
},
'detect-device-pairs': {
action: detectDevicePairs,
args: [
{
name: 'xcode-path',
desc: 'the path to Xcode to use'
}
],
desc: 'detects all valid iOS and watchOS simulator pairs'
},
aliases: [ 'trackdevices', 'track-devices' ],
desc: 'Listens for devices to be connected/disconnected'
}
},
help: true,
Expand All @@ -45,14 +83,10 @@ new CLI({
process.exit(err.exitCode || 1);
});

function detectDevicePairs({ argv }) {
const { existsSync } = require('fs');
function getSimCtl(xcodePath) {
const path = require('path');
const { spawnSync } = require('child_process');

const { existsSync } = require('fs');
let last;
let simctl;
let { xcodePath } = argv;

if (xcodePath) {
xcodePath = path.join(xcodePath, 'Contents');
Expand All @@ -73,8 +107,13 @@ function detectDevicePairs({ argv }) {
throw new Error('Unable to locate simctl');
}

const testSimName = "ioslib_test_sim";
return simctl;
}

function detectDevicePairs({ argv }) {
const startTime = Date.now();
const simctl = getSimCtl(argv.xcodePath);
const testSimName = "ioslib_test_sim";

const getInfo = () => {
return JSON.parse(spawnSync(simctl, [ 'list', '--json' ]).stdout.toString());
Expand Down Expand Up @@ -137,9 +176,9 @@ function detectDevicePairs({ argv }) {

const stats = {
iPhoneSimsCreated: 0,
watchSimsCreated: 0,
pairings: 0,
pairSuccess: 0
watchSimsCreated: 0,
pairings: 0,
pairSuccess: 0
};

// create the watch sims
Expand Down Expand Up @@ -217,3 +256,56 @@ function detectDevicePairs({ argv }) {
console.log();
console.log(results);
}

function resetSims({ argv }) {
const startTime = Date.now();
const simctl = getSimCtl(argv.xcodePath);
const json = JSON.parse(spawnSync(simctl, [ 'list', '--json' ]).stdout.toString());
const stats = {
simsRemoved: 0,
iPhoneSimsCreated: 0,
tvSimsCreated: 0,
watchSimsCreated: 0
};
const runtimeRegExp = /(iOS|tvOS|watchOS)/;

for (const runtime of Object.keys(json.devices)) {
for (const device of json.devices[runtime]) {
console.log(`Removing ${device.name} (${device.udid})`);
spawnSync(simctl, [ 'delete', device.udid ]);
stats.simsRemoved++;
}
}
console.log();

for (const deviceType of json.devicetypes) {
for (const runtime of json.runtimes) {
if (runtime.isAvailable || runtime.availability === '(available)') {
process.stdout.write(`Creating ${deviceType.name} with ${runtime.name}... `);
try {
spawnSync(simctl, [ 'create', `${deviceType.name} ${runtime.name}`, deviceType.identifier, runtime.identifier ]);
console.log('SUCCESS!');

const m = runtime.identifier.match(runtimeRegExp);
switch (m && m[0]) {
case 'iOS': stats.iPhoneSimsCreated++; break;
case 'tvOS': stats.tvSimsCreated++; break;
case 'watchOS': stats.watchSimsCreated++; break;
}
} catch (e) {
console.log(`FAILED! ${e.toString()}`);
}
}
}
}
console.log();

const delta = Date.now() - startTime;
const minutes = Math.floor(delta / 60000);
const seconds = (delta % 60000) / 1000;
console.log(`Completed in ${minutes}m ${seconds}s\n`);
console.log(`Sims Removed: ${stats.simsRemoved}`);
console.log(`iPhone Sims Created: ${stats.iPhoneSimsCreated}`);
console.log(`TV Sims Created: ${stats.tvSimsCreated}`);
console.log(`Watch Sims Created: ${stats.watchSimsCreated}`);
}
2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,6 +1,6 @@
{
"name": "ioslib",
"version": "3.0.0",
"version": "3.1.0",
"publishConfig": {
"tag": "next"
},
Expand Down
8 changes: 8 additions & 0 deletions src/xcode.js
View file
Expand Up @@ -96,6 +96,7 @@ export class Xcode {
xcodebuild
};
this.eulaAccepted = spawnSync(xcodebuild, [ '-checkFirstLaunchStatus' ]).status === 0;
this.coreSimulatorProfilesPaths = [];
this.sdks = {
ios: this.findSDKs('iPhoneOS'),
watchos: this.findSDKs('WatchOS')
Expand All @@ -115,7 +116,11 @@ export class Xcode {
// note: Xcode 9 moved CoreSimulator into the "xxxxOS" directory instead of the "xxxxSimulator" directory
this.findDeviceTypesAndRuntimes(globalSimProfilesPath);
for (const name of [ 'iPhoneSimulator', 'iPhoneOS', 'WatchSimulator', 'WatchOS' ]) {
// Xcode 10 and older
this.findDeviceTypesAndRuntimes(path.join(this.path, `Platforms/${name}.platform/Developer/Library/CoreSimulator/Profiles`));

// Xcode 11 and newer
this.findDeviceTypesAndRuntimes(path.join(this.path, `Platforms/${name}.platform/Library/Developer/CoreSimulator/Profiles`));
}

for (const name of [ 'Simulator', 'iOS Simulator' ]) {
Expand Down Expand Up @@ -187,6 +192,9 @@ export class Xcode {
return;
}

// add the path
this.coreSimulatorProfilesPaths.push(dir);

// device types
const deviceTypesDir = path.join(dir, 'DeviceTypes');
if (isDir(deviceTypesDir)) {
Expand Down

0 comments on commit c170cf6

Please sign in to comment.