Add cipd binary support to cit.py

cit.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 
 """Wrapper for updating and calling infra.git tools.
 
 This tool does a two things:
 * Maintains a infra.git checkout pinned at "deployed" in the home dir
 * Acts as an alias to infra.tools.*
+* Acts as an alias to infra.git/cipd/<executable>
 """
 
 # TODO(hinoka): Use cipd/glyco instead of git/gclient.
 
 import argparse
 import sys
 import os
 import subprocess
 import re
 
@@ skipping 27 matching lines @@
 
   subprocess.check_call(
       ['git', 'fetch', 'origin'], cwd=INFRA_DIR,
       stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
   origin_rev = get_git_rev(INFRA_DIR, 'origin/%s' % (branch,))
   return origin_rev != local_rev
 
 
 def ensure_infra(branch):
   """Ensures that infra.git is present in ~/.chrome-infra."""
-  sys.stderr.write(
-      'Fetching infra@%s into %s, may take a couple of minutes...' % (
-      branch, TARGET_DIR))
-  sys.stderr.flush()

[tandrii(chromium), 2016/07/14 12:59:26]

you really don't like my stderr writing :(
the purpose of it was to avoid polluting stdout so that "cit log" output can be
piped without hackery of skipping first line.

The real fix would be to use logging with proper levels of verbosity.

[Ryan Tseng, 2016/07/14 20:27:11]

Oops I think this was a mistake, or I rebased badly.

+  print 'Fetching infra@%s into %s, may take a couple of minutes...' % (
+      branch, TARGET_DIR)
   if not os.path.isdir(TARGET_DIR):
     os.mkdir(TARGET_DIR)
   if not os.path.exists(os.path.join(TARGET_DIR, '.gclient')):
     subprocess.check_call(
         [sys.executable, os.path.join(SCRIPT_DIR, 'fetch.py'), 'infra'],
         cwd=TARGET_DIR,
         stdout=subprocess.PIPE)
   subprocess.check_call(
       [sys.executable, GCLIENT, 'sync', '--revision', 'origin/%s' % (branch,)],
       cwd=TARGET_DIR,
       stdout=subprocess.PIPE)
-  sys.stderr.write(' done.\n')
-  sys.stderr.flush()
+
+
+def is_exe(filename):
+  """Given a full filepath, return true if the file is an executable."""
+  if sys.platform.startswith('win'):
+    return filename.endswith('.exe')
+  else:
+    return os.path.isfile(filename) and os.access(filename, os.X_OK)
 
 
 def get_available_tools():
-  tools = []
+  """Returns a tuple of (list of infra tools, list of cipd tools)"""
+  infra_tools = []
+  cipd_tools = []
   starting = os.path.join(TARGET_DIR, 'infra', 'infra', 'tools')
   for root, _, files in os.walk(starting):
     if '__main__.py' in files:
-      tools.append(root[len(starting)+1:].replace(os.path.sep, '.'))
-  return sorted(tools)
+      infra_tools.append(root[len(starting)+1:].replace(os.path.sep, '.'))
+  cipd = os.path.join(TARGET_DIR, 'infra', 'cipd')
+  for fn in os.listdir(cipd):
+    if is_exe(os.path.join(cipd, fn)):
+      cipd_tools.append(fn)
+  return (sorted(infra_tools), sorted(cipd_tools))
 
 
 def run(args):
   if args:
     tool_name = args[0]
-    cmd = [
-        sys.executable, os.path.join(TARGET_DIR, 'infra', 'run.py'),
-        'infra.tools.%s' % tool_name]
+    # Check to see if it is a infra tool first.
+    infra_dir = os.path.join(
+      TARGET_DIR, 'infra', 'infra', 'tools', *tool_name.split('.'))
+    cipd_file = os.path.join(TARGET_DIR, 'infra', 'cipd', tool_name)
+    if sys.platform.startswith('win'):
+      cipd_file += '.exe'
+    if (os.path.isdir(infra_dir)
+        and os.path.isfile(os.path.join(infra_dir, '__main__.py'))):
+      cmd = [
+          sys.executable, os.path.join(TARGET_DIR, 'infra', 'run.py'),
+          'infra.tools.%s' % tool_name]
+    elif os.path.isfile(cipd_file) and is_exe(cipd_file):
+      cmd = [cipd_file]
+
+    # Add the remaining arguments.
     cmd.extend(args[1:])
     return subprocess.call(cmd)
 
-  tools = get_available_tools()
+  infra_tools, cipd_tools = get_available_tools()
   print """usage: cit.py <name of tool> [args for tool]
 
-  Wrapper for maintaining and calling tools in "infra.git/run.py infra.tools.*"
+  Wrapper for maintaining and calling tools in:
+    "infra.git/run.py infra.tools.*"
+    "infra.git/cipd/*"
 
-  Available tools are:
-  """
-  for tool in tools:
+  Available infra tools are:"""
+  for tool in infra_tools:
     print '  * %s' % tool
 
+  print """
+  Available cipd tools are:"""
+  for tool in cipd_tools:
+    print '  * %s' % tool
+
+
 
 def main():
   parser = argparse.ArgumentParser("Chrome Infrastructure CLI.")
   parser.add_argument('-b', '--infra-branch', default='deployed',
       help="The name of the 'infra' branch to use (default is %(default)s).")
   parser.add_argument('args', nargs=argparse.REMAINDER)
 
   args, extras = parser.parse_known_args()
   if args.args and args.args[0] == '--':
     args.args.pop(0)
   if extras:
     args.args = extras + args.args
 
   if need_to_update(args.infra_branch):
     ensure_infra(args.infra_branch)
   return run(args.args)
 
 if __name__ == '__main__':
   sys.exit(main())