test runner progress

Signed-off-by: shmck <[email protected]>

Author: ShMcK

src/utils/exec.ts

@@ -1,4 +1,6 @@
+import * as T from "../../typings/tutorial";
 import { exec as cpExec } from "child_process";
+import * as path from "path";
 import { promisify } from "util";
 
 const asyncExec = promisify(cpExec);
@@ -29,15 +31,46 @@ export function createCherryPick(cwd: string) {
 }
 
 export function createCommandRunner(cwd: string) {
-  return async function runCommands(commands: string[]) {
+  return async function runCommands(commands: string[], dir?: string) {
     for (const command of commands) {
       try {
         console.log(`> ${command}`);
-        await createExec(cwd)(command);
+        let cwdDir = cwd;
+        if (dir) {
+          cwdDir = path.join(cwd, dir);
+        }
+        await createExec(cwdDir)(command);
       } catch (e) {
         console.log(`Setup command failed: "${command}"`);
         console.log(e.message);
       }
     }
   };
 }
+
+function isAbsolute(p: string) {
+  return path.normalize(p + "/") === path.normalize(path.resolve(p) + "/");
+}
+
+export function createTestRunner(cwd: string, config: T.TestRunnerConfig) {
+  const { command, args, directory } = config;
+
+  const commandIsAbsolute = isAbsolute(command);
+
+  let runnerPath;
+  if (commandIsAbsolute) {
+    // absolute path
+    runnerPath = command;
+  } else {
+    // relative path
+    runnerPath = path.join(cwd, directory || "", command);
+  }
+
+  const commandWithArgs = `${runnerPath} ${args.tap}`;
+
+  return async function runTest() {
+    const { stdout, stderr } = await createExec(cwd)(commandWithArgs);
+    console.log(stdout);
+    console.warn(stderr);
+  };
+}

src/validate.ts

@@ -3,7 +3,11 @@ 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 { createCommandRunner, createCherryPick } from "./utils/exec";
+import {
+  createCommandRunner,
+  createCherryPick,
+  createTestRunner,
+} from "./utils/exec";
 import { getCommits, CommitLogObject } from "./utils/commits";
 
 async function validate(args: string[]) {
@@ -51,6 +55,7 @@ async function validate(args: string[]) {
     // no js cherry pick implementation
     const cherryPick = createCherryPick(tmpDir);
     const runCommands = createCommandRunner(tmpDir);
+    const runTest = createTestRunner(tmpDir, skeleton.config.testRunner);
 
     // VALIDATE TUTORIAL TESTS
 
@@ -63,11 +68,15 @@ async function validate(args: string[]) {
       // run commands
       if (skeleton.config?.testRunner?.setup?.commands) {
         console.info("Running setup commands...");
-        await runCommands(skeleton.config?.testRunner?.setup?.commands);
+
+        await runCommands(
+          skeleton.config?.testRunner?.setup?.commands,
+          // add optional setup directory
+          skeleton.config?.testRunner?.directory
+        );
       }
     }
 
-    console.log(skeleton.levels);
     for (const level of skeleton.levels) {
       if (level.setup) {
         // load commits
@@ -84,6 +93,7 @@ async function validate(args: string[]) {
       // steps
       if (level.steps) {
         for (const step of level.steps) {
+          console.log(step);
           // load commits
           if (step.setup.commits) {
             console.log(`Loading ${step.id} commits...`);
@@ -94,6 +104,10 @@ async function validate(args: string[]) {
             console.log(`Running ${step.id} commands...`);
             await runCommands(step.setup.commands);
           }
+
+          // run test
+          console.info("Running test");
+          await runTest();
         }
       }
     }

typings/tutorial.d.ts

@@ -62,7 +62,7 @@ export interface TestRunnerArgs {
 
 export interface TestRunnerConfig {
   command: string;
-  args?: TestRunnerArgs;
+  args: TestRunnerArgs;
   directory?: string;
   setup?: StepActions;
 }