gitshift 1.0.1 → 1.0.3

package/.github/workflows/ci.yml

@@ -0,0 +1,41 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  test:
+    name: ${{ matrix.os }} / Node ${{ matrix.node-version }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+        node-version:
+          - "20"
+          - "22"
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: npm
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: CLI smoke test
+        run: |
+          node src/server.js --version
+          node src/server.js --help

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitshift",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "GitHub Account Switcher CLI",
   "main": "server.js",
   "bin": {
@@ -16,6 +16,7 @@
   "type": "module",
   "dependencies": {
     "@inquirer/prompts": "^8.5.1",
+    "axios": "^1.16.1",
     "chalk": "^5.6.2",
     "commander": "^15.0.0",
     "conf": "^15.1.0",

package/src/commands/add.js

@@ -6,6 +6,7 @@ import {
 import ora from "ora";
 
 import {
+    getProfile,
     saveProfile,
 } from "../services/profile.js";
 
@@ -14,6 +15,7 @@ import {
 } from "../services/ssh.js";
 
 import {
+    error,
     success,
 } from "../utils/logger.js";
 
@@ -22,6 +24,15 @@ export async function addCommand() {
         message: "Profile Name",
     });
 
+    if (getProfile(name)) {
+        error(
+            `Profile "${name}" already exists`
+        );
+
+        process.exitCode = 1;
+        return;
+    }
+
     const username = await input({
         message: "GitHub Username",
     });
@@ -43,14 +54,36 @@ export async function addCommand() {
             "Generating SSH key..."
         ).start();
 
-        sshKey = await generateSSHKey(
-            name,
-            email
-        );
+        try {
+            sshKey = await generateSSHKey(
+                name,
+                email
+            );
 
-        spinner.succeed(
-            "SSH key generated"
-        );
+            spinner.succeed(
+                "SSH key generated"
+            );
+        } catch (err) {
+            spinner.fail(
+                "Unable to generate SSH key"
+            );
+
+            error(
+                "Could not create SSH key. Ensure OpenSSH is installed and available."
+            );
+
+            if (
+                err &&
+                typeof err === "object" &&
+                "shortMessage" in err &&
+                err.shortMessage
+            ) {
+                error(String(err.shortMessage));
+            }
+
+            process.exitCode = 1;
+            return;
+        }
     }
 
     saveProfile({
@@ -61,6 +94,6 @@ export async function addCommand() {
     });
 
     success(
-        `Profile "${name}" created`
+        `Profile "${name}" saved locally`
     );
 }

package/src/server.js

@@ -1,69 +1,131 @@
 #!/usr/bin/env node
 
+import axios from "axios";
+import chalk from "chalk";
 import { Command } from "commander";
-
+import { createRequire } from "node:module";
 import { addCommand } from "./commands/add.js";
-
-import { listCommand } from "./commands/list.js";
-
 import { currentCommand } from "./commands/current.js";
-
-import { useCommand } from "./commands/use.js";
-
-import { removeCommand } from "./commands/remove.js";
-
 import { doctorCommand } from "./commands/doctor.js";
+import { listCommand } from "./commands/list.js";
+import { removeCommand } from "./commands/remove.js";
+import { useCommand } from "./commands/use.js";
 
-const program =
-    new Command();
-
-program
-    .name("gitshift")
-    .description(
-        "GitHub Account Switcher"
-    )
-    .version("1.0.0");
-
-program
-    .command("add")
-    .description(
-        "Create profile"
-    )
-    .action(addCommand);
-
-program
-    .command("list")
-    .description(
-        "List profiles"
-    )
-    .action(listCommand);
-
-program
-    .command("current")
-    .description(
-        "Show active profile"
-    )
-    .action(currentCommand);
-
-program
-    .command("use <profile>")
-    .description(
-        "Switch profile"
-    )
-    .action(useCommand);
-
-program
-    .command("remove <profile>")
-    .description(
-        "Delete profile"
-    )
-    .action(removeCommand);
-
-program
-    .command("doctor")
-    .description(
-        "System health check"
-    )
-    .action(doctorCommand);
-
-program.parse();
+const require = createRequire(import.meta.url);
+const { name, version } = require("../package.json");
+
+function printBanner() {
+    const logo = String.raw`
+  ██████╗ ██╗████████╗███████╗██╗  ██╗██╗███████╗████████╗
+ ██╔════╝ ██║╚══██╔══╝██╔════╝██║  ██║██║██╔════╝╚══██╔══╝
+ ██║  ███╗██║   ██║   ███████╗███████║██║█████╗     ██║
+ ██║   ██║██║   ██║   ╚════██║██╔══██║██║██╔══╝     ██║
+ ╚██████╔╝██║   ██║   ███████║██║  ██║██║██║        ██║
+  ╚═════╝ ╚═╝   ╚═╝   ╚══════╝╚═╝  ╚═╝╚═╝╚═╝        ╚═╝
+`;
+    console.log(chalk.cyanBright(logo));
+    console.log(chalk.bold("GitShift CLI"));
+    console.log(
+        chalk.dim("Manage and switch GitHub accounts effortlessly\n")
+    );
+}
+
+function compareVersions(currentVersion, latestVersion) {
+    const currentParts = currentVersion.split(".").map(Number);
+    const latestParts = latestVersion.split(".").map(Number);
+
+    for (let index = 0; index < 3; index += 1) {
+        const currentPart = currentParts[index] || 0;
+        const latestPart = latestParts[index] || 0;
+
+        if (currentPart > latestPart) return 1;
+        if (currentPart < latestPart) return -1;
+    }
+
+    return 0;
+}
+
+async function checkForUpdates() {
+    try {
+        const response = await axios.get(
+            `https://registry.npmjs.org/${name}/latest`,
+            {
+                timeout: 3000,
+            },
+        );
+
+        const latestVersion = response.data.version;
+
+        if (latestVersion && compareVersions(version, latestVersion) < 0) {
+            console.log(
+                `A new version of ${name} is available: ${version} -> ${latestVersion}`,
+            );
+            console.log(`Run: npm install -g ${name}`);
+        }
+    } catch (error) {
+        // Ignore version check failures so the CLI still starts offline.
+    }
+}
+
+async function main() {
+    printBanner();
+    await checkForUpdates();
+
+    const program = new Command();
+
+    program
+        .name("gitshift")
+        .description(
+            "GitHub Account Switcher"
+        )
+        .version(version);
+
+    program
+        .command("add")
+        .description(
+            "Create local profile"
+        )
+        .action(addCommand);
+
+    program
+        .command("list")
+        .description(
+            "List profiles"
+        )
+        .action(listCommand);
+
+    program
+        .command("current")
+        .description(
+            "Show active profile"
+        )
+        .action(currentCommand);
+
+    program
+        .command("use <profile>")
+        .description(
+            "Switch profile and update git config"
+        )
+        .action(useCommand);
+
+    program
+        .command("remove <profile>")
+        .description(
+            "Delete profile"
+        )
+        .action(removeCommand);
+
+    program
+        .command("doctor")
+        .description(
+            "System health check"
+        )
+        .action(doctorCommand);
+
+    await program.parseAsync(process.argv);
+}
+
+main().catch((error) => {
+    console.error(error);
+    process.exit(1);
+});

package/src/services/ssh.js

@@ -3,14 +3,28 @@ import fs from "fs-extra";
 import os from "os";
 import path from "path";
 
+function toSafeKeyName(profileName) {
+    const normalized = profileName
+        .trim()
+        .replace(/[^a-zA-Z0-9._-]+/g, "-")
+        .replace(/-+/g, "-")
+        .replace(/^-|-$/g, "");
+
+    return normalized || "profile";
+}
+
 export async function generateSSHKey(
     profileName,
     email
 ) {
+    const safeProfileName = toSafeKeyName(
+        profileName
+    );
+
     const keyPath = path.join(
         os.homedir(),
         ".ssh",
-        `ghswitch-${profileName}`
+        `ghswitch-${safeProfileName}`
     );
 
     const exists = await fs.pathExists(
@@ -21,6 +35,10 @@ export async function generateSSHKey(
         return keyPath;
     }
 
+    await fs.ensureDir(
+        path.dirname(keyPath)
+    );
+
     await execa("ssh-keygen", [
         "-t",
         "ed25519",