Merge pull request #241 from Alanoll/0.6.0-dev

Ability to launch SourceJS via NodeJS Script

Author: robhrt7

app.js

@@ -254,10 +254,7 @@ var logErrors = function(err, req, res, next) {
 app.use(logErrors);
 /* /Error handling */
 
-
-
-/* Server start */
-if (!module.parent) {
+var startServer = function () {
     var serverOpts = global.opts.core.server;
     var port = serverOpts.port;
 
@@ -267,7 +264,7 @@ if (!module.parent) {
     if (commander.test) {
         var spawn = require('cross-spawn');
 
-        spawn('./node_modules/grunt-cli/bin/grunt', [commander.postGrunt, '--port='+port], {stdio: 'inherit'})
+        spawn('./node_modules/grunt-cli/bin/grunt', [commander.postGrunt, '--port=' + port], { stdio: 'inherit' })
             .on('close', function (code) {
                 if (code === 0) {
                     log.info('Test successful');
@@ -290,5 +287,14 @@ if (!module.parent) {
             }, true);
         }
     }
+};
+
+/* Server start */
+if (!module.parent) {
+    startServer();
 }
 /* Server start */
+
+module.exports = {
+    startServer: startServer
+};

core/api/index.js

@@ -4,7 +4,7 @@ var express = require('express');
 var path = require('path');
 var ParseData = require(path.join(global.pathToApp, 'core/lib/parseData'));
 var utils = require(path.join(global.pathToApp, 'core/lib/utils'));
-var pathToApp = path.dirname(require.main.filename);
+var pathToApp = global.pathToApp;
 var htmlTree = require(path.join(global.pathToApp, 'core/html-tree'));
 var unflatten = require(path.join(global.pathToApp,'core/unflat'));
 

core/loadOptions.js

@@ -76,7 +76,7 @@ var legacyOptionsChecker = function(options, fileName){
 module.exports = function(basePath, _silent){
     silent = _silent;
 
-    var pathToApp = basePath || path.dirname(require.main.filename);
+    var pathToApp = basePath || global.pathToApp;
 
     var mergedOptions = utils.requireUncached(path.join(pathToApp, 'options'));
 

core/middlewares/clarify.js

@@ -9,7 +9,7 @@ var http = require('http');
 
 var ejs = require(path.join(global.pathToApp, 'core/ejsWithHelpers.js'));
 var trackStats = require(path.join(global.pathToApp, 'core/trackStats'));
-var pathToApp = path.dirname(require.main.filename);
+var pathToApp = global.pathToApp;
 var specUtils = require(path.join(pathToApp, 'core/lib/specUtils'));
 var ParseData = require(path.join(pathToApp, 'core/lib/parseData'));
 var specsParser = require(path.join(pathToApp, 'core/lib/specPageParser'));

core/routes/redirects.js

@@ -8,7 +8,7 @@
 
 var path = require('path');
 var express = require('express');
-var pathToApp = path.dirname(require.main.filename);
+var pathToApp = global.pathToApp;
 
 /*
 *