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

recipe_engine/util.py

 # Copyright 2013-2015 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.
 
 import contextlib
 import functools
 import os
 import sys
 import traceback
 import urllib
@@ skipping 17 matching lines @@
       raise ModuleInjectionError(
         "RecipeApi has no dependency %r. (Add it to DEPS?)" % (key,))
     else:
       raise ModuleInjectionError(
         "Recipe Module %r has no dependency %r. (Add it to __init__.py:DEPS?)"
         % (self.owner_module.name, key))
 
 
 class Placeholder(object):
   """Base class for command line argument placeholders. Do not use directly."""
-  def __init__(self):
-    self.name_pieces = None
+  def __init__(self, name=None):
+    if name is not None:
+      assert isinstance(name, basestring), (
+          'Expect a string name for a placeholder, but got %r' % name)
+    self.name = name
+    self.namespaces = None
 
   @property
   def backing_file(self):  # pragma: no cover
     """Return path to a temp file that holds or receives the data.
 
     Valid only after 'render' has been called.
     """
     raise NotImplementedError
 
   def render(self, test):  # pragma: no cover
     """Return [cmd items]*"""
     raise NotImplementedError
 
   @property
-  def name(self):
-    assert self.name_pieces
-    return "%s.%s" % self.name_pieces
+  def label(self):
+    if self.name is None:
+      return "%s.%s" % self.namespaces

[iannucci, 2016/03/23 18:50:13]

"%s.%s[DEFAULT]" ?

[stgao, 2016/03/23 19:01:44]

This is used as the log name in buildbots.
For backward-compatibility, we don't want to add the "[DEFAULT]" in case any
service relies on the log name to be "json.output" instead of
"json.output[DEFAULT]".

+    else:
+      return "%s.%s[%s]" % (self.namespaces[0], self.namespaces[1], self.name)
 
 
 class InputPlaceholder(Placeholder):
   """Base class for json/raw_io input placeholders. Do not use directly."""
   def cleanup(self, test_enabled):
     """Called after step completion.
 
     Args:
       test_enabled (bool) - indicate whether running in simulation mode.
     """
@@ skipping 38 matching lines @@
     return func.__get__(obj).__name__
   else:
     return func.__name__
 
 
 def returns_placeholder(func):
   @static_wraps(func)
   def inner(self, *args, **kwargs):
     ret = static_call(self, func, *args, **kwargs)
     assert isinstance(ret, Placeholder)
-    ret.name_pieces = (self.name, static_name(self, func))
+    ret.namespaces = (self.name, static_name(self, func))
     return ret
   # prevent this placeholder-returning function from becoming a composite_step.
   inner._non_step = True # pylint: disable=protected-access
   return inner
 
 
 def scan_directory(path, predicate):
   """Recursively scans a directory and yields paths that match predicate."""
   for root, _dirs, files in os.walk(path):
     for file_name in (f for f in files if predicate(f)):
@@ skipping 51 matching lines @@
         self.lines[-1].write(s)
         break
       self.lines[-1].write(s[:i])
       self.lines[-1] = self.lines[-1].getvalue()
       self.lines.append(StringIO())
       s = s[i+1:]
 
   def close(self):
     if not isinstance(self.lines[-1], basestring):
       self.lines[-1] = self.lines[-1].getvalue()