Jun 13, 2020 · Jun 13, 2020 · Jun 13, 2020 · Jun 13, 2020 · Jun 13, 2020 · Jun 13, 2020
diff --git a/src/utils/cherryPick.ts b/src/utils/cherryPick.ts
 import { exec as cpExec } from "child_process";
 import { promisify } from "util";

 const asyncExec = promisify(cpExec);

 export const exec = (
  command: string,
  cwd: string
 ): Promise<{ stdout: string; stderr: string }> | never => {
  return asyncExec(command, { cwd });
 };

 export function gitPCherryPick(cwd: string) {
  return async function cherryPick(commits: string[]): Promise<void> {
    for (const commit of commits) {
      try {
        const { stdout } = await exec(
          `git cherry-pick -X theirs ${commit}`,
          cwd
        );
        if (!stdout) {
          console.warn(`No cherry-pick output for ${commit}`);
        }
      } catch (e) {
        console.warn(`Cherry-pick failed for ${commit}`);
      }
    }
  };
 }
diff --git a/src/validate.ts b/src/validate.ts
 import * as yamlParser from "js-yaml";
 import { getArg } from "./utils/args";
 import gitP, { SimpleGit } from "simple-git/promise";
 import { gitPCherryPick } from "./utils/cherryPick";
 import { getCommits, CommitLogObject } from "./utils/commits";

 async function validate(args: string[]) {
      await fs.emptyDir(tmpDir);
    }
    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);

    // VALIDATE TUTORIAL TESTS
    if (commits.INIT) {
      cherryPick(commits.INIT);
    }

    // run test runner setup command(s)
    console.error(e.message);
  } finally {
    // cleanup
    await fs.emptyDir(tmpDir);
 //await fs.emptyDir(tmpDir);
  }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,29 @@
		import { exec as cpExec } from "child_process";
		import { promisify } from "util";

		const asyncExec = promisify(cpExec);

		export const exec = (
		command: string,
		cwd: string
		): Promise<{ stdout: string; stderr: string }> \| never => {
		return asyncExec(command, { cwd });
		};

		export function gitPCherryPick(cwd: string) {
		return async function cherryPick(commits: string[]): Promise<void> {
		for (const commit of commits) {
		try {
		const { stdout } = await exec(
		`git cherry-pick -X theirs ${commit}`,
		cwd
		);
		if (!stdout) {
		console.warn(`No cherry-pick output for ${commit}`);
		}
		} catch (e) {
		console.warn(`Cherry-pick failed for ${commit}`);
		}
		}
		};
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,6 +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 { getCommits, CommitLogObject } from "./utils/commits";

		async function validate(args: string[]) {
Expand DownExpand Up		@@ -46,10 +47,18 @@ async function validate(args: string[]) {
		await fs.emptyDir(tmpDir);
		}
		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);

		// VALIDATE TUTORIAL TESTS
		if (commits.INIT) {
		cherryPick(commits.INIT);
		}

		// run test runner setup command(s)
Expand All		@@ -71,7 +80,7 @@ async function validate(args: string[]) {
		console.error(e.message);
		} finally {
		// cleanup
		await fs.emptyDir(tmpDir);
		//await fs.emptyDir(tmpDir);
		}
		}

Expand Down