Add simple depends_on API.

recipes.py

 #!/usr/bin/env python
 
 """Tool to interact with recipe repositories.
 
 This tool operates on the nearest ancestor directory containing an
 infra/config/recipes.cfg.
 """
 
 import argparse
 import json
@@ skipping 13 matching lines @@
   assert os.path.exists(args.package), (
       'Given recipes config file %s does not exist.' % args.package)
   return (
       package.InfraRepoConfig().from_recipes_cfg(args.package),
       package.ProtoFile(args.package)
   )
 
 
 def simulation_test(package_deps, args):
   from recipe_engine import simulation_test
-  simulation_test.main(package_deps, args=json.loads(args.args))
+  from recipe_engine import loader
+
+  _, config_file = get_package_config(args)
+  universe = loader.RecipeUniverse(package_deps, config_file.path)
+
+  simulation_test.main(universe, args=json.loads(args.args))
 
 
 def lint(package_deps, args):
   from recipe_engine import lint_test
-  lint_test.main(package_deps, args.whitelist or [])
+  from recipe_engine import loader
+
+  _, config_file = get_package_config(args)
+  universe = loader.RecipeUniverse(package_deps, config_file.path)
+
+  lint_test.main(universe, args.whitelist or [])
 
 
 def handle_recipe_return(recipe_result, result_filename, stream):
     if 'recipe_result' in recipe_result.result:
       result_string = json.dumps(
           recipe_result.result['recipe_result'], indent=2)
       if result_filename:
         with open(result_filename, 'w') as f:
           f.write(result_string)
-      else:
-        with stream.step('recipe result') as s:
-          s.write_log_lines('result', [result_string])
+      with stream.step('recipe result') as s:
+        s.write_log_lines('result', [result_string])
 
     if 'reason' in recipe_result.result:
       with stream.step('recipe failure reason') as s:
         s.write_log_lines(
             'failure reason',
             [recipe_result.result['reason']])
 
         code = recipe_result.result.get('status_code', 1)
         if code == -1:
           s.step_exception()
@@ skipping 39 matching lines @@
   elif args.properties_file:
     properties = get_properties_from_file(args.properties_file)
   else:
     properties = arg_properties
 
   properties['recipe'] = args.recipe
 
   os.environ['PYTHONUNBUFFERED'] = '1'
   os.environ['PYTHONIOENCODING'] = 'UTF-8'
 
-  universe = loader.RecipeUniverse(package_deps)
+  _, config_file = get_package_config(args)
+  universe = loader.RecipeUniverse(package_deps, config_file.path)
 
   workdir = (args.workdir or
       os.path.join(os.path.dirname(os.path.realpath(__file__)), 'workdir'))
   logging.info('Using %s as work directory' % workdir)
   if not os.path.exists(workdir):
     os.makedirs(workdir)
 
   old_cwd = os.getcwd()
   os.chdir(workdir)
   stream = annotator.StructuredAnnotationStream()
 
   try:
     ret = recipe_run.run_steps(properties, stream, universe=universe)
 
   finally:
     os.chdir(old_cwd)
 
-  return handle_recipe_return(ret, args.result_file, stream)
+  return handle_recipe_return(ret, args.output_result_json, stream)
 
 
 def roll(args):
   from recipe_engine import package
   repo_root, config_file = get_package_config(args)
   context = package.PackageContext.from_proto_file(repo_root, config_file)
   package_spec = package.PackageSpec.load_proto(config_file)
 
   for update in package_spec.iterate_consistent_updates(config_file, context):
     config_file.write(update.spec.dump())
@@ skipping 40 matching lines @@
       raise ValueError("An override is already defined for [%s] (%s)" % (
                        project_id, v[project_id]))
     path = os.path.abspath(os.path.expanduser(path))
     if not os.path.isdir(path):
       raise ValueError("Override path [%s] is not a directory" % (path,)) 
     v[project_id] = path
 
 
 def doc(package_deps, args):
   from recipe_engine import doc
-  doc.main(package_deps)
+  from recipe_engine import loader
+
+  _, config_file = get_package_config(args)
+  universe = loader.RecipeUniverse(package_deps, config_file)
+
+  doc.main(universe)
 
 
 def info(args):
   from recipe_engine import package
   repo_root, config_file = get_package_config(args)
   package_spec = package.PackageSpec.load_proto(config_file)
 
   if args.recipes_dir:
     print package_spec.recipes_path
 
@@ skipping 55 matching lines @@
   run_p.add_argument(
       '--properties-file',
       help='A file containing a json blob of properties')
   run_p.add_argument(
       '--properties',
       help='A json string containing the properties')
   run_p.add_argument(
       '--workdir',
       help='The working directory of recipe execution')
   run_p.add_argument(
-      '--result-file',
+      '--output-result-json',
       help='The file to write the JSON serialized returned value \
             of the recipe to')
   run_p.add_argument(
       'recipe',
       help='The recipe to execute')
   run_p.add_argument(
       'props', nargs=argparse.REMAINDER,
       help='A list of property pairs; e.g. mastername=chromium.linux '
            'issue=12345')
 
@@ skipping 60 matching lines @@
 
     Warmly,
     recipes.py
     """
     return 1
 
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())