Merge lp:~xavier-antoviaque/ibid/scrummeeting-934376 into lp:ibid

[XavierAntoviaque]

[lp:~xavier-antoviaque/ibid/scrummeeting-934376]

1049. By XavierAntoviaque on 2012-02-18

Removes superflous line

1050. By XavierAntoviaque on 2012-02-24

Refs #934376 - SCRUM Meetings - Separator is now only ';', added reporting on behalf of another user

* Fix usability issue with separators, based on feedback from real-world usage. Dots and commas tend to split progress report items in unintended ways, for example with URLs or long items which need punctuation.

* Added reporting on behalf of another user, similarly to the 'topic <subject> [<user>]' command

1051. By XavierAntoviaque on 2012-02-27

Missing test commit for #934376

Unmerged revisions

1051. By XavierAntoviaque on 2012-02-27

Missing test commit for #934376

1050. By XavierAntoviaque on 2012-02-24

Refs #934376 - SCRUM Meetings - Separator is now only ';', added reporting on behalf of another user

* Fix usability issue with separators, based on feedback from real-world usage. Dots and commas tend to split progress report items in unintended ways, for example with URLs or long items which need punctuation.

* Added reporting on behalf of another user, similarly to the 'topic <subject> [<user>]' command

1049. By XavierAntoviaque on 2012-02-18

Removes superflous line

1048. By XavierAntoviaque on 2012-02-17

Implements #934376 - Commands to hold SCRUM meetings

Implements the following commands:

    (next | done | blocked by) <statement>[, <statement>[, ...]]
    what is my progress report?
    what's the progress report from <nick>?

"next|done|blocked by" work similarly to agreed|rejected|..., with the
following refinements:

* They are available to all participants
* They are sorted by participant in the minutes
* When a user has used all three commands, ibid prints a recap of his
  progress report (which can also be obtained manually with "what is...?"
* Ibid splits the statements when it encounters one of the following
  characters ";.,". This allows to present the items in a readable way, as
  unsplitted lists are pretty hard to read when there are more than 1-2
  items.
* Blockers are automatically added to the agenda for later discussion,
  except when it is "nothing"/

1047. By XavierAntoviaque on 2012-02-17

Adding myself to the AUTHORS file, as requested :p

1046. By XavierAntoviaque on 2012-02-17

Implements #931774 - Agenda tracking for meetings (adds tests)

Adding unit test for the meeting agenda feature, as per the code review.

1045. By XavierAntoviaque on 2012-02-15

Implements #931774 - Agenda tracking for meetings

* Implementation based on https://wiki.koumbit.net/IrcBotService/ToDo#Agenda_tracking
  For the complete list of supported commands, see below.

* Integrated the "topic <text>" command as part of the agenda tracking
  feature, in a manner which keeps backward compatibility, but allows
  to take advantage of the new features. It can be used alone, the same
  way as before, and will then create agenda topics and open them
  immediately, closing the previous one if any. If used with pre-defined
  agenda items, it will insert the new topic immediately after the current
  one, and move to it.

* Factored the meeting identification based on the current event in a single
  method

== List of implemented commands ==

Add a topic to the agenda
    agenda+ <text>
    topic+ <text>
    agenda+ <text> '['<proposer>']'
    topic+ <text> '['<proposer>']'

Add a topic and open it immediately
    topic <text>
    topic <text> '['<proposer>']'

Display the topics on the agenda
    what is [on] [the] agenda?
    what's [on] [the] agenda?
    list [the] agenda
    show [the] agenda
    agenda?
    what are the topics?
    list [the] topics
    show [the] topics
    topics?

Rename an agenda topic
    rename topic <number> to <newtext>

Drop a topic from the agenda
    agenda- <number>
    topic- <number>
    delete topic <number>
    drop topic <number>
    forget topic <number>
    remove topic <number>

Reorder the agenda
    [the] agenda order [is] a [, b]... [, m-[n]]...
    [the] topic[s] order [is] a [, b]... [, m-[n]]...

Clear the agenda
    [please] clear [the] agenda
    [please] clear [the] topics

Move to the next agenda topic
    [take up] next topic
    [open] next topic
    move to next topic

Open the discussion about an agenda topic
    take up topic <number|pattern>
    open topic <number|pattern>
    move to topic <number|pattern>

What is the current agenda topic?
    what topic [is open]?
    what topic is this?
    what topic are we on?
    current topic?
    topic?

Close an agenda topic
    close topic <number|pattern>
    close this topic
    close [the] current topic

Defer a topic on the agenda
    skip [this] topic

A sample usage can be found at http://paste.pocoo.org/show/551514/

=== modified file 'AUTHORS'
--- AUTHORS	2011-03-23 16:11:13 +0000
+++ AUTHORS	2012-02-27 20:39:17 +0000
@@ -24,4 +24,5 @@
  * Kevin Woodland
  * Guy Halse
  * Dominic Cleal
- * Keegan Carruthers-Smith
\ No newline at end of file
+ * Keegan Carruthers-Smith
+ * Xavier Antoviaque
\ No newline at end of file

=== modified file 'ibid/plugins/meetings.py'
--- ibid/plugins/meetings.py	2012-02-13 22:04:05 +0000
+++ ibid/plugins/meetings.py	2012-02-27 20:39:17 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2010, Stefano Rivera and Max Rabkin
+# Copyright (c) 2009-2012, Stefano Rivera, Max Rabkin and Xavier Antoviaque
 # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
 
 from datetime import datetime, timedelta
@@ -9,6 +9,7 @@
 import re
 from urllib import quote
 from xmlrpclib import ServerProxy
+from copy import copy
 
 from dateutil.parser import parse
 from dateutil.tz import tzlocal, tzutc
@@ -33,10 +34,26 @@
     usage = u"""
     (start | end) meeting [about <title>]
     I am <True Name>
-    topic <topic>
     (agreed | idea | accepted | rejected) <statement>
+    (next | done | blocked by) <statement>[; <statement>[; ...]] '['<nickname>']'
+    what is my progress report?
+    what's the progress report from <nick>?
     minutes so far
     meeting title is <title>
+    topic+ <text>
+    topic+ <text> '['<proposer>']'
+    what's on the agenda?
+    topic- <number>
+    the agenda order is a [, b]... [, m-[n]]...
+    rename topic <number> to <newtext>
+    move to next topic
+    move to topic <number|pattern>
+    what topic are we on?
+    close this topic
+    close topic <number|pattern>
+    skip this topic
+    topic <text>
+    topic <text> '['<proposer>']'
     """
     features = ('meeting',)
     permission = u'chairmeeting'
@@ -57,6 +74,7 @@
     file_mode = Option('file_mode', u'File Permissions mode, in octal', '644')
     dir_mode = Option('dir_mode',
             u'Directory Permissions mode, in octal', '755')
+    progress_report_types = ['done', 'next', 'blockers']
 
     @authorise(fallthrough=False)
     @match(r'^start\s+meeting(?:\s+about\s+(.+))?$')
@@ -75,12 +93,14 @@
                 .logging_name(event.channel),
             'title': title,
             'attendees': {},
+            'agenda': [],
             'minutes': [{
                 'time': event.time,
                 'type': 'started',
                 'subject': None,
                 'nick': event.sender['nick'],
             }],
+            'progress_report': {},
             'log': [],
         }
         meetings[(event.source, event.channel)] = meeting
@@ -88,6 +108,18 @@
         event.addresponse(u'gets out his memo-pad and cracks his knuckles',
                 action=True)
 
+    def locate_meeting(self, event):
+        """Attempt to find the meeting corresponding to the event"""
+        if not event.public:
+            event.addresponse(u'Sorry, must be done in public')
+            return
+        if (event.source, event.channel) not in meetings:
+            event.addresponse(u'Sorry, no meeting in progress.')
+            return
+
+        meeting = meetings[(event.source, event.channel)]
+        return meeting
+
     @match(r'^i\s+am\s+(.+)$')
     def ident(self, event, name):
         if not event.public or (event.source, event.channel) not in meetings:
@@ -99,14 +131,13 @@
         event.addresponse(True)
 
     @authorise()
-    @match(r'^(topic|idea|agreed|accepted|rejected)\s+(.+)$')
-    def identify(self, event, action, subject):
-        if not event.public or (event.source, event.channel) not in meetings:
+    @match(r'^(idea|agreed|accepted|rejected)\s+(.+)$')
+    def record_action(self, event, action, subject):
+        meeting = self.locate_meeting(event)
+        if not meeting:
             return
 
         action = action.lower()
-
-        meeting = meetings[(event.source, event.channel)]
         meeting['minutes'].append({
             'time': event.time,
             'type': action,
@@ -114,9 +145,7 @@
             'nick': event.sender['nick'],
         })
 
-        if action == 'topic':
-            message = u'Current Topic: %s'
-        elif action == 'idea':
+        if action == 'idea':
             message = u'Idea recorded: %s'
         elif action == 'agreed':
             message = u'Agreed: %s'
@@ -126,28 +155,371 @@
             message = u'Rejected: %s'
         event.addresponse(message, subject, address=False)
 
