Make adb_install_apk.py saner for humans.

build/android/adb_install_apk.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility script to install APKs from the command line quickly."""
 
 import multiprocessing
 import optparse
 import os
 import sys
 
 from pylib import android_commands
 from pylib import constants
 from pylib.device import device_utils
 from pylib.utils import apk_helper
 
 
 def AddInstallAPKOption(option_parser):
   """Adds apk option used to install the APK to the OptionParser."""
   option_parser.add_option('--apk',
-                           help=('The name of the apk containing the '
+                           help=('DEPRECATED The name of the apk containing the'
                                  ' application (with the .apk extension).'))
   option_parser.add_option('--apk_package',
                            help=('The package name used by the apk containing '
                                  'the application.'))
   option_parser.add_option('--keep_data',
                            action='store_true',
                            default=False,
                            help=('Keep the package data when installing '
                                  'the application.'))
   option_parser.add_option('--debug', action='store_const', const='Debug',
                            dest='build_type',
                            default=os.environ.get('BUILDTYPE', 'Debug'),
                            help='If set, run test suites under out/Debug. '
                            'Default is env var BUILDTYPE or Debug')
   option_parser.add_option('--release', action='store_const', const='Release',
                            dest='build_type',
                            help='If set, run test suites under out/Release. '
                            'Default is env var BUILDTYPE or Debug.')
 
 
-def ValidateInstallAPKOption(option_parser, options):
+def ValidateInstallAPKOption(option_parser, options, args):
   """Validates the apk option and potentially qualifies the path."""
   if not options.apk:
-    option_parser.error('--apk is mandatory.')
+    if len(args) > 1:
+      options.apk = args[1]
+    else:
+      option_parser.error('apk target not specified.')
+      return

[jbudorick, 2014/05/19 15:13:42]

nit: OptionParser.error exits, so the return is unnecessary

[mlamouri (slow - plz ping), 2014/05/20 13:09:05]

Oups, forgot about that one. Fixed.

+
+  if not options.apk.endswith('.apk'):
+    options.apk += '.apk'
+
   if not os.path.exists(options.apk):
     options.apk = os.path.join(constants.GetOutDirectory(), 'apks',
                                options.apk)
 
 
 def _InstallApk(args):
   apk_path, apk_package, keep_data, device = args
   device_utils.DeviceUtils(device=device).old_interface.ManagedInstall(
       apk_path, keep_data, apk_package)
   print '-----  Installed on %s  -----' % device
 
 
 def main(argv):
   parser = optparse.OptionParser()
+  parser.set_usage("usage: %prog [options] target")
   AddInstallAPKOption(parser)
   options, args = parser.parse_args(argv)
+
+  if len(args) > 1 and options.apk:
+    parser.error("Appending the apk as argument can't be used with --apk.")
+  elif len(args) > 2:
+    parser.error("Too many arguments.")
+
   constants.SetBuildType(options.build_type)
-  ValidateInstallAPKOption(parser, options)
-  if len(args) > 1:
-    raise Exception('Error: Unknown argument:', args[1:])
+  ValidateInstallAPKOption(parser, options, args)
 
   devices = android_commands.GetAttachedDevices()
   if not devices:
     raise Exception('Error: no connected devices')
 
   if not options.apk_package:
     options.apk_package = apk_helper.GetPackageName(options.apk)
 
   pool = multiprocessing.Pool(len(devices))
   # Send a tuple (apk_path, apk_package, device) per device.
   pool.map(_InstallApk, zip([options.apk] * len(devices),
                             [options.apk_package] * len(devices),
                             [options.keep_data] * len(devices),
                             devices))
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))