1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-03 17:59:28 +02:00

Rename cliargs to cliutil for consistency.

This commit is contained in:
Simo Kinnunen 2014-01-23 14:32:03 +09:00
parent 35ac51795b
commit 11ad1ffc38
2 changed files with 13 additions and 13 deletions

View file

@ -1,7 +1,7 @@
var program = require('commander') var program = require('commander')
var pkg = require('../package') var pkg = require('../package')
var cliargs = require('./util/cliargs') var cliutil = require('./util/cliutil')
program program
.version(pkg.version) .version(pkg.version)
@ -9,11 +9,11 @@ program
program program
.command('provider [serial..]') .command('provider [serial..]')
.description('start provider') .description('start provider')
.option('-s, --connect-sub <endpoint>', 'sub endpoint', cliargs.list) .option('-s, --connect-sub <endpoint>', 'sub endpoint', cliutil.list)
.option('-p, --connect-push <endpoint>', 'push endpoint', cliargs.list) .option('-p, --connect-push <endpoint>', 'push endpoint', cliutil.list)
.action(function() { .action(function() {
var serials = cliargs.allUnknownArgs(arguments) var serials = cliutil.allUnknownArgs(arguments)
, options = cliargs.lastArg(arguments) , options = cliutil.lastArg(arguments)
if (!options.connectSub) { if (!options.connectSub) {
this.missingArgument('--connect-sub') this.missingArgument('--connect-sub')
@ -44,8 +44,8 @@ program
program program
.command('device <serial>') .command('device <serial>')
.description('start device worker') .description('start device worker')
.option('-s, --connect-sub <endpoint>', 'sub endpoint', cliargs.list) .option('-s, --connect-sub <endpoint>', 'sub endpoint', cliutil.list)
.option('-p, --connect-push <endpoint>', 'push endpoint', cliargs.list) .option('-p, --connect-push <endpoint>', 'push endpoint', cliutil.list)
.action(function(serial, options) { .action(function(serial, options) {
if (!options.connectSub) { if (!options.connectSub) {
this.missingArgument('--connect-sub') this.missingArgument('--connect-sub')
@ -67,9 +67,9 @@ program
.command('coordinator <name>') .command('coordinator <name>')
.description('start coordinator') .description('start coordinator')
.option('-a, --connect-app-dealer <endpoint>', 'app dealer endpoint', .option('-a, --connect-app-dealer <endpoint>', 'app dealer endpoint',
cliargs.list) cliutil.list)
.option('-d, --connect-dev-dealer <endpoint>', 'device dealer endpoint', .option('-d, --connect-dev-dealer <endpoint>', 'device dealer endpoint',
cliargs.list) cliutil.list)
.action(function(name, options) { .action(function(name, options) {
if (!options.connectAppDealer) { if (!options.connectAppDealer) {
this.missingArgument('--connect-app-dealer') this.missingArgument('--connect-app-dealer')
@ -110,8 +110,8 @@ program
program program
.command('console') .command('console')
.description('start console') .description('start console')
.option('-s, --connect-sub <endpoint>', 'sub endpoint', cliargs.list) .option('-s, --connect-sub <endpoint>', 'sub endpoint', cliutil.list)
.option('-p, --connect-push <endpoint>', 'push endpoint', cliargs.list) .option('-p, --connect-push <endpoint>', 'push endpoint', cliutil.list)
.action(function(options) { .action(function(options) {
if (!options.connectSub) { if (!options.connectSub) {
this.missingArgument('--connect-sub') this.missingArgument('--connect-sub')
@ -144,7 +144,7 @@ program
.option('--bind-dev-pull <endpoint>', 'device pull endpoint', .option('--bind-dev-pull <endpoint>', 'device pull endpoint',
String, 'tcp://127.0.0.1:7116') String, 'tcp://127.0.0.1:7116')
.action(function() { .action(function() {
var options = cliargs.lastArg(arguments) var options = cliutil.lastArg(arguments)
, fork = require('child_process').fork , fork = require('child_process').fork
// app triproxy // app triproxy
@ -182,7 +182,7 @@ program
'provider' 'provider'
, '--connect-sub', options.bindDevPub , '--connect-sub', options.bindDevPub
, '--connect-push', options.bindDevPull , '--connect-push', options.bindDevPull
].concat(cliargs.allUnknownArgs(arguments))) ].concat(cliutil.allUnknownArgs(arguments)))
}) })
program.parse(process.argv) program.parse(process.argv)