[recipes.py] move autoroll arg parsing to its module

recipes.py

 #!/usr/bin/env python
 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Tool to interact with recipe repositories.
 
 This tool operates on the nearest ancestor directory containing an
 infra/config/recipes.cfg.
 """
@@ skipping 208 matching lines @@
     return handle_recipe_return(
         ret, args.output_result_json, stream_engine, engine_flags)
 
 
 def remote(args):
   from recipe_engine import remote
 
   return remote.main(args)
 
 
-def autoroll(repo_root, config_file, args):
-  from recipe_engine import autoroll
-
-  if args.verbose_json and not args.output_json:
-    print >> sys.stderr, '--verbose-json passed without --output-json'
-    return 1
-
-  return autoroll.main(args, repo_root, config_file)
-
-
 class ProjectOverrideAction(argparse.Action):
   def __call__(self, parser, namespace, values, option_string=None):
     p = values.split('=', 2)
     if len(p) != 2:
       raise ValueError('Override must have the form: repo=path')
     project_id, path = p
 
     v = getattr(namespace, self.dest, None)
     if v is None:
       v = {}
@@ skipping 134 matching lines @@
 
   return post_process_args
 
 
 def main():
   parser = argparse.ArgumentParser(
       description='Interact with the recipe system.')
 
   common_postprocess_func = add_common_args(parser)
 
-  from recipe_engine import fetch, lint_test, bundle, depgraph
-  to_add = [fetch, lint_test, bundle, depgraph]
+  from recipe_engine import fetch, lint_test, bundle, depgraph, autoroll
+  to_add = [fetch, lint_test, bundle, depgraph, autoroll]
 
   subp = parser.add_subparsers()
   for module in to_add:
     module.add_subparser(subp)
 
   test_p = subp.add_parser(
     'test',
     description='Generate or check expectations by simulation')
   test_p.set_defaults(command='test')
   test_p.add_argument('args', nargs=argparse.REMAINDER)
@@ skipping 88 matching lines @@
       type=os.path.abspath,
       help='The working directory of repo checkout')
   remote_p.add_argument(
       '--use-gitiles', action='store_true',
       help='Use Gitiles-specific way to fetch repo (potentially cheaper for '
            'large repos)')
   remote_p.add_argument(
       'remote_args', nargs='*',
       help='Arguments to pass to fetched repo\'s recipes.py')
 
-  autoroll_p = subp.add_parser(
-      'autoroll',
-      help='Roll dependencies of a recipe package forward (implies fetch)')
-  autoroll_p.set_defaults(command='autoroll')
-  autoroll_p.add_argument(
-      '--output-json',
-      type=os.path.abspath,
-      help='A json file to output information about the roll to.')
-  autoroll_p.add_argument(
-      '--verbose-json',
-      action='store_true',
-      help=('Emit even more data in the output-json file. '
-            'Requires --output-json.'))
 
   refs_p = subp.add_parser(
       'refs',
       description='List places referencing given recipe module(s).')
   refs_p.set_defaults(command='refs')
   refs_p.add_argument('modules', nargs='+', help='Module(s) to query for')
   refs_p.add_argument('--transitive', action='store_true',
                       help='Compute transitive closure of the references')
 
   doc_kinds=('binarypb', 'jsonpb', 'textpb', 'markdown(github)',
@@ skipping 125 matching lines @@
     # an infra failure, rather than a test failure.
     return 2
 
   if hasattr(args, 'func'):
     return args.func(package_deps, args)
 
   if args.command == 'test':
     return test(config_file, package_deps, args)
   elif args.command == 'run':
     return run(config_file, package_deps, args)
-  elif args.command == 'autoroll':
-    return autoroll(repo_root, config_file, args)
   elif args.command == 'refs':
     return refs(config_file, package_deps, args)
   elif args.command == 'doc':
     return doc(config_file, package_deps, args)
   else:
     print """Dear sir or madam,
         It has come to my attention that a quite impossible condition has come
     to pass in the specification you have issued a request for us to fulfill.
     It is with a heavy heart that I inform you that, at the present juncture,
     there is no conceivable next action to be taken upon your request, and as
@@ skipping 23 matching lines @@
 
   if not isinstance(ret, int):
     if ret is None:
       ret = 0
     else:
       print >> sys.stderr, ret
       ret = 1
   sys.stdout.flush()
   sys.stderr.flush()
   os._exit(ret)