move marge to bin so it'll work globally first (#216)

bin/magellan

@@ -3,6 +3,23 @@
 
 "use strict";
 
+const yargs = require("yargs");
+const logger = require("../src/logger");
+const margs = require("marge");
+
+const defaultConfigFilePath = "./magellan.json";
+const configFilePath = yargs.argv.config;
+
+if (configFilePath) {
+  logger.log("Will try to load configuration from " + configFilePath);
+} else {
+  logger.log("Will try to load configuration from default of " + defaultConfigFilePath);
+}
+
+// NOTE: marge can throw an error here if --config points at a file that doesn't exist
+// FIXME: handle this error nicely instead of printing an ugly stack trace
+margs.init(defaultConfigFilePath, configFilePath);
+
 require("../src/cli")()
   .then(() => process.exit(0))
   .catch(() => process.exit(1));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "testarmada-magellan",
-  "version": "10.0.3",
+  "version": "10.0.4",
   "description": "Massively parallel automated testing",
   "main": "src/main",
   "directories": {

src/cli.js

@@ -53,19 +53,6 @@ module.exports = (opts) => {
 
   logger.log("Magellan " + project.version);
 
-  const defaultConfigFilePath = "./magellan.json";
-  const configFilePath = runOpts.yargs.argv.config;
-
-  if (configFilePath) {
-    logger.log("Will try to load configuration from " + configFilePath);
-  } else {
-    logger.log("Will try to load configuration from default of " + defaultConfigFilePath);
-  }
-
-  // NOTE: marge can throw an error here if --config points at a file that doesn't exist
-  // FIXME: handle this error nicely instead of printing an ugly stack trace
-  runOpts.margs.init(defaultConfigFilePath, configFilePath);
-
   // const isNodeBased = runOpts.margs.argv.framework &&
   //   runOpts.margs.argv.framework.indexOf("mocha") > -1;