From 1c890b015737dba4d12df643021d6f6635794dd4 Mon Sep 17 00:00:00 2001 From: loicgasser Date: Thu, 8 Mar 2018 15:46:32 +0000 Subject: [PATCH 1/4] Update doc --- docs/usage.rst | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/usage.rst b/docs/usage.rst index e4662f8..ed738c1 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -4,21 +4,21 @@ Usage Getting started ====== - :: - Usage: tileserver-gl [mbtiles] [options] + Usage: main.js tileserver-gl [mbtiles] [options] - mbtiles MBTiles file (uses demo configuration); - ignored if the configuration file is also specified - - Options: - -c, --config Configuration file [config.json] - -b, --bind Bind address - -p, --port Port [8080] - -V, --verbose More verbose output - -v, --version Version info + Options: + -h, --help output usage information + --mbtiles MBTiles file (uses demo configuration); + ignored if the configuration file is also specified + -c, --config Configuration file + -b, --bind
Bind address + -p, --port Port + -C|--no-cors Disable Cross-origin resource sharing headers + -V, --verbose More verbose output + -v, --version Version info Default styles and configuration From a74ca20375559826cb558335b4bc835426d4b828 Mon Sep 17 00:00:00 2001 From: loicgasser Date: Wed, 7 Mar 2018 17:06:26 +0000 Subject: [PATCH 2/4] Replace nomnom with commander --- package.json | 2 +- src/main.js | 77 +++++++++++++++++++++++++--------------------------- 2 files changed, 38 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index 0b73d9c..05bae9b 100644 --- a/package.json +++ b/package.json @@ -28,13 +28,13 @@ "canvas": "1.6.8", "clone": "2.1.1", "color": "1.0.3", + "commander": "2.1.0", "cors": "2.8.4", "express": "4.16.2", "glyph-pbf-composite": "0.0.2", "handlebars": "4.0.11", "http-shutdown": "^1.2.0", "morgan": "1.9.0", - "nomnom": "1.8.1", "pbf": "3.0.5", "proj4": "2.4.4", "request": "2.83.0", diff --git a/src/main.js b/src/main.js index 1f058a8..b44fbb5 100644 --- a/src/main.js +++ b/src/main.js @@ -10,46 +10,43 @@ var mbtiles = require('@mapbox/mbtiles'); var packageJson = require('../package'); -var opts = require('nomnom') - .option('mbtiles', { - default: undefined, - help: 'MBTiles file (uses demo configuration);\n' + - '\t ignored if the configuration file is also specified', - position: 0 - }) - .option('config', { - abbr: 'c', - default: 'config.json', - help: 'Configuration file' - }) - .option('bind', { - abbr: 'b', - default: undefined, - help: 'Bind address' - }) - .option('port', { - abbr: 'p', - default: 8080, - help: 'Port' - }) - .option('cors', { - default: true, - help: 'Enable Cross-origin resource sharing headers' - }) - .option('verbose', { - abbr: 'V', - flag: true, - help: 'More verbose output' - }) - .option('version', { - abbr: 'v', - flag: true, - help: 'Version info', - callback: function() { - return packageJson.name + ' v' + packageJson.version; - } - }).parse(); - +var opts = require('commander') + .description('tileserver-gl startup options') + .usage('tileserver-gl [mbtiles] [options]') + .option( + '--mbtiles ', + 'MBTiles file (uses demo configuration);\n' + + '\t ignored if the configuration file is also specified' + ) + .option( + '-c, --config ', + 'Configuration file', + 'config.json' + ) + .option( + '-b, --bind
', + 'Bind address' + ) + .option( + '-p, --port ', + 'Port', + parseInt, + 8080 + ) + .option( + '-C|--no-cors', + 'Disable Cross-origin resource sharing headers' + ) + .option( + '-V, --verbose', + 'More verbose output' + ) + .option( + '-v, --version', + 'Version info', + packageJson.version + ) + .parse(process.argv); console.log('Starting ' + packageJson.name + ' v' + packageJson.version); From df05ce3f2a64103d6ae5051de615657d84ca5c35 Mon Sep 17 00:00:00 2001 From: loicgasser Date: Thu, 8 Mar 2018 16:09:16 +0000 Subject: [PATCH 3/4] Add default val in description --- docs/usage.rst | 4 ++-- src/main.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/usage.rst b/docs/usage.rst index ed738c1..0b3586b 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -13,9 +13,9 @@ Getting started -h, --help output usage information --mbtiles MBTiles file (uses demo configuration); ignored if the configuration file is also specified - -c, --config Configuration file + -c, --config Configuration file [config.json] -b, --bind
Bind address - -p, --port Port + -p, --port Port [8080] -C|--no-cors Disable Cross-origin resource sharing headers -V, --verbose More verbose output -v, --version Version info diff --git a/src/main.js b/src/main.js index b44fbb5..e4d635d 100644 --- a/src/main.js +++ b/src/main.js @@ -20,7 +20,7 @@ var opts = require('commander') ) .option( '-c, --config ', - 'Configuration file', + 'Configuration file [config.json]', 'config.json' ) .option( @@ -29,7 +29,7 @@ var opts = require('commander') ) .option( '-p, --port ', - 'Port', + 'Port [8080]', parseInt, 8080 ) From edff8ce06ca95ca453ecda2293cf0408773dbcd8 Mon Sep 17 00:00:00 2001 From: loicgasser Date: Mon, 12 Mar 2018 11:53:11 +0000 Subject: [PATCH 4/4] Fix version and positional argument for mbtiles --- src/main.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main.js b/src/main.js index e4d635d..c2d1797 100644 --- a/src/main.js +++ b/src/main.js @@ -10,6 +10,11 @@ var mbtiles = require('@mapbox/mbtiles'); var packageJson = require('../package'); +var args = process.argv; +if (args.length >= 3 && args[2][0] != '-') { + args.splice(2, 0, '--mbtiles'); +} + var opts = require('commander') .description('tileserver-gl startup options') .usage('tileserver-gl [mbtiles] [options]') @@ -41,12 +46,11 @@ var opts = require('commander') '-V, --verbose', 'More verbose output' ) - .option( - '-v, --version', - 'Version info', - packageJson.version + .version( + packageJson.version, + '-v, --version' ) - .parse(process.argv); + .parse(args); console.log('Starting ' + packageJson.name + ' v' + packageJson.version);