Merge branch 'master' of https://github.com/openstf/stf into s3insteadoftmp

lib/cli.js

@@ -15,7 +15,7 @@ program
   .version(pkg.version)
 
 program
-  .command('provider [serial..]')
+  .command('provider [serial...]')
   .description('start provider')
   .option('-s, --connect-sub <endpoint>'
     , 'sub endpoint'
@@ -68,12 +68,15 @@ program
     , 'adb connect URL pattern'
     , String
     , '${publicIp}:${publicPort}')
+  .option('--vnc-initial-size <size>'
+    , 'initial VNC size'
+    , cliutil.size
+    , [600, 800])
   .option('--mute-master'
     , 'whether to mute master volume when devices are being used')
-  .action(function() {
-    var serials = cliutil.allUnknownArgs(arguments)
-      , options = cliutil.lastArg(arguments)
-
+  .option('--lock-rotation'
+    , 'whether to lock rotation when devices are being used')
+  .action(function(serials, options) {
     if (!options.connectSub) {
       this.missingArgument('--connect-sub')
     }
@@ -101,6 +104,7 @@ program
         , '--connect-push', options.connectPush.join(',')
         , '--screen-port', ports.shift()
         , '--connect-port', ports.shift()
+        , '--vnc-port', ports.shift()
         , '--public-ip', options.publicIp
         , '--group-timeout', options.groupTimeout
         , '--storage-url', options.storageUrl
@@ -109,8 +113,10 @@ program
         , '--screen-ws-url-pattern', options.screenWsUrlPattern
         , '--connect-url-pattern', options.connectUrlPattern
         , '--heartbeat-interval', options.heartbeatInterval
+        , '--vnc-initial-size', options.vncInitialSize.join('x')
         ]
-        .concat(options.muteMaster ? ['--mute-master'] : []))
+        .concat(options.muteMaster ? ['--mute-master'] : [])
+        .concat(options.lockRotation ? ['--lock-rotation'] : []))
       }
     , endpoints: {
         sub: options.connectSub
@@ -139,6 +145,13 @@ program
   .option('--connect-port <port>'
     , 'port allocated to adb connect'
     , Number)
+  .option('--vnc-port <port>'
+    , 'port allocated to vnc'
+    , Number)
+  .option('--vnc-initial-size <size>'
+    , 'initial VNC size'
+    , cliutil.size
+    , [600, 800])
   .option('--connect-url-pattern <pattern>'
     , 'adb connect URL pattern'
     , String
@@ -172,6 +185,8 @@ program
     , 10000)
   .option('--mute-master'
     , 'whether to mute master volume when devices are being used')
+  .option('--lock-rotation'
+    , 'whether to lock rotation when devices are being used')
   .action(function(serial, options) {
     if (!options.connectSub) {
       this.missingArgument('--connect-sub')
@@ -188,6 +203,9 @@ program
     if (!options.connectPort) {
       this.missingArgument('--connect-port')
     }
+    if (!options.vncPort) {
+      this.missingArgument('--vnc-port')
+    }
     if (!options.storageUrl) {
       this.missingArgument('--storage-url')
     }
@@ -208,8 +226,11 @@ program
     , screenPort: options.screenPort
     , connectUrlPattern: options.connectUrlPattern
     , connectPort: options.connectPort
+    , vncPort: options.vncPort
+    , vncInitialSize: options.vncInitialSize
     , heartbeatInterval: options.heartbeatInterval
     , muteMaster: options.muteMaster
+    , lockRotation: options.lockRotation
     })
   })
 
@@ -866,7 +887,7 @@ program
   })
 
 program
-  .command('local [serial..]')
+  .command('local [serial...]')
   .description('start everything locally')
   .option('--bind-app-pub <endpoint>'
     , 'app pub endpoint'
@@ -976,6 +997,10 @@ program
   .option('--user-profile-url <url>'
     , 'URL to external user profile page'
     , String)
+  .option('--vnc-initial-size <size>'
+    , 'initial VNC size'
+    , cliutil.size
+    , [600, 800])
   .option('--mute-master'
     , 'whether to mute master volume when devices are being used')
   .option('--use-s3'
@@ -991,10 +1016,10 @@ program
     , 's3 endpoint'
     , String
     , 's3-ap-northeast-1.amazonaws.com')
-  .action(function() {
+  .option('--lock-rotation'
+    , 'whether to lock rotation when devices are being used')
+  .action(function(serials, options) {
     var log = logger.createLogger('cli:local')
-      , args = arguments
-      , options = cliutil.lastArg(args)
       , procutil = require('./util/procutil')
 
     // Each forked process waits for signals to stop, and so we run over the
@@ -1054,10 +1079,12 @@ program
           , util.format('http://localhost:%d/', options.poorxyPort)
           , '--adb-host', options.adbHost
           , '--adb-port', options.adbPort
+          , '--vnc-initial-size', options.vncInitialSize.join('x')
           ]
           .concat(options.allowRemote ? ['--allow-remote'] : [])
           .concat(options.muteMaster ? ['--mute-master'] : [])
-          .concat(cliutil.allUnknownArgs(args)))
+          .concat(options.lockRotation ? ['--lock-rotation'] : [])
+          .concat(serials))
 
         // auth
       , procutil.fork(__filename, [