target user folder with remove file

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

Author: ShMcK

src/channel/index.ts

@@ -18,8 +18,8 @@ import { openWorkspace, checkWorkspaceEmpty } from '../services/workspace'
 import { showOutput } from '../services/testRunner/output'
 import { exec } from '../services/node'
 import { WORKSPACE_ROOT, TUTORIAL_URL } from '../environment'
-import reset from '../services/git/reset'
-import getLastCommitHash from '../services/git/lastHash'
+import reset from '../services/reset'
+import getLastCommitHash from '../services/reset/lastHash'
 
 const readFileAsync = promisify(readFile)
 
@@ -330,8 +330,15 @@ class Channel implements Channel {
         // get last pass commit
         const hash = getLastCommitHash(position, tutorial?.levels || [])
 
+        const branch = tutorial?.config.repo.branch
+
+        if (!branch) {
+          console.error('No repo branch found for tutorial')
+          return
+        }
+
         // load timeline until last pass commit
-        reset({ branch: tutorial?.config.repo.branch, hash })
+        reset({ branch, hash })
 
         // if tutorial.config.reset.command, run it
         if (tutorial?.config?.reset?.command) {

src/services/node/index.ts

@@ -5,6 +5,7 @@ import { promisify } from 'util'
 import { WORKSPACE_ROOT } from '../../environment'
 
 const asyncExec = promisify(cpExec)
+const asyncRemoveFile = promisify(fs.unlink)
 
 interface ExecParams {
   command: string
@@ -19,3 +20,7 @@ export const exec = (params: ExecParams): Promise<{ stdout: string; stderr: stri
 export const exists = (...paths: string[]): boolean | never => {
   return fs.existsSync(join(WORKSPACE_ROOT, ...paths))
 }
+
+export const removeFile = (...paths: string[]) => {
+  return asyncRemoveFile(join(WORKSPACE_ROOT, ...paths))
+}

src/services/git/reset.ts src/services/reset/index.ts

@@ -1,8 +1,4 @@
-import * as fs from 'fs'
-import { promisify } from 'util'
-import { exec } from '../node'
-
-const removeFile = promisify(fs.unlink)
+import { exec, removeFile } from '../node'
 
 interface Input {
   hash: string