Some changes to allow recipes and modules to live noncentrally

scripts/slave/annotated_run.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Entry point for fully-annotated builds.
 
 This script is part of the effort to move all builds to annotator-based
 systems. Any builder configured to use the AnnotatorFactory.BaseFactory()
 found in scripts/master/factory/annotator_factory.py executes a single
@@ skipping 296 matching lines @@
                     help='factory properties in b64 gz JSON format')
   parser.add_option('--keep-stdin', action='store_true', default=False,
                     help='don\'t close stdin when running recipe steps')
   return parser.parse_args(argv)
 
 
 def main(argv=None):
   opts, _ = get_args(argv)
 
   stream = annotator.StructuredAnnotationStream()
+  loader = recipe_loader.ModuleLoader()
 
-  ret = run_steps(stream, opts.build_properties, opts.factory_properties)
+  ret = run_steps(stream, opts.build_properties, opts.factory_properties,
+                  loader)
   return ret.status_code
 
 
 # Return value of run_steps and RecipeEngine.run.
 RecipeExecutionResult = collections.namedtuple(
     'RecipeExecutionResult', 'status_code steps_ran')
 
 
 def get_recipe_properties(factory_properties, build_properties):
   """Constructs the recipe's properties from buildbot's properties.
@@ skipping 22 matching lines @@
       properties['recipe'] = builder['recipe']
       properties.update(builder.get('properties', {}))
     else:
       raise LookupError('Cannot find recipe for %s on %s' %
                         (build_properties['buildername'],
                         build_properties['mastername']))
   return properties
 
 
 def run_steps(stream, build_properties, factory_properties,
-              test_data=recipe_test_api.DisabledTestData()):
+              loader, test_data=recipe_test_api.DisabledTestData()):
   """Returns a tuple of (status_code, steps_ran).
 
   Only one of these values will be set at a time. This is mainly to support the
   testing interface used by unittests/recipes_test.py.
   """
   stream.honor_zero_return_code()
 
   # TODO(iannucci): Stop this when blamelist becomes sane data.
   if ('blamelist_real' in build_properties and
       'blamelist' in build_properties):
@@ skipping 44 matching lines @@
         '',
         'To run on Windows, you can put the JSON in a file and redirect the',
         'contents of the file into run_recipe.py, with the < operator.',
     ]
 
     for line in run_recipe_help_lines:
       s.step_log_line('run_recipe', line)
     s.step_log_end('run_recipe')
 
     try:
-      recipe_module = recipe_loader.load_recipe(recipe)
+      recipe_module = recipe_loader.load_recipe(recipe, loader)

[iannucci, 2015/05/05 23:35:59]

erm... shouldn't this be 

  recipe_module = loader.load(recipe)

?

[luqui, 2015/05/06 22:18:39]

Done.

       stream.emit('Running recipe with %s' % (properties,))
-      api = recipe_loader.create_recipe_api(recipe_module.DEPS,
+      api = recipe_loader.create_recipe_api(recipe_module.LOADED_DEPS,
                                             engine,
                                             test_data)
       steps = recipe_module.GenSteps
       s.step_text('<br/>running recipe: "%s"' % recipe)
     except recipe_loader.NoSuchRecipe as e:
       s.step_text('<br/>recipe not found: %s' % e)
       s.step_failure()
       return RecipeExecutionResult(2, None)
 
   # Run the steps emitted by a recipe via the engine, emitting annotations
@@ skipping 266 matching lines @@
 
 def shell_main(argv):
   if update_scripts():
     return subprocess.call([sys.executable] + argv)
   else:
     return main(argv)
 
 
 if __name__ == '__main__':
   sys.exit(shell_main(sys.argv))