[recipes.py] move remote 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 202 matching lines @@
           step_runner.SubprocessStepRunner(stream_engine, engine_flags),
           universe_view, engine_flags=engine_flags,
           emit_initial_properties=emit_initial_properties)
     finally:
       os.chdir(old_cwd)
 
     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)
-
-
 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 105 matching lines @@
       help='Use bootstrap/bootstrap.py to create a isolated python virtualenv'
            ' with required python dependencies.')
   parser.add_argument(
       '--disable-bootstrap', action='store_false', dest='use_bootstrap',
       help='Disables bootstrap (see --use-bootstrap)')
 
   def operational_args_type(value):
     with open(value) as fd:
       return jsonpb.ParseDict(json.load(fd), arguments_pb2.Arguments())
 
-  parser.set_defaults(operational_args=arguments_pb2.Arguments())
+  parser.set_defaults(
+    operational_args=arguments_pb2.Arguments(),
+    bare_command=False,  # don't call postprocess_func, don't use package_deps

[dnj, 2017/04/27 16:38:40]

add a TODO here, remove this when "remote" command is removed.

+  )
 
   parser.add_argument(
       '--operational-args-path',
       dest='operational_args',
       type=operational_args_type,
       help='The path to an operational Arguments file. If provided, this file '
            'must contain a JSONPB-encoded Arguments protobuf message, and will '
            'be integrated into the runtime parameters.')
 
   def post_process_args(parser, args):
-    if args.command == 'remote':
-      # TODO(iannucci): this is a hack; remote doesn't behave like ANY other
-      # commands. A way to solve this will be to allow --package to take
-      # a remote repo and then simply remove the remote subcommand entirely.
-      return
-
-    if not args.package:
-      parser.error('%s requires --package' % args.command)
+    if args.bare_command:
+      # TODO(iannucci): this is gross, and only for the remote subcommand;
+      # remote doesn't behave like ANY other commands. A way to solve this will
+      # be to allow --package to take a remote repo and then simply remove the
+      # remote subcommand entirely.
+      if args.package is not None:
+        parser.error('%s forbids --package' % args.command)
+    else:
+      if not args.package:
+        parser.error('%s requires --package' % args.command)
 
   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, autoroll
-  to_add = [fetch, lint_test, bundle, depgraph, autoroll]
+  from recipe_engine import remote

[dnj, 2017/04/27 16:38:40]

Since you're adding a lot of optional flags, can we document "func",
"postprocess_func", "bare_command", etc. here?

+  to_add = [fetch, lint_test, bundle, depgraph, autoroll, remote]
 
   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 62 matching lines @@
       'recipe',
       help='The recipe to execute')
   run_p.add_argument(
       'props',
       nargs=argparse.REMAINDER,
       type=parse_prop,
       help='A list of property pairs; e.g. mastername=chromium.linux '
            'issue=12345. The property value will be decoded as JSON, but if '
            'this decoding fails the value will be interpreted as a string.')
 
-
-  remote_p = subp.add_parser(
-      'remote',
-      description='Invoke a recipe command from specified repo and revision')
-  remote_p.set_defaults(command='remote')
-  remote_p.add_argument(
-      '--repository', required=True,
-      help='URL of a git repository to fetch')
-  remote_p.add_argument(
-      '--revision',
-      help=(
-        'Git commit hash to check out; defaults to latest revision on master'
-        ' (refs/heads/master)'
-      ))
-  remote_p.add_argument(
-      '--workdir',
-      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')
-
-
   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)',
              'markdown(gitiles)')
@@ skipping 95 matching lines @@
       # wrong, log the error, but don't actually raise anything.
       def on_error(_function, path, excinfo):
         logging.error('Error cleaning up temporary deps file: %s', path,
                       exc_info=excinfo)
       shutil.rmtree(temp_deps_dir, onerror=on_error)
 
 
 def _real_main(args):
   from recipe_engine import package
 
-  # Commands which do not require config_file, package_deps, and other objects
-  # initialized later.
-  if args.command == 'remote':
-    return remote(args)
+  if args.bare_command:
+    return args.func(None, args)
 
   config_file = args.package
   repo_root = package.InfraRepoConfig().from_recipes_cfg(args.package.path)
 
   try:
     # TODO(phajdan.jr): gracefully handle inconsistent deps when rolling.
     # This fails if the starting point does not have consistent dependency
     # graph. When performing an automated roll, it'd make sense to attempt
     # to automatically find a consistent state, rather than bailing out.
     # Especially that only some subcommands refer to package_deps.
@@ skipping 48 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)