further fixes for windows

ShMcK · ShMcK · commit e25d9a209075 · 2016-03-12T19:59:31.000-08:00
diff --git a/lib/atom/editor.js b/lib/atom/editor.js
@@ -4,6 +4,9 @@ var exists_1 = require('../services/exists');
 function setAtomGlobals() {
     if (atom.project.rootDirectories.length > 0) {
         window.coderoad.dir = atom.project.rootDirectories[0].path;
+        if (navigator.appVersion.indexOf('Win') > -1) {
+            window.coderoad.win = true;
+        }
     }
     else {
         window.coderoad.dir = null;
diff --git a/lib/reducers/task-tests/concat-tests.js b/lib/reducers/task-tests/concat-tests.js
@@ -1,6 +1,7 @@
 "use strict";
 var fs = require('fs');
 function concatTests(targetFile, files) {
+    console.log('files', files);
     if (fs.existsSync(targetFile)) {
         fs.unlink(targetFile);
     }
diff --git a/lib/services/package.js b/lib/services/package.js
@@ -5,6 +5,9 @@ var Action = require('../actions/actions');
 var _base_1 = require('../_base');
 var _ = require('lodash');
 function configTestString(config, packageName, test) {
+    if (window.coderoad.win) {
+        test = test.split('/').join('\\');
+    }
     if (config.testDir) {
         test = path.join(window.coderoad.dir, 'node_modules', packageName, config.testDir, test);
     }
@@ -45,7 +48,7 @@ var PackageService = (function () {
         return !tasks ? [] : tasks.map(function (task) {
             if (task.tests) {
                 task.tests = task.tests.map(function (test) {
-                    if (_.isString(test) && task.tests.indexOf(test) === -1) {
+                    if (_.isString(test)) {
                         return configTestString(config, _this.packageName, test);
                     }
                     else {
diff --git a/lib/services/setGlobals.js b/lib/services/setGlobals.js
@@ -30,7 +30,7 @@ function loadRunnerDep(config) {
         console.log(message);
         throw message;
     }
-    var slash = navigator.appVersion.indexOf('Win') !== -1 ? '\\' : '/';
+    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);
diff --git a/src/atom/editor.ts b/src/atom/editor.ts
@@ -4,6 +4,9 @@ import {fileExists} from '../services/exists';
 export function setAtomGlobals() {
   if (atom.project.rootDirectories.length > 0) {
     window.coderoad.dir = atom.project.rootDirectories[0].path;
+    if (navigator.appVersion.indexOf('Win') > -1) {
+      window.coderoad.win = true;
+    }
   } else {
     window.coderoad.dir = null;
   }
diff --git a/src/reducers/task-tests/concat-tests.ts b/src/reducers/task-tests/concat-tests.ts
@@ -1,21 +1,27 @@
 import * as fs from 'fs';
 
 export function concatTests(targetFile: string, files: any): string {
+  console.log('files', files);
   // delete previous file
   if (fs.existsSync(targetFile)) {
     fs.unlink(targetFile);
   }
 
   // load tests in order
-  files.forEach((test: string) => readAppend(targetFile, test));
+  files.forEach((test: string) => {
+    // ensure loaded synchronously
+    return new Promise((resolve, reject) => {
+      resolve(readAppend(targetFile, test));
+    });
+  });
   return targetFile;
 }
 
-function readAppend(targetFile: string, file: string): void {
+function readAppend(targetFile: string, file: string): boolean {
   try {
     let data = fs.readFileSync(file, 'utf8');
     fs.appendFileSync(targetFile, data, 'utf8');
-    return;
+    return true;
   } catch (e) {
     console.log('Error reading test file', e);
   }
diff --git a/src/services/package.ts b/src/services/package.ts
@@ -5,6 +5,9 @@ import {store} from '../_base';
 const _ = require('lodash');
 
 function configTestString(config: CR.Config, packageName: string, test: string): string {
+  if (window.coderoad.win) {
+    test = test.split('/').join('\\');
+  }
   if (config.testDir) {
     test = path.join(window.coderoad.dir, 'node_modules', packageName, config.testDir, test);
   } else {
@@ -47,7 +50,7 @@ class PackageService {
       if (task.tests) {
         task.tests = task.tests.map((test: string) => {
           // add unique string to tests
-          if (_.isString(test) && task.tests.indexOf(test) === -1) {
+          if (_.isString(test)) {
             return configTestString(config, this.packageName, test);
           } else {
             console.error('Invalid task test', test);
diff --git a/src/services/setGlobals.ts b/src/services/setGlobals.ts
@@ -34,7 +34,7 @@ function loadRunnerDep(config: PackageJson) {
   }
 
   // fix main path for Windows
-  let slash = navigator.appVersion.indexOf('Win') !== -1 ? '\\' : '/';
+  let slash = window.coderoad.win ? '\\' : '/';
   runnerMain = path.join.apply(null, runnerMain.split(slash));
   // trim root path to folder
   runnerRoot = runnerRoot.substring(0, runnerRoot.lastIndexOf(slash));
diff --git a/src/typings/cr/cr.d.ts b/src/typings/cr/cr.d.ts
@@ -109,6 +109,7 @@ declare namespace CR {
     edit?: boolean;
     runner?: any;
     taskPosition?: number;
+    win?: boolean;
   }
 
   interface Config {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`"use strict";`
`2`	`2`	`var fs = require('fs');`
`3`	`3`	`function concatTests(targetFile, files) {`
	`4`	`+ console.log('files', files);`
`4`	`5`	`if (fs.existsSync(targetFile)) {`
`5`	`6`	`fs.unlink(targetFile);`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ function loadRunnerDep(config) {`
`30`	`30`	`console.log(message);`
`31`	`31`	`throw message;`
`32`	`32`	`}`
`33`		`- var slash = navigator.appVersion.indexOf('Win') !== -1 ? '\\' : '/';`
	`33`	`+ var slash = window.coderoad.win ? '\\' : '/';`
`34`	`34`	`runnerMain = path.join.apply(null, runnerMain.split(slash));`
`35`	`35`	`runnerRoot = runnerRoot.substring(0, runnerRoot.lastIndexOf(slash));`
`36`	`36`	`var pathToMain = path.join(runnerRoot, runnerMain);`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ function loadRunnerDep(config: PackageJson) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`// fix main path for Windows`
`37`		`- let slash = navigator.appVersion.indexOf('Win') !== -1 ? '\\' : '/';`
	`37`	`+ let slash = window.coderoad.win ? '\\' : '/';`
`38`	`38`	`runnerMain = path.join.apply(null, runnerMain.split(slash));`
`39`	`39`	`// trim root path to folder`
`40`	`40`	`runnerRoot = runnerRoot.substring(0, runnerRoot.lastIndexOf(slash));`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ declare namespace CR {`
`109`	`109`	`edit?: boolean;`
`110`	`110`	`runner?: any;`
`111`	`111`	`taskPosition?: number;`
	`112`	`+ win?: boolean;`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`interface Config {`