Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd875e4c

Browse files
authored
Merge pull requestcoderoad#276 from coderoad/feature/coderoad-directory
allow for separate coderoad directory
2 parentsb3e43f6 +4034389 commitd875e4c

File tree

11 files changed

+104
-49
lines changed

11 files changed

+104
-49
lines changed

‎CHANGELOG.md‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
3131
},
3232
{
3333
"name":"npm",
34-
"version":">5"
34+
"version":">=5"
3535
}
3636
]
3737
}
@@ -52,4 +52,42 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
5252

5353
##[0.3.0]
5454

55-
- Validate the extension version against the tutorial config version. This should allow us to manage breaking changes in tutorial schema in upcoming versions
55+
- Validate the extension version against the tutorial config version. This should allow us to manage breaking changes in tutorial schema in upcoming versions. See[node-semver](https://github.com/npm/node-semver#advanced-range-syntax) for possible version ranges and options.
56+
57+
```json
58+
{
59+
"config": {
60+
"appVersions": {
61+
"vscode":">=0.2"
62+
},
63+
}
64+
```
65+
66+
- Configure the CodeRoad to load and run in a different directory. The example below will:
67+
- load a commit and run npm install to setup the test runner in its own folder.
68+
- run "npm test" in the \$ROOT/coderoad directory on save
69+
70+
```json
71+
{
72+
"config": {
73+
"testRunner": {
74+
"command":"npm test",// runs in path location or root
75+
"path":"coderoad",
76+
"actions": {
77+
"commits": ["a974aea"],
78+
"commands": ["npm install"]// runs in path location or root
79+
}
80+
},
81+
}
82+
```
83+
84+
Resulting in a folder structure like the following:
85+
86+
```
87+
- .vscode
88+
- coderoad (test runner files only with their own setup)
89+
- package.json
90+
- tests
91+
- package.json
92+
- server.js
93+
```

‎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
importrunCommandsfrom'./utils/runCommands'
77
importonErrorfrom'../services/sentry/onError'
88

9-
constsetupActions=async(
10-
actions:TT.StepActions,
11-
send:(action:T.Action)=>void,// send messages to client
12-
):Promise<void>=>{
9+
asyncfunctionwait(ms:number){
10+
returnnewPromise((resolve)=>{
11+
setTimeout(resolve,ms)
12+
})
13+
}
14+
15+
interfaceSetupActions{
16+
actions:TT.StepActions
17+
send:(action:T.Action)=>void// send messages to client
18+
path?:string
19+
}
20+
21+
exportconstsetupActions=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+
awaitwait(1000)
39+
2940
// 4. run command
30-
awaitrunCommands(commands||[],send).catch(onError)
41+
awaitrunCommands({commands:commands||[], send, path}).catch(onError)
3142
}
3243

33-
exportdefaultsetupActions
44+
exportconstsolutionActions=async(params:SetupActions):Promise<void>=>{
45+
awaitgit.clear()
46+
returnsetupActions(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*asTfrom'typings'
22
import{exec}from'../../services/node'
33

4-
construnCommands=async(commands:string[],send:(action:T.Action)=>void)=>{
4+
interfaceRunCommands{
5+
commands:string[]
6+
send:(action:T.Action)=>void
7+
path?:string
8+
}
9+
10+
construnCommands=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
letresult:{stdout:string;stderr:string}
1521
try{
16-
result=awaitexec(command)
22+
result=awaitexec({ 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*asvscodefrom'vscode'
55
import{satisfies}from'semver'
66
importsaveCommitfrom'../actions/saveCommit'
7-
importsetupActionsfrom'../actions/setupActions'
8-
importsolutionActionsfrom'../actions/solutionActions'
7+
import{setupActions,solutionActions}from'../actions/setupActions'
98
importtutorialConfigfrom'../actions/tutorialConfig'
109
import{COMMANDS}from'../editor/commands'
1110
importloggerfrom'../services/logger'
@@ -287,11 +286,11 @@ class Channel implements Channel {
287286
// load step actions (git commits, commands, open files)
288287
case'SETUP_ACTIONS':
289288
awaitvscode.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-
awaitsolutionActions(action.payload,this.send)
293+
awaitsolutionActions({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: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import*asTTfrom'typings/tutorial'
22
import*asvscodefrom'vscode'
33
importcreateTestRunner,{Payload}from'../services/testRunner'
4+
import{setupActions}from'../actions/setupActions'
45
importcreateWebViewfrom'../webview'
56

67
exportconstCOMMANDS={
@@ -47,7 +48,12 @@ export const createCommands = ({ extensionPath, workspaceState }: CreateCommandP
4748
// setup 1x1 horizontal layout
4849
webview.createOrShow()
4950
},
50-
[COMMANDS.CONFIG_TEST_RUNNER]:(config:TT.TutorialTestRunner)=>{
51+
[COMMANDS.CONFIG_TEST_RUNNER]:async(config:TT.TutorialTestRunnerConfig)=>{
52+
if(config.actions){
53+
// setup tutorial test runner commits
54+
// assumes git already exists
55+
awaitsetupActions({actions:config.actions,send:webview.send,path:config.path})
56+
}
5157
testRunner=createTestRunner(config,{
5258
onSuccess:(payload:Payload)=>{
5359
// send test pass message back to client

‎src/services/dependencies/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const semverRegex = /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)
55

66
exportconstversion=async(name:string):Promise<string|null>=>{
77
try{
8-
const{ stdout, stderr}=awaitexec(`${name} --version`)
8+
const{ stdout, stderr}=awaitexec({command:`${name} --version`})
99
if(!stderr){
1010
constmatch=stdout.match(semverRegex)
1111
if(match){

‎src/services/git/index.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const gitOrigin = 'coderoad'
66

77
conststashAllFiles=async():Promise<never|void>=>{
88
// stash files including untracked (eg. newly created file)
9-
const{ stdout, stderr}=awaitexec(`git stash --include-untracked`)
9+
const{ stdout, stderr}=awaitexec({command:`git stash --include-untracked`})
1010
if(stderr){
1111
console.error(stderr)
1212
thrownewError('Error stashing files')
@@ -21,7 +21,7 @@ const cherryPickCommit = async (commit: string, count = 0): Promise<never | void
2121
try{
2222
// cherry-pick pulls commits from another branch
2323
// -X theirs merges and accepts incoming changes over existing changes
24-
const{ stdout}=awaitexec(`git cherry-pick -X theirs${commit}`)
24+
const{ stdout}=awaitexec({command:`git cherry-pick -X theirs${commit}`})
2525
if(!stdout){
2626
thrownewError('No cherry-pick output')
2727
}
@@ -47,7 +47,7 @@ export function loadCommit(commit: string): Promise<never | void> {
4747
*/
4848

4949
exportasyncfunctionsaveCommit(message:string):Promise<never|void>{
50-
const{ stdout, stderr}=awaitexec(`git commit -am '${message}'`)
50+
const{ stdout, stderr}=awaitexec({command:`git commit -am '${message}'`})
5151
if(stderr){
5252
console.error(stderr)
5353
thrownewError('Error saving progress to Git')
@@ -58,7 +58,7 @@ export async function saveCommit(message: string): Promise<never | void> {
5858
exportasyncfunctionclear():Promise<Error|void>{
5959
try{
6060
// commit progress to git
61-
const{ stderr}=awaitexec('git reset HEAD --hard && git clean -fd')
61+
const{ stderr}=awaitexec({command:'git reset HEAD --hard && git clean -fd'})
6262
if(!stderr){
6363
return
6464
}
@@ -70,7 +70,7 @@ export async function clear(): Promise<Error | void> {
7070
}
7171

7272
asyncfunctioninit():Promise<Error|void>{
73-
const{ stderr}=awaitexec('git init')
73+
const{ stderr}=awaitexec({command:'git init'})
7474
if(stderr){
7575
thrownewError('Error initializing Git')
7676
}
@@ -85,13 +85,13 @@ export async function initIfNotExists(): Promise<never | void> {
8585

8686
exportasyncfunctioncheckRemoteConnects(repo:TT.TutorialRepo):Promise<never|void>{
8787
// check for git repo
88-
constexternalRepoExists=awaitexec(`git ls-remote --exit-code --heads${repo.uri}`)
88+
constexternalRepoExists=awaitexec({command:`git ls-remote --exit-code --heads${repo.uri}`})
8989
if(externalRepoExists.stderr){
9090
// no repo found or no internet connection
9191
thrownewError(externalRepoExists.stderr)
9292
}
9393
// check for git repo branch
94-
const{ stderr, stdout}=awaitexec(`git ls-remote --exit-code --heads${repo.uri}${repo.branch}`)
94+
const{ stderr, stdout}=awaitexec({command:`git ls-remote --exit-code --heads${repo.uri}${repo.branch}`})
9595
if(stderr){
9696
thrownewError(stderr)
9797
}
@@ -101,7 +101,7 @@ export async function checkRemoteConnects(repo: TT.TutorialRepo): Promise<never
101101
}
102102

103103
exportasyncfunctionaddRemote(repo:string):Promise<never|void>{
104-
const{ stderr}=awaitexec(`git remote add${gitOrigin}${repo} && git fetch${gitOrigin}`)
104+
const{ stderr}=awaitexec({command:`git remote add${gitOrigin}${repo} && git fetch${gitOrigin}`})
105105
if(stderr){
106106
constalreadyExists=stderr.match(`${gitOrigin} already exists.`)
107107
constsuccessfulNewBranch=stderr.match('new branch')
@@ -116,7 +116,7 @@ export async function addRemote(repo: string): Promise<never | void> {
116116

117117
exportasyncfunctioncheckRemoteExists():Promise<boolean>{
118118
try{
119-
const{ stdout, stderr}=awaitexec('git remote -v')
119+
const{ stdout, stderr}=awaitexec({command:'git remote -v'})
120120
if(stderr){
121121
returnfalse
122122
}

‎src/services/node/index.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ import { WORKSPACE_ROOT } from '../../environment'
66

77
constasyncExec=promisify(cpExec)
88

9-
exportconstexec=(cmd:string):Promise<{stdout:string;stderr:string}>|never=>{
10-
returnasyncExec(cmd,{
11-
cwd:WORKSPACE_ROOT,
12-
})
9+
interfaceExecParams{
10+
command:string
11+
path?:string
12+
}
13+
14+
exportconstexec=(params:ExecParams):Promise<{stdout:string;stderr:string}>|never=>{
15+
constcwd=join(WORKSPACE_ROOT,params.path||'')
16+
returnasyncExec(params.command,{ cwd})
1317
}
1418

1519
exportconstexists=(...paths:string[]):boolean|never=>{

‎src/services/testRunner/index.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import{TutorialTestRunnerConfig}from'typings/tutorial'
12
import{exec}from'../node'
23
importloggerfrom'../logger'
34
importparserfrom'./parser'
@@ -17,14 +18,10 @@ interface Callbacks {
1718
onError(payload:Payload):void
1819
}
1920

20-
interfaceTestRunnerConfig{
21-
command:string
22-
}
23-
2421
constfailChannelName='CodeRoad (Tests)'
2522
constlogChannelName='CodeRoad (Logs)'
2623

27-
constcreateTestRunner=(config:TestRunnerConfig,callbacks:Callbacks)=>{
24+
constcreateTestRunner=(config:TutorialTestRunnerConfig,callbacks:Callbacks)=>{
2825
returnasync(payload:Payload,onSuccess?:()=>void):Promise<void>=>{
2926
conststartTime=throttle()
3027
// throttle time early
@@ -39,7 +36,7 @@ const createTestRunner = (config: TestRunnerConfig, callbacks: Callbacks) => {
3936

4037
letresult:{stdout:string|undefined;stderr:string|undefined}
4138
try{
42-
result=awaitexec(config.command)
39+
result=awaitexec({command:config.command,path:config.path})
4340
}catch(err){
4441
result={stdout:err.stdout,stderr:err.stack}
4542
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp