8000 run setup commands in path · myhololens/coderoad-vscode@73fbd92 · GitHub
[go: up one dir, main page]
Skip to content

Commit 73fbd92

Browse files
ShMcKShMcK
committed
run setup commands in path
Signed-off-by: shmck <shawn.j.mckay@gmail.com>
1 parent eaf27ff commit 73fbd92

File tree

7 files changed

+39
-32
lines changed

7 files changed

+39
-32
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
7171
{
7272
"config": {
7373
"testRunner": {
74-
"command": "npm test",
74+
"command": "npm test", // runs in path location or root
7575
"path": "coderoad",
7676
"actions": {
7777
"commits": ["a974aea"],
78-
"commands": ["cd coderoad && npm install"]
78+
"commands": ["npm install"] // runs in path location or root
7979
}
8080
},
8181
}

‎src/actions/setupActions.ts

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,19 @@ import openFiles from './utils/openFiles'
66
import runCommands from './utils/runCommands'
77
import onError from '../services/sentry/onError'
88

9-
const setupActions = async (
10-
actions: TT.StepActions,
11-
send: (action: T.Action) => void, // send messages to client
12-
): Promise<void> => {
9+
async function wait(ms: number) {
10+
return new Promise((resolve) => {
11+
setTimeout(resolve, ms)
12+
})
13+
}
14+
15+
interface SetupActions {
16+
actions: TT.StepActions
17+
send: (action: T.Action) => void // send messages to client
18+
path?: string
19+
}
20+
21+
export const setupActions = async ({ actions, send, path }: SetupActions): Promise<void> => {
1322
const { commands, commits, files, watchers } = actions
1423

1524
// 1. run commits
@@ -26,8 +35,13 @@ const setupActions = async (
2635
// 3. start file watchers
2736
loadWatchers(watchers || [])
2837

38+
await wait(1000)
39+
2940
// 4. run command
30-
await runCommands(commands || [], send).catch(onError)
41+
await runCommands({ commands: commands || [], send, path }).catch(onError)
3142
}
3243

33-
export default setupActions
44+
export const solutionActions = async (params: SetupActions): Promise<void> => {
45+
await git.clear()
46+
return setupActions(params).catch(onError)
47+
}

‎src/actions/solutionActions.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/actions/utils/runCommands.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import * as T from 'typings'
22
import { exec } from '../../services/node'
33

4-
const runCommands = async (commands: string[], send: (action: T.Action) => void) => {
4+
interface RunCommands {
5+
commands: string[]
6+
send: (action: T.Action) => void
7+
path?: string
8+
}
9+
10+
const runCommands = async ({ commands, send, path }: RunCommands) => {
511
if (!commands.length) {
612
return
713
}
@@ -13,7 +19,8 @@ const runCommands = async (commands: string[], send: (action: T.Action) => void)
1319
send({ type: 'COMMAND_START', payload: { process: { ...process, status: 'RUNNING' } } })
1420
let result: { stdout: string; stderr: string }
1521
try {
16-
result = await exec({ command })
22+
result = await exec({ command, path })
23+
console.log(result)
1724
} catch (error) {
1825
console.log(`Test failed: ${error.message}`)
1926
send({ type: 'COMMAND_FAIL', payload: { process: { ...process, status: 'FAIL' } } })

‎src/channel/index.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import * as E from 'typings/error'
44
import * as vscode from 'vscode'
55
import { satisfies } from 'semver'
66
import saveCommit from '../actions/saveCommit'
7-
import setupActions from '../actions/setupActions'
8-
import solutionActions from '../actions/solutionActions'
7+
import { setupActions, solutionActions } from '../actions/setupActions'
98
import tutorialConfig from '../actions/tutorialConfig'
109
import { COMMANDS } from '../editor/commands'
1110
import logger from '../services/logger'
@@ -287,11 +286,11 @@ class Channel implements Channel {
287286
// load step actions (git commits, commands, open files)
288287
case 'SETUP_ACTIONS':
289288
await vscode.commands.executeCommand(COMMANDS.SET_CURRENT_STEP, action.payload)
290-
setupActions(action.payload, this.send)
289+
setupActions({ actions: action.payload, send: this.send })
291290
return
292291
// load solution step actions (git commits, commands, open files)
293292
case 'SOLUTION_ACTIONS':
294-
await solutionActions(action.payload, this.send)
293+
await solutionActions({ actions: action.payload, send: this.send })
295294
// run test following solution to update position
296295
vscode.commands.executeCommand(COMMANDS.RUN_TEST, action.payload)
297296
return

‎src/editor/commands.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as TT from 'typings/tutorial'
22
import * as vscode from 'vscode'
33
import createTestRunner, { Payload } from '../services/testRunner'
4-
import setupActions from 'actions/setupActions'
4+
import { setupActions } from '../actions/setupActions'
55
import createWebView from '../webview'
66

77
export const COMMANDS = {
@@ -48,11 +48,11 @@ export const createCommands = ({ extensionPath, workspaceState }: CreateCommandP
4848
// setup 1x1 horizontal layout
4949
webview.createOrShow()
5050
},
51-
[COMMANDS.CONFIG_TEST_RUNNER]: (config: TT.TutorialTestRunnerConfig) => {
51+
[COMMANDS.CONFIG_TEST_RUNNER]: async (config: TT.TutorialTestRunnerConfig) => {
5252
if (config.actions) {
5353
// setup tutorial test runner commits
5454
// assumes git already exists
55-
setupActions(config.actions, webview.send)
55+
await setupActions({ actions: config.actions, send: webview.send, path: config.path })
5656
}
5757
testRunner = createTestRunner(config, {
5858
onSuccess: (payload: Payload) => {

‎src/services/node/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ interface ExecParams {
1212
}
1313

1414
export const exec = (params: ExecParams): Promise<{ stdout: string; stderr: string }> | never => {
15-
return asyncExec(params.command, {
16-
cwd: join(WORKSPACE_ROOT, params.path || ''),
17-
})
15+
const cwd = join(WORKSPACE_ROOT, params.path || '')
16+
return asyncExec(params.command, { cwd })
1817
}
1918

2019
export const exists = (...paths: string[]): boolean | never => {

0 commit comments

Comments
 (0)
0