Rename recipes/ to fetch_configs/

We are making depot_tools a proper (chromium) recipe package, which assumes
that recipes are located in recipes/.  So I need to move these other kinds of
recipes out of the way.

BUG=564920
R=dpranke@chromium.org, iannucci@chromium.org

Review URL: https://codereview.chromium.org/1494793002 .

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297837 0039d316-1c4b-4281-b951-d872f2087c98

fetch.py

@@ -7,15 +7,15 @@
 Tool to perform checkouts in one easy command line!
 
 Usage:
-  fetch <recipe> [--property=value [--property2=value2 ...]]
+  fetch <config> [--property=value [--property2=value2 ...]]
 
 This script is a wrapper around various version control and repository
-checkout commands. It requires a |recipe| name, fetches data from that
-recipe in depot_tools/recipes, and then performs all necessary inits,
+checkout commands. It requires a |config| name, fetches data from that
+config in depot_tools/fetch_configs, and then performs all necessary inits,
 checkouts, pulls, fetches, etc.
 
 Optional arguments may be passed on the command line in key-value pairs.
-These parameters will be passed through to the recipe's main method.
+These parameters will be passed through to the config's main method.
 """
 
 import json
@@ -39,10 +39,10 @@ class Checkout(object):
 
   Attributes:
     |base|: the absolute path of the directory in which this script is run.
-    |spec|: the spec for this checkout as returned by the recipe. Different
+    |spec|: the spec for this checkout as returned by the config. Different
         subclasses will expect different keys in this dictionary.
     |root|: the directory into which the checkout will be performed, as returned
-        by the recipe. This is a relative path from |base|.
+        by the config. This is a relative path from |base|.
   """
   def __init__(self, options, spec, root):
     self.base = os.getcwd()
@@ -222,7 +222,7 @@ def usage(msg=None):
     print 'Error:', msg
 
   print textwrap.dedent("""\
-    usage: %s [options] <recipe> [--property=value [--property2=value2 ...]]
+    usage: %s [options] <config> [--property=value [--property2=value2 ...]]
 
     This script can be used to download the Chromium sources. See
     http://www.chromium.org/developers/how-tos/get-the-code
@@ -234,21 +234,21 @@ def usage(msg=None):
        -n, --dry-run      Don't run commands, only print them.
        --no-history       Perform shallow clones, don't fetch the full git history.
 
-    Valid fetch recipes:""") % os.path.basename(sys.argv[0])
+    Valid fetch configs:""") % os.path.basename(sys.argv[0])
 
-  recipes_dir = os.path.join(SCRIPT_PATH, 'recipes')
-  recipes = [f[:-3] for f in os.listdir(recipes_dir) if f.endswith('.py')]
-  recipes.sort()
-  for fname in recipes:
+  configs_dir = os.path.join(SCRIPT_PATH, 'fetch_configs')
+  configs = [f[:-3] for f in os.listdir(configs_dir) if f.endswith('.py')]
+  configs.sort()
+  for fname in configs:
     print '  ' + fname
 
   sys.exit(bool(msg))
 
 
 def handle_args(argv):
-  """Gets the recipe name from the command line arguments."""
+  """Gets the config name from the command line arguments."""
   if len(argv) <= 1:
-    usage('Must specify a recipe.')
+    usage('Must specify a config.')
   if argv[1] in ('-h', '--help', 'help'):
     usage()
 
@@ -276,32 +276,33 @@ def handle_args(argv):
   if bad_parms:
     usage('Got bad arguments %s' % bad_parms)
 
-  recipe = argv[1]
+  config = argv[1]
   props = argv[2:]
   return (
       optparse.Values(
           {'dry_run':dry_run, 'nohooks':nohooks, 'no_history': no_history }),
-      recipe,
+      config,
       props)
 
 
-def run_recipe_fetch(recipe, props, aliased=False):
-  """Invoke a recipe's fetch method with the passed-through args
+def run_config_fetch(config, props, aliased=False):
+  """Invoke a config's fetch method with the passed-through args
   and return its json output as a python object."""
-  recipe_path = os.path.abspath(os.path.join(SCRIPT_PATH, 'recipes', recipe))
-  if not os.path.exists(recipe_path + '.py'):
-    print "Could not find a recipe for %s" % recipe
+  config_path = os.path.abspath(
+      os.path.join(SCRIPT_PATH, 'fetch_configs', config))
+  if not os.path.exists(config_path + '.py'):
+    print "Could not find a config for %s" % config
     sys.exit(1)
 
-  cmd = [sys.executable, recipe_path + '.py', 'fetch'] + props
+  cmd = [sys.executable, config_path + '.py', 'fetch'] + props
   result = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
 
   spec = json.loads(result)
   if 'alias' in spec:
     assert not aliased
