Merge pull request #204 from rust-lang/infra-ci

Add a subset of the infra team as the reviewer for CI

Author: alexcrichton

highfive/configs/rust-lang/cargo.json

@@ -3,7 +3,7 @@
         "all": ["@alexcrichton", "@ehuss", "@dwijnand", "@nrc", "@Eh2406"]
     },
     "dirs": {
-        "doc": ["doc"]
+        "src/doc": ["doc"]
     },
     "contributing": "https://github.com/rust-lang/cargo/blob/master/CONTRIBUTING.md",
     "new_pr_labels": ["S-waiting-on-review"]

highfive/configs/rust-lang/rust.json

@@ -4,40 +4,44 @@
         "compiler": ["@cramertj", "@pnkfelix", "@eddyb", "@petrochenkov", "@estebank", "@michaelwoerister", "@varkor", "@matthewjasper", "@davidtwco", "@zackmdavis", "@oli-obk"],
         "syntax": ["@pnkfelix", "@petrochenkov", "@michaelwoerister", "@eddyb"],
         "libs": ["@KodrAus", "@alexcrichton", "@sfackler", "@dtolnay", "@JoshTriplett", "@rkruppe", "@bluss", "@kimundi", "@withoutboats", "@cramertj", "@shepmaster", "@Mark-Simulacrum", "@TimNN", "@kennytm", "@aidanhs"],
