Updated asdf to support linux. Util changes

kevinwang5658 · kevinwang5658 · commit c62ece86486c · 2025-12-25T19:25:25.000-05:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "chalk": "^5.3.0",
-    "codify-plugin-lib": "1.0.182-beta18",
+    "codify-plugin-lib": "1.0.182-beta21",
     "codify-schemas": "1.0.86-beta5",
     "debug": "^4.3.4",
     "lodash.isequal": "^4.5.0",
diff --git a/scripts/run-tests.ts b/scripts/run-tests.ts
@@ -39,7 +39,7 @@ async function launchTestAll(debug: boolean): Promise<void> {
 
 async function launchSingleTest(test: string, debug: boolean) {
   console.log(`Running test: ${test}`)
-  await run(`cirrus run --lazy-pull integration_individual_test -e FILE_NAME="${test}" -o simple`, debug)
+  await run(`cirrus run --lazy-pull integration_individual_test_linux -e FILE_NAME="${test}" -o simple`, debug)
 }
 
 async function run(cmd: string, debug: boolean, simple = true) {
diff --git a/src/resources/asdf/asdf.ts b/src/resources/asdf/asdf.ts
@@ -1,10 +1,9 @@
-import { CreatePlan, DestroyPlan, Resource, ResourceSettings, SpawnStatus, getPty } from 'codify-plugin-lib';
+import { CreatePlan, DestroyPlan, Resource, ResourceSettings, SpawnStatus, getPty, FileUtils } from 'codify-plugin-lib';
 import { OS, ResourceConfig } from 'codify-schemas';
 import fs from 'node:fs/promises';
 import os, { homedir } from 'node:os';
 import path from 'node:path';
 
-import { FileUtils } from '../../utils/file-utils.js';
 import { Utils } from '../../utils/index.js';
 import AsdfSchema from './asdf-schema.json';
 import { AsdfPluginsParameter } from './plugins-parameter.js';
@@ -17,7 +16,7 @@ export class AsdfResource extends Resource<AsdfConfig> {
     getSettings(): ResourceSettings<AsdfConfig> {
       return {
         id: 'asdf',
-        operatingSystems: [OS.Darwin],
+        operatingSystems: [OS.Darwin, OS.Linux],
         schema: AsdfSchema,
         parameterSettings: {
           plugins: { type: 'stateful', definition: new AsdfPluginsParameter() },
@@ -35,25 +34,67 @@ export class AsdfResource extends Resource<AsdfConfig> {
     async create(plan: CreatePlan<AsdfConfig>): Promise<void> {
       const $ = getPty();
 
-      if (!(await Utils.isHomebrewInstalled())) {
-        throw new Error('Homebrew is not installed. Please install Homebrew before installing asdf.');
+      if (Utils.isMacOS()) {
+        if (!(await Utils.isHomebrewInstalled())) {
+          throw new Error('Homebrew is not installed. Please install Homebrew before installing asdf.');
+        }
+
+        await $.spawn('brew install asdf', { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1 } });
+
       }
 
-      await $.spawn('brew install asdf', { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1 } });
+      if (Utils.isLinux()) {
+        const { data: latestVersion } = await $.spawn('curl -s https://api.github.com/repos/asdf-vm/asdf/releases/latest | grep \'"tag_name":\' | sed -E \'s/.*"([^"]+)".*/\\1/\'');
 
-      await FileUtils.addAllToStartupFile([
-        'export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"',
-      ]);
-    }
+        // Create .asdf directory if it doesn't exist
+        const asdfDir = path.join(os.homedir(), '.local', 'bin');
+        await fs.mkdir(asdfDir, { recursive: true });
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'codify-asdf'));
+        const arch = Utils.isLinux() ? 'amd64' : 'arm64';
 
-    async destroy(plan: DestroyPlan<AsdfConfig>): Promise<void> {
-      if (!(await Utils.isHomebrewInstalled())) {
-        return;
+        // Download and extract asdf
+        await $.spawn(`curl -Lo ${tmpDir}/asdf.tar.gz "https://github.com/asdf-vm/asdf/releases/download/${latestVersion}/asdf-${latestVersion}-linux-${arch}.tar.gz"`, { cwd: tmpDir });
+        console.log(await $.spawn('ls -la', { cwd: tmpDir }));
+        await $.spawn(`tar -xzf ${tmpDir}/asdf.tar.gz -C ${asdfDir}`, { cwd: tmpDir });
+        await fs.chmod(path.join(asdfDir, 'asdf'), 0o755);
+
+        await fs.rm(tmpDir, { recursive: true, force: true });
       }
 
+      await FileUtils.addPathToShellRc(path.join(os.homedir(), '.local', 'bin'), true);
+      // eslint-disable-next-line no-template-curly-in-string
+      await FileUtils.addToShellRc('export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"')
+
+      // TODO: Add filtering to resources for operating systems
+      // os parameter
+      // TODO: Move all utils to codify-plugin-lib
+      // TODO: Move OsUtils to a separate name space? All things that have to do with the os.
+      // TODO: Add a way to run multiple commands in sequence
+      // TODO: Add a easier way to make sure path is on the path
+      // TODO: Change all plugins to install to ~/.local/bin
+
+      await $.spawnSafe('which asdf', { interactive: true });
+      await $.spawnSafe('ls ~/.local/bin');
+      console.log((await $.spawnSafe('echo $PATH', { interactive: true })).data);
+
+    }
+
+    async destroy(): Promise<void> {
       const $ = getPty();
-      await $.spawn('brew uninstall asdf', { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1 } });
-      await FileUtils.removeLineFromStartupFile('export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"')
+
+      const asdfDir = (await $.spawn('which asdf', { interactive: true })).data;
+      if (Utils.isMacOS() && asdfDir.includes('homebrew')) {
+        if (!(await Utils.isHomebrewInstalled())) {
+          return;
+        }
+
+        await $.spawn('brew uninstall asdf', { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1 } });
+      } else {
+        await fs.rm(asdfDir, { recursive: true, force: true });
+      }
+
+      // eslint-disable-next-line no-template-curly-in-string
+      await FileUtils.removeLineFromShellRc('export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"')
       await fs.rm(path.join(os.homedir(), '.asdf'), { recursive: true, force: true });
     }
 
diff --git a/src/resources/docker/docker.ts b/src/resources/docker/docker.ts
@@ -88,7 +88,7 @@ export class DockerResource extends Resource<DockerConfig> {
     }
 
     await $.spawn('xattr -r -d com.apple.quarantine /Applications/Docker.app', { requiresRoot: true });
-    await FileUtils.addPathToZshrc('/Applications/Docker.app/Contents/Resources/bin', false);
+    await FileUtils.addPathToPrimaryShellRc('/Applications/Docker.app/Contents/Resources/bin', false);
   }
 
   async destroy(plan: DestroyPlan<DockerConfig>): Promise<void> {
diff --git a/src/resources/java/jenv/jenv.ts b/src/resources/java/jenv/jenv.ts
@@ -1,11 +1,10 @@
-import { getPty, Resource, ResourceSettings, SpawnStatus } from 'codify-plugin-lib';
-import { ResourceConfig } from 'codify-schemas';
+import { Resource, ResourceSettings, SpawnStatus, getPty } from 'codify-plugin-lib';
+import { OS, ResourceConfig } from 'codify-schemas';
 import * as fs from 'node:fs';
 
 import { FileUtils } from '../../../utils/file-utils.js';
 import { JenvGlobalParameter } from './global-parameter.js';
 import {
-  JAVA_VERSION_INTEGER,
   JenvAddParameter,
   OPENJDK_SUPPORTED_VERSIONS
 } from './java-versions-parameter.js';
@@ -20,6 +19,7 @@ export class JenvResource extends Resource<JenvConfig> {
   getSettings(): ResourceSettings<JenvConfig> {
     return {
       id: 'jenv',
+      operatingSystems: [OS.Darwin],
       schema: Schema,
       dependencies: ['homebrew'],
       parameterSettings: {
diff --git a/src/resources/shell/path/path-resource.ts b/src/resources/shell/path/path-resource.ts
@@ -193,7 +193,7 @@ export class PathResource extends Resource<PathConfig> {
 
   private async addPath(path: string, prepend = false): Promise<void> {
     // Escaping is done within file utils
-    await FileUtils.addPathToZshrc(path, prepend);
+    await FileUtils.addPathToPrimaryShellRc(path, prepend);
   }
   
   private async removePath(pathValue: string): Promise<void> {
diff --git a/src/resources/terraform/terraform.ts b/src/resources/terraform/terraform.ts
@@ -98,7 +98,7 @@ ${JSON.stringify(releaseInfo, null, 2)}
     await $.spawn(`mv ./terraform ${directory}`, { cwd: temporaryDir, requiresRoot: true })
     await $.spawn(`rm -rf ${temporaryDir}`)
 
-    if (!await Utils.isDirectoryOnPath(directory)) {
+    if (!(await Utils.isDirectoryOnPath(directory))) {
       await FileUtils.addToStartupFile(`export PATH=$PATH:${directory}`);
     }
   }
diff --git a/src/utils/file-utils.ts b/src/utils/file-utils.ts
@@ -28,8 +28,8 @@ export class FileUtils {
     }
   }
 
-  static async addAllToStartupFile(lines: string[]): Promise<void> {
-    const formattedLines = '\n' + lines.join('\n') + '\n';
+  static async addAllToStartupFile(lines: (string | undefined)[]): Promise<void> {
+    const formattedLines = '\n' + lines.filter(Boolean).join('\n') + '\n';
     const shellRc = Utils.getPrimaryShellRc();
 
     console.log(`Adding to ${path.basename(shellRc)}:
@@ -38,7 +38,7 @@ ${lines.join('\n')}`)
     await fs.appendFile(shellRc, formattedLines)
   }
 
-  static async addPathToZshrc(value: string, prepend: boolean): Promise<void> {
+  static async addPathToPrimaryShellRc(value: string, prepend: boolean): Promise<void> {
     const shellRc = Utils.getPrimaryShellRc();
     console.log(`Saving path: ${value} to ${shellRc}`);
 
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -1,3 +1,4 @@
+import { getPty } from 'codify-plugin-lib';
 import * as fsSync from 'node:fs';
 import * as fs from 'node:fs/promises';
 import os from 'node:os';
@@ -83,8 +84,10 @@ export const Utils = {
   },
 
   async isDirectoryOnPath(directory: string): Promise<boolean> {
-    const pathQuery = await codifySpawn('echo $PATH');
-    return pathQuery.data.includes(directory);
+    const $ = getPty();
+    const { data: pathQuery } = await $.spawn('echo $PATH', { interactive: true });
+    const lines = pathQuery.split(':');
+    return lines.includes(directory);
   },
 
   async isHomebrewInstalled(): Promise<boolean> {
diff --git a/test/asdf/asdf.test.ts b/test/asdf/asdf.test.ts
@@ -12,7 +12,7 @@ describe('Asdf tests', async () => {
 
   it('Can install asdf and plugins', { timeout: 300000 }, async () => {
     await PluginTester.fullTest(pluginPath, [
-      { type: 'homebrew' },
+      // { type: 'homebrew' },
       {
         type: 'asdf',
         plugins: ['nodejs', 'ruby']
@@ -36,7 +36,7 @@ describe('Asdf tests', async () => {
 
   it('Support plugins resource', { timeout: 300000 }, async () => {
     await PluginTester.fullTest(pluginPath, [
-      { type: 'homebrew' },
+      // { type: 'homebrew' },
       {
         type: 'asdf',
       },
@@ -59,7 +59,7 @@ describe('Asdf tests', async () => {
 
   it('Can install custom gitUrls', { timeout: 300000 }, async () => {
     await PluginTester.fullTest(pluginPath, [
-      { type: 'homebrew' },
+      // { type: 'homebrew' },
       {
         type: 'asdf',
       },
@@ -74,7 +74,7 @@ describe('Asdf tests', async () => {
     });
 
     await PluginTester.fullTest(pluginPath, [
-      { type: 'homebrew' },
+      // { type: 'homebrew' },
       {
         type: 'asdf',
       },

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ async function launchTestAll(debug: boolean): Promise<void> {`
`39`	`39`
`40`	`40`	`async function launchSingleTest(test: string, debug: boolean) {`
`41`	`41`	console.log(`Running test: ${test}`)
`42`		- await run(`cirrus run --lazy-pull integration_individual_test -e FILE_NAME="${test}" -o simple`, debug)
	`42`	+ await run(`cirrus run --lazy-pull integration_individual_test_linux -e FILE_NAME="${test}" -o simple`, debug)
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`async function run(cmd: string, debug: boolean, simple = true) {`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ export class DockerResource extends Resource<DockerConfig> {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`await $.spawn('xattr -r -d com.apple.quarantine /Applications/Docker.app', { requiresRoot: true });`
`91`		`- await FileUtils.addPathToZshrc('/Applications/Docker.app/Contents/Resources/bin', false);`
	`91`	`+ await FileUtils.addPathToPrimaryShellRc('/Applications/Docker.app/Contents/Resources/bin', false);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`async destroy(plan: DestroyPlan<DockerConfig>): Promise<void> {`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ export class PathResource extends Resource<PathConfig> {`
`193`	`193`
`194`	`194`	`private async addPath(path: string, prepend = false): Promise<void> {`
`195`	`195`	`// Escaping is done within file utils`
`196`		`- await FileUtils.addPathToZshrc(path, prepend);`
	`196`	`+ await FileUtils.addPathToPrimaryShellRc(path, prepend);`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`private async removePath(pathValue: string): Promise<void> {`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ ${JSON.stringify(releaseInfo, null, 2)}`
`98`	`98`	await $.spawn(`mv ./terraform ${directory}`, { cwd: temporaryDir, requiresRoot: true })
`99`	`99`	await $.spawn(`rm -rf ${temporaryDir}`)
`100`	`100`
`101`		`- if (!await Utils.isDirectoryOnPath(directory)) {`
	`101`	`+ if (!(await Utils.isDirectoryOnPath(directory))) {`
`102`	`102`	await FileUtils.addToStartupFile(`export PATH=$PATH:${directory}`);
`103`	`103`	`}`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ export class FileUtils {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`- static async addAllToStartupFile(lines: string[]): Promise<void> {`
`32`		`- const formattedLines = '\n' + lines.join('\n') + '\n';`
	`31`	`+ static async addAllToStartupFile(lines: (string \| undefined)[]): Promise<void> {`
	`32`	`+ const formattedLines = '\n' + lines.filter(Boolean).join('\n') + '\n';`
`33`	`33`	`const shellRc = Utils.getPrimaryShellRc();`
`34`	`34`
`35`	`35`	console.log(`Adding to ${path.basename(shellRc)}:
@@ -38,7 +38,7 @@ ${lines.join('\n')}`)
`38`	`38`	`await fs.appendFile(shellRc, formattedLines)`
`39`	`39`	`}`
`40`	`40`
`41`		`- static async addPathToZshrc(value: string, prepend: boolean): Promise<void> {`
	`41`	`+ static async addPathToPrimaryShellRc(value: string, prepend: boolean): Promise<void> {`
`42`	`42`	`const shellRc = Utils.getPrimaryShellRc();`
`43`	`43`	console.log(`Saving path: ${value} to ${shellRc}`);
`44`	`44`