gitshift 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitshift",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "GitHub Account Switcher CLI",
   "main": "server.js",
   "bin": {
@@ -28,6 +28,7 @@
     "commander": "^15.0.0",
     "conf": "^15.1.0",
     "execa": "^9.6.1",
+    "fast-glob": "^3.3.3",
     "fs-extra": "^11.3.5",
     "ora": "^9.4.0"
   }

package/src/commands/add.js

@@ -26,9 +26,7 @@ export async function addCommand() {
         });
 
         if (getProfile(name)) {
-            error(
-                `Profile "${name}" already exists`
-            );
+            error(`Profile "${name}" already exists`);
 
             process.exitCode = 1;
             return;
@@ -43,35 +41,23 @@ export async function addCommand() {
         });
 
         const createSSH = await confirm({
-            message:
-                "Generate SSH key automatically?",
+            message: "Generate SSH key automatically?",
             default: true,
         });
 
         let sshKey = null;
 
         if (createSSH) {
-            const spinner = ora(
-                "Generating SSH key..."
-            ).start();
+            const spinner = ora("Generating SSH key...").start();
 
             try {
-                sshKey = await generateSSHKey(
-                    name,
-                    email
-                );
-
-                spinner.succeed(
-                    "SSH key generated"
-                );
+                sshKey = await generateSSHKey(name, email);
+
+                spinner.succeed("SSH key generated");
             } catch (err) {
-                spinner.fail(
-                    "Unable to generate SSH key"
-                );
+                spinner.fail("Unable to generate SSH key");
 
-                error(
-                    "Could not create SSH key. Ensure OpenSSH is installed and available."
-                );
+                error("Could not create SSH key. Ensure OpenSSH is installed and available.");
 
                 if (
                     err &&
@@ -100,6 +86,7 @@ export async function addCommand() {
     } catch (err) {
         if (err && err.name === "ExitPromptError") {
             // User canceled the prompt (Ctrl+C / SIGINT). Exit gracefully.
+            error("Profile creation canceled.");
             process.exitCode = 0;
             return;
         }

package/src/commands/scan.js

@@ -0,0 +1,89 @@
+import path from "path";
+
+import {
+    input,
+    select,
+} from "@inquirer/prompts";
+
+import {
+    findSSHKeys,
+} from "../services/scan.js";
+
+import {
+    getProfiles,
+    saveProfile,
+} from "../services/profile.js";
+
+import {
+    error,
+    info,
+    success,
+} from "../utils/logger.js";
+
+export async function scanCommand() {
+    try {
+        const keys = await findSSHKeys();
+
+        if (!keys.length) {
+            info("No SSH keys found");
+            return;
+        }
+
+        const existing = getProfiles();
+
+        const importedPaths = existing.map((profile) => profile.sshKey);
+
+        const available = keys.filter((key) => !importedPaths.includes(key));
+
+        if (!available.length) {
+            info("All keys already imported");
+            return;
+        }
+
+        const selected = await select({
+            message: "Select SSH Key",
+            choices: available.map((key) => ({
+                name: path.basename(key),
+                value: key,
+            })),
+        });
+
+        const profileName = await input({
+            message: "Profile Name",
+            default: path.basename(selected),
+        });
+
+        const username = await input({
+            message: "GitHub Username",
+        });
+
+        const email = await input({
+            message: "Email",
+        });
+
+        try {
+            saveProfile({
+                name: profileName,
+                username,
+                email,
+                sshKey: selected,
+                source:
+                    "imported",
+            });
+
+            success(`Existing SSH Key Imported "${profileName}"`);
+        } catch (err) {
+            error(err.message);
+        }
+    } catch (err) {
+        if (err && err.name === "ExitPromptError") {
+            // User canceled the prompt (Ctrl+C / SIGINT). Exit gracefully.
+            error("Existing SSH Key Import canceled by user.");
+            process.exitCode = 0;
+            return;
+        }
+
+        error(String(err));
+        process.exitCode = 1;
+    }
+}

package/src/server.js

@@ -9,6 +9,7 @@ import { currentCommand } from "./commands/current.js";
 import { doctorCommand } from "./commands/doctor.js";
 import { listCommand } from "./commands/list.js";
 import { removeCommand } from "./commands/remove.js";
+import { scanCommand } from "./commands/scan.js";
 import { useCommand } from "./commands/use.js";
 
 const require = createRequire(import.meta.url);
@@ -116,6 +117,13 @@ async function main() {
         )
         .action(removeCommand);
 
+    program
+        .command("scan")
+        .description(
+            "Import existing SSH keys"
+        )
+        .action(scanCommand);
+
     program
         .command("doctor")
         .description(

package/src/services/scan.js

@@ -0,0 +1,36 @@
+import fg from "fast-glob";
+import fs from "fs-extra";
+import os from "os";
+import path from "path";
+
+export async function findSSHKeys() {
+    const sshDir = path.join(os.homedir(), ".ssh");
+
+    const exists =
+        await fs.pathExists(sshDir);
+
+    if (!exists) {
+        return [];
+    }
+
+    const files = await fg("*", {
+        cwd: sshDir,
+        absolute: true,
+        onlyFiles: true,
+    });
+
+    return files.filter((file) => {
+        const name = path.basename(file);
+
+        if (
+            name.endsWith(".pub") ||
+            name === "config" ||
+            name === "known_hosts" ||
+            name === "authorized_keys"
+        ) {
+            return false;
+        }
+
+        return true;
+    });
+}

package/src/services/ssh.js

@@ -51,4 +51,23 @@ export async function generateSSHKey(
     ]);
 
     return keyPath;
+}
+
+export async function getPublicKey(
+    privateKeyPath
+) {
+    const publicKey =
+        `${privateKeyPath}.pub`;
+
+    const exists =
+        await fs.pathExists(publicKey);
+
+    if (!exists) {
+        return null;
+    }
+
+    return fs.readFile(
+        publicKey,
+        "utf8"
+    );
 }