Add useConfig and a config flag

Author: bterlson

bin/run.js

@@ -4,18 +4,14 @@
 // This code is governed by the BSD License found in the LICENSE file.
 
 var args = require('minimist')(process.argv.slice(2), {
-    default: {
-        runner: 'node',
-        reporter: 'simple',
-        threads: 4,
-    },
     alias: {
         consoleCommand: 'e',
         consolePrintCommand: 'p',
         runner: 'r',
         reporter: 'R',
         threads: 't',
-        batch: 'b'
+        batch: 'b',
+        config: 'c'
     }
 });
 
@@ -28,68 +24,58 @@ var fs = require('fs');
 var path = require('path');
 var jss = require('JSONStream').stringify();
 var Tributary = require('stream-bifurcate')
-
 var scenarios = require('../lib/scenarios');
 var readFile = _.wrapCallback(fs.readFile);
 var DEFAULT_BATCH_SIZE = 75;
+var t262 = require('../index');
 
-if(args.config) {
-    require(path.join(process.cwd(), args.config));
-}
-
-var t262 = require('../index')
-console.log(t262.config);
-
-console.log()
-
-var Runner = loadRunner();
-console.log(Runner);
+if(args.config) require(path.join(process.cwd(), args.config));
+t262.useConfig(args);
 
-// default to console runner if passing console command
-if(args.consoleCommand && args.runner === 'node') {
-    args.runner = 'console';
-}
+var Runner = t262.loadRunner();
 
-// apply default batch size
-if(args.batch === true) args.batch = DEFAULT_BATCH_SIZE;
+// apply defaults
+if(t262.config.batch === true) t262.config.batch = DEFAULT_BATCH_SIZE;
+if(!t262.config.threads) t262.config.threads = 4;
+if(!t262.config.reporter) t262.config.reporter = 'simple';
 
 var start = Date.now();
 
-var files = _(args._.map(globStream)).merge();
+var files = _(t262.config._.map(globStream)).merge();
 var contents = files.fork().map(readFile).sequence();
 var tests = contents.zip(files.fork()).map(function(d) {
     return parser.parseFile({ contents: d[0].toString('utf8'), file: d[1]});
 });
-var getScenarios = scenarios(args);
+var getScenarios = scenarios(t262.config);
 var scenarios = tests.flatMap(scenarioStream);
-if(args.batch) scenarios = _(scenarios).batch(args.batch);
+if(t262.config.batch) scenarios = _(scenarios).batch(t262.config.batch);
 
 var trb = scenarios.pipe(new Tributary());
 var results = _(function(push) {
-    for(var i = 0; i < args.threads; i++) push(null, run(trb.fork()));
+    for(var i = 0; i < t262.config.threads; i++) push(null, run(trb.fork()));
     push(null, _.nil);
 }).merge();
 
 results.on('end', function() {
     console.log("Took " + ((Date.now() - start) / 1000) + " seconds");
 })
 
-if(args.reporter === 'json') {
+if(t262.config.reporter === 'json') {
     results.pipe(jss).pipe(process.stdout);
-} else if(args.reporter === 'tap') {
+} else if(t262.config.reporter === 'tap') {
     results.pipe(tapify).pipe(process.stdout);
-} else if(args.reporter === 'simple') {
+} else if(t262.config.reporter === 'simple') {
     results.pipe(simpleReporter);
 }
 
 // takes a test collateral stream.
 // Returns test results stream.
 function run(tests) {
-    var runner = new Runner(args);
+    var runner = new Runner(t262.config);
 
     return _(tests).map(function(test) {
         return _(function(push) {
-            if(args.batch) {
+            if(t262.config.batch) {
                 runner.runBatch(test, function() {
                     test.forEach(function(t) {
                         push(null, t);
@@ -129,15 +115,3 @@ function scenarioStream(test) {
         push(null, _.nil);
     })
 }
-
-// Load the runner
-function loadRunner() {
-    if(t262.config.runner) return t262.config.runner;
-
-    try {
-        return require('../lib/runners/' + args.runner);
-    } catch(e) {
-        if(e.code === 'MODULE_NOT_FOUND') throw new Error('Runner ' + args.runner + ' not found.');
-        throw e;
-    }
-}

index.js

@@ -10,3 +10,26 @@ exports.useConfig = function(conf) {
         config[k] = conf[k];
     })
 }
+
+exports.loadRunner = function loadRunner() {
+    if(typeof config.runner === 'string')
+        return requireRunner(config.runner);
+
+    if(typeof config.runner === 'function')
+        return config.runner;
+
+    if(config.consoleCommand)
+        return requireRunner('console')
+
+    return requireRunner('node');
+}
+
+function requireRunner(name) {
+    try {
+        return require('./lib/runners/' + name);
+    } catch(e) {
+        if(e.code === 'MODULE_NOT_FOUND')
+            throw new Error('Runner ' + name + ' not found.');
+        throw e;
+    }
+}