+    @match(r'^(done|next|blocked\s+by):?\s+(?!topic)([^\[]+)(?:\s+\[(.+)\])?$')
+    def record_progress_report(self, event, action, subject, nick):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        action = action.lower()
+        nick = nick or event.sender['nick']
+
+        if nick not in meeting['progress_report']:
+            meeting['progress_report'][nick] = {'done': [],
+                                                'next': [],
+                                                'blockers': []}
+
+        subject_list = re.split(';', subject.strip())
+        message = u''
+        for subject in subject_list:
+            subject = subject.strip()
+            if not subject:
+                continue
+
+            if action == 'done':
+                meeting['progress_report'][nick]['done'].append(subject)
+                message = u'Good job!'
+            elif action == 'next':
+                meeting['progress_report'][nick]['next'].append(subject)
+                message = u'Quite a plan.'
+            elif re.match(r'blocked\s+by', action, re.I):
+                meeting['progress_report'][nick]['blockers'].append(subject)
+                if re.match(r'nothing|none|nada', subject, re.I):
+                    message = u'Glad to hear that'
+                else:
+                    message = u'We\'ll need to solve that later, I\'m' \
+                              u' adding it to the agenda'
+                    self.add_agenda_topic_silently(event, subject, nick)
+
+        event.addresponse(message)
+
+        if meeting['progress_report'][nick]['done'] and \
+                    meeting['progress_report'][nick]['next'] and \
+                    meeting['progress_report'][nick]['blockers']:
+            self.show_progress_report(event, nick)
+
+    @match(r'^(?:what\'s|what\s+is|show|show\s+me|list)(?:\s+the|\s+my)?'
+           r'(?:\s+progress)?\s+report(?:\s+from\s+(.+))?$')
+    def show_progress_report(self, event, nick):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        if not nick:
+            nick = event.sender['nick']
+
+        event.addresponse(u'My notes of %s\'s report:', nick, address=False)
+        for report_type in self.progress_report_types:
+            if report_type == 'done' and meeting['progress_report'][nick]['done']:
+                event.addresponse(u' - What %s worked on:', nick, address=False)
+            elif report_type == 'next' and meeting['progress_report'][nick]['next']:
+                event.addresponse(u' - What %s will be working on next:', nick, address=False)
+            elif report_type == 'blockers' and meeting['progress_report'][nick]['blockers']:
+                event.addresponse(u' - What\'s blocking %s:', nick, address=False)
+
+            for subject in meeting['progress_report'][nick][report_type]:
+                event.addresponse(u'     * %s', subject, address=False)
+
     @authorise()
     @match(r'^meeting\s+title\s+is\s+(.+)$')
     def set_title(self, event, title):
-        if not event.public:
-            event.addresponse(u'Sorry, must be done in public')
-            return
-        if (event.source, event.channel) not in meetings:
-            event.addresponse(u'Sorry, no meeting in progress.')
-            return
-        meeting = meetings[(event.source, event.channel)]
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
         meeting['title'] = title
         event.addresponse(True)
 
