kayodebristol
diff --git a/‎src/channel/index.ts
Lines changed: 23 additions & 15 deletions b/‎src/channel/index.ts
Lines changed: 23 additions & 15 deletions
diff --git a/‎src/services/dependencies/index.ts
Lines changed: 11 additions & 12 deletions b/‎src/services/dependencies/index.ts
Lines changed: 11 additions & 12 deletions
@@ -96,15 +96,16 @@ class Channel implements Channel {
         await this.context.setTutorial(this.workspaceState, data)
 
         // validate dependencies
-        if (data.config.dependencies) {
-          for (const dep of data.config.dependencies) {
+        const dependencies = data.config.dependencies
+        if (dependencies && dependencies.length) {
+          for (const dep of dependencies) {
             // check dependency is installed
-            const currentVersion: string | null = await version(name)
+            const currentVersion: string | null = await version(dep.name)
             if (!currentVersion) {
               // use a custom error message
               const error = {
                 type: 'MissingTutorialDependency',
-                message: dep.message || `Process ${name} is required but not found. It may need to be installed`,
+                message: dep.message || `Process "${dep.name}" is required but not found. It may need to be installed`,
                 actions: [
                   {
                     label: 'Check Again',
@@ -117,16 +118,23 @@ class Channel implements Channel {
             }
 
             // check dependency version
-            const satisfiedDependency = await compareVersions(currentVersion, dep.version).catch((error: Error) => ({
-              type: 'UnmetTutorialDependency',
-              message: error.message,
-              actions: [
-                {
-                  label: 'Check Again',
-                  transition: 'TRY_AGAIN',
-                },
-              ],
-            }))
+            const satisfiedDependency = await compareVersions(currentVersion, dep.version)
+
+            if (!satisfiedDependency) {
+              const error = {
+                type: 'UnmetTutorialDependency',
+                message: `Expected ${dep.name} to have version ${dep.version}, but found version ${currentVersion}`,
+                actions: [
+                  {
+                    label: 'Check Again',
+                    transition: 'TRY_AGAIN',
+                  },
+                ],
+              }
+              this.send({ type: 'TUTORIAL_CONFIGURE_FAIL', payload: { error } })
+              return
+            }
+
             if (satisfiedDependency !== true) {
               const error = satisfiedDependency || {
                 type: 'UnknownError',
@@ -247,7 +255,7 @@ class Channel implements Channel {
 
       if (errorMarkdown) {
         // add a clearer error message for the user
-        error.message = `${errorMarkdown}\n${error.message}`
+        error.message = `${errorMarkdown}\n\n${error.message}`
       }
     }
 
 
@@ -1,25 +1,24 @@
-import * as TT from 'typings/tutorial'
 import { satisfies } from 'semver'
 import node from '../node'
 
 const semverRegex = /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*)(?:\.(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*))*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?(?=$|\s)/gi
 
 export const version = async (name: string): Promise<string | null> => {
-  const { stdout, stderr } = await node.exec(`${name} --version`)
-  if (!stderr) {
-    const match = stdout.match(semverRegex)
-    if (match) {
-      return match[0]
+  try {
+    const { stdout, stderr } = await node.exec(`${name} --version`)
+    if (!stderr) {
+      const match = stdout.match(semverRegex)
+      if (match) {
+        return match[0]
+      }
     }
+    return null
+  } catch (error) {
+    return null
   }
-  return null
 }
 
 export const compareVersions = async (currentVersion: string, expectedVersion: string): Promise<never | boolean> => {
   // see node-semver docs: https://github.com/npm/node-semver
-  const satisfied: boolean = satisfies(currentVersion, expectedVersion)
-  if (!satisfied) {
-    throw new Error(`Expected ${name} to have version ${expectedVersion}, but found version ${currentVersion}`)
-  }
-  return true
+  return satisfies(currentVersion, expectedVersion)
 }