Skip to content

feat: make run-ios output leaner #472

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 5, 2019
Merged

feat: make run-ios output leaner #472

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa629e4
feat: make run-ios output leaner
thymikee Jul 4, 2019
f173eb4
--ammend
thymikee Jul 4, 2019
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
56 changes: 35 additions & 21 deletions packages/platform-ios/src/commands/runIOS/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ function runIOS(_: Array<string>, ctx: ConfigT, args: FlagsT) {
const scheme = args.scheme || inferredSchemeName;

logger.info(
`Found Xcode ${xcodeProject.isWorkspace ? 'workspace' : 'project'} ${
xcodeProject.name
}`,
`Found Xcode ${
xcodeProject.isWorkspace ? 'workspace' : 'project'
} "${chalk.bold(xcodeProject.name)}"`,
);

const {device, udid} = args;
Expand Down Expand Up @@ -161,14 +161,12 @@ async function runOnSimulator(xcodeProject, scheme, args: FlagsT) {

const appPath = getBuildPath(args.configuration, appName, false, scheme);

logger.info(`Installing ${appPath}`);
logger.info(`Installing "${chalk.bold(appPath)}"`);

child_process.spawnSync(
'xcrun',
['simctl', 'install', selectedSimulator.udid, appPath],
{
stdio: 'inherit',
},
{stdio: 'inherit'},
);

const bundleID = child_process
Expand All @@ -180,15 +178,20 @@ async function runOnSimulator(xcodeProject, scheme, args: FlagsT) {
// $FlowExpectedError https://github.com/facebook/flow/issues/5675
.trim();

logger.info(`Launching ${bundleID}`);
logger.info(`Launching "${chalk.bold(bundleID)}"`);

child_process.spawnSync(
'xcrun',
['simctl', 'launch', selectedSimulator.udid, bundleID],
{
stdio: 'inherit',
},
);
const result = child_process.spawnSync('xcrun', [
'simctl',
'launch',
selectedSimulator.udid,
bundleID,
]);

if (result.status === 0) {
logger.success('Successfully launched the app on the simulator');
} else {
logger.error('Failed to launch the app on simulator', result.stderr);
}
}

async function runOnDevice(selectedDevice, scheme, xcodeProject, args: FlagsT) {
Expand Down Expand Up @@ -221,7 +224,7 @@ async function runOnDevice(selectedDevice, scheme, xcodeProject, args: FlagsT) {
'--justlaunch',
];

logger.info(`Installing and launching your app on ${selectedDevice.name}...`);
logger.info(`Installing and launching your app on ${selectedDevice.name}`);

const iosDeployOutput = child_process.spawnSync(
'ios-deploy',
Expand Down Expand Up @@ -254,7 +257,11 @@ function buildProject(xcodeProject, udid, scheme, args: FlagsT) {
'-derivedDataPath',
`build/${scheme}`,
];
logger.info(`Building using "xcodebuild ${xcodebuildArgs.join(' ')}"`);
logger.info(
`Building ${chalk.dim(
`(using "xcodebuild ${xcodebuildArgs.join(' ')}")`,
)}`,
);
let xcpretty;
if (!args.verbose) {
xcpretty =
Expand All @@ -271,11 +278,16 @@ function buildProject(xcodeProject, udid, scheme, args: FlagsT) {
let buildOutput = '';
let errorOutput = '';
buildProcess.stdout.on('data', data => {
buildOutput += data.toString();
const stringData = data.toString();
buildOutput += stringData;
if (xcpretty) {
xcpretty.stdin.write(data);
} else {
logger.info(data.toString());
if (logger.isVerbose()) {
logger.debug(stringData);
} else {
process.stdout.write('.');
}
}
});
buildProcess.stderr.on('data', data => {
Expand All @@ -284,6 +296,8 @@ function buildProject(xcodeProject, udid, scheme, args: FlagsT) {
buildProcess.on('close', code => {
if (xcpretty) {
xcpretty.stdin.end();
} else {
process.stdout.write('\n');
}
if (code !== 0) {
reject(
Expand All @@ -295,7 +309,7 @@ function buildProject(xcodeProject, udid, scheme, args: FlagsT) {
logs further, consider building your app with Xcode.app, by opening
${xcodeProject.name}.
`,
errorOutput,
buildOutput + '\n' + errorOutput,
),
);
return;
Expand All @@ -307,7 +321,7 @@ function buildProject(xcodeProject, udid, scheme, args: FlagsT) {

function bootSimulator(selectedSimulator) {
const simulatorFullName = formattedDeviceName(selectedSimulator);
logger.info(`Launching ${simulatorFullName}...`);
logger.info(`Launching ${simulatorFullName}`);
try {
child_process.spawnSync('xcrun', [
'instruments',
Expand Down