Changeset 56977 in webkit

Timestamp:

Apr 2, 2010 12:14:58 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-02 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Record the IRC nick of folks who request rollouts
​https://bugs.webkit.org/show_bug.cgi?id=36999

• Scripts/webkitpy/common/net/irc/ircbot.py:
• Scripts/webkitpy/tool/bot/irc_command.py:
• Scripts/webkitpy/tool/bot/sheriffircbot.py:
• Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/irc/ircbot.py (modified) (2 diffs)
• Scripts/webkitpy/tool/bot/irc_command.py (modified) (5 diffs)
• Scripts/webkitpy/tool/bot/sheriffircbot.py (modified) (2 diffs)
• Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-02  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Record the IRC nick of folks who request rollouts
+        https://bugs.webkit.org/show_bug.cgi?id=36999
+
+        * Scripts/webkitpy/common/net/irc/ircbot.py:
+        * Scripts/webkitpy/tool/bot/irc_command.py:
+        * Scripts/webkitpy/tool/bot/sheriffircbot.py:
+        * Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py:
+
 2010-04-01  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/net/irc/ircbot.py

@@ -35 +35 @@
 
 class IRCBotDelegate(object):
-    def irc_message_received(self, message):
+    def irc_message_received(self, nick, message):
         raise NotImplementedError, "subclasses must implement"
 
@@ -73 +73 @@
 
     def on_pubmsg(self, connection, event):
+        nick = irclib.nm_to_n(event.source())
         request = event.arguments()[0].split(":", 1)
         if len(request) > 1 and irclib.irc_lower(request[0]) == irclib.irc_lower(self.connection.get_nickname()):
-            response = self._delegate.irc_message_received(request[1])
+            response = self._delegate.irc_message_received(nick, request[1])
             if response:
                 connection.privmsg(self._channel, response)

trunk/WebKitTools/Scripts/webkitpy/tool/bot/irc_command.py

@@ -27 +27 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import webkitpy.common.config.irc as config_irc
+
 from webkitpy.common.checkout.changelog import view_source_url
 from webkitpy.tool.bot.queueengine import TerminateQueue
@@ -34 +36 @@
 # FIXME: Merge with Command?
 class IRCCommand(object):
-    def execute(self, args, tool, sheriff):
+    def execute(self, nick, args, tool, sheriff):
         raise NotImplementedError, "subclasses must implement"
 
 
 class LastGreenRevision(IRCCommand):
-    def execute(self, args, tool, sheriff):
-        return view_source_url(tool.buildbot.last_green_revision())
+    def execute(self, nick, args, tool, sheriff):
+        return "%s: %s" % (nick,
+            view_source_url(tool.buildbot.last_green_revision()))
 
 
 class Restart(IRCCommand):
-    def execute(self, args, tool, sheriff):
+    def execute(self, nick, args, tool, sheriff):
         tool.irc().post("Restarting...")
         raise TerminateQueue()
@@ -50 +53 @@
 
 class Rollout(IRCCommand):
-    def execute(self, args, tool, sheriff):
+    def execute(self, nick, args, tool, sheriff):
         if len(args) < 2:
-            tool.irc().post("Usage: SVN_REVISION REASON")
+            tool.irc().post("%s: Usage: SVN_REVISION REASON" % nick)
             return
         svn_revision = args[0]
@@ -58 +61 @@
         tool.irc().post("Preparing rollout for r%s..." % svn_revision)
         try:
-            bug_id = sheriff.post_rollout_patch(svn_revision, rollout_reason)
+            complete_reason = "%s (Requested by %s on %s)." % (
+                rollout_reason, nick, config_irc.channel)
+            bug_id = sheriff.post_rollout_patch(svn_revision, complete_reason)
             bug_url = tool.bugs.bug_url_for_bug_id(bug_id)
-            tool.irc().post("Created rollout: %s" % bug_url)
+            tool.irc().post("%s: Created rollout: %s" % (nick, bug_url))
         except ScriptError, e:
-            tool.irc().post("Failed to create rollout patch:")
+            tool.irc().post("%s: Failed to create rollout patch:" % nick)
             tool.irc().post("%s" % e)
             bug_id = parse_bug_id(e.output)
@@ -71 +76 @@
 
 class Hi(IRCCommand):
