run setup commands

Signed-off-by: shmck <shawn.j.mckay@gmail.com>
coderoad · ShMcK · Jun 13, 2020 · Jun 13, 2020 · Jun 13, 2020 · Jun 13, 2020
commit b7acb6702c461589a9486d079ae6969581309544
diff --git a/src/utils/cherryPick.ts b/src/utils/cherryPick.ts
diff --git a/src/utils/exec.ts b/src/utils/exec.ts
@@ -0,0 +1,43 @@
+import { exec as cpExec } from "child_process";
+import { promisify } from "util";
+
+const asyncExec = promisify(cpExec);
+
+export function createExec(cwd: string) {
+  return function exec(
+    command: string
+  ): Promise<{ stdout: string; stderr: string }> | never {
+    return asyncExec(command, { cwd });
+  };
+}
+
+export function createCherryPick(cwd: string) {
+  return async function cherryPick(commits: string[]): Promise<void> {
+    for (const commit of commits) {
+      try {
+        const { stdout } = await createExec(cwd)(
+          `git cherry-pick -X theirs ${commit}`
+        );
+        if (!stdout) {
+          console.warn(`No cherry-pick output for ${commit}`);
+        }
+      } catch (e) {
+        console.warn(`Cherry-pick failed for ${commit}`);
+      }
+    }
+  };
+}
+
+export function createCommandRunner(cwd: string) {
+  return async function runCommands(commands: string[]) {
+    for (const command of commands) {
+      try {
+        console.log(`> ${command}`);
+        await createExec(cwd)(command);
+      } catch (e) {
+        console.log(`Setup command failed: "${command}"`);
+        console.log(e.message);
+      }
+    }
+  };
+}
diff --git a/src/validate.ts b/src/validate.ts
@@ -3,7 +3,7 @@ import * as fs from "fs-extra";
 import * as yamlParser from "js-yaml";
 import { getArg } from "./utils/args";
 import gitP, { SimpleGit } from "simple-git/promise";
-import { gitPCherryPick } from "./utils/cherryPick";
+import { createCommandRunner, createCherryPick } from "./utils/exec";
 import { getCommits, CommitLogObject } from "./utils/commits";
 
 async function validate(args: string[]) {
@@ -23,8 +23,6 @@ async function validate(args: string[]) {
   try {
     skeleton = yamlParser.load(_yaml);
 
-    console.log("config", skeleton);
-    // TODO: validate yaml
     if (!skeleton) {
       throw new Error("Invalid yaml file contents");
     }
@@ -37,7 +35,6 @@ async function validate(args: string[]) {
 
   // validate commits
   const commits: CommitLogObject = await getCommits({ localDir, codeBranch });
-  console.log("commits", commits);
 
   // setup tmp dir
   const tmpDir = path.join(localDir, ".tmp");
@@ -48,17 +45,23 @@ async function validate(args: string[]) {
     }
     const tempGit: SimpleGit = gitP(tmpDir);
 
-    console.log(Object.keys(gitP));
-
     await tempGit.init();
     await tempGit.addRemote("origin", skeleton.config.repo.uri);
     await tempGit.fetch("origin", skeleton.config.repo.branch);
     // no js cherry pick implementation
-    const cherryPick = gitPCherryPick(tmpDir);
+    const cherryPick = createCherryPick(tmpDir);
+    const runCommands = createCommandRunner(tmpDir);
 
     // VALIDATE TUTORIAL TESTS
     if (commits.INIT) {
+      // load commits
+      console.info("Loading setup commits...");
       cherryPick(commits.INIT);
+
+      // run commands
+      if (skeleton.config?.testRunner?.setup?.commands) {
+        runCommands(skeleton.config?.testRunner?.setup?.commands);
+      }
     }
 
     // run test runner setup command(s)