build-strap 5.0.0-dev.69 → 5.0.0-dev.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-strap",
-  "version": "5.0.0-dev.69",
+  "version": "5.0.0-dev.73",
   "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/env.d.ts

@@ -15,12 +15,12 @@ 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>, opts?: ReadShellEnvVarOptions | undefined) => Promise<void>;
 export declare const ensureProcessPathEnvIncludes: (binPath: string) => void;

package/src/env.js

@@ -60,7 +60,7 @@ export const whichCmd = async (cmd) => {
     }
     return binPath;
 };
-export const cmdExists = async (cmd) => !!whichCmd(cmd);
+export const cmdExists = async (cmd) => !!(await whichCmd(cmd));
 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}`);
@@ -74,17 +74,17 @@ export const readShellEnvVar = async (name, { refreshEnv = true, envFile = shell
         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;
 };
@@ -92,7 +92,7 @@ export const ensureEnvVarSet = async (name, getValue, opts) => {
     const currentValue = await readShellEnvVar(name, opts);
     if (!currentValue) {
         const newValue = await getValue();
-        await appendEnvVarToProfile(name, newValue, opts);
+        await appendEnvVar(name, newValue, opts);
         process.env[name] = newValue;
     }
 };

package/src/gh.d.ts

@@ -1,7 +1,11 @@
 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 ensureGhRepo: (repo: string, { rootDir, targetDir, targetName, }?: {
+    rootDir?: string | undefined;
+    targetDir?: string | undefined;
+    targetName?: string | undefined;
+}) => Promise<void>;
 export declare const ensureGhAuthLogin: ({ host, scopes, }?: {
     host?: string | undefined;
     scopes?: string | undefined;

package/src/gh.js

@@ -9,10 +9,11 @@ export const ghRepoClone = async (repo, repoDir) => {
         stdio: 'inherit',
     });
 };
-export const ensureGhRepo = async (repo, rootDir = '.') => {
-    const repoDir = path.join(rootDir, repo);
+export const ensureGhRepo = async (repo, { rootDir = '.', targetDir, targetName, } = {}) => {
+    const repoDir = targetDir ||
+        path.join(rootDir, targetName || repo.split('/').pop() || repo);
     if (!(await fs.pathExists(repoDir))) {
-        buildLog(`${repo} not found, cloning...`);
+        buildLog(`${repo} not found, cloning into ${repoDir}...`);
         await ghRepoClone(repo, repoDir);
     }
 };

package/src/git.d.ts

@@ -1,5 +1,6 @@
 import { SpawnOptions } from './cp.js';
-export declare const git: (args: string[], opts?: SpawnOptions | undefined) => Promise<string>;
+export declare const git: (args: string[], opts?: SpawnOptions | undefined) => Promise<import("./cp.js").SpawnResult>;
+export declare const gitOutput: (args: string[], opts?: SpawnOptions | undefined) => Promise<string>;
 export declare function gitBranch(): Promise<string>;
 export declare function gitRevId(): Promise<string>;
 declare type GitInfo = {

package/src/git.js

@@ -1,14 +1,15 @@
 import { spawn } from './cp.js';
 import { userQuestion } from './prompt.js';
 import { buildLog } from './run.js';
-export const git = async (args, opts) => (await spawn('git', args, { captureOutput: true, ...opts })).stdout.trim();
+export const git = async (args, opts) => spawn('git', args, opts);
+export const gitOutput = async (args, opts) => (await git(args, { captureOutput: true, ...opts })).stdout.trim();
 export async function gitBranch() {
-    return (await git(['symbolic-ref', '--short', 'HEAD']))
+    return (await gitOutput(['symbolic-ref', '--short', 'HEAD']))
         .replace(/[_+/]/g, '-')
         .trim();
 }
 export async function gitRevId() {
-    return (await git(['rev-parse', '--short=12', 'HEAD']))
+    return (await gitOutput(['rev-parse', '--short=12', 'HEAD']))
         .replace(/[+]/g, '')
         .trim();
 }
@@ -25,7 +26,7 @@ export async function gitInfo(noCache = false) {
 export const ensureGitLfsInstalled = async () => {
     await git(['lfs', 'install'], { stdio: 'inherit' });
 };
-export const gitConfigRead = async (key, global = true) => git(['config', ...(global ? ['--global'] : []), key], {
+export const gitConfigRead = async (key, global = true) => gitOutput(['config', ...(global ? ['--global'] : []), key], {
     rejectOnErrorCode: false,
 });
 export const gitConfigWrite = async (key, value, global = true) => {