Merge lp:~stefanor/ibid/coffee-374028 into lp:~ibid-core/ibid/old-trunk-pack-0.92

[Stefano Rivera]

[Stefano Rivera (stefanor)]

Removed russell's coffee hack

[Stefano Rivera (stefanor)]

Removed russell's coffee hack.

Excuse first merge request - had a bad commit

[Michael Gorven (mgorven)]

 review approve

review: Approve

[Stefano Rivera (stefanor)]

Resubmitted with decent delayed infrastructure

[Stefano Rivera (stefanor)]

No reviews, 3 fixes, might as well resubmit

[Stefano Rivera (stefanor)]

> No reviews, 3 fixes, might as well resubmit

And another one, but I'm getting tired of resubmitting. So read 652 by hand

[lp:~stefanor/ibid/coffee-374028]

652. By Stefano Rivera on 2009-05-31

More "pot on" responses

[Michael Gorven (mgorven)]

 review approve

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/core.py'
--- ibid/core.py	2009-05-05 07:58:29 +0000
+++ ibid/core.py	2009-05-31 11:11:45 +0000
@@ -10,6 +10,8 @@
 from sqlalchemy.exceptions import IntegrityError
 
 import ibid
+from ibid.event import Event
+
 import auth
 
 class Dispatcher(object):
@@ -79,6 +81,28 @@
 
         return threads.deferToThread(self._process, event)
 
+    def call_later(self, delay, callable, oldevent, *args, **kw):
+        "Run callable after delay seconds. Pass args and kw to it"
+
+        event = Event(oldevent.source, u'delayed')
+        event.sender = oldevent.sender
+        event.channel = oldevent.channel
+        event.public = oldevent.public
+        return reactor.callLater(delay, threads.deferToThread, self.delayed_call, callable, event, *args, **kw)
+
+    def delayed_call(self, callable, event, *args, **kw):
+        # Twisted doesn't catch exceptions here, so we must do it ourselves
+        try:
+            callable(event, *args, **kw)
+            self._process(event)
+            reactor.callFromThread(self.delayed_response, event)
+        except:
+            self.log.exception(u'Call Later')
+
+    def delayed_response(self, event):
+        for response in event.responses:
+            ibid.sources[event.source].send(response)
+
 class Reloader(object):
 
     def __init__(self):

=== modified file 'ibid/plugins/misc.py'
--- ibid/plugins/misc.py	2009-05-01 12:17:57 +0000
+++ ibid/plugins/misc.py	2009-05-31 11:18:46 +0000
@@ -1,43 +1,61 @@
+import logging
+from random import choice
 from time import sleep
 
+import ibid
 from ibid.plugins import Processor, match
 from ibid.config import IntOption
 from ibid.utils import ibid_version
 
 help = {}
+log = logging.getLogger('plugins.misc')
 
 help['coffee'] = u"Times coffee brewing and reserves cups for people"
 class Coffee(Processor):
     u"""coffee (on|please)"""
     feature = 'coffee'
 
-    pot = None
+    pots = {}
 
     time = IntOption('coffee_time', u'Brewing time in seconds', 240)
     cups = IntOption('coffee_cups', u'Maximum number of cups', 4)
     
+    def coffee_announce(self, event):
+        event.addresponse(u"Coffee's ready for %s!", u', '.join(self.pots[(event.source, event.channel)]))
+        del self.pots[(event.source, event.channel)]
+
     @match(r'^coffee\s+on$')
     def coffee_on(self, event):
-        # Hi ... race condition.
-        if self.pot:
+        if (event.source, event.channel) in self.pots:
             event.addresponse(u"There's already a pot on")
             return
         
-        self.pot = [event.sender['nick']]
-        sleep(self.time)
-        event.addresponse(u"Coffee's ready for %s!", u', '.join(self.pot))
-        self.pot = None
+        self.pots[(event.source, event.channel)] = [event.sender['nick']]
+        ibid.dispatcher.call_later(self.time, self.coffee_announce, event)
+
+        event.addresponse({
+            'action': True,
+            'reply': choice((
+                u'puts the kettle on',
+                u'starts grinding coffee',
+                u'flips the salt-timer',
+                u'washes some mugs',
+            )),
+        })
     
     @match('^coffee\s+(?:please|pls)$')
     def coffee_accept(self, event):
-        if not self.pot:
+        if (event.source, event.channel) not in self.pots:
             event.addresponse(u"There isn't a pot on")
 
-        elif len(self.pot) >= self.cups:
+        elif len(self.pots[(event.source, event.channel)]) >= self.cups:
             event.addresponse(u"Sorry, there aren't any more cups left")
 
+        elif event.sender['nick'] in self.pots[(event.source, event.channel)]:
+            event.addresponse(u"Now now, we don't want anyone getting caffine overdoses")
+
         else:
-            self.pot.append(event.sender['nick'])
+            self.pots[(event.source, event.channel)].append(event.sender['nick'])
             event.addresponse(True)
 
 help['version'] = u"Show the Ibid version currently running"

=== modified file 'scripts/ibid-plugin'
--- scripts/ibid-plugin	2009-05-05 07:58:29 +0000
+++ scripts/ibid-plugin	2009-05-30 22:07:09 +0000
@@ -52,6 +52,7 @@
 class TestSource(dict):
     type = 'test'
     permissions = []
+    supports = []
 
 ibid.sources[u'test_source'] = TestSource()