fix: bug fixes and improvements to dependencies for git-repository, virtualenv-project. Improvements to xcode-tools and wait-github-ssh-key

Author: kevinwang5658

package.json

@@ -1,6 +1,6 @@
 {
   "name": "default",
-  "version": "0.12.3",
+  "version": "0.13.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

src/resources/git/clone/git-repository.ts

@@ -56,7 +56,7 @@ export class GitCloneResource extends Resource<GitCloneConfig> {
       },
       dependencies: [
         'ssh-key',
-        'ssh-add-key',
+        'ssh-add',
         'ssh-config',
         'wait-github-ssh-key'
       ]

src/resources/git/wait-github-ssh-key/wait-github-ssh-key.ts

@@ -1,10 +1,14 @@
+import chalk from 'chalk';
 import {
   CodifyCliSender,
   Resource,
   ResourceSettings,
   getPty
 } from 'codify-plugin-lib';
 import { ResourceConfig } from 'codify-schemas';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
 
 import { codifySpawn } from '../../../utils/codify-spawn.js';
 
@@ -16,7 +20,7 @@ export class WaitGithubSshKey extends Resource<WaitGithubSshKeyConfig> {
       id: 'wait-github-ssh-key',
       dependencies: [
         'ssh-key',
-        'ssh-add-key',
+        'ssh-add',
         'ssh-config',
       ]
     }
@@ -36,14 +40,41 @@ export class WaitGithubSshKey extends Resource<WaitGithubSshKeyConfig> {
   async create(): Promise<void> {
     let attemptCount = 0;
 
+    const publicKeys: string[] = []
+    try {
+      const sshFolder = path.join(os.homedir(), '.ssh');
+      const publicKeysFiles = (await fs.readdir(sshFolder))
+        .filter((name) => name.endsWith('.pub'));
+
+      if (publicKeysFiles.length === 0) {
+        throw new Error();
+      }
+
+      publicKeys.push(...(await Promise.all(publicKeysFiles.map(
+        (name) => fs.readFile(path.join(sshFolder, name), 'utf8'))
+      )));
+    } catch {}
+
     do {
       if (attemptCount > 0) {
         console.error('Unable to verify that github ssh access is connected.')
       }
 
       await CodifyCliSender.requestPressKeyToContinuePrompt(
-        (attemptCount > 0 ? 'Unable to verify that github ssh access is connected. Please try again. \n\n' : '') +
-        'Waiting for user to add ssh-key to github. For instructions please follow: https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account.')
+        (attemptCount > 0 ? chalk.redBright('Unable to verify that github ssh access is connected. Please try again. \n\n') : '') +
+`${chalk.bold('Waiting for user to add ssh public to github')}
+Add ssh public key to: ${chalk.underline('https://github.com/settings/ssh/new')}
+
+${publicKeys.length > 0 
+  ? `${chalk.bold('Public keys found:')}
+${publicKeys.map((l, idx) => `${chalk.underline.italic(`key ${idx + 1}:\n`)}${l}`).join('\n')}  
+
+Paste one of the above key/keys into github and then press any key to continue.`
+  : 'No public keys were found in your .ssh folder. Please use a public key located elsewhere or visit: https://docs.codifycli.com/core-resources/ssh/ssh-key/ to generate an ssh key using Codify.'
+}
+
+For additional information visit: ${chalk.underline('https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account')}`
+      )
       attemptCount++;
     } while(!(await this.isConnectedToGithub()));
   }

src/resources/python/virtualenv/virtualenv-project.ts

@@ -40,7 +40,7 @@ export class VirtualenvProject extends Resource<VirtualenvProjectConfig> {
       allowMultiple: {
         identifyingParameters: ['dest'],
       },
-      dependencies: ['virtualenv', 'homebrew', 'pyenv']
+      dependencies: ['virtualenv', 'homebrew', 'pyenv', 'git-repository']
     }
   }
 

src/resources/xcode-tools/xcode-tools.ts

@@ -3,6 +3,7 @@ import { StringIndexedObject } from 'codify-schemas';
 import path from 'node:path';
 
 import { SpawnStatus, codifySpawn } from '../../utils/codify-spawn.js';
+import fs from 'node:fs/promises';
 
 interface XCodeToolsConfig extends StringIndexedObject {}
 
@@ -53,7 +54,7 @@ export class XcodeToolsResource extends Resource<XCodeToolsConfig> {
       await codifySpawn(`softwareupdate -i "${xcodeToolsVersion[0]}" --verbose`, { requiresRoot: true });
 
     } finally {
-      await codifySpawn('rm /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress')
+      await fs.rm('/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress', { force: true, recursive: true });
     }
   }