+        "infra-ci": ["@alexcrichton", "@Mark-Simulacrum", "@kennytm", "@pietroalbini"],
         "rustdoc": ["@QuietMisdreavus", "@steveklabnik", "@GuillaumeGomez", "@ollie27"]
     },
     "dirs": {
-        "doc":              ["doc"],
-        "liballoc":         ["libs"],
-        "libarena":         ["libs"],
-        "libbacktrace":     [],
-        "libcollections":   ["libs", "@Gankro"],
-        "libcore":          ["libs"],
-        "libcoretest":      ["libs"],
-        "libflate":         ["libs"],
-        "libfmt_macros":    ["libs"],
-        "libgetopts":       ["libs"],
-        "libgraphviz":      ["@pnkfelix"],
-        "liblibc":          ["libs"],
-        "liblog":           ["libs"],
-        "librand":          ["libs"],
-        "librbml":          ["libs", "@erickt"],
-        "librustc":         ["compiler"],
-        "librustdoc":       ["rustdoc"],
-        "libserialize":     ["libs", "@erickt"],
-        "libstd":           ["libs"],
-        "libsyntax":        ["syntax"],
-        "libterm":          ["libs"],
-        "libtest":          ["libs"],
-        "libunicode":       ["libs", "@SimonSapin"],
-        "rustbook":         ["doc"]
+        "src/doc":              ["doc"],
+        "src/liballoc":         ["libs"],
+        "src/libarena":         ["libs"],
+        "src/libbacktrace":     [],
+        "src/libcollections":   ["libs", "@Gankro"],
+        "src/libcore":          ["libs"],
+        "src/libcoretest":      ["libs"],
+        "src/libflate":         ["libs"],
+        "src/libfmt_macros":    ["libs"],
+        "src/libgetopts":       ["libs"],
+        "src/libgraphviz":      ["@pnkfelix"],
+        "src/liblibc":          ["libs"],
+        "src/liblog":           ["libs"],
+        "src/librand":          ["libs"],
+        "src/librbml":          ["libs", "@erickt"],
+        "src/librustc":         ["compiler"],
+        "src/librustdoc":       ["rustdoc"],
+        "src/libserialize":     ["libs", "@erickt"],
+        "src/libstd":           ["libs"],
+        "src/libsyntax":        ["syntax"],
+        "src/libterm":          ["libs"],
+        "src/libtest":          ["libs"],
+        "src/libunicode":       ["libs", "@SimonSapin"],
+        "src/rustbook":         ["doc"],
+        "src/ci":               ["infra-ci"],
+        ".travis.yml":          ["infra-ci"],
+        "appveyor.yml":         ["infra-ci"]
     },
     "mentions": {
-        "librustdoc/html/static": {
+        "src/librustdoc/html/static": {
             "message": "Some changes occurred in HTML/CSS.",
             "reviewers": ["@GuillaumeGomez"]
         },
-        "src/doc": {
+        "src/src/doc": {
             "message": "Some changes occurred in HTML/CSS.",
             "reviewers": ["@GuillaumeGomez"]
         },

highfive/newpr.py

@@ -259,30 +259,24 @@ def choose_reviewer(self, repo, owner, diff, exclude):
         most_changed = None
         to_mention = []
         # If there's directories with specially assigned groups/users
-        # inspect the diff to find the directory (under src) with the most
-        # additions
+        # inspect the diff to find the directory with the most additions
         if dirs:
             counts = {}
             cur_dir = None
             for line in diff.split('\n'):
                 if line.startswith("diff --git "):
                     # update cur_dir
                     cur_dir = None
-                    start = line.find(" b/src/") + len(" b/src/")
-                    if start == -1:
+                    parts = line[line.find(" b/") + len(" b/"):].split("/")
+                    if not parts:
                         continue
-                    end = line.find("/", start)
-                    if end == -1:
-                        continue
-                    full_end = line.rfind("/", start)
-
-                    cur_dir = line[start:end]
-                    full_dir = line[start:full_end] if full_end != -1 else ""
+                    cur_dir = "/".join(parts[:2])
+                    full_dir = "/".join(parts)
 
                     # A few heuristics to get better reviewers
-                    if cur_dir.startswith('librustc'):
-                        cur_dir = 'librustc'
-                    if cur_dir == 'test':
+                    if cur_dir.startswith('src/librustc'):
+                        cur_dir = 'src/librustc'
+                    if cur_dir == 'src/test':
                         cur_dir = None
                     if len(full_dir) > 0:
                         for entry in mentions:

highfive/tests/fakes.py

@@ -24,11 +24,15 @@ def get_repo_configs():
         },
         'individuals_dirs': {
             "groups": { "all": ["@pnkfelix", "@nrc"] },
-            "dirs": { "librustc": ["@aturon"] },
+            "dirs": { "src/librustc": ["@aturon"] },
         },
         'individuals_dirs_2': {
             "groups": { "all": ["@pnkfelix", "@nrc"] },
-            "dirs": { "foobazdir": ["@aturon"] },
+            "dirs": { "src/foobazdir": ["@aturon"] },
+        },
+        'individual_files': {
+            "groups": { "all": ["@pnkfelix", "@nrc"] },
+            "dirs": { ".travis.yml":  ["@aturon"] },
         },
         'circular_groups': {
             "groups": {

highfive/tests/fakes/travis-yml.diff

@@ -0,0 +1,12 @@
+diff --git a/.travis.yml b/.travis.yml
+index 7f99678499..c4efa88460 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -1,6 +1,6 @@
+ language: shell
+ sudo: required
+-dist: trusty
++dist: xenial
+ services:
+   - docker
+ addons:

highfive/tests/test_newpr.py

@@ -1099,6 +1099,7 @@ def make_fakes(cls):
         cls.fakes = {
             'diff': {
                 'normal': load_fake('normal.diff'),
+                'travis-yml': load_fake('travis-yml.diff'),
             },
             'config': fakes.get_repo_configs(),
             'global_': fakes.get_global_configs(),
@@ -1238,6 +1239,17 @@ def test_with_dirs_no_intersection(self):
         assert set(["pnkfelix", "nrc"]) == chosen_reviewers
         assert set([()]) == mentions
 
+    def test_with_files(self):
+        """Test choosing a reviewer when a file os changed."""
+        self.handler = HighfiveHandlerMock(
+            Payload({}), repo_config=self.fakes['config']['individual_files']
+        ).handler
+        (chosen_reviewers, mentions) = self.choose_reviewers(
+            self.fakes['diff']['travis-yml'], "nikomatsakis"
+        )
+        assert set(["pnkfelix", "nrc", "aturon"]) == chosen_reviewers
+        assert set([()]) == mentions
+
 class TestRun(TestNewPR):
     @pytest.fixture(autouse=True)
     def make_mocks(cls, patcherize):