[ENG-4968] better spinner placement for multiple builds (#1105)

* better spinner placement for multiple builds * update CHANGELOG.md
expo · May 17, 2022 · 607838c · 607838c
1 parent 34ecd38
commit 607838c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🧹 Chores
 
 - Update dependencies. ([#1095](https://github.com/expo/eas-cli/pull/1095) by [@dsokal](https://github.com/dsokal))
+- Better spinner placement for multiple builds. ([#1105](https://github.com/expo/eas-cli/pull/1105) by [@dsokal](https://github.com/dsokal))
 
 ## [0.52.0](https://github.com/expo/eas-cli/releases/tag/v0.52.0) - 2022-04-26
 

diff --git a/packages/eas-cli/src/build/build.ts b/packages/eas-cli/src/build/build.ts
@@ -231,16 +231,23 @@ export async function waitForBuildEndAsync(
     intervalSec = 10,
   } = {}
 ): Promise<MaybeBuildFragment[]> {
-  const b = `build${buildIds.length > 1 ? 's' : ''}`;
-  Log.log(`Waiting for ${b} to complete. You can press Ctrl+C to exit.`);
-  const spinner = ora(`Waiting for ${b} to complete.`).start();
+  let spinner;
+  let originalSpinnerText;
+  if (buildIds.length === 1) {
+    Log.log('Waiting for build to complete. You can press Ctrl+C to exit.');
+    originalSpinnerText = 'Waiting for build to complete.';
+    spinner = ora(originalSpinnerText).start();
+  } else {
+    originalSpinnerText = 'Waiting for builds to complete. You can press Ctrl+C to exit.';
+    spinner = ora('Waiting for builds to complete. You can press Ctrl+C to exit.').start();
+  }
   const endTime = new Date().getTime() + timeoutSec * 1000;
   while (new Date().getTime() <= endTime) {
     const builds = await getBuildsSafelyAsync(buildIds);
     const { refetch } =
       builds.length === 1
         ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
-        : await handleMultipleBuildsProgressAsync({ builds }, { spinner });
+        : await handleMultipleBuildsProgressAsync({ builds }, { spinner, originalSpinnerText });
     if (!refetch) {
       return builds;
     }
@@ -373,7 +380,7 @@ const platforms = [AppPlatform.Android, AppPlatform.Ios];
 
 async function handleMultipleBuildsProgressAsync(
   { builds: maybeBuilds }: { builds: MaybeBuildFragment[] },
-  { spinner }: { spinner: Ora }
+  { spinner, originalSpinnerText }: { spinner: Ora; originalSpinnerText: string }
 ): Promise<BuildProgressResult> {
   const buildCount = maybeBuilds.length;
   const builds = maybeBuilds.filter<BuildFragment>(isBuildFragment);
@@ -393,7 +400,7 @@ async function handleMultipleBuildsProgressAsync(
     }
     return { refetch: false };
   } else {
-    spinner.text = formatPendingBuildsText(builds);
+    spinner.text = formatPendingBuildsText(originalSpinnerText, builds);
     return { refetch: true };
   }
 }
@@ -412,9 +419,10 @@ function formatSettledBuildsText(builds: BuildFragment[]): string {
     .join('\n  ');
 }
 
-function formatPendingBuildsText(builds: BuildFragment[]): string {
-  return platforms
-    .map(platform => {
+function formatPendingBuildsText(originalSpinnerText: string, builds: BuildFragment[]): string {
+  return [
+    originalSpinnerText,
+    ...platforms.map(platform => {
       const build = builds.find(build => build.platform === platform);
       const status = build ? statusToDisplayName[build.status] : 'unknown';
       let extraInfo = '';
@@ -437,8 +445,8 @@ function formatPendingBuildsText(builds: BuildFragment[]): string {
       return `${appPlatformEmojis[platform]} ${
         appPlatformDisplayNames[platform]
       } build - status: ${chalk.bold(status)}${extraInfo}`;
-    })
-    .join('\n  ');
+    }),
+  ].join('\n  ');
 }
 
 function isBuildFragment(maybeBuild: MaybeBuildFragment): maybeBuild is BuildFragment {