-    def execute(self, args, tool, sheriff):
+    def execute(self, nick, args, tool, sheriff):
         return '"Only you can prevent forest fires." -- Smokey the Bear'

trunk/WebKitTools/Scripts/webkitpy/tool/bot/sheriffircbot.py

@@ -41 +41 @@
     # IRCBotDelegate methods
 
-    def irc_message_received(self, message):
-        self._message_queue.post(message)
+    def irc_message_received(self, nick, message):
+        self._message_queue.post([nick, message])
         self._wakeup_event.set()
 
@@ -72 +72 @@
 
     def process_message(self, message):
-        tokenized_message = message.strip().split(" ")
-        if not tokenized_message:
+        (nick, request) = message
+        tokenized_request = request.strip().split(" ")
+        if not tokenized_request:
             return
-        command = self.commands.get(tokenized_message[0])
+        command = self.commands.get(tokenized_request[0])
         if not command:
-            self._tool.irc().post(
-                "Available commands: %s" % ", ".join(self.commands.keys()))
+            self._tool.irc().post("%s: Available commands: %s" % (
+                                  nick, ", ".join(self.commands.keys())))
             return
-        response = command().execute(tokenized_message[1:],
+        response = command().execute(nick,
+                                     tokenized_request[1:],
                                      self._tool,
                                      self._sheriff)

trunk/WebKitTools/Scripts/webkitpy/tool/bot/sheriffircbot_unittest.py

@@ -40 +40 @@
     tool.ensure_irc_connected(None)
     bot = SheriffIRCBot(tool, Sheriff(tool, MockSheriffBot()))
-    bot._message_queue.post(message)
+    bot._message_queue.post(["mock_nick", message])
     bot.process_pending_messages()
 
@@ -50 +50 @@
 
     def test_bogus(self):
-        expected_stderr = "MOCK: irc.post: Available commands: rollout, hi, restart, last-green-revision\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: Available commands: rollout, hi, restart, last-green-revision\n"
         OutputCapture().assert_outputs(self, run, args=["bogus"], expected_stderr=expected_stderr)
 
     def test_lgr(self):
-        expected_stderr = "MOCK: irc.post: http://trac.webkit.org/changeset/9479\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: http://trac.webkit.org/changeset/9479\n"
         OutputCapture().assert_outputs(self, run, args=["last-green-revision"], expected_stderr=expected_stderr)
 
     def test_rollout(self):
-        expected_stderr = "MOCK: irc.post: Preparing rollout for r21654...\nMOCK: irc.post: Created rollout: http://example.com/36936\n"
+        expected_stderr = "MOCK: irc.post: Preparing rollout for r21654...\nMOCK: irc.post: mock_nick: Created rollout: http://example.com/36936\n"
         OutputCapture().assert_outputs(self, run, args=["rollout 21654 This patch broke the world"], expected_stderr=expected_stderr)
 
     def test_rollout_bananas(self):
-        expected_stderr = "MOCK: irc.post: Usage: SVN_REVISION REASON\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: Usage: SVN_REVISION REASON\n"
         OutputCapture().assert_outputs(self, run, args=["rollout bananas"], expected_stderr=expected_stderr)
 
     def test_rollout_invalidate_revision(self):
-        expected_stderr = ("MOCK: irc.post: Preparing rollout for "
-                           "r--component=Tools...\nMOCK: irc.post: Failed to "
-                           "create rollout patch:\nMOCK: irc.post: Invalid svn"
-                           " revision number \"--component=Tools\".\n")
+        expected_stderr = ("MOCK: irc.post: Preparing rollout for r--component=Tools...\n"
+                           "MOCK: irc.post: mock_nick: Failed to create rollout patch:\n"
+                           "MOCK: irc.post: Invalid svn revision number \"--component=Tools\".\n")
         OutputCapture().assert_outputs(self, run,
                                        args=["rollout "
@@ -76 +75 @@
 
     def test_rollout_no_reason(self):
-        expected_stderr = "MOCK: irc.post: Usage: SVN_REVISION REASON\n"
+        expected_stderr = "MOCK: irc.post: mock_nick: Usage: SVN_REVISION REASON\n"
         OutputCapture().assert_outputs(self, run, args=["rollout 21654"], expected_stderr=expected_stderr)