gitshift 1.0.2 → 1.0.4

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.2",
+  "version": "1.0.4",
   "description": "GitHub Account Switcher CLI",
   "main": "server.js",
   "bin": {
@@ -8,7 +8,8 @@
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node src/server.js"
+    "start": "node src/server.js",
+    "doctor": "node src/server.js doctor"
   },
   "keywords": [],
   "author": "",

package/src/commands/add.js

@@ -15,6 +15,7 @@ import {
 } from "../services/ssh.js";
 
 import {
+    error,
     success,
 } from "../utils/logger.js";
 
@@ -24,9 +25,12 @@ export async function addCommand() {
     });
 
     if (getProfile(name)) {
-        throw new Error(
+        error(
             `Profile "${name}" already exists`
         );
+
+        process.exitCode = 1;
+        return;
     }
 
     const username = await input({
@@ -50,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({

package/src/commands/doctor.js

@@ -34,11 +34,19 @@ export async function doctorCommand() {
         "-V",
     ]);
 
-    await check(
+    const ghInstalled = await check(
         "GitHub CLI",
         "gh",
         ["--version"]
     );
 
+    if (!ghInstalled) {
+        console.log();
+        console.log(
+            "Hint: Install GitHub CLI (macOS): `brew install gh`"
+        );
+        console.log("Then authenticate with: `gh auth login`");
+    }
+
     console.log();
 }

package/src/server.js

@@ -3,7 +3,7 @@
 import axios from "axios";
 import chalk from "chalk";
 import { Command } from "commander";
-import packageJson from "../package.json" with { type: "json" };
+import { createRequire } from "node:module";
 import { addCommand } from "./commands/add.js";
 import { currentCommand } from "./commands/current.js";
 import { doctorCommand } from "./commands/doctor.js";
@@ -11,7 +11,8 @@ import { listCommand } from "./commands/list.js";
 import { removeCommand } from "./commands/remove.js";
 import { useCommand } from "./commands/use.js";
 
-const { name, version } = packageJson;
+const require = createRequire(import.meta.url);
+const { name, version } = require("../package.json");
 
 function printBanner() {
     const logo = String.raw`

package/src/services/profile.js

@@ -1,7 +1,7 @@
 import Conf from "conf";
 
 const config = new Conf({
-    projectName: "ghswitch",
+    projectName: "gitshift",
 });
 
 export function getProfiles() {

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}`
+        `gitshift-${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",