Merge pull request #197 from conveyal/dev

v3.9.1

Author: trevorgerhardt

bin/mastarm

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
 const commander = require('commander')
-const path = require('path')
 
 const mastarmVersion = require('../package.json').version
 
@@ -22,12 +21,4 @@ commander
     'Transpile JavaScript down to ES5 with Babel'
   )
   .command('test [patterns...]', 'Run tests using Jest')
-  .option(
-    '-c, --config <path>',
-    'Path to configuration files.',
-    path.join(process.cwd(), '/configurations/default')
-  )
-  .option('-e, --env <environment>', 'Environment to use.')
-  .option('-m, --minify', 'Minify built files.')
-  .option('-O, --outdir <dir>', 'Publish directory', '')
   .parse(process.argv)

bin/mastarm-build

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+const path = require('path')
+
 const commander = require('commander')
 
 const budo = require('../lib/budo')
@@ -9,7 +11,15 @@ const logger = require('../lib/logger')
 const util = require('../lib/util')
 
 commander
+  .option(
+    '-c, --config <path>',
+    'Path to configuration files.',
+    path.join(process.cwd(), '/configurations/default')
+  )
+  .option('-e, --env <environment>', 'Environment to use.')
   .option('-F, --flyle', 'Cache and serve tiles.')
+  .option('-m, --minify', 'Minify built files.')
+  .option('-O, --outdir <dir>', 'Publish directory', '')
   .option('-p, --proxy <address>', 'Proxy calls through to target address.')
   .option('-s, --serve', 'Serve with budo. Automatically rebuilds on changes.')
   .option('-w, --watch', 'Automatically rebuild on changes.')

bin/mastarm-deploy

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+const path = require('path')
+
 const commander = require('commander')
 const commit = require('this-commit')()
 const username = require('username')
@@ -14,6 +16,14 @@ const util = require('../lib/util')
 const mastarmVersion = require('../package.json').version
 
 commander
+  .option(
+    '-c, --config <path>',
+    'Path to configuration files.',
+    path.join(process.cwd(), '/configurations/default')
+  )
+  .option('-e, --env <environment>', 'Environment to use.')
+  .option('-m, --minify', 'Minify built files.')
+  .option('-O, --outdir <dir>', 'Publish directory', '')
   .option('--cloudfront', 'CloudFront Distribution ID to invalidate.')
   .option('--s3bucket', 'S3 Bucket to push to.')
   .parse(process.argv)

bin/mastarm-lint-messages

@@ -1,12 +1,20 @@
 #!/usr/bin/env node
 
+const path = require('path')
+
 const commander = require('commander')
 
 const lintMessages = require('../lib/lint-messages').lint
 const loadConfig = require('../lib/load-config')
 const logger = require('../lib/logger')
 
-commander.parse(process.argv)
+commander
+  .option(
+    '-c, --config <path>',
+    'Path to configuration files.',
+    path.join(process.cwd(), '/configurations/default')
+  )
+  .parse(process.argv)
 
 const config = loadConfig(process.cwd(), commander.config, commander.env)
 const paths = commander.args

bin/mastarm-prepublish

@@ -1,12 +1,22 @@
 #!/usr/bin/env node
 
+const path = require('path')
+
 const commander = require('commander')
 
 const loadConfig = require('../lib/load-config')
 const prepublish = require('../lib/prepublish')
 const util = require('../lib/util')
 
-commander.parse(process.argv)
+commander
+  .option(
+    '-c, --config <path>',
+    'Path to configuration files.',
+    path.join(process.cwd(), '/configurations/default')
+  )
+  .option('-e, --env <environment>', 'Environment to use.')
+  .option('-O, --outdir <dir>', 'Publish directory', '')
+  .parse(process.argv)
 
 const config = loadConfig(process.cwd(), commander.config, commander.env)
 const get = util.makeGetFn([commander, config.settings])

bin/mastarm-test

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+const path = require('path')
+
 const commander = require('commander')
 const jest = require('jest')
 
@@ -8,6 +10,12 @@ const jestUtils = require('../lib/jest')
 const util = require('../lib/util')
 
 commander
+  .option(
+    '-c, --config <path>',
+    'Path to configuration files.',
+    path.join(process.cwd(), '/configurations/default')
+  )
+  .option('-e, --env <environment>', 'Environment to use.')
   .option(
     '-u, --update-snapshots',
     'Force update of snapshots. USE WITH CAUTION.'