fix: Fixed cask parameter installations. Fixed docker deteching volume breaking entire apply. Filter corepack out of npm install

Author: kevinwang5658

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "default",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.4",
   "description": "Default plugin for Codify - provides 50+ declarative resources for managing development tools and system configuration across macOS and Linux",
   "main": "dist/index.js",
   "scripts": {
@@ -41,8 +41,8 @@
   "license": "ISC",
   "type": "module",
   "dependencies": {
-    "@codifycli/plugin-core": "1.1.0-beta17",
-    "@codifycli/schemas": "1.1.0-beta6",
+    "@codifycli/plugin-core": "1.1.0-beta20",
+    "@codifycli/schemas": "1.1.0-beta8",
     "ajv": "^8.18.0",
     "ajv-formats": "^2.1.1",
     "chalk": "^5.3.0",

package.json

@@ -85,7 +85,7 @@ export class DockerResource extends Resource<DockerConfig> {
 
         // TODO: Attempt to sleep until Docker is ready
         await this.sleep(1000);
-        await $.spawn('hdiutil detach /Volumes/Docker', { cwd: tmpDir })
+        await $.spawnSafe('hdiutil detach /Volumes/Docker', { cwd: tmpDir })
       } finally {
         await fs.rm(tmpDir, { recursive: true, force: true })
       }

src/resources/docker/docker.ts

@@ -97,20 +97,31 @@ export class CasksParameter extends StatefulParameter<HomebrewConfig, string[]>
       return;
     }
 
-    const result = await $.spawnSafe(`brew install --casks --adopt ${casksToInstall.join(' ')}`, {
-      interactive: true,
-      env: { HOMEBREW_NO_AUTO_UPDATE: 1 }
-    })
+    for (const cask of casksToInstall) {
+      const result = await $.spawnSafe(`brew install --casks ${cask}`, {
+        interactive: true,
+        env: { HOMEBREW_NO_AUTO_UPDATE: 1 }
+      })
 
-    if (result.status === SpawnStatus.SUCCESS) {
-      // Casks can't detect if a program was installed by other means. If it returns this message, throw an error
-      if (result.data.includes('It seems there is already an App at')) {
-        throw new Error(`A program already exists for cask ${casks}`)
+      if (result.status === SpawnStatus.SUCCESS) {
+        console.log(`Installed cask: ${cask}`);
+        continue;
       }
 
-      console.log(`Installed casks: ${casks.join(' ')}`);
-    } else {
-      throw new Error(`Failed to install casks: ${casks}. ${JSON.stringify(result.data, null, 2)}`)
+      if (result.data?.includes('It seems there is already an App at')) {
+        const adoptResult = await $.spawnSafe(`brew install --casks --adopt ${cask}`, {
+          interactive: true,
+          env: { HOMEBREW_NO_AUTO_UPDATE: 1 }
+        })
+
+        if (adoptResult.status === SpawnStatus.SUCCESS) {
+          console.log(`Installed cask (adopted): ${cask}`);
+        } else {
+          throw new Error(`Failed to install cask ${cask} with --adopt: ${JSON.stringify(adoptResult.data, null, 2)}`)
+        }
+      } else {
+        throw new Error(`Failed to install cask: ${cask}. ${JSON.stringify(result.data, null, 2)}`)
+      }
     }
   }
 

src/resources/homebrew/casks-parameter.ts

@@ -39,13 +39,15 @@ export class NpmInstallParameter extends StatefulParameter<NpmConfig, string[]>
 
     const parsedData = JSON.parse(data) as NpmLsResponse;
 
-    return Object.entries(parsedData.dependencies ?? {}).map(([name, info]) => {
-      // If desired entry has a version specifier, return name@version so equality checks work
-      if (desired?.some((d) => d.includes('@') && packageName(d) === name)) {
-        return `${name}@${info.version}`
-      }
-      return name
-    })
+    return Object.entries(parsedData.dependencies ?? {})
+      .filter(([name]) => name !== 'corepack')
+      .map(([name, info]) => {
+        // If desired entry has a version specifier, return name@version so equality checks work
+        if (desired?.some((d) => d.includes('@') && packageName(d) === name)) {
+          return `${name}@${info.version}`
+        }
+        return name
+      })
   }
 
   async add(valueToAdd: string[], plan: Plan<NpmConfig>): Promise<void> {