fix: Fixes for docker and pnpm. Improved python tests by switching to uv

Author: kevinwang5658

src/resources/docker/docker.ts

@@ -175,7 +175,7 @@ export class DockerResource extends Resource<DockerConfig> {
       { requiresRoot: true }
     );
     await $.spawn(
-      'curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o --batch --yes /etc/apt/keyrings/docker.gpg',
+      `bash -c 'curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --batch --yes --dearmor -o /etc/apt/keyrings/docker.gpg'`,
       { requiresRoot: true }
     );
     await $.spawn(

src/resources/javascript/pnpm/pnpm.ts

@@ -69,8 +69,13 @@ export class Pnpm extends Resource<PnpmConfig> {
 
   async destroy(plan: DestroyPlan<PnpmConfig>): Promise<void> {
     const $ = getPty();
+
+    const expectedPnpmHome = Utils.isMacOS()
+      ? path.join(os.homedir(), 'Library', 'pnpm')
+      : path.join(os.homedir(), '.local', 'share', 'pnpm');
+
     const { data: pnpmLocation } = await $.spawn('which pnpm', { interactive: true });
-    if (pnpmLocation.trim().toLowerCase() !== path.join(os.homedir(), 'Library', 'pnpm', 'pnpm').trim().toLowerCase()) {
+    if (pnpmLocation.trim().toLowerCase() !== path.join(expectedPnpmHome, 'pnpm').trim().toLowerCase()) {
       throw new Error('pnpm was installed outside of Codify. Please uninstall manually and re-run Codify');
     }
 
@@ -84,7 +89,7 @@ export class Pnpm extends Resource<PnpmConfig> {
 
     const shellRc = Utils.getPrimaryShellRc();
     await FileUtils.removeLineFromStartupFile('# pnpm')
-    await FileUtils.removeLineFromStartupFile(`export PNPM_HOME="${os.homedir()}/Library/pnpm"`)
+    await FileUtils.removeLineFromStartupFile(`export PNPM_HOME="${expectedPnpmHome}"`)
     await FileUtils.removeFromFile(shellRc,
 `case ":$PATH:" in
   *":$PNPM_HOME:"*) ;;

test/node/npm/npm.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeAll } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import { PluginTester, testSpawn } from '@codifycli/plugin-test';
 import path from 'node:path';
 import { SpawnStatus } from '@codifycli/plugin-core';
@@ -20,18 +20,15 @@ describe('Npm tests', () => {
     await PluginTester.fullTest(pluginPath, [
       {
         type: 'npm',
-        globalInstall: ['pnpm'],
+        globalInstall: ['npm-run-all'],
       }
     ], {
+      skipUninstall: true,
       validateApply: async () => {
-        expect(await testSpawn('which nvm')).toMatchObject({ status: SpawnStatus.SUCCESS });
-        expect(await testSpawn('node --version')).toMatchObject({ status: SpawnStatus.SUCCESS });
-        expect(await testSpawn('nvm list')).toMatchObject({ status: SpawnStatus.SUCCESS });
-
-        const { data: installedVersions } = await testSpawn('nvm list')
-        expect(installedVersions).to.include('20');
-        expect(installedVersions).to.include('18');
+        expect(await testSpawn('which npm-run-all')).toMatchObject({ status: SpawnStatus.SUCCESS });
       },
     });
   });
+
+  // Don't uninstall nodeJS here. We need it for the test harness
 });

test/node/pnpm/pnpm.test.ts

@@ -13,7 +13,7 @@ describe('Pnpm tests', () => {
     ], {
       validateDestroy: async () => {
         const shellRcFile = fs.readFileSync(TestUtils.getPrimaryShellRc(), 'utf8')
-        expect(shellRcFile.trim()).to.eq('');
+        expect(shellRcFile).to.not.include('pnpm');
       }
     })
   })
@@ -28,7 +28,7 @@ describe('Pnpm tests', () => {
       },
       validateDestroy: async () => {
         const shellRcFile = fs.readFileSync(TestUtils.getPrimaryShellRc(), 'utf8')
-        expect(shellRcFile.trim()).to.eq('');
+        expect(shellRcFile).to.not.include('pnpm');
       }
     })
   })

test/python/pip-sync.test.ts

@@ -1,16 +1,19 @@
 import { PluginTester, testSpawn } from '@codifycli/plugin-test';
 import * as path from 'node:path';
-import { describe, expect, it } from 'vitest'
+import * as fs from 'node:fs/promises';
+import * as os from 'node:os';
+import { afterAll, describe, expect, it } from 'vitest'
 
 describe('Pip-sync resource integration tests', () => {
   const pluginPath = path.resolve('./src/index.ts');
 
   it('Installs python', { timeout: 500_000 }, async () => {
     await PluginTester.fullTest(pluginPath, [
       {
-        type: 'pyenv',
+        type: 'uv',
         pythonVersions: ['3.11'],
-        global: '3.11'
+        global: '3.11',
+        tools: ['pip'],
       },
     ], {
       skipUninstall: true,
@@ -25,7 +28,7 @@ describe('Pip-sync resource integration tests', () => {
       {
         'type': 'git-repository',
         'directory': '~/Projects/example-project2',
-        'repository': 'https://github.com/daniel-dqsdatalabs/python-template.git'
+        'repository': 'https://github.com/ImperialCollegeLondon/pip-tools-template.git'
       },
       {
         'type': 'venv-project',
@@ -49,4 +52,9 @@ describe('Pip-sync resource integration tests', () => {
       validateApply() {},
     });
   });
+
+  afterAll(async () => {
+    await fs.rm(path.join(os.homedir(), 'Projects', 'example-project2'), { recursive: true, force: true });
+    await PluginTester.uninstall(pluginPath, [{ type: 'uv' }]);
+  }, 120_000);
 })

test/python/pip.test.ts

@@ -10,9 +10,10 @@ describe('Pip resource integration tests', () => {
   it('Installs python', { timeout: 500000 }, async () => {
     await PluginTester.fullTest(pluginPath, [
       {
-        type: 'pyenv',
+        type: 'uv',
         pythonVersions: ['3.11'],
-        global: '3.11'
+        global: '3.11',
+        tools: ['pip'],
       },
     ], {
       skipUninstall: true,

test/python/venv-project.test.ts

@@ -13,7 +13,7 @@ describe('Virtualenv project tests', () => {
     console.log(await fs.readdir('Projects/python-project'));
 
     await PluginTester.fullTest(pluginPath, [
-      { type: 'pyenv', pythonVersions: ['3.11'], global: '3.11' },
+      { type: 'uv', pythonVersions: ['3.11'], global: '3.11' },
       { type: 'venv-project', envDir: '.venv', cwd: 'Projects/python-project', automaticallyInstallRequirementsTxt: true },
     ])
   })

test/python/virtualenv-project.test.ts

@@ -15,7 +15,7 @@ describe('Virtualenv project tests', () => {
 
     await PluginTester.fullTest(pluginPath, [
       { type: 'virtualenv' },
-      { type: 'pyenv', pythonVersions: ['3.11'], global: '3.11' },
+      { type: 'uv', pythonVersions: ['3.11'], global: '3.11' },
       { type: 'virtualenv-project', dest: '.venv', cwd: 'Projects/python-project', automaticallyInstallRequirementsTxt: true },
     ])
   })