Plumb in subcommand options

shell/main.py

 #!/usr/bin/python
 #
 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Main file for the chromite shell."""
 
 # Python imports
 import optparse
@@ skipping 120 matching lines @@
   parser.add_option('-v', dest='verbose', default=3,
       help='Control verbosity: 0=silent, 1=progress, 3=full')
   parser.add_option('-q', action='store_const', dest='verbose', const=0,
       help='Be quieter (sets verbosity to 1)')
   if not cros_lib.IsInsideChroot():
     parser.add_option('--chroot', action='store', type='string',
         dest='chroot_name', default='chroot',
         help="Chroot spec to use. Can be an absolute path to a spec file "
             "or a substring of a chroot spec name (without .spec suffix)")
   parser.usage = help_str
+
+  # We want to parse only the options that we understand at the top level of

[diandersAtChromium, 2011/04/04 20:42:48]

This code won't work, will it?  Try:
  chromite -v 3 -q --chroot myChroot build --clean x86-generic

Your code will see lots of "positional" arguments and will get confused.

+  # Chromite. Our heuristic here is that anything after the first positional
+  # parameter (which we assume is the command) is ignored at this level, and
+  # is passed down to the command level to handle.
+  # FIXME(sjg): Revisit this to include tolerant option parser instead

[diandersAtChromium, 2011/04/04 20:42:48]

nit: please use TODO.

+  # http://codereview.chromium.org/6469035/
+  our_args = []   # Arguments that we will parse here
+  cmd_args = []   # Arguments that we will pass down to the command level
+  positional = 0
+  for arg in sys.argv:
+
+    # Option arguments are collected as it, but we only allow two positional

[diandersAtChromium, 2011/04/04 20:42:48]

nit: "as is"

+    # arguments: argv[0] is the program name, the next is the command name.
+    if positional == 2:
+      cmd_args = sys.argv[len(our_args):]
+      break
+    if arg[0] != '-':
+      positional += 1
+    our_args.append(arg)
+
   try:
-    (options, args) = parser.parse_args()
+    (options, args) = parser.parse_args(our_args)
   except:
     sys.exit(1)
 
   # Set up the cros system.
   cros_env = chromite_env.ChromiteEnv()
 
   # Configure the operation setup.
   oper = cros_env.GetOperation()
   oper.verbose = options.verbose >= 3
   oper.progress = options.verbose >= 1
 
   # Look for special "--chroot" argument to allow for alternate chroots
   if not cros_lib.IsInsideChroot():
     chroot_spec_path = utils.FindSpec(options.chroot_name,
                                       spec_type=utils.CHROOT_SPEC_TYPE)
 
     oper.Info('Using chroot "%s"' % os.path.relpath(chroot_spec_path))
 
     chroot_config = utils.ReadConfig(chroot_spec_path)
   else:
     # Already in the chroot; no need to get config...
     chroot_config = None
 
   # Get command and arguments
   if args:
-    cmd_str = args[0].lower()
-    args = args[1:]
+    cmd_str = args[1].lower()
   else:
     cmd_str = ''
 
   # Validate the subcmd, popping a menu if needed.
   cmd_str = _FindCommand(cmd_str)
   oper.Info("Running command '%s'." % cmd_str)
 
   # Finally, call the function w/ standard argv.
   cmd_cls = _COMMAND_HANDLERS[_COMMAND_STRS.index(cmd_str)]
   cmd_obj = cmd_cls()
   cmd_obj.SetChromiteEnv(cros_env)
   try:
-    cmd_obj.Run([cmd_str] + args, chroot_config=chroot_config)
+    cmd_obj.Run([cmd_str] + cmd_args, chroot_config=chroot_config)
 
   # Handle an error in one of the scripts: print a message and exit.
   except chromite_env.ChromiteError, msg:
     sys.exit(1)
 
 if __name__ == '__main__':
   main()