Update other .success/.error that need to stop

Author: pvdz

src/commands/diff-scan/get-diff-scan.ts

@@ -36,7 +36,9 @@ export async function getDiffScan(
 
   if (!response.ok) {
     const err = await handleAPIError(response.status)
-    spinner.error(`${colors.bgRed(colors.white(response.statusText))}: ${err}`)
+    spinner.errorAndStop(
+      `${colors.bgRed(colors.white(response.statusText))}: ${err}`
+    )
     return
   }
 

src/commands/fix/run-fix.ts

@@ -113,7 +113,7 @@ export async function runFix() {
                 // eslint-disable-next-line no-await-in-loop
                 await editablePkgJson.save()
               } catch {
-                spinner.error(`Reverting ${name} to ${oldVersion}`)
+                spinner.errorAndStop(`Reverting ${name} to ${oldVersion}`)
                 spinner.start()
                 arb.idealTree = revertToIdealTree
               }

src/commands/info/format-package-info.ts

@@ -58,7 +58,7 @@ export function formatPackageInfo(
       )
       formatPackageIssuesDetails(data, outputMarkdown)
     } else {
-      spinner.success('Package has no issues')
+      spinner.successAndStop('Package has no issues')
     }
 
     const format = new ColorOrMarkdown(!!outputMarkdown)

src/commands/login/attempt-login.ts

@@ -55,7 +55,7 @@ export async function attemptLogin(
     orgs = result.data
     spinner.success('API key verified')
   } catch {
-    spinner.error('Invalid API key')
+    spinner.errorAndStop('Invalid API key')
     return
   }
 
@@ -97,8 +97,8 @@ export async function attemptLogin(
   const oldToken = getSetting('apiToken')
   try {
     applyLogin(apiToken, enforcedOrgs, apiBaseUrl, apiProxy)
-    spinner.success(`API credentials ${oldToken ? 'updated' : 'set'}`)
+    spinner.successAndStop(`API credentials ${oldToken ? 'updated' : 'set'}`)
   } catch {
-    spinner.error(`API login failed`)
+    spinner.errorAndStop(`API login failed`)
   }
 }

src/commands/manifest/convert_gradle_to_maven.ts

@@ -53,15 +53,15 @@ export async function convertGradleToMaven(
     const output = await spawn(bin, commandArgs, {
       cwd: target || '.'
     })
-    spinner.success()
+    spinner.stop()
     if (verbose) {
       console.group('[VERBOSE] gradle stdout:')
       console.log(output)
       console.groupEnd()
     }
 
     if (output.stderr) {
-      spinner.error('There were errors while running gradle')
+      spinner.errorAndStop('There were errors while running gradle')
       // (In verbose mode, stderr was printed above, no need to repeat it)
       if (!verbose) {
         console.group('[VERBOSE] stderr:')
@@ -71,6 +71,9 @@ export async function convertGradleToMaven(
       process.exit(1)
     }
 
+    spinner.start()
+    spinner.successAndStop('Executed gradle successfully')
+
     console.log('Reported exports:')
     output.stdout.replace(
       /^POM file copied to: (.*)/gm,
@@ -82,7 +85,7 @@ export async function convertGradleToMaven(
 
     // const loc = output.stdout?.match(/Wrote (.*?.pom)\n/)?.[1]?.trim()
     // if (!loc) {
-    //   spinner.error(
+    //   spinner.errorAndStop(
     //     'There were no errors from sbt but could not find the location of resulting .pom file either'
     //   )
     //   process.exit(1)
@@ -104,11 +107,11 @@ export async function convertGradleToMaven(
     //   }
     //   // TODO: do we prefer fs-extra? renaming can be gnarly on windows and fs-extra's version is better
     //   await renamep(loc, out)
-    //   spinner.success()
+    //   spinner.successAndStop()
     //   spinner.start().success(`OK. File should be available in \`${out}\``)
     // }
   } catch (e) {
-    spinner.error(
+    spinner.errorAndStop(
       'There was an unexpected error while running this' +
         (verbose ? '' : ' (use --verbose for details)')
     )

src/commands/manifest/convert_sbt_to_maven.ts

@@ -43,15 +43,16 @@ export async function convertSbtToMaven(
     const output = await spawn(bin, ['makePom'].concat(sbtOpts), {
       cwd: target || '.'
     })
-    spinner.success()
+    spinner.successAndStop()
     if (verbose) {
       console.group('[VERBOSE] sbt stdout:')
       console.log(output)
       console.groupEnd()
     }
 
     if (output.stderr) {
-      spinner.error('There were errors while running sbt')
+      spinner.start()
+      spinner.errorAndStop('There were errors while running sbt')
       // (In verbose mode, stderr was printed above, no need to repeat it)
       if (!verbose) {
         console.group('[VERBOSE] stderr:')
@@ -68,7 +69,7 @@ export async function convertSbtToMaven(
     })
 
     if (!poms.length) {
-      spinner.error(
+      spinner.errorAndStop(
         'There were no errors from sbt but it seems to not have generated any poms either'
       )
       process.exit(1)
@@ -106,7 +107,7 @@ export async function convertSbtToMaven(
       spinner.start().success(`OK`)
     }
   } catch (e) {
-    spinner.error(
+    spinner.errorAndStop(
       'There was an unexpected error while running this' +
         (verbose ? '' : ' (use --verbose for details)')
     )

src/commands/repos/create-repo.ts

@@ -43,7 +43,7 @@ export async function createRepo({
   )
 
   if (result.success) {
-    spinner.success('Repository created successfully')
+    spinner.successAndStop('Repository created successfully')
   } else {
     handleUnsuccessfulApiResponse('createOrgRepo', result, spinner)
   }

src/commands/repos/delete-repo.ts

@@ -18,7 +18,7 @@ export async function deleteRepo(
   )
 
   if (result.success) {
-    spinner.success('Repository deleted successfully')
+    spinner.successAndStop('Repository deleted successfully')
   } else {
     handleUnsuccessfulApiResponse('deleteOrgRepo', result, spinner)
   }

src/commands/repos/update-repo.ts

@@ -43,7 +43,7 @@ export async function updateRepo({
   )
 
   if (result.success) {
-    spinner.success('Repository updated successfully')
+    spinner.successAndStop('Repository updated successfully')
   } else {
     handleUnsuccessfulApiResponse('updateOrgRepo', result, spinner)
   }

src/commands/scan/delete-full-scan.ts

@@ -18,7 +18,7 @@ export async function deleteOrgFullScan(
   )
 
   if (result.success) {
-    spinner.success('Scan deleted successfully')
+    spinner.successAndStop('Scan deleted successfully')
   } else {
     handleUnsuccessfulApiResponse('deleteOrgFullScan', result, spinner)
   }