+    @match(r'^(?:agenda|topic)\+\s+([^\[]+)(?:\s+\[(.+)\])?$')
+    def add_agenda_topic(self, event, topic_name, proposer):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        self.add_agenda_topic_silently(event, topic_name, proposer or event.sender['nick'])
+        event.addresponse(u'Ok, I added "%(name)s" to the agenda',
+                          {'name': topic_name})
+
+    def add_agenda_topic_silently(self, event, topic_name, proposer):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        meeting['agenda'].append({'name': topic_name,
+                          'state': 'unopened',
+                          'proposer': proposer})
+
+    @authorise()
+    @match(r'^topic\s+([^\[]+)(?:\s+\[(.+)\])?$')
+    def add_and_open_agenda_topic(self, event, topic_name, proposer):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        open_topic_nb = self.get_open_agenda_topic_nb(meeting)
+        if open_topic_nb is None:
+            new_topic_nb = len(meeting['agenda'])
+        else:
+            new_topic_nb = open_topic_nb + 1
+
+        meeting['agenda'].insert(new_topic_nb, {'name': topic_name,
+                                                'state': 'unopened',
+                                                'proposer': proposer or event.sender['nick']})
+        self.open_agenda_topic(event, str(new_topic_nb + 1))
+
+    @match(r'^(?:what(?:\s+is|\'s)\s+(?:on\s+)?(?:the\s+)?agenda\??|what\s+are\s+the\s+topics\??|'
+           r'(?:show|list)\s+(?:the\s+)?(?:agenda|topics)|agenda\??|topics\??)$')
+    def list_agenda(self, event):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        if len(meeting['agenda']) < 1:
+            event.addresponse(u'Well, the agenda is empty. Tell me what I '
+                              u'should add there with "topic+ <name>"')
+            return
+
+        nb = 0
+        event.addresponse(u'Here is the current agenda:')
+        for topic in meeting['agenda']:
+            nb += 1
+
+            if topic['state'] == 'unopened':
+                state = u''
+            elif topic['state'] == 'open':
+                state = u'(current)'
+            elif topic['state'] == 'closed':
+                state = u'(closed)'
+
+            event.addresponse(u'  %(nb)d. %(name)s %(state)s',
+                              {'nb': nb,
+                               'state': state,
+                               'name': topic['name']})
+
+    @authorise()
+    @match(r'^rename\s+topic\s+(\d+)\s*to\s*(.+)$')
+    def rename_agenda_topic(self, event, topic_nb, topic_name):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        try:
+            topic = meeting['agenda'][int(topic_nb) - 1]
+        except IndexError:
+            event.addresponse(u"Did you count right? I don't see any "
+                              u'topic on the agenda with the number %(topic_nb)s', \
+                              {'topic_nb': topic_nb})
+            return
+
+        topic_previous_name = topic['name']
+        topic['name'] = topic_name
+        event.addresponse(u'Ok, I renamed it from "%(previous_name)s" '
+                          u'to "%(new_name)s"',
+                          {'previous_name': topic_previous_name,
+                           'new_name': topic_name})
+
+    @authorise()
+    @match(r'^(?:(?:agenda-|topic-)|(?:delete|drop|forget|remove)\s+'
+           r'(?:agenda|topic))\s+(\d+)$')
+    def delete_agenda_topic(self, event, topic_nb):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        try:
+            topic_name = meeting['agenda'][int(topic_nb) - 1]['name']
+            del meeting['agenda'][int(topic_nb) - 1]
+        except IndexError:
+            event.addresponse(u'Um, there is no topic %(topic_nb)s', \
+                              {'topic_nb': topic_nb})
+            return
+
+        event.addresponse(u'Ok, I removed "%(name)s" from the agenda',
+                          {'name': topic_name})
+
+    @authorise()
+    @match(r'^(?:please\s+)?clear\s+(?:the\s+)?agenda$')
+    def clear_agenda(self, event):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        meeting['agenda'] = []
+        event.addresponse(u'Better start over from scratch, yes. All neat and clean.')
+
+    @authorise()
+    @match(r'^(?:the\s+)?(?:agenda|topics|topic)\s+order\s+(?:is\s+)([\d\s,]+)$')
+    def reorder_agenda(self, event, agenda_order_str):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        reordered_agenda = []
+        remaining_agenda = copy(meeting['agenda'])
+        for topic_nb in agenda_order_str.split(','):
+            topic_nb = int(topic_nb.strip())
+            try:
+                reordered_agenda.append(meeting['agenda'][topic_nb - 1])
+                remaining_agenda.remove(meeting['agenda'][topic_nb - 1])
+            except IndexError:
+                event.addresponse(u'Um, there is no topic %(topic_nb)s', \
+                                  {'topic_nb': topic_nb})
+                return
+        reordered_agenda += remaining_agenda
+        meeting['agenda'] = reordered_agenda
+
+        event.addresponse(u'First things first!')
+
+    @authorise()
+    @match(r'^(?:(?:take\s+up|open|move\s+to)\s+)?next\s+topic$')
+    def next_agenda_topic(self, event):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        open_topic_nb = self.get_open_agenda_topic_nb(meeting)
+        if open_topic_nb is None:
+            open_topic_nb = 0
+        else:
+            meeting['agenda'][open_topic_nb]['state'] = 'closed'
+
+        next_topic = None
+        for topic in meeting['agenda'][open_topic_nb:] \
+                     + meeting['agenda'][:open_topic_nb]:
+            if topic['state'] == 'unopened':
+                next_topic = topic
+                break
+
+        if not next_topic:
+            event.addresponse(u"That's all folks!")
+        else:
+            next_topic_nb = meeting['agenda'].index(next_topic) + 1
+            self.open_agenda_topic(event, str(next_topic_nb))
+
+    @authorise()
+    @match(r'^(?:take\s+up|open|move\s+to)\s+topic\s+(.+)$')
+    def open_agenda_topic(self, event, topic_nb_or_pattern):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        next_topic = self.get_agenda_topic_by_nb_or_pattern(event, topic_nb_or_pattern)
+        if not next_topic:
+            return
+
+        open_topic_nb = self.get_open_agenda_topic_nb(meeting)
+        if open_topic_nb is not None:
+            meeting['agenda'][open_topic_nb]['state'] = 'closed'
+
+        next_topic['state'] = 'open'
+        meeting['minutes'].append({
+            'time': event.time,
+            'type': 'topic',
+            'subject': next_topic['name'],
+            'nick': next_topic['proposer'],
+        })
+        event.addresponse(u'The current topic is now "%(name)s" (from %(proposer)s)',
+                          {'name': next_topic['name'],
+                           'proposer': next_topic['proposer']})
+
+    def get_agenda_topic_by_nb_or_pattern(self, event, topic_nb_or_pattern):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        try:
+            topic_nb = int(topic_nb_or_pattern.strip()) - 1
+            found_topic = meeting['agenda'][topic_nb]
+        except ValueError:
+            found_topic = None
+            for topic in meeting['agenda']:
+                if re.search(topic_nb_or_pattern.strip(), topic['name']):
+                    found_topic = topic
+                    break
+        if found_topic is None:
+            event.addresponse(u"I don't see this topic in the agenda")
+        return found_topic
+
+    @match(r'^(?:(?:what|current)\s+topic(?:\s+(?:is\s+this|is\s+open|are\s+we\s+on)\s*)?\??|topic\??)$')
+    def current_agenda_topic(self, event):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        open_topic_nb = self.get_open_agenda_topic_nb(meeting)
+        if open_topic_nb is None:
+            event.addresponse(u"I don't think we're discussing anything from the agenda")
+        else:
+            current_topic = meeting['agenda'][open_topic_nb]
+            event.addresponse(u'We\'re discussing "%(name)s" (from %(proposer)s)',
+                              {'name': current_topic['name'],
+                               'proposer': current_topic['proposer']})
+
+    @authorise()
+    @match(r'^close\s+(?:this\s+|the\s+current\s+|current\s+)?topic$')
+    def close_current_agenda_topic(self, event):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        open_topic_nb = self.get_open_agenda_topic_nb(meeting)
+        if open_topic_nb is None:
+            event.addresponse(u"I don't think we're discussing anything from the agenda")
+        else:
+            open_topic = meeting['agenda'][open_topic_nb]
+            open_topic['state'] = 'closed'
+            event.addresponse(u"Yes, let's stop talking about %(name)s",
+                              {'name': open_topic['name'].lower()})
+
+    @authorise()
+    @match(r'^close\s+topic\s+(.+)$')
+    def close_agenda_topic(self, event, topic_nb_or_pattern):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        topic = self.get_agenda_topic_by_nb_or_pattern(event, topic_nb_or_pattern)
+        if not topic:
+            return
+
+        if topic['state'] == 'closed':
+            event.addresponse(u"We've already closed that topic")
+        else:
+            topic['state'] = 'closed'
+            event.addresponse(u"We don't need to talk about %(name)s anymore",
+                              {'name': topic['name'].lower()})
+
+    @authorise()
+    @match(r'^skip\s+(?:this\s+)?topic$')
+    def skip_current_agenda_topic(self, event):
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
+        open_topic_nb = self.get_open_agenda_topic_nb(meeting)
+        if open_topic_nb is None:
+            event.addresponse(u"I don't think we're discussing anything from the agenda")
+        else:
+            open_topic = meeting['agenda'][open_topic_nb]
+            event.addresponse(u"Ok, we'll discuss %(name)s later",
+                              {'name': open_topic['name'].lower()})
+            self.next_agenda_topic(event)
+            open_topic['state'] = 'unopened'
+
+    def get_open_agenda_topic_nb(self, meeting):
+        nb = 0
+        for topic in meeting['agenda']:
+            if topic['state'] == 'open':
+                return nb
+            nb += 1
+        return None
+
     @match(r'^minutes(?:\s+(?:so\s+far|please))?$')
     def write_minutes(self, event):
