Changeset 56178 in webkit

Timestamp:

Mar 18, 2010 11:56:57 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-18 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Support using IRC accounts with a password
​https://bugs.webkit.org/show_bug.cgi?id=36287

Add a global option to specify an IRC password so we can use the
sheriffbot account (which needs a password).

• Scripts/webkitpy/irc/ircbot.py:
• Scripts/webkitpy/irc/ircproxy.py:
• Scripts/webkitpy/patch/patcher.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/irc/ircbot.py (modified) (1 diff)
• Scripts/webkitpy/irc/ircproxy.py (modified) (1 diff)
• Scripts/webkitpy/patch/patcher.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-18  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Support using IRC accounts with a password
+        https://bugs.webkit.org/show_bug.cgi?id=36287
+
+        Add a global option to specify an IRC password so we can use the
+        sheriffbot account (which needs a password).
+
+        * Scripts/webkitpy/irc/ircbot.py:
+        * Scripts/webkitpy/irc/ircproxy.py:
+        * Scripts/webkitpy/patch/patcher.py:
+
 2010-03-18  Eric Seidel  <eric@webkit.org>
 

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

@@ -37 +37 @@
                  server="irc.freenode.net",
                  port=6667,
-                 nickname="webkit-smokey",
-                 channel="#webkit-test"):
+                 nickname="sheriffbot",
+                 password=None, # sheriffbot actually needs a password.
+                 channel="#webkit"):
         self._message_queue = message_queue
-        ircbot.SingleServerIRCBot.__init__(self, [(server, port)], nickname, nickname)
+        ircbot.SingleServerIRCBot.__init__(self, [(server, port, password)], nickname, nickname)
         self._channel = channel
 

trunk/WebKitTools/Scripts/webkitpy/irc/ircproxy.py

@@ -33 +33 @@
 
 class _IRCThread(threading.Thread):
-    def __init__(self, message_queue, bot_class):
+    def __init__(self, message_queue, bot_class, password):
         threading.Thread.__init__(self)
         self.setDaemon(True)
         self._message_queue = message_queue
         self._bot_class = bot_class
+        self._password = password
 
     def run(self):
-        bot = self._bot_class(self._message_queue)
+        bot = self._bot_class(self._message_queue, password=self._password)
         bot.start()
 
 
 class IRCProxy(object):
-    def __init__(self, bot_class=IRCBot):
+    def __init__(self, bot_class=IRCBot, password=None):
         self._message_queue = ThreadedMessageQueue()
-        self._child_thread = _IRCThread(self._message_queue, bot_class)
+        self._child_thread = _IRCThread(self._message_queue, bot_class, password=password)
         self._child_thread.start()
 

trunk/WebKitTools/Scripts/webkitpy/patch/patcher.py

@@ -52 +52 @@
         make_option("--dry-run", action="store_true", dest="dry_run", default=False, help="do not touch remote servers"),
         make_option("--status-host", action="store", dest="status_host", type="string", nargs=1, help="Hostname (e.g. localhost or commit.webkit.org) where status updates should be posted."),
+        make_option("--irc-password", action="store", dest="irc_password", type="string", nargs=1, help="Password to use when communicating via IRC."),
     ]
 
@@ -98 +99 @@
         if options.status_host:
             self.status_server.set_host(options.status_host)
+        if options.irc_password:
+            self._irc_password = options.irc_password
 
     def should_execute_command(self, command):