build-strap 5.0.0-dev.71 → 5.0.0-dev.77

package/package.json

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

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();
 }
@@ -23,9 +24,9 @@ export async function gitInfo(noCache = false) {
     return info;
 }
 export const ensureGitLfsInstalled = async () => {
-    await git(['lfs', 'install'], { stdio: 'inherit' });
+    await git(['lfs', 'install']);
 };
-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) => {