Make output placeholders like json.output index-able by name.

recipe_modules/raw_io/api.py

 # Copyright 2014 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.
 
 from recipe_engine import recipe_api
 from recipe_engine import util as recipe_util
 
 import os
 import shutil
 import tempfile
@@ skipping 25 matching lines @@
 
   def result(self, presentation, test):
     assert self._backing_file
     exists = os.path.exists(self._backing_file)
     if not test.enabled and exists:  # pragma: no cover
       os.unlink(self._backing_file)
     self._backing_file = None
 
 
 class OutputDataPlaceholder(recipe_util.OutputPlaceholder):
-  def __init__(self, suffix, leak_to):
+  def __init__(self, suffix, leak_to, name=None):
     self.suffix = suffix
     self.leak_to = leak_to
     self._backing_file = None
-    super(OutputDataPlaceholder, self).__init__()
+    super(OutputDataPlaceholder, self).__init__(name=name)
 
   @property
   def backing_file(self):
     return self._backing_file
 
   def render(self, test):
     assert not self._backing_file, 'Placeholder can be used only once'
     if self.leak_to:
       self._backing_file = str(self.leak_to)
       return [self._backing_file]
@@ skipping 13 matching lines @@
       try:
         with open(self._backing_file, 'rb') as f:
           return f.read()
       finally:
         if not self.leak_to:
           os.unlink(self._backing_file)
         self._backing_file = None
 
 
 class OutputDataDirPlaceholder(recipe_util.OutputPlaceholder):
-  def __init__(self, suffix, leak_to):
+  def __init__(self, suffix, leak_to, name=None):
     self.suffix = suffix
     self.leak_to = leak_to
     self._backing_dir = None
-    super(OutputDataDirPlaceholder, self).__init__()
+    super(OutputDataDirPlaceholder, self).__init__(name=name)
 
   @property
   def backing_file(self):  # pragma: no cover
     raise ValueError('Output dir placeholders can not be used for stdin, '
                      'stdout or stderr')
 
   def render(self, test):
     assert not self._backing_dir, 'Placeholder can be used only once'
     if self.leak_to:
       self._backing_dir = str(self.leak_to)
@@ skipping 30 matching lines @@
 
 
 class RawIOApi(recipe_api.RecipeApi):
   @recipe_util.returns_placeholder
   @staticmethod
   def input(data, suffix=''):
     return InputDataPlaceholder(data, suffix)
 
   @recipe_util.returns_placeholder
   @staticmethod
-  def output(suffix='', leak_to=None):
+  def output(suffix='', leak_to=None, name=None):
     """Returns a Placeholder for use as a step argument, or for std{out,err}.
 
     If 'leak_to' is None, the placeholder is backed by a temporary file with
     a suffix 'suffix'. The file is deleted when the step finishes.
 
     If 'leak_to' is not None, then it should be a Path and placeholder
     redirects IO to a file at that path. Once step finishes, the file is
     NOT deleted (i.e. it's 'leaking'). 'suffix' is ignored in that case.
     """
-    return OutputDataPlaceholder(suffix, leak_to)
+    return OutputDataPlaceholder(suffix, leak_to, name=name)
 
   @recipe_util.returns_placeholder
   @staticmethod
-  def output_dir(suffix='', leak_to=None):
+  def output_dir(suffix='', leak_to=None, name=None):
     """Returns a directory Placeholder for use as a step argument.
 
     If 'leak_to' is None, the placeholder is backed by a temporary dir with
     a suffix 'suffix'. The dir is deleted when the step finishes.
 
     If 'leak_to' is not None, then it should be a Path and placeholder
     redirects IO to a dir at that path. Once step finishes, the dir is
     NOT deleted (i.e. it's 'leaking'). 'suffix' is ignored in that case.
     """
-    return OutputDataDirPlaceholder(suffix, leak_to)
+    return OutputDataDirPlaceholder(suffix, leak_to, name=name)