Restrict Bugzilla features to dlang repositories

Author: wilzbach

.travis.yml

@@ -11,11 +11,6 @@ script:
   # Tests are neither random- nor parallelizable atm., so use a --single serial thread.
   - dub test --compiler=$DC -- --single --trace
 
-addons:
-  apt:
-    packages:
-      - libevent-dev
-
 matrix:
   include:
     - d: dmd-2.085.0 # the deployment compiler

README.md

@@ -210,6 +210,15 @@ For example, `dlang/phobos` is configured as follows:
 
 <a name="missing-a-feature" />
 
+Improve the bot
+---------------
+
+Run the testsuite:
+
+```
+dub test -- --single --trace
+```
+
 Missing a feature?
 ------------------
 

source/dlangbot/app.d

@@ -238,48 +238,52 @@ void handlePR(string action, PullRequest* _pr)
     if (commits is null)
         commits = ghGetRequest(pr.commitsURL).readJson[];
 
-    auto refs = getIssueRefs(commits);
-
-    auto descs = getDescriptions(refs);
     auto comment = pr.getBotComment;
 
     UserMessage[] msgs;
-    if (action == "opened" || action == "synchronize")
+    IssueRef[] refs;
+    Issue[] descs;
+    if (pr.base.repo.owner.login.among("dlang", "dlang-bots"))
     {
-        msgs = pr.checkForWarnings(descs, refs);
-    }
+        refs = getIssueRefs(commits);
+        descs = getDescriptions(refs);
+        if (action == "opened" || action == "synchronize")
+        {
+            msgs = pr.checkForWarnings(descs, refs);
+        }
 
-    if (pr.base.repo.owner.login.among("dlang", "dlang-bots"))
         pr.updateGithubComment(comment, action, refs, descs, msgs);
 
-    if (refs.any!(r => r.fixed))
-    {
-        import std.algorithm : canFind, filter, map, sort, uniq;
-        import std.array : array;
-        // references are already sorted by id
-        auto bugzillaIds = refs.map!(r => r.id).uniq;
-        auto bugzillSeverities = descs
-            .filter!(d => bugzillaIds.canFind(d.id))
-            .map!(i => i.severity);
-        logDebug("[github/handlePR](%s): trying to add bug fix label", _pr.pid);
-        string[] labels;
-        if (bugzillSeverities.canFind("enhancement"))
-            labels ~= "Enhancement";
-        else
-            labels ~= "Bug Fix";
-
-        pr.addLabels(labels);
+        if (refs.any!(r => r.fixed))
+        {
+            import std.algorithm : canFind, filter, map, sort, uniq;
+            import std.array : array;
+            // references are already sorted by id
+            auto bugzillaIds = refs.map!(r => r.id).uniq;
+            auto bugzillSeverities = descs
+                .filter!(d => bugzillaIds.canFind(d.id))
+                .map!(i => i.severity);
+            logDebug("[github/handlePR](%s): trying to add bug fix label", _pr.pid);
+            string[] labels;
+            if (bugzillSeverities.canFind("enhancement"))
+                labels ~= "Enhancement";
+            else
+                labels ~= "Bug Fix";
+
+            pr.addLabels(labels);
+        }
     }
 
-    if (runTrello)
+    if (runTrello && pr.base.repo.owner.login == "dlang")
     {
         logDebug("[github/handlePR](%s): updating trello card", _pr.pid);
         updateTrelloCard(action, pr.htmlURL, refs, descs);
     }
 
     // When a PR is opened or updated mentioning some Bugzilla issues,
     // post a link to the PR as an issue comment.
-    if (runBugzillaUpdates && (action == "opened" || action == "synchronize"))
+    if (runBugzillaUpdates && pr.base.repo.owner.login == "dlang" &&
+        (action == "opened" || action == "synchronize"))
     {
         import std.algorithm.iteration : filter, map;
         import std.algorithm.searching : canFind;
@@ -324,7 +328,8 @@ void handlePR(string action, PullRequest* _pr)
 
     // When a PR is merged, update Bugzilla issues
     // (leave a comment with a link to the PR, and close them appropriately).
-    if (runBugzillaUpdates && action == "merged")
+    if (runBugzillaUpdates && pr.base.repo.owner.login == "dlang" &&
+        action == "merged")
     {
         import std.algorithm.iteration : filter, map;
         import std.algorithm.searching : canFind, all, startsWith;

test/bugzilla.d

@@ -110,6 +110,21 @@ EOF".chomp;
     postGitHubHook("dlang_phobos_merged_4963.json");
 }
 
+@("after-merge-dont-comment-other-org")
+unittest
+{
+    setAPIExpectations(
+        "/github/repos/dlang/phobos/pulls/4963/commits", (ref Json j) {
+            j[0]["commit"]["message"] = "Do something with Issue 17564";
+         },
+        "/github/repos/dlang/phobos/issues/4963/comments",
+    );
+
+    postGitHubHook("dlang_phobos_merged_4963.json", "pull_request", (ref Json j, scope req) {
+        j["pull_request"]["base"]["repo"]["owner"]["login"] = "dlang-community";
+    });
+}
+
 @("after-merge-dont-spam-bugzilla")
 unittest
 {
@@ -216,6 +231,19 @@ EOF".chomp;
     postGitHubHook("dlang_dmd_open_6359.json");
 }
 
+@("pr-open-different-org")
+unittest
+{
+    setAPIExpectations(
+        "/github/repos/dlang/dmd/pulls/6359/commits",
+        "/github/repos/dlang/dmd/issues/6359/comments",
+    );
+
+    postGitHubHook("dlang_dmd_open_6359.json", "pull_request", (ref Json j, scope req) {
+        j["pull_request"]["base"]["repo"]["owner"]["login"] = "dlang-community";
+    });
+}
+
 @("pr-open-dont-spam-closed-bugzilla-issues")
 unittest
 {