-        if not event.public:
-            event.addresponse(u'Sorry, must be done in public')
-            return
-        if (event.source, event.channel) not in meetings:
-            event.addresponse(u'Sorry, no meeting in progress.')
-            return
-        meeting = meetings[(event.source, event.channel)]
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
+
         meeting['attendees'].update((e['nick'], None) for e in meeting['log']
                 if e['nick'] not in meeting['attendees']
                 and e['nick'] != ibid.config['botname'])
@@ -168,8 +540,8 @@
                         indent=2)
             else:
                 template = templates.get_template('meetings/minutes.' + format)
-                minutes[format] = template.render(meeting=meeting) \
-                        .encode('utf-8')
+                minutes[format] = template.render(meeting=meeting, \
+                        progress_report_types=self.progress_report_types).encode('utf-8')
 
             filename = self.logfile % {
                 'source': event.source.replace('/', '-'),
@@ -215,13 +587,9 @@
     @authorise()
     @match(r'^end\s+meeting$')
     def end_meeting(self, event):
-        if not event.public:
-            event.addresponse(u'Sorry, must be done in public')
-            return
-        if (event.source, event.channel) not in meetings:
-            event.addresponse(u'Sorry, no meeting in progress.')
-            return
-        meeting = meetings[(event.source, event.channel)]
+        meeting = self.locate_meeting(event)
+        if not meeting:
+            return
 
         meeting['endtime'] = event.time
         meeting['log'].append({

=== modified file 'ibid/templates/meetings/minutes.html'
--- ibid/templates/meetings/minutes.html	2009-10-25 23:54:25 +0000
+++ ibid/templates/meetings/minutes.html	2012-02-27 20:39:17 +0000
@@ -25,6 +25,29 @@
 {%- endfor %}
 	</div>
 
+{%- if meeting.progress_report %}
+    <h2>Progress Report</h2>
+    <ul id="progress-report">
+    {%- for nick, report_list in meeting.progress_report.iteritems() %}
+        <li><span class="nick">{{ nick|e }}</span>
+            <ul>
+            {%- for report_type in progress_report_types %}
+                <li><span class="type">{{ report_type|e|upper }}</span>
+                    <ul>
+                    {%- if report_type in report_list %}
+                    {%- for subject in report_list[report_type] %}
+                        <li><span class="subject">{{ subject|e }}</span></li>                                
+                    {%- endfor %}
+                    {%- endif %}
+                    </ul>
+                </li>
+            {%- endfor %}
+            </ul>
+        </li>
+    {%- endfor %}
+    </ul>
+{%- endif %}
+
 	<h2>Present</h2>
 	<ul id="present">
 {%- for nick, name in meeting.attendees.iteritems() %}

=== modified file 'ibid/templates/meetings/minutes.txt'
--- ibid/templates/meetings/minutes.txt	2009-10-25 23:54:25 +0000
+++ ibid/templates/meetings/minutes.txt	2012-02-27 20:39:17 +0000
@@ -9,6 +9,27 @@
 [{{ event.time.strftime('%H:%M:%S') }}] {{ event.type | upper }}
 {{- ': ' + event.subject if event.subject else '' }} ({{ event.nick }})
 {% endfor %}
+
+{%- if meeting.progress_report %}
+Progress Report
+===============
+
+{%- for nick, report_list in meeting.progress_report.iteritems() %}
+
+[{{ nick|e }}]
+
+{%- for report_type in progress_report_types %}
+{{ report_type|e|upper }}:
+{%- if report_type in report_list %}
+{%- for subject in report_list[report_type] %}
+  * {{ subject|e }}                                
+{%- endfor %}
+{%- endif %}
+{%- endfor %}
+
+{%- endfor %}
+{%- endif %}
+
 Present
 =======
 

=== added file 'ibid/test/plugins/test_meetings.py'
--- ibid/test/plugins/test_meetings.py	1970-01-01 00:00:00 +0000
+++ ibid/test/plugins/test_meetings.py	2012-02-27 20:39:17 +0000
@@ -0,0 +1,249 @@
+# Copyright \(c) 2010-2011, Max Rabkin, Stefano Rivera
+# Released under terms of the MIT/X/Expat Licence. See COPYING for details.
+
+import logging
+
+import ibid.test
+
+class MeetingsTest(ibid.test.PluginTestCase):
+    load = ['meetings']
+    public = True
+
+    def test_meeting_agenda(self):
+        # Meeting start
+        self.assertResponseMatches(u'Ibid: start meeting',
+                                   u'gets out his memo-pad and cracks his knuckles')
+        self.assertResponseMatches(u'Ibid: what\'s the agenda?',
+                                   u'user: Well, the agenda is empty')
+
+        # Adding topics
+        self.assertResponseMatches(u'Ibid: agenda+ test',
+                                   u'user: Ok, I added "test" to the agenda')
+        self.assertResponseMatches(u'Ibid: topic+ test 2',
+                                   u'user: Ok, I added "test 2" to the agenda')
+        self.assertResponseMatches(u'Ibid: what is on the agenda?',
+                                   u'user: Here is the current agenda:',)
+        self.assertResponseMatches(u'Ibid: what is on the agenda?',
+                                   u'user:   1. test')
+        self.assertResponseMatches(u'Ibid: what is on the agenda?',
+                                   u'user:   2. test 2')
+
+        # Renaming
+        self.assertResponseMatches(u'Ibid: rename topic 2 to test modified 2',
+                                   u'user: Ok, I renamed it from "test 2" to "test modified 2"')
+        self.assertResponseMatches(u'Ibid: what is on the agenda?',
+                                   u'user:   1. test')
+        self.assertResponseMatches(u'Ibid: what is on the agenda?',
+                                   u'user:   2. test modified 2')
+        self.failIfResponseMatches(u'Ibid: what is on the agenda?',
+                                   u'user:   2. test 2')
+        self.assertResponseMatches(u'Ibid: rename topic 3 to bogus agenda topic',
+                                   u'user: Did you count right\? I don\'t see any topic on the agenda with the number 3')
+
+        # Removing topics
+        self.assertResponseMatches(u'Ibid: agenda- 1',
+                                   u'user: Ok, I removed "test" from the agenda')
+        self.assertResponseMatches(u'Ibid: show the agenda',
+                                   u'user:   1. test modified 2')
+        self.failIfResponseMatches(u'Ibid: what is on the agenda?',
+                                   u'user:   1. test$')
+
+        # Clearing the agenda
+        self.assertResponseMatches(u'Ibid: agenda+ the 3rd item',
+                                   u'user: Ok, I added "the 3rd item" to the agenda')
+        self.assertResponseMatches(u'Ibid: what is the agenda',
+                                   u'user:   2. the 3rd item')
+        self.assertResponseMatches(u'Ibid: clear the agenda',
+                                   u'user: Better start over from scratch, yes. All neat and clean.')
+        self.assertResponseMatches(u'Ibid: what is the agenda',
+                                   u'user: Well, the agenda is empty.')
+
+        # Closing topics
+        self.assertResponseMatches(u'Ibid: topic+ test',
+                                   u'user: Ok, I added "test" to the agenda')
+        self.assertResponseMatches(u'Ibid: topic+ test 2',
+                                   u'user: Ok, I added "test 2" to the agenda')
+        self.assertResponseMatches(u'Ibid: what are the topics?',
+                                   u'user:   1. test')
+        self.assertResponseMatches(u'Ibid: what are the topics?',
+                                   u'user:   2. test 2')
+        self.assertResponseMatches(u'Ibid: topic+ test blah',
+                                   u'user: Ok, I added "test blah" to the agenda')
+        self.assertResponseMatches(u'Ibid: topic+ test 4 [toto]',
+                                   u'user: Ok, I added "test 4" to the agenda')
+        self.assertResponseMatches(u'Ibid: topic+ test 5',
+                                   u'user: Ok, I added "test 5" to the agenda')
+        self.assertResponseMatches(u'Ibid: topic+ test 6',
+                                   u'user: Ok, I added "test 6" to the agenda')
+        self.assertResponseMatches(u'Ibid: topic+ test seven',
+                                   u'user: Ok, I added "test seven" to the agenda')
+        self.assertResponseMatches(u'Ibid: close topic 6',
+                                   u'user: We don\'t need to talk about test 6 anymore')
+        self.assertResponseMatches(u'Ibid: close topic seven',
+                                   u'user: We don\'t need to talk about test seven anymore')
+        self.assertResponseMatches(u'Ibid: list the topics',
+                                   u'user:   1. test')
+        self.assertResponseMatches(u'Ibid: list the topics',
+                                   u'user:   2. test 2')
+        self.assertResponseMatches(u'Ibid: list the topics',
+                                   u'user:   3. test blah')
+        self.assertResponseMatches(u'Ibid: list the topics',
+                                   u'user:   4. test 4')
+        self.assertResponseMatches(u'Ibid: list the topics',
+                                   u'user:   5. test 5')
+        self.assertResponseMatches(u'Ibid: list the topics',
+                                   u'user:   6. test 6 \(closed\)')
+        self.assertResponseMatches(u'Ibid: list the topics',
+                                   u'user:   7. test seven \(closed\)')
+
+        # Changing the agenda order
+        self.assertResponseMatches(u'Ibid: the agenda order is 4, 5 ,3,  1,2',
+                                   u'user: First things first!')
+        self.assertResponseMatches(u'Ibid: show topics',
+                                   u'user:   1. test 4')
+        self.assertResponseMatches(u'Ibid: show topics',
+                                   u'user:   2. test 5')
+        self.assertResponseMatches(u'Ibid: show topics',
+                                   u'user:   3. test blah')
+        self.assertResponseMatches(u'Ibid: show topics',
+                                   u'user:   4. test')
+        self.assertResponseMatches(u'Ibid: show topics',
+                                   u'user:   5. test 2')
+        self.assertResponseMatches(u'Ibid: show topics',
+                                   u'user:   6. test 6 \(closed\)')
+        self.assertResponseMatches(u'Ibid: show topics',
+                                   u'user:   7. test seven \(closed\)')
+
+        # Moving through topics
+        self.assertResponseMatches(u'Ibid: take up topic 4',
+                                   u'user: The current topic is now "test" \(from user\)')
+        self.assertResponseMatches(u'Ibid: skip this topic',
+                                   u'user: Ok, we\'ll discuss test later')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   1. test 4')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   2. test 5')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   3. test blah')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   4. test')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   5. test 2 \(current\)')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   6. test 6 \(closed\)')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   7. test seven \(closed\)')
+        self.assertResponseMatches(u'Ibid: move to topic bl.h',
+                                   u'user: The current topic is now "test blah" \(from user\)')
+        self.assertResponseMatches(u'Ibid: show the topics',
+                                   u'user:   1. test 4')
+        self.assertResponseMatches(u'Ibid: show the topics',
+                                   u'user:   2. test 5')
+        self.assertResponseMatches(u'Ibid: show the topics',
+                                   u'user:   3. test blah \(current\)')
+        self.assertResponseMatches(u'Ibid: show the topics',
+                                   u'user:   4. test')
+        self.assertResponseMatches(u'Ibid: show the topics',
+                                   u'user:   5. test 2 \(closed\)')
+        self.assertResponseMatches(u'Ibid: show the topics',
+                                   u'user:   6. test 6 \(closed\)')
+        self.assertResponseMatches(u'Ibid: show the topics',
+                                   u'user:   7. test seven \(closed\)')
+
+        # Inserting and opening a topic immediately
+        self.assertResponseMatches(u'Ibid: topic A new topic',
+                                   u'user: The current topic is now "A new topic" \(from user\)')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   1. test 4')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   2. test 5')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   3. test blah \(closed\)')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   4. A new topic \(current\)')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   5. test')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   6. test 2 \(closed\)')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   7. test 6 \(closed\)')
+        self.assertResponseMatches(u'Ibid: topics?',
+                                   u'user:   8. test seven \(closed\)')
+        self.assertResponseMatches(u'Ibid: topic?',
+                                   u'user: We\'re discussing "A new topic" \(from user\)')
+
+        # Moving throught topics \(closed topics, looping back to skipped topics)
+        self.assertResponseMatches(u'Ibid: open next topic',
+                                   u'user: The current topic is now "test" \(from user\)')
+        self.assertResponseMatches(u'Ibid: current topic?',
+                                   u'user: We\'re discussing "test" \(from user\)')
+        self.assertResponseMatches(u'Ibid: close this topic',
+                                   u'user: Yes, let\'s stop talking about test')
+        self.assertResponseMatches(u'Ibid: move to next topic',
+                                   u'user: The current topic is now "test 4" \(from toto\)')
+        self.assertResponseMatches(u'Ibid: what topic is open?',
+                                   u'user: We\'re discussing "test 4" \(from toto\)')
+        self.assertResponseMatches(u'Ibid: next topic',
+                                   u'user: The current topic is now "test 5" \(from user\)')
+        self.assertResponseMatches(u'Ibid: what topic is this?',
+                                   u'user: We\'re discussing "test 5" \(from user\)')
+        self.assertResponseMatches(u'Ibid: take up next topic',
+                                   u'user: That\'s all folks!')
+        self.assertResponseMatches(u'Ibid: what topic are we on?',
+                                   u'user: I don\'t think we\'re discussing anything from the agenda')
+
+    def test_meeting_progress_report(self):
+        # next/done
+        self.assertResponseMatches(u'Ibid: start meeting',
+                                   u'gets out his memo-pad and cracks his knuckles')
+        self.assertResponseMatches(u'Ibid: next test, dsf;;test 2; test.test',
+                                   u'user: Quite a plan.')
+        self.assertResponseMatches(u'Ibid: done: the next thing,',
+                                   u'user: Good job!')
+        self.assertResponseMatches(u'Ibid: what is my report',
+                                   u'My notes of user\'s report:')
+        self.assertResponseMatches(u'Ibid: what is my report',
+                                   u' - What user worked on:')
+        self.assertResponseMatches(u'Ibid: what\'s the report',
+                                   u'     \* the next thing')
+        self.assertResponseMatches(u'Ibid: show my report',
+                                   u' - What user will be working on next:')
+        self.assertResponseMatches(u'Ibid: show me my report',
+                                   u'     \* test, dsf')
+        self.assertResponseMatches(u'Ibid: show me the report from user',
+                                   u'     \* test 2')
+        self.assertResponseMatches(u'Ibid: what is my progress report',
+                                   u'     \* test\.test')
+        self.failIfResponseMatches(u'Ibid: what is my report',
+                                   u' - What\'s blocking user:')
+        self.assertResponseMatches(u'Ibid: blocked by nothing',
+                                   u'user: Glad to hear that')
+        
+        # Sending a report on behalf of someone else
+        self.assertResponseMatches(u'Ibid: done bla,blahhh;blaaa [toto]',
+                                   u'user: Good job!')
+        self.assertResponseMatches(u'Ibid: show me the report from toto',
+                                   u'     \* bla,blahhh')
+        self.assertResponseMatches(u'Ibid: show me the progress report from toto',
+                                   u'     \* blaaa')
+        self.failIfResponseMatches(u'Ibid: what is my report',
+                                   u'     \* bla,blahhh')        
+
+        # Blockers (added to agenda)        
+        self.assertResponseMatches(u'Ibid: agenda',
+                                   u'user: Well, the agenda is empty.')
+        self.assertResponseMatches(u'Ibid: blocked by test blocker 1;test blocker 2',
+                                   u'user: We\'ll need to solve that later, I\'m adding it to the agenda')
+        self.assertResponseMatches(u'Ibid: what is my report',
+                                   u' - What\'s blocking user:')
+        self.assertResponseMatches(u'Ibid: what is my report',
+                                   u'     \* test blocker 1')
+        self.assertResponseMatches(u'Ibid: what is my report',
+                                   u'     \* test blocker 2')
+        self.assertResponseMatches(u'Ibid: agenda',
+                                   u'user: Here is the current agenda:')
+        self.assertResponseMatches(u'Ibid: agenda',
+                                   u'user:   1. test blocker 1')
+        self.assertResponseMatches(u'Ibid: agenda',
+                                   u'user:   2. test blocker 2')
+