load runner progress

Author: ShMcK

lib/components/Test/Solution.js

@@ -36,6 +36,9 @@ var Solution = (function (_super) {
     function Solution() {
         _super.apply(this, arguments);
     }
+    Solution.prototype.componentDidMount = function () {
+        this.props.runnerSet();
+    };
     Solution.prototype.runTest = function () {
         var content = "\n" + this.refs.solution.get() + "\n" + atom.workspace.getActiveTextEditor().getText() + "\n";
         this.props.runnerRun(content);
@@ -54,7 +57,7 @@ var Solution = (function (_super) {
     Solution = __decorate([
         react_redux_1.connect(function (state) { return ({
             language: core_coderoad_1.languageSuffixSelector(state),
-        }); }, { runnerRun: actions_1.runnerRun }), 
+        }); }, { runnerRun: actions_1.runnerRun, runnerSet: actions_1.runnerSet }), 
         __metadata('design:paramtypes', [])
     ], Solution);
     return Solution;

lib/modules/runner/index.js

@@ -2,32 +2,37 @@
 var loadRunner_1 = require('./loadRunner');
 var RUNNER_SET = 'RUNNER_SET';
 var RUNNER_RUN = 'RUNNER_RUN';
-function runnerSet(name) {
+function runnerSet() {
     return function (dispatch, getState) {
-        var dir = getState().dir;
-        dispatch({ type: RUNNER_SET, payload: { dir: dir, name: name } });
+        var _a = getState(), dir = _a.dir, packageJson = _a.packageJson;
+        if (packageJson && packageJson.config && packageJson.config.runner) {
+            var name_1 = packageJson.config.runner;
+            dispatch({ type: RUNNER_SET, payload: { dir: dir, name: name_1 } });
+        }
     };
 }
 exports.runnerSet = runnerSet;
 function runnerRun(content) {
     return function (dispatch, getState) {
-        dispatch({ type: RUNNER_RUN, payload: { content: content } });
+        var _a = getState(), dir = _a.dir, tutorial = _a.tutorial;
+        var config = Object.assign({}, dir, tutorial.config);
+        dispatch({ type: RUNNER_RUN, payload: { content: content, config: config } });
     };
 }
 exports.runnerRun = runnerRun;
 var r = function (content) {
     console.log(content);
-    alert('Runner not installed. Try running "npm install"');
+    alert('Runner not yet implemented.');
 };
 function reducer(runner, action) {
     if (runner === void 0) { runner = r; }
     switch (action.type) {
         case RUNNER_SET:
-            var _a = action.payload, dir = _a.dir, name_1 = _a.name;
-            return loadRunner_1.default(dir, name_1);
+            var _a = action.payload, dir = _a.dir, name_2 = _a.name;
+            return loadRunner_1.default(dir, name_2);
         case RUNNER_RUN:
-            var content = action.payload.content;
-            runner(content);
+            var _b = action.payload, content = _b.content, config = _b.config;
+            r(content);
             return runner;
         default:
             return runner;

lib/modules/runner/loadRunner.js

@@ -1,20 +1,25 @@
 "use strict";
 var path_1 = require('path');
-var fs_1 = require('fs');
 var node_file_exists_1 = require('node-file-exists');
+function noRunner() {
+    alert("Runner not installed.\nSelect a runner and run \"npm install\"");
+}
 function loadRunner(dir, name) {
     var packagePath = path_1.join(dir, 'node_modules', name);
     if (!node_file_exists_1.default(packagePath)) {
-        console.log("Runner " + name + " not installed");
-        return false;
+        return noRunner;
     }
+    var runner;
     try {
-        var pj = JSON.parse(fs_1.readFileSync(path_1.join(packagePath, 'package.json'), 'utf8'));
-        return require(name);
+        var pj = path_1.join(packagePath, 'package.json');
+        var runnerMain = require(pj).main;
+        var pathToMain = path_1.resolve(packagePath, runnerMain);
+        runner = require(pathToMain);
     }
     catch (e) {
         console.log(e);
     }
+    return runner ? runner.default : noRunner;
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = loadRunner;

src/components/Test/Solution.tsx

@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 import {Card, CardText, CardTitle} from 'material-ui/Card';
 import RaisedButton from 'material-ui/RaisedButton';
 import {TextEditor} from '../index';
-import {runnerRun} from '../../actions';
+import {runnerRun, runnerSet} from '../../actions';
 import {languageSuffixSelector} from 'core-coderoad';
 
 const styles = {
@@ -20,15 +20,19 @@ const styles = {
 
 @connect(state => ({
   language: languageSuffixSelector(state),
-}), {runnerRun})
+}), {runnerRun, runnerSet})
 export default class Solution extends React.Component <{
   language?: string,
   runnerRun?: (content: string) => Redux.ActionCreator,
+  runnerSet?: () => Redux.ActionCreator,
 }, {}> {
   refs: {
     [key: string]: Element;
     solution: any;
   };
+  componentDidMount() {
+    this.props.runnerSet();
+  }
   runTest() {
     // content = solution + tests
     const content = `

src/modules/runner/index.ts

@@ -3,34 +3,43 @@ import loadRunner from './loadRunner';
 const RUNNER_SET = 'RUNNER_SET';
 const RUNNER_RUN = 'RUNNER_RUN';
 
-export function runnerSet(name: string) {
+export function runnerSet() {
   return (dispatch, getState) => {
-    const {dir} = getState();
-    dispatch({ type: RUNNER_SET, payload: { dir, name } });
+    const {dir, packageJson} = getState();
+    if (packageJson && packageJson.config && packageJson.config.runner) {
+      const name = packageJson.config.runner;
+      dispatch({ type: RUNNER_SET, payload: { dir, name } });
+    }
   };
 }
 
 export function runnerRun(content: string) {
   return (dispatch, getState) => {
-    dispatch({ type: RUNNER_RUN, payload: { content } });
+    const {dir, tutorial} = getState();
+    let config = Object.assign({}, dir, tutorial.config);
+    dispatch({ type: RUNNER_RUN, payload: { content, config } });
   };
 }
 
 const r = (content: string) => {
   console.log(content);
-  alert('Runner not installed. Try running "npm install"');
+  // alert('Runner not installed. Try running "npm install"');
+  alert('Runner not yet implemented.');
 };
 
 
 export function reducer(runner = r, action: Action) {
   switch (action.type) {
+
     case RUNNER_SET:
       const {dir, name} = action.payload;
       return loadRunner(dir, name);
 
     case RUNNER_RUN:
-      const {content} = action.payload;
-      runner(content);
+      let {content, config} = action.payload;
+      // call runner
+      r(content);
+      // runner(content, config, function() {});
       return runner;
 
     default:

src/modules/runner/loadRunner.ts

@@ -1,21 +1,26 @@
-import {join} from 'path';
+import {join, resolve} from 'path';
 import {readFileSync} from 'fs';
 import fileExists from 'node-file-exists';
 
+function noRunner() {
+  alert(`Runner not installed.
+Select a runner and run "npm install"`);
+}
+
 export default function loadRunner(dir: string, name: string) {
   const packagePath = join(dir, 'node_modules', name);
+  // no runner installed
   if (!fileExists(packagePath)) {
-    console.log(`Runner ${name} not installed`);
-    return false;
+    return noRunner;
   }
+  let runner;
   try {
-    const pj = JSON.parse(
-      readFileSync(
-        join(packagePath, 'package.json'), 'utf8'
-      )
-    );
-    return require(name);
+    const pj = join(packagePath, 'package.json');
+    const runnerMain = require(pj).main;
+    let pathToMain = resolve(packagePath, runnerMain);
+    runner = require(pathToMain);
   } catch (e) {
     console.log(e);
   }
+  return runner ? runner.default : noRunner;
 }