fix version check

Author: ShMcK

lib/reducers/checks/check-setup.js

@@ -7,7 +7,7 @@ function hasDirectory() {
             resolve(true);
         }
         else {
-            resolve(true);
+            resolve(false);
         }
     });
 }
@@ -18,7 +18,7 @@ function hasPackageJson() {
         if (!hasPackageJson) {
             resolve(true);
         }
-        resolve(true);
+        resolve(false);
     });
 }
 exports.hasPackageJson = hasPackageJson;
@@ -30,7 +30,7 @@ function hasTutorialDep() {
         if (!hasTutorialDep) {
             resolve(true);
         }
-        resolve(true);
+        resolve(false);
     });
 }
 exports.hasTutorialDep = hasTutorialDep;

lib/reducers/checks/check-system.js

@@ -1,19 +1,22 @@
 "use strict";
 var command_line_1 = require('../../services/command-line');
+function matchVersions(v) {
+    return v.match(/([0-9]+)\.([0-9]+)/);
+}
 function minVersion(command, minVersion) {
     return new Promise(function (resolve, reject) {
         var minOrLater = command_line_1.default(command, '-v')
             .then(function (res) {
             if (parseInt(res, 10).toString() === 'NaN') {
                 return false;
             }
-            var hasSecondDigit = res.match(/([0-9]+)\.([0-9]+)/);
-            if (!!hasSecondDigit) {
-                var versions = minVersion.match(/([0-9]+)\.([0-9]+)/);
-                var firstDigit = parseInt(hasSecondDigit[1], 10);
-                var firstVersion = parseInt(versions[1], 10);
+            var mins = matchVersions(minVersion);
+            if (!!mins) {
+                var resMins = matchVersions(res);
+                var firstDigit = parseInt(resMins[1], 10);
+                var firstVersion = parseInt(mins[1], 10);
                 return firstDigit > firstVersion ||
-                    firstDigit === firstVersion && parseInt(hasSecondDigit[2], 10) >= parseInt(firstVersion[2], 10);
+                    firstDigit === firstVersion && parseInt(resMins[2], 10) >= parseInt(firstVersion[2], 10);
             }
             else {
                 return parseInt(res, 10) >= parseInt(minVersion, 10);

lib/reducers/checks/verify.js

@@ -2,9 +2,9 @@
 var check_system_1 = require('./check-system');
 var check_setup_1 = require('./check-setup');
 var result = function (x) { return x; };
-var allTrue = function (obj) {
+function allTrue(obj) {
     return Object.values(obj).every(function (x) { return x === true; });
-};
+}
 function verifySetup() {
     var checks = {
         system: {
@@ -20,7 +20,6 @@ function verifySetup() {
     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 });

src/reducers/checks/check-setup.ts

@@ -9,7 +9,7 @@ export function hasDirectory(): Promise<boolean> {
     if (!hasDirectory) {
       resolve(true);
     } else {
-      resolve(true);
+      resolve(false);
     }
   });
 }
@@ -20,7 +20,7 @@ export function hasPackageJson(): Promise<boolean> {
     if (!hasPackageJson) {
       resolve(true);
     }
-    resolve(true);
+    resolve(false);
   });
 }
 
@@ -32,7 +32,7 @@ export function hasTutorialDep(): Promise<boolean> {
     if (!hasTutorialDep) {
       resolve(true);
     }
-    resolve(true);
+    resolve(false);
   });
 }
 

src/reducers/checks/check-system.ts

@@ -1,5 +1,9 @@
 import commandLine from '../../services/command-line';
 
+function matchVersions(v: string): string[] {
+  return v.match(/([0-9]+)\.([0-9]+)/);
+}
+
 function minVersion(command: string, minVersion: string): Promise<boolean> {
   return new Promise((resolve, reject) => {
     let minOrLater: Promise<boolean> = commandLine(command, '-v')
@@ -9,13 +13,13 @@ function minVersion(command: string, minVersion: string): Promise<boolean> {
           return false;
         }
         // two digits, ex: 0.10
-        let hasSecondDigit = res.match(/([0-9]+)\.([0-9]+)/);
-        if (!!hasSecondDigit) {
-          let versions = minVersion.match(/([0-9]+)\.([0-9]+)/);
-          let firstDigit = parseInt(hasSecondDigit[1], 10);
-          let firstVersion = parseInt(versions[1], 10);
+        let mins = matchVersions(minVersion);
+        if (!!mins) {
+          let resMins = matchVersions(res);
+          let firstDigit = parseInt(resMins[1], 10);
+          let firstVersion = parseInt(mins[1], 10);
           return firstDigit > firstVersion ||
-            firstDigit === firstVersion && parseInt(hasSecondDigit[2], 10) >= parseInt(firstVersion[2], 10);
+            firstDigit === firstVersion && parseInt(resMins[2], 10) >= parseInt(firstVersion[2], 10);
         } else {
           // single digit, ex: 3.0
           return parseInt(res, 10) >= parseInt(minVersion, 10);

src/reducers/checks/verify.js

@@ -20,7 +20,6 @@ function verifySetup() {
     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 });

src/reducers/checks/verify.ts

@@ -26,6 +26,5 @@ export default function verifySetup(): CR.Checks {
   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;
 }