coerce checks into bools

ShMcK · ShMcK · commit ffa81b07e725 · 2016-04-13T17:33:06.000+08:00
diff --git a/lib/atom/main.js b/lib/atom/main.js
@@ -2,6 +2,8 @@
 var render_1 = require('../components/render');
 var polyfills_1 = require('../services/polyfills');
 var subscriptions_1 = require('./subscriptions');
+var store_1 = require('../store/store');
+var Action = require('../actions/actions');
 function setDir() {
     if (atom.project.rootDirectories.length > 0) {
         return atom.project.rootDirectories[0].path;
@@ -15,11 +17,12 @@ function setWin() {
 }
 var Main = (function () {
     function Main() {
+        polyfills_1.default();
         window.coderoad = {
             dir: setDir(),
             win: setWin()
         };
-        polyfills_1.default();
+        store_1.store.dispatch(Action.verifySetup());
         this.root = render_1.initRoot();
     }
     Main.prototype.activate = function () {
diff --git a/lib/reducers/checks/check-system.js b/lib/reducers/checks/check-system.js
@@ -1,7 +1,7 @@
 "use strict";
 var command_line_1 = require('../../services/command-line');
+var minVersion = 3;
 function npmVersionThreeOrLater() {
-    var minVersion = 3;
     return new Promise(function (resolve, reject) {
         var threeOrLater = command_line_1.default('npm', '-v').then(function (res) { return parseInt(res, 10) >= minVersion; });
         if (!threeOrLater) {
diff --git a/lib/reducers/checks/setup.js b/lib/reducers/checks/setup.js
@@ -14,12 +14,12 @@ function verifySetup() {
     var checks = {
         system: {
             node: true,
-            npm: check_system_1.npmVersionThreeOrLater().then(result)
+            npm: !!check_system_1.npmVersionThreeOrLater()
         },
         setup: {
-            dir: check_setup_1.hasDirectory().then(result),
-            packageJson: check_setup_1.hasPackageJson().then(result),
-            tutorial: check_setup_1.hasTutorialDep().then(result)
+            dir: !!check_setup_1.hasDirectory(),
+            packageJson: !!check_setup_1.hasPackageJson(),
+            tutorial: !!check_setup_1.hasTutorialDep()
         }
     };
     checks.passed = verified(checks);
diff --git a/src/atom/main.ts b/src/atom/main.ts
@@ -4,6 +4,11 @@ import {render, initRoot, togglePanel} from '../components/render';
 import loadPolyfills from '../services/polyfills';
 import {onActivate, onDeactivate, addToStatusBar} from './subscriptions';
 
+import {store} from '../store/store';
+import * as Action from '../actions/actions';
+
+// TODO: find a better place to load globals
+
 function setDir(): string {
   if (atom.project.rootDirectories.length > 0) {
     return atom.project.rootDirectories[0].path;
@@ -19,11 +24,12 @@ class Main {
   root: HTMLElement;
   statusBarTile: StatusBar.IStatusBarView;
   constructor() {
+    loadPolyfills(); // remove with later version of Chrome
     window.coderoad = {
       dir: setDir(),
       win: setWin()
     };
-    loadPolyfills();
+    store.dispatch(Action.verifySetup());
     this.root = initRoot();
   }
   activate(): void {
diff --git a/src/reducers/checks/check-system.ts b/src/reducers/checks/check-system.ts
@@ -1,7 +1,7 @@
 import commandLine from '../../services/command-line';
 
+const minVersion = 3;
 export function npmVersionThreeOrLater(): Promise<boolean> {
-  const minVersion = 3;
   return new Promise((resolve, reject) => {
     let threeOrLater: Promise<boolean> = commandLine('npm', '-v').then((res: string) => parseInt(res, 10) >= minVersion);
     if (!threeOrLater) {
diff --git a/src/reducers/checks/setup.ts b/src/reducers/checks/setup.ts
@@ -21,12 +21,12 @@ export default function verifySetup(): CR.Checks {
   let checks: CR.Checks = {
     system: {
       node: true,
-      npm: npmVersionThreeOrLater().then(result)
+      npm: !!npmVersionThreeOrLater()
     },
     setup: {
-      dir: hasDirectory().then(result),
-      packageJson: hasPackageJson().then(result),
-      tutorial: hasTutorialDep().then(result)
+      dir: !!hasDirectory(),
+      packageJson: !!hasPackageJson(),
+      tutorial: !!hasTutorialDep()
     }
   };
 
diff --git a/src/reducers/globals/globals.ts b/src/reducers/globals/globals.ts
@@ -1,5 +1,5 @@
 import * as Type from '../../actions/actionTypes';
-import {setWin, setGlobals} from './set-globals';
+import {setGlobals} from './set-globals';
 
 // TODO: refactor out globals into state
 
diff --git a/src/reducers/tutorials/check-tutorials.ts b/src/reducers/tutorials/check-tutorials.ts
@@ -7,7 +7,7 @@ import {canUpdateTutorial} from './update-tutorial';
 let tutorialError = 'This is an error with the tutorial itself';
 
 export function packageJsonExists(): boolean {
-  console.log('packageJsonExists?')
+  console.log('packageJsonExists?');
   const pathToPackageJson = path.join(window.coderoad.dir, 'package.json');
   return fileExists(pathToPackageJson);
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import {canUpdateTutorial} from './update-tutorial';`
`7`	`7`	`let tutorialError = 'This is an error with the tutorial itself';`
`8`	`8`
`9`	`9`	`export function packageJsonExists(): boolean {`
`10`		`- console.log('packageJsonExists?')`
	`10`	`+ console.log('packageJsonExists?');`
`11`	`11`	`const pathToPackageJson = path.join(window.coderoad.dir, 'package.json');`
`12`	`12`	`return fileExists(pathToPackageJson);`
`13`	`13`	`}`