Merge pull request #1335 from atom/fix-windows-specs

Return windows specs to green

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "vendor/apm"]
 	path = vendor/apm
-	url = git@github.com:atom/apm.git
+	url = https://github.com/atom/apm.git

build/tasks/spec-task.coffee

@@ -39,7 +39,7 @@ module.exports = (grunt) ->
       grunt.verbose.writeln "Launching #{path.basename(packagePath)} specs."
       spawn options, (error, results, code) ->
         if process.platform is 'win32'
-          process.stdout.write(fs.readFileSync(path.join(packagePath, 'ci.log')))
+          process.stderr.write(fs.readFileSync(path.join(packagePath, 'ci.log')))
           fs.unlinkSync(path.join(packagePath, 'ci.log'))
 
         failedPackages.push path.basename(packagePath) if error
@@ -77,7 +77,7 @@ module.exports = (grunt) ->
 
     spawn options, (error, results, code) ->
       if process.platform is 'win32'
-        process.stdout.write(fs.readFileSync('ci.log'))
+        process.stderr.write(fs.readFileSync('ci.log'))
         fs.unlinkSync('ci.log')
       else
         # TODO: Restore concurrency on Windows

package.json

@@ -44,7 +44,7 @@
     "pathwatcher": "0.11.0",
     "pegjs": "0.7.0",
     "q": "0.9.7",
-    "scandal": "0.9.0",
+    "scandal": "0.11.0",
     "season": "0.14.0",
     "semver": "1.1.4",
     "space-pen": "2.0.2",
@@ -83,7 +83,6 @@
     "grammar-selector": "0.15.0",
     "image-view": "0.14.0",
     "keybinding-resolver": "0.8.0",
-    "link": "0.11.0",
     "markdown-preview": "0.22.0",
     "metrics": "0.20.0",
     "package-generator": "0.23.0",

spec/jasmine-helper.coffee

@@ -10,21 +10,24 @@ module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) ->
   TimeReporter = require './time-reporter'
   timeReporter = new TimeReporter()
 
-  if logFile?
-    logStream = fs.createWriteStream(logFile, flags: 'w')
-    process.__defineGetter__ 'stdout', -> logStream
-    process.__defineGetter__ 'stderr', -> logStream
+  logStream = fs.openSync(logFile, 'w') if logFile?
+  log = (str) ->
+    if logStream?
+      fs.writeSync(logStream, str)
+    else
+      process.stderr.write(str)
 
   if atom.getLoadSettings().exitWhenDone
     {jasmineNode} = require 'jasmine-node/lib/jasmine-node/reporter'
     reporter = new jasmineNode.TerminalReporter
-      print: (args...) ->
-        process.stderr.write(args...)
+      print: (str) ->
+        log(str)
       onComplete: (runner) ->
-        process.stdout.write('\n')
-        timeReporter.logLongestSuites 10, (line) -> process.stdout.write("#{line}\n")
-        process.stdout.write('\n')
-        timeReporter.logLongestSpecs 10, (line) -> process.stdout.write("#{line}\n")
+        log('\n')
+        timeReporter.logLongestSuites 10, (line) -> log("#{line}\n")
+        log('\n')
+        timeReporter.logLongestSpecs 10, (line) -> log("#{line}\n")
+        fs.closeSync(logStream) if logStream?
         atom.exit(runner.results().failedCount > 0 ? 1 : 0)
   else
     AtomReporter = require './atom-reporter'