6 Commits

Author SHA1 Message Date
Roman Shtylman
4f97434a69 v1.7.0 2015-07-22 17:19:32 -07:00
Roman Shtylman
a46cd02fcb update history 2015-07-22 17:19:15 -07:00
Roman Shtylman
792d9f19bd update history 2015-07-22 17:18:45 -07:00
Roman Shtylman
d0b483b92b Merge pull request #75 from artmees/master
Implement short argv via yargs
2015-07-22 17:16:49 -07:00
Ahmed Abdel Razzak
59d96a3cc6 Update the client to include shorthand options
Providing aliases for all of the supported options
-h, --host
-s, --subdomain
-l, --local-host
-o, --open
-p, --port
--help
--version

Minor clean up in the code removing the blocks that already handled
by yargs ( version, help and required options )

Handle validating that the passed port could be validated as a number

Remove the spaces in empty lines
2015-07-23 02:05:17 +02:00
Ahmed Abdel Razzak
b516ecccfa Replace optimist with yargs 2015-07-23 00:57:01 +02:00
3 changed files with 34 additions and 28 deletions

View File

@@ -1,4 +1,8 @@
# UNRELEASED # 1.7.0 (2015-07-22)
* add short arg options
# 1.6.0 (2015-05-15)
* keep sockets alive after connecting * keep sockets alive after connecting
* add --open param to CLI * add --open param to CLI

View File

@@ -2,35 +2,37 @@
var lt_client = require('../client'); var lt_client = require('../client');
var open_url = require('openurl'); var open_url = require('openurl');
var argv = require('optimist') var argv = require('yargs')
.usage('Usage: $0 --port [num]') .usage('Usage: $0 --port [num] <options>')
.options('host', { .option('h', {
default: 'http://localtunnel.me', alias: 'host',
describe: 'upstream server providing forwarding' describe: 'Upstream server providing forwarding',
default: 'http://localtunnel.me'
}) })
.options('subdomain', { .option('s', {
describe: 'request this subdomain' alias: 'subdomain',
describe: 'Request this subdomain'
}) })
.options('local-host', { .option('l', {
describe: 'tunnel traffic to this host instead of localhost, override Host header to this host' alias: 'local-host',
describe: 'Tunnel traffic to this host instead of localhost, override Host header to this host'
}) })
.options('version', { .options('o', {
describe: 'print version and exit' alias: 'open',
})
.options('open', {
describe: 'opens url in your browser' describe: 'opens url in your browser'
}) })
.describe('port', 'internal http server port') .option('p', {
alias: 'port',
describe: 'Internal http server port',
})
.require('port')
.help('help', 'Show this help and exit')
.version(require('../package').version)
.argv; .argv;
if (argv.version) { if (typeof argv.port !== 'number') {
console.log(require('../package.json').version); require('yargs').showHelp();
process.exit(0); console.error('port must be a number');
}
if (argv.port == null) {
require('optimist').showHelp();
console.error('Missing required arguments: port');
process.exit(1); process.exit(1);
} }

View File

@@ -2,7 +2,7 @@
"author": "Roman Shtylman <shtylman@gmail.com>", "author": "Roman Shtylman <shtylman@gmail.com>",
"name": "localtunnel", "name": "localtunnel",
"description": "expose localhost to the world", "description": "expose localhost to the world",
"version": "1.6.0", "version": "1.7.0",
"license": "MIT", "license": "MIT",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -10,7 +10,7 @@
}, },
"dependencies": { "dependencies": {
"request": "2.11.4", "request": "2.11.4",
"optimist": "0.3.4", "yargs": "3.15.0",
"debug": "0.7.4", "debug": "0.7.4",
"openurl": "1.1.0" "openurl": "1.1.0"
}, },