Dependancy check for .proto files is added.

checkdeps/checkdeps.py

 #!/usr/bin/env python
 # Copyright 2012 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.
 
 """Makes sure that files include headers from allowed directories.
 
 Checks DEPS files in the source tree for rules, and applies those rules to
-"#include" and "import" directives in the .cpp and .java source files.
+"#include" and "import" directives in the .cpp, .java, and .proto source files.
 Any source file including something not permitted by the DEPS files will fail.
 
 See builddeps.py for a detailed description of the DEPS format.
 """
 
 import os
 import optparse
 import re
 import sys
 
+import proto_checker
 import cpp_checker
 import java_checker
 import results
 
 from builddeps import DepsBuilder
 from rules import Rule, Rules
 
 
 def _IsTestFile(filename):
   """Does a rudimentary check to try to skip test files; this could be
@@ skipping 17 matching lines @@
                resolve_dotdot=True):
     """Creates a new DepsChecker.
 
     Args:
       base_directory: OS-compatible path to root of checkout, e.g. C:\chr\src.
       verbose: Set to true for debug output.
       being_tested: Set to true to ignore the DEPS file at tools/checkdeps/DEPS.
       ignore_temp_rules: Ignore rules that start with Rule.TEMP_ALLOW ("!").
     """
     DepsBuilder.__init__(
-        self, base_directory, extra_repos, verbose, being_tested, ignore_temp_rules)
+        self, base_directory, extra_repos, verbose, being_tested,
+        ignore_temp_rules)
 
     self._skip_tests = skip_tests
     self._resolve_dotdot = resolve_dotdot
     self.results_formatter = results.NormalResultsFormatter(verbose)
 
   def Report(self):
     """Prints a report of results, and returns an exit code for the process."""
     if self.results_formatter.GetResults():
       self.results_formatter.PrintResults()
       return 1
     print '\nSUCCESS\n'
     return 0
 
   def CheckDirectory(self, start_dir):
     """Checks all relevant source files in the specified directory and
     its subdirectories for compliance with DEPS rules throughout the
     tree (starting at |self.base_directory|).  |start_dir| must be a
     subdirectory of |self.base_directory|.
 
     On completion, self.results_formatter has the results of
     processing, and calling Report() will print a report of results.
     """
     java = java_checker.JavaChecker(self.base_directory, self.verbose)
     cpp = cpp_checker.CppChecker(
         self.verbose, self._resolve_dotdot, self.base_directory)
+    proto = proto_checker.ProtoChecker(
+        self.verbose, self._resolve_dotdot, self.base_directory)
     checkers = dict(
         (extension, checker)
-        for checker in [java, cpp] for extension in checker.EXTENSIONS)
+        for checker in [java, cpp, proto] for extension in checker.EXTENSIONS)
 
     for rules, file_paths in self.GetAllRulesAndFiles(start_dir):
       for full_name in file_paths:
         if self._skip_tests and _IsTestFile(os.path.basename(full_name)):
           continue
         file_extension = os.path.splitext(full_name)[1]
         if not file_extension in checkers:
           continue
         checker = checkers[file_extension]
         file_status = checker.CheckFile(rules, full_name)
         if file_status.HasViolations():
           self.results_formatter.AddError(file_status)
 
   def CheckIncludesAndImports(self, added_lines, checker):
     """Check new import/#include statements added in the change
     being presubmit checked.
 
     Args:
       added_lines: ((file_path, (changed_line, changed_line, ...), ...)
-      checker: CppChecker/JavaChecker checker instance
+      checker: CppChecker/JavaChecker/ProtoChecker checker instance
 
     Return:
       A list of tuples, (bad_file_path, rule_type, rule_description)
       where rule_type is one of Rule.DISALLOW or Rule.TEMP_ALLOW and
       rule_description is human-readable. Empty if no problems.
     """
     problems = []
     for file_path, changed_lines in added_lines:
       if not checker.ShouldCheck(file_path):
         continue
@@ skipping 37 matching lines @@
 
     Return:
       A list of tuples, (bad_file_path, rule_type, rule_description)
       where rule_type is one of Rule.DISALLOW or Rule.TEMP_ALLOW and
       rule_description is human-readable. Empty if no problems.
     """
     return self.CheckIncludesAndImports(
         added_imports,
         java_checker.JavaChecker(self.base_directory, self.verbose))
 
+  def CheckAddedProtoImports(self, added_imports):
+    """This is used from PRESUBMIT.py to check new #import statements added in
+    the change being presubmit checked.
+
+    Args:
+      added_imports : ((file_path, (import_line, import_line, ...), ...)
+
+    Return:
+      A list of tuples, (bad_file_path, rule_type, rule_description)
+      where rule_type is one of Rule.DISALLOW or Rule.TEMP_ALLOW and
+      rule_description is human-readable. Empty if no problems.
+    """
+    return self.CheckIncludesAndImports(
+        added_imports, proto_checker.ProtoChecker(
+            verbose=self.verbose, root_dir=self.base_directory))
+
 def PrintUsage():
   print """Usage: python checkdeps.py [--root <root>] [tocheck]
 
   --root ROOT Specifies the repository root. This defaults to "../../.."
               relative to the script file. This will be correct given the
               normal location of the script in "<root>/tools/checkdeps".
 
   --(others)  There are a few lesser-used options; run with --help to show them.
 
   tocheck  Specifies the directory, relative to root, to check. This defaults
@@ skipping 84 matching lines @@
   if options.json:
     deps_checker.results_formatter = results.JSONResultsFormatter(
         options.json, deps_checker.results_formatter)
 
   deps_checker.CheckDirectory(start_dir)
   return deps_checker.Report()
 
 
 if '__main__' == __name__:
   sys.exit(main())