run setup commands in path

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

Author: ShMcK

CHANGELOG.md

@@ -71,11 +71,11 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 {
 "config": {
   "testRunner": {
-    "command": "npm test",
+    "command": "npm test", // runs in path location or root
     "path": "coderoad",
     "actions": {
       "commits": ["a974aea"],
-      "commands": ["cd coderoad && npm install"]
+      "commands": ["npm install"] // runs in path location or root
     }
   },
 }

src/actions/setupActions.ts

@@ -6,10 +6,19 @@ import openFiles from './utils/openFiles'
 import runCommands from './utils/runCommands'
 import onError from '../services/sentry/onError'
 
-const setupActions = async (
-  actions: TT.StepActions,
-  send: (action: T.Action) => void, // send messages to client
-): Promise<void> => {
+async function wait(ms: number) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms)
+  })
+}
+
+interface SetupActions {
+  actions: TT.StepActions
+  send: (action: T.Action) => void // send messages to client
+  path?: string
+}
+
+export const setupActions = async ({ actions, send, path }: SetupActions): Promise<void> => {
   const { commands, commits, files, watchers } = actions
 
   // 1. run commits
@@ -26,8 +35,13 @@ const setupActions = async (
   // 3. start file watchers
   loadWatchers(watchers || [])
 
+  await wait(1000)
+
   // 4. run command
-  await runCommands(commands || [], send).catch(onError)
+  await runCommands({ commands: commands || [], send, path }).catch(onError)
 }
 
-export default setupActions
+export const solutionActions = async (params: SetupActions): Promise<void> => {
+  await git.clear()
+  return setupActions(params).catch(onError)
+}

src/actions/solutionActions.ts

@@ -1,7 +1,13 @@
 import * as T from 'typings'
 import { exec } from '../../services/node'
 
-const runCommands = async (commands: string[], send: (action: T.Action) => void) => {
+interface RunCommands {
+  commands: string[]
+  send: (action: T.Action) => void
+  path?: string
+}
+
+const runCommands = async ({ commands, send, path }: RunCommands) => {
   if (!commands.length) {
     return
   }
@@ -13,7 +19,8 @@ const runCommands = async (commands: string[], send: (action: T.Action) => void)
     send({ type: 'COMMAND_START', payload: { process: { ...process, status: 'RUNNING' } } })
     let result: { stdout: string; stderr: string }
     try {
-      result = await exec({ command })
+      result = await exec({ command, path })
+      console.log(result)
     } catch (error) {
       console.log(`Test failed: ${error.message}`)
       send({ type: 'COMMAND_FAIL', payload: { process: { ...process, status: 'FAIL' } } })

src/actions/utils/runCommands.ts

@@ -4,8 +4,7 @@ import * as E from 'typings/error'
 import * as vscode from 'vscode'
 import { satisfies } from 'semver'
 import saveCommit from '../actions/saveCommit'
-import setupActions from '../actions/setupActions'
-import solutionActions from '../actions/solutionActions'
+import { setupActions, solutionActions } from '../actions/setupActions'
 import tutorialConfig from '../actions/tutorialConfig'
 import { COMMANDS } from '../editor/commands'
 import logger from '../services/logger'
@@ -287,11 +286,11 @@ class Channel implements Channel {
       // load step actions (git commits, commands, open files)
       case 'SETUP_ACTIONS':
         await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP, action.payload)
-        setupActions(action.payload, this.send)
+        setupActions({ actions: action.payload, send: this.send })
         return
       // load solution step actions (git commits, commands, open files)
       case 'SOLUTION_ACTIONS':
-        await solutionActions(action.payload, this.send)
+        await solutionActions({ actions: action.payload, send: this.send })
         // run test following solution to update position
         vscode.commands.executeCommand(COMMANDS.RUN_TEST, action.payload)
         return

src/channel/index.ts

@@ -1,7 +1,7 @@
 import * as TT from 'typings/tutorial'
 import * as vscode from 'vscode'
 import createTestRunner, { Payload } from '../services/testRunner'
-import setupActions from 'actions/setupActions'
+import { setupActions } from '../actions/setupActions'
 import createWebView from '../webview'
 
 export const COMMANDS = {
@@ -48,11 +48,11 @@ export const createCommands = ({ extensionPath, workspaceState }: CreateCommandP
       // setup 1x1 horizontal layout
       webview.createOrShow()
     },
-    [COMMANDS.CONFIG_TEST_RUNNER]: (config: TT.TutorialTestRunnerConfig) => {
+    [COMMANDS.CONFIG_TEST_RUNNER]: async (config: TT.TutorialTestRunnerConfig) => {
       if (config.actions) {
         // setup tutorial test runner commits
         // assumes git already exists
-        setupActions(config.actions, webview.send)
+        await setupActions({ actions: config.actions, send: webview.send, path: config.path })
       }
       testRunner = createTestRunner(config, {
         onSuccess: (payload: Payload) => {

src/editor/commands.ts

@@ -12,9 +12,8 @@ interface ExecParams {
 }
 
 export const exec = (params: ExecParams): Promise<{ stdout: string; stderr: string }> | never => {
-  return asyncExec(params.command, {
-    cwd: join(WORKSPACE_ROOT, params.path || ''),
-  })
+  const cwd = join(WORKSPACE_ROOT, params.path || '')
+  return asyncExec(params.command, { cwd })
 }
 
 export const exists = (...paths: string[]): boolean | never => {