-    return run_recipe_fetch(
-        spec['alias']['recipe'], spec['alias']['props'] + props, aliased=True)
-  cmd = [sys.executable, recipe_path + '.py', 'root']
+    return run_config_fetch(
+        spec['alias']['config'], spec['alias']['props'] + props, aliased=True)
+  cmd = [sys.executable, config_path + '.py', 'root']
   result = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
   root = json.loads(result)
   return spec, root
@@ -312,7 +313,7 @@ def run(options, spec, root):
 
     Args:
       options: Options instance.
-      spec: Checkout configuration returned by the the recipe's fetch_spec
+      spec: Checkout configuration returned by the the config's fetch_spec
           method (checkout type, repository url, etc.).
       root: The directory into which the repo expects to be checkout out.
   """
@@ -335,8 +336,8 @@ def run(options, spec, root):
 
 
 def main():
-  options, recipe, props = handle_args(sys.argv)
-  spec, root = run_recipe_fetch(recipe, props)
+  options, config, props = handle_args(sys.argv)
+  spec, root = run_config_fetch(config, props)
   return run(options, spec, root)
 
 

recipes/android.py → fetch_configs/android.py

@@ -4,19 +4,19 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class Android(recipe_util.Recipe):
-  """Basic Recipe alias for Android -> Chromium."""
+class Android(config_util.Config):
+  """Basic Config alias for Android -> Chromium."""
 
   @staticmethod
   def fetch_spec(props):
     return {
       'alias': {
-        'recipe': 'chromium',
+        'config': 'chromium',
         'props': ['--target_os=android'],
       },
     }

recipes/breakpad.py → fetch_configs/breakpad.py

@@ -4,12 +4,12 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class Breakpad(recipe_util.Recipe):
+class Breakpad(config_util.Config):
   @staticmethod
   def fetch_spec(props):
     url = 'https://chromium.googlesource.com/breakpad/breakpad.git'

recipes/chromium.py → fetch_configs/chromium.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class Chromium(recipe_util.Recipe):
-  """Basic Recipe class for Chromium."""
+class Chromium(config_util.Config):
+  """Basic Config class for Chromium."""
 
   @staticmethod
   def fetch_spec(props):

recipes/recipe_util.py → fetch_configs/config_util.py

@@ -2,13 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""This module holds utilities which make writing recipes easier."""
+"""This module holds utilities which make writing configs easier."""
 
 import json
 
 
-class Recipe(object):
-  """Base class for all recipes.
+class Config(object):
+  """Base class for all configs.
 
   Provides methods that are expected to be overridden by child classes. Also
   provides an command-line parsing method that converts the unified command-line

recipes/crashpad.py → fetch_configs/crashpad.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class CrashpadRecipe(recipe_util.Recipe):
-  """Basic Recipe class for Crashpad."""
+class CrashpadConfig(config_util.Config):
+  """Basic Config class for Crashpad."""
 
   @staticmethod
   def fetch_spec(props):
@@ -34,7 +34,7 @@ class CrashpadRecipe(recipe_util.Recipe):
 
 
 def main(argv=None):
-  return CrashpadRecipe().handle_args(argv)
+  return CrashpadConfig().handle_args(argv)
 
 
 if __name__ == '__main__':

recipes/dart.py → fetch_configs/dart.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class Dart(recipe_util.Recipe):
-  """Basic Recipe class for Dart."""
+class Dart(config_util.Config):
+  """Basic Config class for Dart."""
 
   @staticmethod
   def fetch_spec(props):

recipes/dartium.py → fetch_configs/dartium.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class Dart(recipe_util.Recipe):
-  """Basic Recipe class for Dart."""
+class Dart(config_util.Config):
+  """Basic Config class for Dart."""
 
   @staticmethod
   def fetch_spec(props):

recipes/depot_tools.py → fetch_configs/depot_tools.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class DepotTools(recipe_util.Recipe):
-  """Basic Recipe class for DepotTools."""
+class DepotTools(config_util.Config):
+  """Basic Config class for DepotTools."""
 
   @staticmethod
   def fetch_spec(props):

recipes/fletch.py → fetch_configs/fletch.py

@@ -4,12 +4,12 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class Fletch(recipe_util.Recipe):
-  """Basic Recipe class for Fletch."""
+class Fletch(config_util.Config):
+  """Basic Config class for Fletch."""
 
   @staticmethod
   def fetch_spec(props):

recipes/gyp.py → fetch_configs/gyp.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class Chromium(recipe_util.Recipe):
-  """Basic Recipe class for Chromium."""
+class Chromium(config_util.Config):
+  """Basic Config class for Chromium."""
 
   @staticmethod
   def fetch_spec(props):

