catch early no-dir failures

ShMcK · ShMcK · commit 56e2ffb9faad · 2016-04-15T16:40:40.000+08:00
diff --git a/lib/reducers/checks/check-setup.js b/lib/reducers/checks/check-setup.js
@@ -1,37 +1,17 @@
 "use strict";
 var check_tutorials_1 = require('../tutorials/check-tutorials');
 function hasDirectory() {
-    return new Promise(function (resolve, reject) {
-        var hasDirectory = !!window.coderoad.dir;
-        if (!hasDirectory) {
-            resolve(true);
-        }
-        else {
-            resolve(false);
-        }
-    });
+    return !!window.coderoad.dir;
 }
 exports.hasDirectory = hasDirectory;
 function hasPackageJson() {
-    return new Promise(function (resolve, reject) {
-        var hasPackageJson = check_tutorials_1.packageJsonExists();
-        if (!hasPackageJson) {
-            resolve(true);
-        }
-        resolve(false);
-    });
+    return check_tutorials_1.packageJsonExists();
 }
 exports.hasPackageJson = hasPackageJson;
 function hasTutorialDep() {
-    return new Promise(function (resolve, reject) {
-        var packageJson = hasPackageJson ? check_tutorials_1.loadRootPackageJson() : null;
-        var hasTutorialDep = !!packageJson && _tutorialInstalled(packageJson.dependencies) ||
-            _tutorialInstalled(packageJson.devDependencies);
-        if (!hasTutorialDep) {
-            resolve(true);
-        }
-        resolve(false);
-    });
+    var packageJson = hasPackageJson ? check_tutorials_1.loadRootPackageJson() : null;
+    return !!packageJson && _tutorialInstalled(packageJson.dependencies) ||
+        _tutorialInstalled(packageJson.devDependencies);
 }
 exports.hasTutorialDep = hasTutorialDep;
 function _hasKeys(obj) {
diff --git a/lib/reducers/checks/verify.js b/lib/reducers/checks/verify.js
@@ -6,20 +6,22 @@ function allTrue(obj) {
     return Object.values(obj).every(function (x) { return x === true; });
 }
 function verifySetup() {
+    var hasDir = !!check_setup_1.hasDirectory();
     var checks = {
         system: {
             node: !!check_system_1.nodeMinVersion(),
             npm: !!check_system_1.npmMinVersion()
         },
         setup: {
-            dir: !!check_setup_1.hasDirectory(),
-            packageJson: !!check_setup_1.hasPackageJson(),
-            tutorial: !!check_setup_1.hasTutorialDep()
+            dir: hasDir,
+            packageJson: hasDir ? !!check_setup_1.hasPackageJson() : false,
+            tutorial: hasDir ? !!check_setup_1.hasTutorialDep() : false
         }
     };
     checks.system.passed = allTrue(checks.system);
     checks.setup.passed = allTrue(checks.setup);
     checks.passed = checks.system.passed && checks.setup.passed;
+    console.log('checks', checks);
     return checks;
 }
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/src/reducers/checks/check-setup.ts b/src/reducers/checks/check-setup.ts
@@ -3,37 +3,18 @@ import {packageJsonExists, loadRootPackageJson, searchForTutorials} from '../tut
 import {createPackageJson, openDirectory, installTutorial} from './action-setup';
 import * as path from 'path';
 
-export function hasDirectory(): Promise<boolean> {
-  return new Promise((resolve, reject) => {
-    const hasDirectory = !!window.coderoad.dir;
-    if (!hasDirectory) {
-      resolve(true);
-    } else {
-      resolve(false);
-    }
-  });
+export function hasDirectory(): boolean {
+    return !!window.coderoad.dir;
 }
 
-export function hasPackageJson(): Promise<boolean> {
-  return new Promise((resolve, reject) => {
-    const hasPackageJson = packageJsonExists();
-    if (!hasPackageJson) {
-      resolve(true);
-    }
-    resolve(false);
-  });
+export function hasPackageJson(): boolean {
+  return packageJsonExists();
 }
 
-export function hasTutorialDep(): Promise<boolean> {
-  return new Promise((resolve, reject) => {
+export function hasTutorialDep(): boolean {
     const packageJson = hasPackageJson ? loadRootPackageJson() : null;
-    const hasTutorialDep = !!packageJson && _tutorialInstalled(packageJson.dependencies) ||
+    return !!packageJson && _tutorialInstalled(packageJson.dependencies) ||
       _tutorialInstalled(packageJson.devDependencies);
-    if (!hasTutorialDep) {
-      resolve(true);
-    }
-    resolve(false);
-  });
 }
 
 function _hasKeys(obj: Object): boolean {
diff --git a/src/reducers/checks/verify.ts b/src/reducers/checks/verify.ts
@@ -11,20 +11,23 @@ function allTrue(obj: Object): boolean {
 }
 
 export default function verifySetup(): CR.Checks {
+  let hasDir = !!hasDirectory();
+
   let checks: CR.Checks = {
     system: {
       node: !!nodeMinVersion(),
       npm: !!npmMinVersion()
     },
     setup: {
-      dir: !!hasDirectory(),
-      packageJson: !!hasPackageJson(),
-      tutorial: !!hasTutorialDep()
+      dir: hasDir,
+      packageJson: hasDir ? !!hasPackageJson() : false,
+      tutorial: hasDir ? !!hasTutorialDep() : false
     }
   };
 
   checks.system.passed = allTrue(checks.system);
   checks.setup.passed = allTrue(checks.setup);
   checks.passed = checks.system.passed && checks.setup.passed;
+  console.log('checks', checks);
   return checks;
 }
