Update cq_client and add validate command to commit_queue binary

commit_queue.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Access the commit queue from the command line.
 """
 
 __version__ = '0.1'
 
 import functools
 import json
 import logging
 import optparse
 import os
 import sys
 import urllib2
 
 import breakpad  # pylint: disable=W0611
 
 import auth
 import fix_encoding
 import rietveld
 
 THIRD_PARTY_DIR = os.path.join(os.path.dirname(__file__), 'third_party')
 sys.path.insert(0, THIRD_PARTY_DIR)
 
 from cq_client import cq_pb2
+from cq_client import validate_config
 from protobuf26 import text_format
 
 def usage(more):
   def hook(fn):
     fn.func_usage_more = more
     return fn
   return hook
 
 
 def need_issue(fn):
@@ skipping 97 matching lines @@
   if config.HasField('verifiers') and config.verifiers.HasField('try_job'):
     for bucket in config.verifiers.try_job.buckets:
       masters.setdefault(bucket.name, [])
       for builder in bucket.builders:
         if not builder.HasField('experiment_percentage'):
           masters[bucket.name].append(builder.name)
   print json.dumps(masters)
 
 CMDbuilders.func_usage_more = '<path-to-cq-config>'
 
+
+def CMDvalidate(parser, args):
+  """Validates a CQ config.
+
+  Takes a single argument - path to the CQ config to be validated. Returns 0 on
+  valid config, non-zero on invalid config. Errors and warnings are printed to
+  screen.
+  """
+  _, args = parser.parse_args(args)
+  if len(args) != 1:
+    parser.error('Expected a single path to CQ config. Got: %s' %
+                 ' '.join(args))
+
+  with open(args[0]) as config_file:
+    cq_config = config_file.read()
+  return 0 if validate_config.IsValid(cq_config) else 1
+
+CMDvalidate.func_usage_more = '<path-to-cq-config>'
+
 ###############################################################################
 ## Boilerplate code
 
 
 class OptionParser(optparse.OptionParser):
   """An OptionParser instance with default options.
 
   It should be then processed with gen_usage() before being used.
   """
   def __init__(self, *args, **kwargs):
@@ skipping 67 matching lines @@
   return CMDhelp(parser, args)
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   try:
     sys.exit(main())
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)