recipes/infra.py → fetch_configs/infra.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class Infra(recipe_util.Recipe):
-  """Basic Recipe class for the Infrastructure repositories."""
+class Infra(config_util.Config):
+  """Basic Config class for the Infrastructure repositories."""
 
   @staticmethod
   def fetch_spec(_props):

recipes/infra_internal.py → fetch_configs/infra_internal.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class InfraInternal(recipe_util.Recipe):
-  """Basic Recipe class for the whole set of Infrastructure repositories."""
+class InfraInternal(config_util.Config):
+  """Basic Config class for the whole set of Infrastructure repositories."""
 
   @staticmethod
   def fetch_spec(_props):

recipes/ios.py → fetch_configs/ios.py

@@ -4,19 +4,19 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class IOS(recipe_util.Recipe):
-  """Basic Recipe alias for iOS -> Chromium."""
+class IOS(config_util.Config):
+  """Basic Config alias for iOS -> Chromium."""
 
   @staticmethod
   def fetch_spec(props):
     return {
       'alias': {
-        'recipe': 'chromium',
+        'config': 'chromium',
         'props': ['--target_os=ios', '--target_os_only=True'],
       },
     }

recipes/mojo.py → fetch_configs/mojo.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class Mojo(recipe_util.Recipe):
-  """Basic Recipe class for Mojo."""
+class Mojo(config_util.Config):
+  """Basic Config class for Mojo."""
 
   @staticmethod
   def fetch_spec(props):

recipes/nacl.py → fetch_configs/nacl.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class NaCl(recipe_util.Recipe):
-  """Basic Recipe class for NaCl."""
+class NaCl(config_util.Config):
+  """Basic Config class for NaCl."""
 
   @staticmethod
   def fetch_spec(props):

recipes/naclports.py → fetch_configs/naclports.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class Naclports(recipe_util.Recipe):
-  """Basic Recipe class for naclports."""
+class Naclports(config_util.Config):
+  """Basic Config class for naclports."""
 
   @staticmethod
   def fetch_spec(props):

recipes/pdfium.py → fetch_configs/pdfium.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class PdfiumRecipe(recipe_util.Recipe):
-  """Basic Recipe class for pdfium."""
+class PdfiumConfig(config_util.Config):
+  """Basic Config class for pdfium."""
 
   @staticmethod
   def fetch_spec(props):
@@ -33,7 +33,7 @@ class PdfiumRecipe(recipe_util.Recipe):
 
 
 def main(argv=None):
-  return PdfiumRecipe().handle_args(argv)
+  return PdfiumConfig().handle_args(argv)
 
 
 if __name__ == '__main__':

recipes/skia.py → fetch_configs/skia.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class Skia(recipe_util.Recipe):
-  """Basic Recipe class for the Skia repository."""
+class Skia(config_util.Config):
+  """Basic Config class for the Skia repository."""
 
   @staticmethod
   def fetch_spec(_props):

recipes/skia_buildbot.py → fetch_configs/skia_buildbot.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class SkiaBuildbot(recipe_util.Recipe):
-  """Basic Recipe class for the Skia Buildbot repository."""
+class SkiaBuildbot(config_util.Config):
+  """Basic Config class for the Skia Buildbot repository."""
 
   @staticmethod
   def fetch_spec(_props):

recipes/v8.py → fetch_configs/v8.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class V8(recipe_util.Recipe):
-  """Basic Recipe class for V8."""
+class V8(config_util.Config):
+  """Basic Config class for V8."""
 
   @staticmethod
   def fetch_spec(props):

recipes/webrtc.py → fetch_configs/webrtc.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class WebRTC(recipe_util.Recipe):
-  """Basic Recipe class for WebRTC."""
+class WebRTC(config_util.Config):
+  """Basic Config class for WebRTC."""
 
   @staticmethod
   def fetch_spec(props):

recipes/webrtc_android.py → fetch_configs/webrtc_android.py

@@ -4,19 +4,19 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class WebRTCAndroid(recipe_util.Recipe):
-  """Basic Recipe alias for Android -> WebRTC."""
+class WebRTCAndroid(config_util.Config):
+  """Basic Config alias for Android -> WebRTC."""
 
   @staticmethod
   def fetch_spec(props):
     return {
       'alias': {
-        'recipe': 'webrtc',
+        'config': 'webrtc',
         'props': ['--target_os=android,unix'],
       },
     }

recipes/webrtc_ios.py → fetch_configs/webrtc_ios.py

@@ -4,19 +4,19 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class WebRTCIOS(recipe_util.Recipe):
-  """Basic Recipe alias for iOS -> WebRTC."""
+class WebRTCIOS(config_util.Config):
+  """Basic Config alias for iOS -> WebRTC."""
 
   @staticmethod
   def fetch_spec(props):
     return {
       'alias': {
-        'recipe': 'webrtc',
+        'config': 'webrtc',
         'props': ['--target_os=ios,mac'],
       },
     }