theamify-cli 2.1.0 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "theamify-cli",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "theamify — GRUB theme manager & interactive browser wizard. Browse, preview, download and apply GRUB boot themes from the terminal.",
   "type": "module",
   "main": "src/cli.js",

package/src/cli.js

@@ -2,7 +2,7 @@ import { defineCommand, runMain } from 'citty';
 import pc from 'picocolors';
 import { createRequire } from 'node:module';
 import { runThemeBrowser } from './wizard/browse.js';
-import { runDoctor, runStatus, runUninstallWizard } from './commands/manage.js';
+import { runDoctor, runStatus, runUninstallWizard, runSelfUpgrade, runRepair } from './commands/manage.js';
 import { updateManagedTools } from './lib/tools.js';
 import { runEngine } from './core/engine.js';
 
@@ -42,7 +42,9 @@ ${pc.bold('Usage:')}
   theamify open <name>        Open the theme source page in a browser
   theamify status             Show GRUB & dependency status
   theamify doctor             Diagnose install, GRUB & dependencies
-  theamify uninstall          Remove theamify (asks before deleting anything)
+  theamify upgrade            Check for & install the latest npm version
+  theamify repair             Fix a broken install (re-provision the engine)
+  theamify uninstall          Remove theamify entirely (incl. npm package)
   theamify clean              Clear the repo clone cache
 `);
 }
@@ -96,6 +98,12 @@ const main = defineCommand({
         return runStatus();
       case 'doctor':
         return runDoctor();
+      case 'upgrade':
+      case 'self-update':
+      case 'selfupdate':
+        return runSelfUpgrade();
+      case 'repair':
+        return runRepair();
       case 'uninstall':
         return runUninstallWizard();
       case 'update':

package/src/commands/manage.js

@@ -7,10 +7,12 @@ import {
   findInstalledRuntime,
   USER_DIR,
   removeShadowBin,
+  repairRuntime,
   resolveEngine,
 } from '../core/engine.js';
 import { parseThemes, resolveConfPath } from '../lib/conf.js';
 import { companionToolStatus } from '../lib/tools.js';
+import { checkForUpdate, promptSelfUpdate, selfUninstall } from '../lib/self.js';
 
 /** `theamify doctor` — installation, GRUB and dependency health. */
 export async function runDoctor() {
@@ -80,14 +82,54 @@ export async function runStatus() {
   if (res.exitCode !== 0) process.exit(res.exitCode);
 }
 
+/** `theamify upgrade` — self-update the npm CLI if a newer version is published. */
+export async function runSelfUpgrade() {
+  const { outdated, latest, current } = await checkForUpdate();
+  if (!outdated) {
+    console.log(pc.green(`Already on the latest version (v${current}).`));
+    return;
+  }
+  console.log(`Available: ${pc.cyan('v' + latest)}  (you have ${pc.dim('v' + current)})`);
+  await promptSelfUpdate();
+}
+
+/** `theamify repair` — fix a broken install by re-provisioning the engine/runtime. */
+export async function runRepair() {
+  console.log(pc.bold('\n🔧 theamify Repair\n'));
+  const engine = await repairRuntime();
+  console.log(`  Engine   : ${pc.cyan(engine)}`);
+  console.log(`  Runtime  : ${pc.cyan(path.join(USER_DIR))}`);
+  console.log('  Status   : ' + pc.green('engine re-provisioned'));
+  console.log('  Downloads: ' + (fs.existsSync(path.join(USER_DIR, 'themes')) ? pc.green('themes preserved') : pc.dim('no cached themes yet')));
+  console.log();
+}
+
 /**
- * Remove GRUB_THEME from /etc/default/grub and rebuild the boot menu so the
- * system returns to the default theme. Requires sudo when not root.
- * @returns {Promise<boolean>} true when GRUB was reset
+ * Remove a theamify runtime directory and everything in it (the engine PLUS all
+ * downloaded themes under themes/ and .repo_cache/). Uses sudo when the dir is
+ * root-owned.
+ * @param {string} dir absolute path to the runtime dir
+ * @returns {Promise<boolean>} true when the dir no longer exists
  */
-async function resetGrubTheme() {
-  const script = `
-GRUB=/etc/default/grub
+export async function removeRuntimeDir(dir) {
+  if (!fs.existsSync(dir)) return true;
+  try {
+    const owner = fs.statSync(dir).uid;
+    if (owner === 0 && process.getuid() !== 0) {
+      const res = await execa('sudo', ['rm', '-rf', dir], { stdio: 'inherit', reject: false });
+      return res.exitCode === 0 && !fs.existsSync(dir);
+    }
+    fs.rmSync(dir, { recursive: true, force: true });
+    return !fs.existsSync(dir);
+  } catch {
+    return false;
+  }
+}
+
+/** Build the bash script that clears GRUB_THEME and rebuilds the boot menu. */
+export function buildResetGrubScript(grubFile = '/etc/default/grub') {
+  return `
+GRUB=${grubFile}
 [ -f "$GRUB" ] || exit 0
 sed -i '/^GRUB_THEME=/d' "$GRUB"
 if command -v update-grub >/dev/null 2>&1; then
@@ -98,7 +140,17 @@ elif command -v grub2-mkconfig >/dev/null 2>&1; then
   grub2-mkconfig -o /boot/grub2/grub.cfg
 fi
 `.trim();
-  if (process.getuid() === 0) {
+}
+
+/**
+ * Remove GRUB_THEME from /etc/default/grub and rebuild the boot menu so the
+ * system returns to the default theme. Requires sudo when not root.
+ * @param {{grubFile?:string, asRoot?:boolean}} [opts] injectable for tests
+ * @returns {Promise<boolean>} true when GRUB was reset
+ */
+export async function resetGrubTheme({ grubFile = '/etc/default/grub', asRoot = process.getuid() === 0 } = {}) {
+  const script = buildResetGrubScript(grubFile);
+  if (asRoot) {
     const res = await execa('bash', ['-c', script], { stdio: 'inherit', reject: false });
     return res.exitCode === 0;
   }
@@ -121,19 +173,9 @@ export async function runUninstallWizard() {
       initialValue: true,
     });
     if (!p.isCancel(confirm) && confirm) {
-      try {
-        const dir = found.dir;
-        const owner = fs.statSync(dir).uid;
-        if (owner === 0 && process.getuid() !== 0) {
-          await execa('sudo', ['rm', '-rf', dir], { stdio: 'inherit' });
-        } else {
-          fs.rmSync(dir, { recursive: true, force: true });
-        }
-        removed = true;
-        removeShadowBin();
-      } catch {
-        p.log.warn(`Could not remove ${found.dir}.`);
-      }
+      removed = await removeRuntimeDir(found.dir);
+      if (removed) removeShadowBin();
+      else p.log.warn(`Could not remove ${found.dir}.`);
     }
   }
 
