build-strap 5.0.0-dev.66 → 5.0.0-dev.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-strap",
-  "version": "5.0.0-dev.66",
+  "version": "5.0.0-dev.70",
   "description": "Node scripts for building things",
   "license": "MIT",
   "authors": [

package/src/brew.js

@@ -2,7 +2,7 @@ import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
 import { spawn } from './cp.js';
-import { appendToEnvProfile, cmdExists, ensureProcessPathEnvIncludes, } from './env.js';
+import { appendToEnv, cmdExists, ensureProcessPathEnvIncludes, } from './env.js';
 const brewPath = async () => {
     for (const testPath of [
         '/opt/homebrew/bin/brew',
@@ -26,7 +26,7 @@ const brewPathExists = async () => {
 };
 const appendBrewShellEnv = async (opts) => {
     const brewDir = path.dirname(await brewPath());
-    await appendToEnvProfile(`\neval "$(${brewDir}/brew shellenv)"`, opts);
+    await appendToEnv(`\neval "$(${brewDir}/brew shellenv)"`, opts);
     ensureProcessPathEnvIncludes(brewDir);
 };
 export const ensureBrewInstalled = async () => {

package/src/docker.d.ts

@@ -68,4 +68,5 @@ export declare function copyFilesFromDockerImage({ filePaths, ignoreErrors, imag
 export declare const dockerIsRunning: () => Promise<boolean>;
 export declare const ensureDockerRunning: (timeoutSeconds?: number) => Promise<void>;
 export declare const ensureDockerInstalled: () => Promise<void>;
+export declare const ensureDockerForMacConfigured: (desiredConfig?: Record<string, unknown> | null | undefined) => Promise<void>;
 export {};

package/src/docker.js

@@ -263,3 +263,34 @@ export const ensureDockerInstalled = async () => {
         }
     }
 };
+export const ensureDockerForMacConfigured = async (desiredConfig) => {
+    if (isMac()) {
+        if (!desiredConfig) {
+            buildLog('Skipping docker configuration due to empty config value');
+            return;
+        }
+        const configPath = path.join(os.homedir(), '/Library/Group Containers/group.com.docker/settings.json');
+        await fs.ensureDir(path.dirname(configPath));
+        if (!(await fs.pathExists(configPath))) {
+            // Must run Docker at least once to create the config file
+            await ensureDockerRunning();
+        }
+        if (!(await fs.pathExists(configPath))) {
+            throw new Error('Failed to locate the Docker config file');
+        }
+        const existingConfig = await fs.readJson(configPath);
+        if (!Object.entries(desiredConfig).every(([key, value]) => existingConfig[key] === value)) {
+            buildLog('Adjusting Docker config...');
+            await fs.writeJson(configPath, {
+                ...existingConfig,
+                ...desiredConfig,
+            }, { spaces: 2 });
+            if (await dockerIsRunning()) {
+                // Restart the Docker app
+                buildLog('Killing Docker...');
+                await spawn('osascript', ['-e', `quit app "Docker"`]);
+                await ensureDockerRunning();
+            }
+        }
+    }
+};

package/src/env.d.ts

@@ -6,6 +6,7 @@ export declare const isArm: () => boolean;
 export declare const isAppleSilicon: () => boolean;
 export declare const shellType: () => string | null;
 export declare const shellEnvFile: () => string | null;
+export declare const shellProfile: () => string | null;
 export declare const whichCmd: (cmd: string) => Promise<null | string>;
 export declare const cmdExists: (cmd: string) => Promise<boolean>;
 interface ReadShellEnvVarOptions {
@@ -14,13 +15,13 @@ interface ReadShellEnvVarOptions {
     shell?: string;
 }
 export declare const readShellEnvVar: (name: string, { refreshEnv, envFile, shell, }?: ReadShellEnvVarOptions) => Promise<string | null>;
-export interface AppendToEnvProfileOptions {
+export interface AppendToEnvOptions {
     envFile?: string | null;
     testContent?: string | StringGenFn;
 }
-export declare const appendToEnvProfile: (content: string | StringGenFn, { envFile, testContent }?: AppendToEnvProfileOptions) => Promise<void>;
-export declare const appendEnvVarToProfile: (name: string, value: string, { envFile }?: ReadShellEnvVarOptions) => Promise<void>;
+export declare const appendToEnv: (content: string | StringGenFn, { envFile, testContent }?: AppendToEnvOptions) => Promise<void>;
+export declare const appendEnvVar: (name: string, value: string, { envFile }?: ReadShellEnvVarOptions) => Promise<void>;
 export declare const ensureEnvVarValue: (name: string, value: string, opts?: ReadShellEnvVarOptions | undefined) => Promise<void>;
-export declare const ensureEnvVarSet: (name: string, getValue: () => Promise<string>) => Promise<void>;
+export declare const ensureEnvVarSet: (name: string, getValue: () => Promise<string>, opts?: ReadShellEnvVarOptions | undefined) => Promise<void>;
 export declare const ensureProcessPathEnvIncludes: (binPath: string) => void;
 export {};

package/src/env.js

@@ -27,6 +27,16 @@ const cacheString = (key, fn) => {
 };
 export const shellType = () => cacheString('shellType', () => os.userInfo().shell.split('/').pop() || null);
 export const shellEnvFile = () => cacheString('shellEnvFile', () => {
+    switch (shellType()) {
+        case 'zsh':
+            return path.join(os.homedir(), '.zshrc');
+        case 'bash':
+            return path.join(os.homedir(), '.bashrc');
+        default:
+            return null;
+    }
+});
+export const shellProfile = () => cacheString('shellProfile', () => {
     switch (shellType()) {
         case 'zsh':
             return path.join(os.homedir(), '.zprofile');
@@ -51,7 +61,7 @@ export const whichCmd = async (cmd) => {
     return binPath;
 };
 export const cmdExists = async (cmd) => !!whichCmd(cmd);
-export const readShellEnvVar = async (name, { refreshEnv = false, envFile = shellEnvFile(), shell = os.userInfo().shell, } = {}) => {
+export const readShellEnvVar = async (name, { refreshEnv = true, envFile = shellEnvFile(), shell = os.userInfo().shell, } = {}) => {
     if (refreshEnv && (!envFile || !(await fs.pathExists(envFile)))) {
         throw new Error(`Could not find shell env file: ${envFile}`);
     }
@@ -64,25 +74,25 @@ export const readShellEnvVar = async (name, { refreshEnv = false, envFile = shel
         return null;
     }
 };
-export const appendToEnvProfile = async (content, { envFile = shellEnvFile(), testContent } = {}) => {
+export const appendToEnv = async (content, { envFile = shellEnvFile(), testContent } = {}) => {
     if (!envFile) {
         throw new Error('envFile must be set');
     }
     await appendIfMissing(envFile, content, testContent);
 };
-export const appendEnvVarToProfile = async (name, value, { envFile = shellEnvFile() } = {}) => appendToEnvProfile(`\nexport ${name}=${value}`, { envFile });
+export const appendEnvVar = async (name, value, { envFile = shellEnvFile() } = {}) => appendToEnv(`\nexport ${name}=${value}`, { envFile });
 export const ensureEnvVarValue = async (name, value, opts) => {
     const currentValue = await readShellEnvVar(name, opts);
     if (currentValue !== value) {
-        await appendEnvVarToProfile(name, value, opts);
+        await appendEnvVar(name, value, opts);
     }
     process.env[name] = value;
 };
-export const ensureEnvVarSet = async (name, getValue) => {
-    const currentValue = await readShellEnvVar(name);
+export const ensureEnvVarSet = async (name, getValue, opts) => {
+    const currentValue = await readShellEnvVar(name, opts);
     if (!currentValue) {
         const newValue = await getValue();
-        await appendEnvVarToProfile(name, newValue);
+        await appendEnvVar(name, newValue, opts);
         process.env[name] = newValue;
     }
 };

package/src/gh.d.ts

@@ -1,6 +1,7 @@
 import { SpawnOptions } from './cp.js';
 export declare const gh: (args: string[], options?: SpawnOptions | undefined) => Promise<import("./cp.js").SpawnResult>;
 export declare const ghRepoClone: (repo: string, repoDir: string) => Promise<void>;
+export declare const ensureGhRepo: (repo: string, rootDir?: string) => Promise<void>;
 export declare const ensureGhAuthLogin: ({ host, scopes, }?: {
     host?: string | undefined;
     scopes?: string | undefined;

package/src/gh.js

@@ -1,4 +1,5 @@
 import fs from 'fs-extra';
+import path from 'path';
 import { spawn } from './cp.js';
 import { buildLog } from './run.js';
 import { ensureSshKeyGenerated } from './ssh.js';
@@ -8,6 +9,13 @@ export const ghRepoClone = async (repo, repoDir) => {
         stdio: 'inherit',
     });
 };
+export const ensureGhRepo = async (repo, rootDir = '.') => {
+    const repoDir = path.join(rootDir, repo);
+    if (!(await fs.pathExists(repoDir))) {
+        buildLog(`${repo} not found, cloning...`);
+        await ghRepoClone(repo, repoDir);
+    }
+};
 export const ensureGhAuthLogin = async ({ host = 'github.com', scopes, } = {}) => {
     const configured = (await gh(['auth', 'status'], { rejectOnErrorCode: false })).code === 0;
     if (!configured) {