@kud/soap-cli 3.0.6 → 3.0.9

package/dist/index.js

@@ -176,7 +176,7 @@ var getCaskInfo = async (caskName) => {
     let appName = null;
     for (const artifact of caskData.artifacts) {
       if (artifact.app) {
-        appName = artifact.app[0];
+        appName = artifact.app[0] || null;
         break;
       }
     }
@@ -243,7 +243,7 @@ var firstArg = rawArgs[0];
 var param = rawArgs.find((a) => !a.startsWith("-"));
 var yes = rawArgs.includes("--yes") || rawArgs.includes("-y");
 if (firstArg === "--version" || firstArg === "-v") {
-  console.log("3.0.6");
+  console.log("3.0.9");
   process.exit(0);
 }
 if (!firstArg || firstArg === "--help" || firstArg === "-h") {
@@ -346,18 +346,50 @@ try {
     }
   ]);
   if (!isAppFilesEmpty && deletedFilesWish && deletedFilesWish.length > 0) {
-    await trash(deletedFilesWish);
+    const skipped = [];
+    const moved = [];
+    for (const file of deletedFilesWish) {
+      try {
+        await trash(file);
+        moved.push(file);
+      } catch {
+        skipped.push(file);
+      }
+    }
     console.log("");
-    signale.success(
-      `Moved ${chalk.bold(deletedFilesWish.length)} file(s) to Trash:`
-    );
-    deletedFilesWish.forEach(
-      (p) => console.log(`  ${chalk.dim("\xB7")} ${chalk.dim(p)}`)
-    );
+    if (moved.length > 0) {
+      signale.success(`Moved ${chalk.bold(moved.length)} file(s) to Trash:`);
+      moved.forEach((p) => console.log(`  ${chalk.dim("\xB7")} ${chalk.dim(p)}`));
+    }
+    if (skipped.length > 0) {
+      console.log("");
+      signale.warn(
+        `Skipped ${chalk.bold(skipped.length)} file(s) \u2014 no permission (may require sudo):`
+      );
+      skipped.forEach((p) => console.log(`  ${chalk.dim("\xB7")} ${chalk.dim(p)}`));
+    }
   } else if (!isAppFilesEmpty) {
     signale.info("No files selected \u2014 nothing moved to Trash.");
   }
   if (isCask && deletedCaskWish) {
+    const isAdmin = (await $2`id -Gn`).stdout.trim().split(" ").includes("admin");
+    if (!isAdmin && !yes) {
+      const { ready } = await inquirer.prompt([
+        {
+          type: "confirm",
+          name: "ready",
+          message: `This step requires admin rights and you don't appear to have them.
+Can you become an admin before we proceed?`,
+          default: false
+        }
+      ]);
+      if (!ready) {
+        signale.info("Skipped Homebrew uninstall.");
+        console.log("");
+        signale.success("Done.");
+        process.exit(0);
+      }
+    }
     console.log("");
     signale.pending("Running Homebrew uninstall\u2026");
     await $2`brew uninstall --zap ${param}`;
@@ -365,14 +397,14 @@ try {
   console.log("");
   signale.success("Done.");
 } catch (error) {
+  const message = error instanceof Error ? error.message : "An unexpected error occurred.";
+  const isPermissionError = message.includes("sudoers") || message.includes("Permission denied");
   console.log("");
-  signale.error(
-    error instanceof Error ? error.message : "An unexpected error occurred."
-  );
+  signale.error(message);
   if (process.env.SOAP_DEBUG === "1") {
     console.error(error);
   }
-  if (isCask) {
+  if (isCask && !isPermissionError) {
     const { forceUninstall } = await inquirer.prompt([
       {
         type: "confirm",
@@ -388,5 +420,9 @@ Force-run ${chalk.bold(`brew uninstall --zap --force ${param}`)}?`,
       await $2`brew uninstall --zap --force ${param}`;
       signale.success("Force uninstall complete.");
     }
+  } else if (isCask && isPermissionError) {
+    signale.info(
+      "Re-run with an admin account to complete the Homebrew uninstall."
+    );
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kud/soap-cli",
-  "version": "3.0.6",
+  "version": "3.0.9",
   "description": "An app cleaner cli for macOS",
   "main": "dist/index.js",
   "bin": {