@@ -145,6 +187,9 @@ export async function runUninstallWizard() {
   if (p.isCancel(resetGrub)) { p.cancel('Aborted.'); process.exit(0); }
   const grubReset = resetGrub ? await resetGrubTheme() : false;
 
+  // Remove the npm package so the `theamify` command actually disappears.
+  const npmRemoved = await selfUninstall();
+
   // Companion tools (chafa, grub-customizer) are intentionally LEFT in place —
   // the user may want them for later; uninstall only removes theamify itself.
   const themeNote = grubReset
@@ -152,6 +197,6 @@ export async function runUninstallWizard() {
     : (resetGrub ? 'GRUB reset could not be completed — remove GRUB_THEME= from /etc/default/grub and rebuild.' : 'Your applied GRUB theme was left in place.');
 
   p.outro(pc.green(
-    `Uninstalled.${removed ? ' Runtime + all downloaded themes removed.' : ''} ${themeNote} Companion tools (chafa, grub-customizer) were kept for your use.`,
+    `Uninstalled.${removed ? ' Runtime + all downloaded themes removed.' : ''} ${themeNote} ${npmRemoved ? 'theamify npm package removed — command no longer available.' : 'theamify npm package kept.'} Companion tools (chafa, grub-customizer) were kept for your use.`,
   ));
 }

package/src/core/engine.js

@@ -94,6 +94,24 @@ export async function installUserRuntime() {
   return USER_DIR;
 }
 
+/**
+ * Repair a broken install: re-provision the engine/runtime from the bundled
+ * package (fixes a missing/corrupt engine or runtime tree) and remove any stale
+ * shadow symlink. Downloads are preserved unless the whole runtime is missing.
+ * @returns {Promise<string>} path to the repaired engine
+ */
+export async function repairRuntime() {
+  const found = findInstalledRuntime();
+  if (found) {
+    syncEngineTo(found.dir);
+    removeShadowBin();
+    return path.join(found.dir, BIN_NAME);
+  }
+  const dir = await installUserRuntime();
+  removeShadowBin();
+  return path.join(dir, BIN_NAME);
+}
+
 /**
  * Resolve the path to the engine to run for a subcommand.
  * Prefers an installed runtime; otherwise provisions the bundled one in the

package/src/lib/self.js

@@ -0,0 +1,94 @@
+import { execa } from 'execa';
+import pc from 'picocolors';
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+const pkg = require('../../package.json');
+
+export const NPM_NAME = pkg.name;
+export const BIN_NAME = 'theamify';
+
+/** Simple numeric semver compare: returns <0, 0, >0 when a is older/equal/newer. */
+export function compareVersions(a, b) {
+  const pa = String(a || '').split('.').map((n) => parseInt(n, 10) || 0);
+  const pb = String(b || '').split('.').map((n) => parseInt(n, 10) || 0);
+  for (let i = 0; i < 3; i++) {
+    const d = (pa[i] || 0) - (pb[i] || 0);
+    if (d !== 0) return d < 0 ? -1 : 1;
+  }
+  return 0;
+}
+
+/** Query npm for the latest published version of this package. */
+export async function getLatestVersion() {
+  try {
+    const { stdout } = await execa('npm', ['view', NPM_NAME, 'version'], { reject: false });
+    const v = (stdout || '').trim();
+    return /^\d+\.\d+\.\d+/.test(v) ? v : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Check whether the running local version is behind the latest published one.
+ * @returns {Promise<{outdated:boolean, latest:string|null, current:string}>}
+ */
+export async function checkForUpdate() {
+  const latest = await getLatestVersion();
+  if (!latest) return { outdated: false, latest: null, current: pkg.version };
+  return { outdated: compareVersions(latest, pkg.version) > 0, latest, current: pkg.version };
+}
+
+/**
+ * If a newer version is available, offer to self-update via `npm install -g`.
+ * @returns {Promise<boolean>} true when an update was performed
+ */
+export async function promptSelfUpdate() {
+  const { outdated, latest, current } = await checkForUpdate();
+  if (!outdated || !latest) return false;
+
+  const p = await import('@clack/prompts');
+  const want = await p.confirm({
+    message: `A new version (${pc.cyan('v' + latest)}) is available — you have ${pc.dim('v' + current)}. Update now?`,
+    initialValue: true,
+  });
+  if (p.isCancel(want) || !want) {
+    p.log.message(pc.dim(`Keeping v${current} — update later with: npm install -g ${NPM_NAME}@latest`));
+    return false;
+  }
+
+  // Release the terminal so npm's output is visible & interruptible.
+  console.log();
+  const res = await execa('npm', ['install', '-g', `${NPM_NAME}@latest`], { stdio: 'inherit', reject: false });
+  if (res.exitCode !== 0) {
+    p.log.warn('Update failed. You can retry with: npm install -g ' + NPM_NAME + '@latest');
+    return false;
+  }
+  p.log.success(`Updated to v${latest}. Restart ${BIN_NAME} to use the new version.`);
+  return true;
+}
+
+/**
+ * Fully remove the npm package so the `theamify` command disappears from PATH.
+ * @returns {Promise<boolean>} true when uninstalled
+ */
+export async function selfUninstall() {
+  const p = await import('@clack/prompts');
+  const want = await p.confirm({
+    message: `Also remove the ${NPM_NAME} npm package, so the ${pc.cyan(BIN_NAME)} command is gone from your system?`,
+    initialValue: true,
+  });
+  if (p.isCancel(want) || !want) {
+    p.log.message(pc.dim(`Keeping the npm package — the ${BIN_NAME} command will remain.`));
+    return false;
+  }
+  console.log();
+  const res = await execa('npm', ['uninstall', '-g', NPM_NAME], { stdio: 'inherit', reject: false });
+  if (res.exitCode === 0) {
+    p.log.success(`${NPM_NAME} removed. The ${BIN_NAME} command is no longer available.`);
+    return true;
+  }
+  p.log.warn(`Could not uninstall ${NPM_NAME} automatically. Run: npm uninstall -g ${NPM_NAME}`);
+  return false;
+}

package/src/wizard/browse.js

@@ -124,6 +124,14 @@ async function ensureAllThemes(engine, { prompt = true } = {}) {
  * back to the theme list — it NEVER hard-exits until you choose Quit.
  */
 export async function runThemeBrowser() {
+  // Step 0: self-check — offer an update if a newer version is published, and
+  // repair a broken/unprovisioned runtime before anything else.
+  const { checkForUpdate, promptSelfUpdate } = await import('../lib/self.js');
+  const { repairRuntime } = await import('../core/engine.js');
+  const { outdated } = await checkForUpdate();
+  if (outdated) await promptSelfUpdate();
+  await repairRuntime();
+
   // Step 1: ensure companion tools (chafa, grub-customizer) — detect, install
   // or update, then continue BEFORE showing the theme picker.
   await ensureManagedTools();

package/vendor/theamify

@@ -10,7 +10,7 @@ set -euo pipefail
 # -----------------------------------------------------------------------------
 # VERSION & TOOL NAME
 # -----------------------------------------------------------------------------
-readonly VERSION="2.1.0"
+readonly VERSION="2.2.0"
 readonly TOOL="theamify"
 
 # -----------------------------------------------------------------------------