create minVersion checker, check for node version

Author: ShMcK

lib/reducers/checks/check-system.js

@@ -1,15 +1,38 @@
 "use strict";
 var command_line_1 = require('../../services/command-line');
-var minVersion = 3;
-function npmVersionThreeOrLater() {
+function minVersion(command, minVersion) {
     return new Promise(function (resolve, reject) {
-        var threeOrLater = command_line_1.default('npm', '-v').then(function (res) { return parseInt(res, 10) >= minVersion; });
-        if (!threeOrLater) {
+        var minOrLater = command_line_1.default(command, '-v')
+            .then(function (res) {
+            console.log(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);
+                return firstDigit > firstVersion ||
+                    firstDigit === firstVersion && parseInt(hasSecondDigit[2], 10) >= parseInt(firstVersion[2], 10);
+            }
+            else {
+                return parseInt(res, 10) >= parseInt(minVersion, 10);
+            }
+        });
+        if (!minOrLater) {
             resolve(false);
         }
         else {
             resolve(true);
         }
     });
 }
-exports.npmVersionThreeOrLater = npmVersionThreeOrLater;
+function npmMinVersion() {
+    return minVersion('npm', '3');
+}
+exports.npmMinVersion = npmMinVersion;
+function nodeMinVersion() {
+    return minVersion('node', '0.10');
+}
+exports.nodeMinVersion = nodeMinVersion;

lib/reducers/checks/verify.js

@@ -10,8 +10,8 @@ function result(x) {
 function verifySetup() {
     var checks = {
         system: {
-            node: false,
-            npm: !!check_system_1.npmVersionThreeOrLater()
+            node: !!check_system_1.nodeMinVersion(),
+            npm: !!check_system_1.npmMinVersion()
         },
         setup: {
             dir: !!check_setup_1.hasDirectory(),

package.json

@@ -40,7 +40,7 @@
   "dependencies": {
     "classnames": "2.2.3",
     "highlights": "1.3.1",
-    "lodash": "4.10.0",
+    "lodash": "4.11.0",
     "marked": "0.3.5",
     "material-ui": "0.15.0-alpha.2",
     "react": "15.0.1",

src/reducers/checks/check-system.ts

@@ -1,13 +1,38 @@
 import commandLine from '../../services/command-line';
 
-const minVersion = 3;
-export function npmVersionThreeOrLater(): Promise<boolean> {
+function minVersion(command: string, minVersion: string): Promise<boolean> {
   return new Promise((resolve, reject) => {
-    let threeOrLater: Promise<boolean> = commandLine('npm', '-v').then((res: string) => parseInt(res, 10) >= minVersion);
-    if (!threeOrLater) {
+    let minOrLater: Promise<boolean> = commandLine(command, '-v')
+      .then((res: string) => {
+        // not installed
+        if (parseInt(res, 10).toString() === 'NaN') {
+          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);
+          return firstDigit > firstVersion ||
+            firstDigit === firstVersion && parseInt(hasSecondDigit[2], 10) >= parseInt(firstVersion[2], 10);
+        } else {
+          // single digit, ex: 3.0
+          return parseInt(res, 10) >= parseInt(minVersion, 10);
+        }
+      });
+    if (!minOrLater) {
       resolve(false);
     } else {
       resolve(true);
     }
   });
 }
+
+export function npmMinVersion(): Promise<boolean> {
+  return minVersion('npm', '3');
+}
+
+export function nodeMinVersion(): Promise<boolean> {
+  return minVersion('node', '0.10');
+}

src/reducers/checks/verify.ts

@@ -1,8 +1,8 @@
 import {fileExists} from '../../services/exists';
-import {npmVersionThreeOrLater} from './check-system';
+import {npmMinVersion, nodeMinVersion} from './check-system';
 import {hasDirectory, hasPackageJson, hasTutorialDep} from './check-setup';
 import {packageJsonExists, loadRootPackageJson, searchForTutorials} from '../tutorials/check-tutorials';
-import {createPackageJson, openDirectory, installTutorial} from './setup-actions';
+import {createPackageJson, openDirectory, installTutorial} from './action-setup';
 import * as path from 'path';
 
 function allTrue(obj: Object): boolean {
@@ -16,8 +16,8 @@ function result(x) {
 export default function verifySetup(): CR.Checks {
   let checks: CR.Checks = {
     system: {
-      node: false,
-      npm: !!npmVersionThreeOrLater()
+      node: !!nodeMinVersion(),
+      npm: !!npmMinVersion()
     },
     setup: {
       dir: !!hasDirectory(),