cleanup & path fixes

Author: ShMcK

lib/actions/actions.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 var Type = require('./actionTypes');
 var _base_1 = require('../_base');
 var package_1 = require('../services/package');

lib/components/menu/menu.js

@@ -69,7 +69,7 @@ var default_1 = (function (_super) {
                 routeToProjects: function () { return dispatch(Action.setRoute('projects')); },
                 quit: function () {
                     render_1.togglePanel();
-                    subscriptions_1.onDeactivateSubscriptionsAndUnmount();
+                    subscriptions_1.onDeactivate();
                 }
             };
         }), 

lib/services/package.js

@@ -1,6 +1,6 @@
 "use strict";
 var path = require('path');
-var setGlobals_1 = require('./setGlobals');
+var set_globals_1 = require('./set-globals');
 var Action = require('../actions/actions');
 var _base_1 = require('../_base');
 var _ = require('lodash');
@@ -31,7 +31,7 @@ var PackageService = (function () {
     PackageService.prototype.selectPackage = function (packageName) {
         var packagePath = path.join(window.coderoad.dir, 'node_modules', packageName);
         this.config = require(path.join(packagePath, 'package.json'));
-        setGlobals_1.setGlobals(this.config);
+        set_globals_1.setGlobals(this.config);
         this.data = require(path.join(packagePath, this.config.main));
         this.packageName = packageName;
     };

lib/services/set-globals.js

@@ -0,0 +1,57 @@
+"use strict";
+var path = require('path');
+var exists_1 = require('./exists');
+function setGlobals(config) {
+    window.coderoad = Object.assign(window.coderoad, {
+        tutorial: config.name,
+        suffix: config.config.testSuffix.substring(config.config.testSuffix.lastIndexOf('.') + 1, config.config.testSuffix.length),
+        tutorialDir: path.join(window.coderoad.dir, 'node_modules', config.name, config.config.testDir),
+        testRunner: config.config.testRunner,
+        testRunnerOptions: config.config.testRunnerOptions || {}
+    });
+    loadRepo(config);
+    loadRunnerDep(config);
+}
+exports.setGlobals = setGlobals;
+function loadRunnerDep(config) {
+    var flatDep = path.join(window.coderoad.dir, 'node_modules', config.config.testRunner, 'package.json');
+    var treeDep = path.join(window.coderoad.dir, 'node_modules', config.name, 'node_modules', config.config.testRunner, 'package.json');
+    var runnerMain;
+    var runnerRoot;
+    if (exists_1.fileExists(flatDep)) {
+        runnerMain = require(flatDep).main;
+        runnerRoot = flatDep;
+    }
+    else if (exists_1.fileExists(treeDep)) {
+        runnerMain = require(treeDep).main;
+        runnerRoot = treeDep;
+    }
+    else {
+        var message = 'Error loading test runner. Post an issue. https://github.com/coderoad/atom-coderoad/issues';
+        console.log(message);
+        throw message;
+    }
+    var slash = window.coderoad.win ? '\\' : '/';
+    runnerMain = path.join.apply(null, runnerMain.split(slash));
+    runnerRoot = runnerRoot.substring(0, runnerRoot.lastIndexOf(slash));
+    var pathToMain = path.join(runnerRoot, runnerMain);
+    if (!!require(pathToMain).default) {
+        window.coderoad.runner = require(pathToMain).default;
+    }
+    else {
+        window.coderoad.runner = require(pathToMain);
+    }
+}
+function loadRepo(config) {
+    if (config.bugs && config.bugs.url) {
+        window.coderoad.issuesPath = config.bugs.url;
+    }
+    if (config.repo && config.repo.url) {
+        var repo = config.repo.url;
+        if (!!repo.match(/\.git$/)) {
+            repo = repo.slice(0, repo.length - 4);
+        }
+        window.coderoad.repo = repo;
+    }
+    window.coderoad.edit = config.config.edit && !!window.coderoad.repo || false;
+}

src/actions/actions.ts

@@ -1,4 +1,3 @@
-'use strict';
 import * as Type from './actionTypes';
 import {store} from '../_base';
 import Package from '../services/package';

src/components/menu/menu.tsx

@@ -3,7 +3,7 @@ import * as React from 'react';
 import {connect} from 'react-redux';
 import * as Action from '../../actions/actions';
 import {togglePanel} from '../render';
-import {onDeactivateSubscriptionsAndUnmount} from '../../atom/subscriptions';
+import {onDeactivate} from '../../atom/subscriptions';
 
 import {AppBar, IconButton, IconMenu, MenuItem, Divider} from 'material-ui';
 let MoreVertIcon = require('material-ui/lib/svg-icons/navigation/more-vert');
@@ -26,7 +26,7 @@ let NavigationClose = require('material-ui/lib/svg-icons/navigation/close');
     routeToProjects: () => dispatch(Action.setRoute('projects')),
     quit: () => {
       togglePanel();
-      onDeactivateSubscriptionsAndUnmount();
+      onDeactivate();
     }
   };
 })

src/services/package.ts

@@ -1,5 +1,5 @@
 import * as path from 'path';
-import {setGlobals} from './setGlobals';
+import {setGlobals} from './set-globals';
 import * as Action from '../actions/actions';
 import {store} from '../_base';
 const _ = require('lodash');

src/services/setGlobals.ts renamed to src/services/set-globals.ts

@@ -101,7 +101,7 @@ declare namespace CR {
   interface Coderoad {
     dir: string;
     testRunner?: string;
-    suffix: string;
+    suffix?: string;
     tutorial?: string;
     tutorialDir?: string;
     tutorialOptions?: Object;

src/typings/cr/cr.d.ts

@@ -1,16 +1,12 @@
 /// <reference path="assertion-error/assertion-error.d.ts" />
 /// <reference path="atom/atom.d.ts" />
-/// <reference path="chai/chai.d.ts" />
 /// <reference path="classnames/classnames.d.ts" />
 /// <reference path="es6-promise/es6-promise.d.ts" />
-/// <reference path="mocha/mocha.d.ts" />
 /// <reference path="node/node.d.ts" />
 /// <reference path="react-dom/react-dom.d.ts" />
 /// <reference path="react-redux/react-redux.d.ts" />
 /// <reference path="react/react-addons-css-transition-group.d.ts" />
 /// <reference path="react/react.d.ts" />
-/// <reference path="redux-devtools/redux-devtools.d.ts" />
-/// <reference path="redux-thunk/redux-thunk.d.ts" />
 /// <reference path="redux/redux.d.ts" />
 /// <reference path="text-buffer/text-buffer.d.ts" />
 /// <reference path="react/react-addons-css-transition-group.d.ts" />