update pytest runner

Author: ShMcK

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.3.0] - WIP
+- change input to Object
+- change input to testString, write file within create-runner
+
 ## [0.2.0] - 2016-04-04
 - `print` to console
 

README.md

@@ -1,6 +1,6 @@
 # PyTest CodeRoad
 
-PyTest Python test runner for [Atom-CodeRoad](https://github.com/coderoad/atom-coderoad).
+[PyTest](http://pytest.org/latest/) Python test runner for [Atom-CodeRoad](https://github.com/coderoad/atom-coderoad).
 
 [Learn more about CodeRoad](https://coderoad.github.io), an interactive coding tutorial creator built inside of Atom.
 

examples/basic/coderoad.json

@@ -1,5 +1,5 @@
 {
-  "project": {
+  "info": {
     "title": "PyTest Demo",
     "description": "A demo for testing Python's PyTest in CodeRoad."
   },
@@ -45,4 +45,4 @@
       ]
     }
   ]
-}
+}

examples/basic/package.json

@@ -15,8 +15,8 @@
     "pytest-coderoad": "^0.1.0"
   },
   "config": {
-    "testDir": "tutorial",
+    "dir": "tutorial",
     "testSuffix": ".py",
-    "testRunner": "pytest-coderoad"
+    "runner": "pytest-coderoad"
   }
 }

lib/create-runner.js

@@ -1,6 +1,7 @@
 "use strict";
 var exists_1 = require('./exists');
 var child_process_1 = require('child_process');
+var fs_1 = require('fs');
 var python = 'python';
 var localPath = '/usr/local/bin/python';
 var globalPath = '/usr/bin/python';
@@ -15,7 +16,9 @@ if (process.platform === 'darwin' && process.resourcesPath) {
         throw 'Python not found. Python may not be installed';
     }
 }
-function createRunner(config, testFile) {
+var testFile = 'tmp-pytest.py';
+function createRunner(config, testString) {
+    fs_1.writeFileSync(testFile, testString, 'utf8');
     return child_process_1.exec([
         python,
         '-m pytest',

lib/exists.js

@@ -1,8 +1,8 @@
 "use strict";
-var fs = require('fs');
+var fs_1 = require('fs');
 function fileExists(path) {
     try {
-        fs.accessSync(path, fs.F_OK);
+        fs_1.accessSync(path, fs_1.F_OK);
     }
     catch (e) {
         if (e) {

lib/parse-tap.js

@@ -3,7 +3,7 @@ var regex = {
     isTap: /^# TAP results/m,
     test: /^[not ]?ok [0-9]+ -/m,
     finalTest: /^1..([0-9+])$/m,
-    error: /^# E\s+(.+)$/m
+    error: /^# E\s+(.+)$/m,
 };
 function formatFeedback(message) {
     return message.split('_').join(' ');
@@ -38,7 +38,7 @@ function parseTap(data) {
             completed: false,
             msg: formatFeedback(message),
             taskPosition: taskPosition - 1,
-            timedOut: false
+            timedOut: false,
         };
     }
     else {
@@ -48,7 +48,7 @@ function parseTap(data) {
         final = {
             completed: true,
             msg: "Task " + taskPosition + " Complete",
-            taskPosition: taskPosition
+            taskPosition: taskPosition,
         };
     }
     return final;

lib/runner.js

@@ -2,11 +2,12 @@
 var create_runner_1 = require('./create-runner');
 var parse_tap_1 = require('./parse-tap');
 var logger_1 = require('./logger');
-function runner(testFile, config, handleResult) {
-    var runner = create_runner_1.default(config, testFile);
+function runner(_a) {
+    var testString = _a.testString, config = _a.config, handleResult = _a.handleResult;
+    var runner = create_runner_1.default(config, testString);
     var final = null;
-    return new Promise(function (resolve, reject) {
-        runner.stdout.on('data', function (data) {
+    return new Promise(function run(resolve, reject) {
+        runner.stdout.on('data', function testData(data) {
             data = data.toString();
             if (!data || !data.length) {
                 return;
@@ -20,12 +21,12 @@ function runner(testFile, config, handleResult) {
             final.pass = final.change > 0;
             handleResult(final);
         });
-        runner.stderr.on('data', function (data) {
+        runner.stderr.on('data', function testError(data) {
             if (data.length) {
                 console.log('Test runner error:', data.toString());
             }
         });
-        runner.on('end', function (code) {
+        runner.on('end', function testEnd(code) {
             if (code === 0) {
                 resolve(final);
             }

package.json

@@ -25,20 +25,5 @@
   "bugs": {
     "url": "https://github.com/coderoad/pytest-coderoad/issues"
   },
-  "homepage": "https://github.com/coderoad/pytest-coderoad#readme",
-  "devDependencies": {
-    "ava": "^0.13.0"
-  },
-  "ava": {
-    "files": [
-      "test/*.spec.js",
-      "!node_modules"
-    ],
-    "source": [
-      "test/*.spec.js"
-    ],
-    "failFast": false,
-    "serial": true,
-    "noCache": true
-  }
+  "homepage": "https://github.com/coderoad/pytest-coderoad#readme"
 }

src/create-runner.ts

@@ -1,5 +1,6 @@
 import exists from './exists';
 import {exec} from 'child_process';
+import {writeFileSync} from 'fs';
 
 let python = 'python';
 let localPath = '/usr/local/bin/python';
@@ -16,7 +17,14 @@ if (process.platform === 'darwin' && process.resourcesPath) {
   }
 }
 
-export default function createRunner(config: CR.Config, testFile: string) {
+
+const testFile = 'tmp-pytest.py';
+
+export default function createRunner(
+  config: CR.Config, testString: string
+) {
+  // write file and run test
+  writeFileSync(testFile, testString, 'utf8');
   // see pytest options: https://pytest.org/latest/usage.html
   return exec([
     python,