whimsy-asf 0.0.22 → 0.0.23

data/asf.version

@@ -1 +1 @@
-0.0.22
+0.0.23

data/lib/whimsy/asf/agenda/back.rb

@@ -26,22 +26,26 @@ class ASF::Board::Agenda
       end
 
       if attrs['title'] =~ /Action Items/
-        list = {}
 
         # extract action items associated with projects
-        attrs['text'].to_s.split(/^\s+\* /).each do |action|
-          next unless action =~ /\[ (\S*) \]\s*Status:/
-          pmc = $1
-          indent = action.scan(/\n +/).min
-          action.gsub! indent, "\n" if indent
-          action[/(\[ #{pmc} \])\s*Status:/, 1] = ''
-          action.chomp!
-          action.sub! /\s+Status:\Z/, ''
-          list[pmc] ||= []
-          list[pmc] << action
-        end
+        text = attrs['text'].sub(/\A\s*\n/, '').sub(/\s+\Z/, '')
+        unindent = text.sub(/s+\Z/,'').scan(/^ *\S/).map(&:length).min || 1
+        text.gsub! /^ {#{unindent-1}}/, ''
+
+        attrs['actions'] = text.sub(/^\* /, '').split(/^\n\* /).map do |text|
+          match1 = /(.*?)(\n\s*Status:(.*))/m.match(text)
+          match2 = /(.*?)(\[ ([^\]]+) \])?\s*\Z/m.match(match1[1])
+          match3 = /(.*?): (.*)\Z/m.match(match2[1])
+          match4 = /(.*?)( (\d+-\d+-\d+))?$/.match(match2[3])
 
-        attrs['actions'] = list
+          { 
+            owner: match3[1],
+            text: match3[2].strip,
+            status: match1[3].to_s.strip,
+            pmc: (match4[1] if match4), 
+            date: (match4[3] if match4)
+          }
+        end
       end
     end
   end

data/lib/whimsy/asf/agenda.rb

@@ -69,7 +69,11 @@ class ASF::Board::Agenda
       @sections[section][:index] = index if @sections[section]
     end
 
-    # cleanup text and comment whitespace
+    # look for flags
+    flagged_reports = Hash[@file[/ \d\. Committee Reports.*?\n\s+A\./m].
+      scan(/# Apache (.*?) \[(.*)\]/)]
+
+    # cleanup text and comment whitespace, add flags
     @sections.each do |section, hash|
       text = hash['text'] || hash['report']
       if text
@@ -86,6 +90,10 @@ class ASF::Board::Agenda
         unindent = text.sub(/s+\Z/,'').scan(/^ *\S/).map(&:length).min || 1
         text.gsub! /^ {#{unindent-1}}/, ''
       end
+
+      # add flags
+      flags = flagged_reports[hash['title']]
+      hash['flags'] = flags.split(', ') if flags
     end
 
     unless @quick

metadata

@@ -2,14 +2,14 @@
 name: whimsy-asf
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement