split further fix a huge bug where reversing the feed would print only old items

adamwight · adamwight · commit c1e676b53721 · 2012-06-22T11:24:01.000-07:00
diff --git a/brain.py b/brain.py
@@ -0,0 +1,34 @@
+import re
+
+from job import JobQueue
+
+class Brain(object):
+    def __init__(self, config, sink=None):
+        self.config = config
+        self.sink = sink
+        self.project_url = "https://github.com/adamwight/slander"
+        if "project_url" in self.config:
+            self.project_url = self.config["project_url"]
+
+    def say(self, message):
+        self.sink.say(self.sink.channel, message)
+
+    def respond(self, user, message):
+        if re.search(r'\bhelp\b', message):
+            self.say("If I only had a brain: %s -- Commands: help jobs kill last" % (self.project_url, ))
+        elif re.search(r'\bjobs\b', message):
+            jobs_desc = JobQueue.describe()
+            jobs_desc = re.sub(r'p(ass)?w(ord)?[ :=]*[^ ]+', r'p***word', jobs_desc)
+
+            self.say("Running jobs [%s]" % (jobs_desc, ))
+        #elif re.search(r'\bkill\b', message):
+        #    self.say("Squeal! Killed by %s" % (user, ))
+        #    self.factory.stopTrying()
+        #    self.quit()
+        elif re.search(r'\blast\b', message):
+            if self.sink.timestamp:
+                self.say("My last post was %s UTC" % (self.sink.timestamp, ))
+            else:
+                self.say("No activity.")
+        else:
+            print "Failed to handle incoming command: %s said %s" % (user, message)
diff --git a/feed.py b/feed.py
@@ -1,5 +1,4 @@
 import feedparser
-from HTMLParser import HTMLParser
 
 class FeedPoller(object):
     """
@@ -14,14 +13,15 @@ def __init__(self, source=None):
     def check(self):
         result = feedparser.parse(self.source)
         result.entries.reverse()
+        skipping = True
         for entry in result.entries:
-            if (not self.last_seen_id) or (self.last_seen_id == entry.id):
-                if not test:
-                    break
-            yield self.parse(entry)
+            if (self.last_seen_id == entry.id):
+                skipping = False
+            elif not skipping:
+                yield self.parse(entry)
 
         if result.entries:
-            self.last_seen_id = result.entries[0].id
+            self.last_seen_id = result.entries[-1].id
 
     def parse(self, entry):
         return "%s [%s]" % (entry.summary, entry.link)
diff --git a/irc.py b/irc.py
@@ -0,0 +1,57 @@
+import datetime
+
+#pip install twisted twisted.words
+from twisted.words.protocols import irc
+from twisted.internet.protocol import ReconnectingClientFactory
+from twisted.internet import reactor
+
+import text
+from job import JobQueue
+from brain import Brain
+
+class RelayToIRC(irc.IRCClient):
+    """
+    Bot brain will spawn listening jobs and then relay results to an irc channel.
+    """
+    timestamp = None
+
+    def connectionMade(self):
+        self.config = self.factory.config
+        self.nickname = self.config["irc"]["nick"]
+        self.realname = self.config["irc"]["realname"]
+        self.channel = self.config["irc"]["channel"]
+        if "maxlen" in self.config["irc"]:
+            text.maxlen = self.config["irc"]["maxlen"]
+
+        irc.IRCClient.connectionMade(self)
+
+    def signedOn(self):
+        self.join(self.channel)
+
+    def joined(self, channel):
+        print "Joined channel %s as %s" % (channel, self.nickname)
+        #XXX get outta here:
+        source = JobQueue(self.config["jobs"], self, self.config["poll_interval"])
+        source.run()
+        self.brain = Brain(self.config, sink=self)
+
+    def privmsg(self, user, channel, message):
+        if message.find(self.nickname) >= 0:
+            self.brain.respond(user, message)
+
+    def write(self, data):
+        if isinstance(data, list):
+            for line in data:
+                self.write(line)
+            return
+        self.say(self.channel, str(data))
+        self.timestamp = datetime.datetime.utcnow()
+
+
+    @staticmethod
+    def run(config):
+        factory = ReconnectingClientFactory()
+        factory.protocol = RelayToIRC
+        factory.config = config
+        reactor.connectTCP(config["irc"]["host"], config["irc"]["port"], factory)
+        reactor.run()
diff --git a/jira.py b/jira.py
@@ -1,3 +1,8 @@
+import text
+from feed import FeedPoller
+
+import re
+
 class JiraPoller(FeedPoller):
     """
     Polls a Jira RSS feed and formats changes to issue trackers.
@@ -11,7 +16,7 @@ def parse(self, entry):
         if (not m) or (entry.generator_detail.href != self.base_url):
             return
         issue = m.group(1)
-        summary = truncate(strip(entry.summary))
+        summary = text.strip(entry.summary, truncate=True)
         url = "%s/browse/%s" % (self.base_url, issue)
 
         return "%s: %s %s -- %s" % (entry.author_detail.name, issue, summary, url)
diff --git a/job.py b/job.py
@@ -0,0 +1,41 @@
+from twisted.internet.task import LoopingCall
+
+jobs = []
+
+class JobQueue(object):
+    def __init__(self, definition, sink, interval):
+        """
+        Read job definitions from a config source, create an instance of the job using its configuration, and store the config for reference.
+        """
+        self.sink = sink
+        self.interval = interval
+        for type_name, options in definition.items():
+            classname = type_name.capitalize() + "Poller"
+            m = __import__(type_name, fromlist=[classname])
+            if hasattr(m, classname):
+                klass = getattr(m, classname)
+                job = klass(**options)
+                job.config = options
+                job.config['class'] = type_name
+                jobs.append(job)
+            else:
+                raise Exception("Failed to create job of type " + classname)
+
+    @staticmethod
+    def describe():
+        jobs_desc = ", ".join(
+            [("%s: %s" % (j.config['class'], j.config))
+                for j in jobs]
+        )
+        return jobs_desc
+
+    def check(self):
+        for job in jobs:
+            for line in job.check():
+                if line:
+                    self.sink.write(line)
+
+    def run(self):
+        task = LoopingCall(self.check)
+        task.start(self.interval)
+        print "Started polling jobs, every %d seconds." % (self.interval, )
diff --git a/mingle.py b/mingle.py
@@ -1,3 +1,8 @@
+import text
+from feed import FeedPoller
+
+import re
+
 class MinglePoller(FeedPoller):
     """
     Format changes to Mingle cards
@@ -6,7 +11,7 @@ def parse(self, entry):
         m = re.search(r'^(.*/([0-9]+))', entry.id)
         url = m.group(1)
         issue = int(m.group(2))
-        author = abbrevs(entry.author_detail.name)
+        author = text.abbrevs(entry.author_detail.name)
 
         assignments = []
         details = entry.content[0].value
@@ -22,18 +27,21 @@ def parse(self, entry):
                 elif re.match(r'Planning - Sprint', m.group('property')):
                     n = re.search(r'(Sprint \d+)', m.group('value'))
                     normal_form = "->" + n.group(1)
+                elif 'Deployed' == m.group('value'):
+                    normal_form = "*Deployed*"
                 else:
-                    normal_form = abbrevs(m.group('property')+" : "+m.group('value'))
+                    normal_form = text.abbrevs(m.group('property')+" : "+m.group('value'))
 
                 if normal_form:
                     assignments.append(normal_form)
         summary = '|'.join(assignments)
 
-        # TODO 'Description changed'
         for m in re.finditer(r'(?P<property>[^:>]+): (?P<value>[^<]+)', details):
             if m.group('property') == 'Comment added':
                 summary = m.group('value')+" "+summary
+        for m in re.finditer(r'Description changed', details):
+            summary += " " + m.group(0)
 
-        summary = truncate(summary)
+        summary = text.trunc(summary)
 
         return "#%d: (%s) %s -- %s" % (issue, author, summary, url)
diff --git a/slander.py b/slander.py
@@ -32,150 +32,18 @@
 
     poll_interval: 60
 
-    sourceURL: https://svn.civicrm.org/tools/trunk/bin/scripts/ircbot-civi.py
+    project_url: https://svn.civicrm.org/tools/trunk/bin/scripts/ircbot-civi.py
 '''
 
+from irc import RelayToIRC
+from job import JobQueue
+
 import sys
 import os
-import re
-import datetime
 
 # pip install pyyaml
 import yaml
 
-#pip install twisted twisted.words
-from twisted.words.protocols import irc
-from twisted.internet.protocol import ReconnectingClientFactory
-from twisted.internet import reactor
-from twisted.internet.task import LoopingCall
-
-test = False
-maxlen = 200
-config = None
-
-class RelayToIRC(irc.IRCClient):
-    """
-    Bot brain will spawn listening jobs and then relay results to an irc channel.
-    TODO:
-    * separate polling manager from irc protocol
-    * operator ACL and commands which perform an action
-    """
-    sourceURL = "https://github.com/adamwight/slander"
-    timestamp = None
-
-    def connectionMade(self):
-        self.config = self.factory.config
-        self.jobs = create_jobs(self.config["jobs"])
-        self.nickname = self.config["irc"]["nick"]
-        self.realname = self.config["irc"]["realname"]
-        self.channel = self.config["irc"]["channel"]
-        global maxlen
-        if "maxlen" in self.config["irc"]:
-            maxlen = self.config["irc"]["maxlen"]
-        if "sourceURL" in self.config:
-            self.sourceURL = self.config["sourceURL"]
-
-        irc.IRCClient.connectionMade(self)
-
-    def signedOn(self):
-        self.join(self.channel)
-
-    def joined(self, channel):
-        print "Joined channel %s as %s" % (channel, self.nickname)
-        task = LoopingCall(self.check)
-        task.start(self.config["poll_interval"])
-        print "Started polling jobs, every %d seconds." % (self.config["poll_interval"], )
-
-    def privmsg(self, user, channel, message):
-        if message.find(self.nickname) >= 0:
-            if re.search(r'\bhelp\b', message):
-                self.say(channel, "If I only had a brain: %s -- Commands: help jobs kill last" % (self.sourceURL, ))
-            elif re.search(r'\bjobs\b', message):
-                jobs_desc = ", ".join(
-                    [("%s: %s" % (j.config['class'], j.config))
-                        for j in self.jobs]
-                )
-                jobs_desc = re.sub(r'p(ass)?w(ord)?[ :=]*[^ ]+', r'p***word', jobs_desc)
-
-                self.say(channel, "Running jobs [%s]" % (jobs_desc, ))
-            #elif re.search(r'\bkill\b', message):
-            #    self.say(self.channel, "Squeal! Killed by %s" % (user, ))
-            #    self.factory.stopTrying()
-            #    self.quit()
-            elif re.search(r'\blast\b', message):
-                if self.timestamp:
-                    self.say(channel, "My last post was %s UTC" % (self.timestamp, ))
-                else:
-                    self.say(channel, "No activity.")
-            else:
-                print "Failed to handle incoming command: %s said %s" % (user, message)
-
-    def check(self):
-        for job in self.jobs:
-            for line in job.check():
-                if line:
-                    if test:
-                        print(line)
-                    self.say(self.channel, str(line))
-                    self.timestamp = datetime.datetime.utcnow()
-
-    @staticmethod
-    def run(config):
-        factory = ReconnectingClientFactory()
-        factory.protocol = RelayToIRC
-        factory.config = config
-        reactor.connectTCP(config["irc"]["host"], config["irc"]["port"], factory)
-        reactor.run()
-
-
-def strip(text, html=True, space=True):
-    class MLStripper(HTMLParser):
-        def __init__(self):
-            self.reset()
-            self.fed = []
-        def handle_data(self, d):
-            self.fed.append(d)
-        def get_data(self):
-            return ''.join(self.fed)
-
-    if html:
-        stripper = MLStripper()
-        stripper.feed(text)
-        text = stripper.get_data()
-    if space:
-        text = re.sub("\s+", " ", text).strip()
-    return text
-
-def abbrevs(name):
-    """
-    Turn a space-delimited name into initials, e.g. Frank Ubiquitous Zappa -> FUZ
-    """
-    return "".join([w[:1] for w in name.split()])
-
-def truncate(message):
-    if len(message) > maxlen:
-        return (message[:(maxlen-3)] + "...")
-    else:
-        return message
-
-
-def create_jobs(d):
-    """
-    Read job definitions from a config source, create an instance of the job using its configuration, and store the config for reference.
-    """
-    jobs = []
-    for type_name, options in d.items():
-        m = __import__(type_name)
-        classname = type_name.capitalize() + "Poller"
-        if hasattr(m, classname):
-            klass = getattr(m, classname)
-            job = klass(**options)
-            job.config = options
-            job.config['class'] = type_name
-            jobs.append(job)
-        else:
-            sys.exit("Failed to create job of type " + classname)
-    return jobs
 
 def load_config(path):
     dotfile = os.path.expanduser(path)
@@ -203,6 +71,11 @@ def parse_args(args):
     if not config:
         sys.exit(args[0] + ": No config!")
 
+    global test
+    test = False
+    if "test" in config:
+        test = config["test"]
+
     return config
 
 if __name__ == "__main__":
diff --git a/svn.py b/svn.py
diff --git a/text.py b/text.py
