update for coderoad-cli 0.8

ShMcK · ShMcK · commit 6e435286a7fb · 2016-08-13T16:28:31.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# [0.11.0] - 2016-08-09
+- break runner calls into two steps:
+  - load
+  - run
+
 # [0.10.10] - 2016-07-30
 - performance increase
 - fix test run on page load
diff --git a/ROADMAP.md b/ROADMAP.md
@@ -7,7 +7,8 @@
     1. Video Player
     1. Visualize html
 1. More test runners
-    1. Ruby
+    1. Elixir
+    1. Fix Python
     1. Java
 1. User Accounts
     1. Sync Progress
diff --git a/lib/modules/setup/utils/verify.js b/lib/modules/setup/utils/verify.js
@@ -12,7 +12,7 @@ function setupVerify(dir, packageJson) {
         hasPackageJson = !!packageJson;
     }
     if (hasDir && hasPackageJson) {
-        hasTutorial = !!coderoad_cli_1.tutorials(dir);
+        hasTutorial = !!coderoad_cli_1.tutorials({ dir: dir });
     }
     var checks = {
         system: {
diff --git a/lib/modules/tutorial/utils/config-runner.js b/lib/modules/tutorial/utils/config-runner.js
@@ -25,8 +25,8 @@ function configRunner(name, runner, dir) {
     runnerRoot = runnerRoot.substring(0, runnerRoot.lastIndexOf(slash));
     var pathToMain = path_1.join(runnerRoot, runnerMain);
     return {
-        load: require(pathToMain).load,
-        run: require(pathToMain).run,
+        load: require(pathToMain).load || { load: function () { return console.log('invalid test loader'); } },
+        run: require(pathToMain).run || { run: function () { return console.log('invalid test runner'); } },
     };
 }
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/lib/modules/tutorials/reducer.js b/lib/modules/tutorials/reducer.js
@@ -5,7 +5,7 @@ function tutorialsReducer(t, action) {
     if (t === void 0) { t = []; }
     switch (action.type) {
         case types_1.TUTORIALS_FIND:
-            var tuts = coderoad_cli_1.tutorials(action.payload.dir);
+            var tuts = coderoad_cli_1.tutorials({ dir: action.payload.dir });
             return tuts ? tuts : t;
         default:
             return t;
diff --git a/package.json b/package.json
@@ -30,9 +30,9 @@
   },
   "dependencies": {
     "atom-plugin-command-line": "1.0.2",
-    "coderoad-cli": "0.6.0",
+    "coderoad-cli": "0.8.0",
     "core-coderoad": "0.6.2",
-    "material-ui": "0.15.2",
+    "material-ui": "0.15.3",
     "node-file-exists": "1.1.0",
     "react": "15.3.0",
     "react-dom": "15.3.0",
diff --git a/src/modules/setup/utils/verify.ts b/src/modules/setup/utils/verify.ts
@@ -16,7 +16,7 @@ export default function setupVerify(
     hasPackageJson = !!packageJson;
   }
   if (hasDir && hasPackageJson) {
-    hasTutorial = !!tutorials(dir);
+    hasTutorial = !!tutorials({ dir });
   }
 
   let checks: CR.Checks = {
diff --git a/src/modules/tests/actions.ts b/src/modules/tests/actions.ts
@@ -6,7 +6,6 @@ export function testLoad() {
   return (dispatch, getState): void => {
     const { dir, pagePosition, tutorial, taskTests } = getState();
     const testFile = getTestName({tutorial, pagePosition});
-    console.log('testLoad file', testFile);
 
     dispatch({
       type: TEST_LOAD, payload: {
diff --git a/src/modules/tutorial/utils/config-runner.ts b/src/modules/tutorial/utils/config-runner.ts
@@ -35,7 +35,7 @@ export default function configRunner(name: string, runner: string, dir: string):
   let pathToMain = join(runnerRoot, runnerMain);
 
   return {
-    load: require(pathToMain).load,
-    run: require(pathToMain).run,
+    load: require(pathToMain).load || { load: () => console.log('invalid test loader')},
+    run: require(pathToMain).run || { run: () => console.log('invalid test runner')},
   };
 }
diff --git a/src/modules/tutorials/reducer.ts b/src/modules/tutorials/reducer.ts
@@ -12,7 +12,7 @@ export default function tutorialsReducer(
     /* falls through */
 
     case TUTORIALS_FIND:
-      const tuts = tutorials(action.payload.dir);
+      const tuts = tutorials({ dir: action.payload.dir });
       return tuts ? tuts : t;
 
     default:
diff --git a/src/typings/cr/cli.d.ts b/src/typings/cr/cli.d.ts
@@ -8,7 +8,7 @@ declare module 'coderoad-cli' {
     dir: string, name: string
   ): boolean | Promise<boolean>;
 
-  export function tutorials(dir: string): Tutorial.Info[];
+  export function tutorials({ dir: string}): Tutorial.Info[];
 
   export function validatePacakgeJson(): Validation.Object;
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ function setupVerify(dir, packageJson) {`
`12`	`12`	`hasPackageJson = !!packageJson;`
`13`	`13`	`}`
`14`	`14`	`if (hasDir && hasPackageJson) {`
`15`		`- hasTutorial = !!coderoad_cli_1.tutorials(dir);`
	`15`	`+ hasTutorial = !!coderoad_cli_1.tutorials({ dir: dir });`
`16`	`16`	`}`
`17`	`17`	`var checks = {`
`18`	`18`	`system: {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export default function setupVerify(`
`16`	`16`	`hasPackageJson = !!packageJson;`
`17`	`17`	`}`
`18`	`18`	`if (hasDir && hasPackageJson) {`
`19`		`- hasTutorial = !!tutorials(dir);`
	`19`	`+ hasTutorial = !!tutorials({ dir });`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`let checks: CR.Checks = {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export default function configRunner(name: string, runner: string, dir: string):`
`35`	`35`	`let pathToMain = join(runnerRoot, runnerMain);`
`36`	`36`
`37`	`37`	`return {`
`38`		`- load: require(pathToMain).load,`
`39`		`- run: require(pathToMain).run,`
	`38`	`+ load: require(pathToMain).load \|\| { load: () => console.log('invalid test loader')},`
	`39`	`+ run: require(pathToMain).run \|\| { run: () => console.log('invalid test runner')},`
`40`	`40`	`};`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ declare module 'coderoad-cli' {`
`8`	`8`	`dir: string, name: string`
`9`	`9`	`): boolean \| Promise<boolean>;`
`10`	`10`
`11`		`- export function tutorials(dir: string): Tutorial.Info[];`
	`11`	`+ export function tutorials({ dir: string}): Tutorial.Info[];`
`12`	`12`
`13`	`13`	`export function validatePacakgeJson(): Validation.Object;`
`14`	`14`	`}`