whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Use nominated-members.rb to parse the file
Date Sat, 13 Feb 2021 00:54:58 GMT
This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new e40cdd0  Use nominated-members.rb to parse the file
e40cdd0 is described below

commit e40cdd06b258a340202e09aa8065e69dca69fafa
Author: Sebb <sebb@apache.org>
AuthorDate: Sat Feb 13 00:54:49 2021 +0000

    Use nominated-members.rb to parse the file
    
    Also fix missing cell
---
 www/members/watch.cgi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/www/members/watch.cgi b/www/members/watch.cgi
index 68a7731..3097f42 100755
--- a/www/members/watch.cgi
+++ b/www/members/watch.cgi
@@ -4,6 +4,7 @@ $LOAD_PATH.unshift '/srv/whimsy/lib'
 
 require 'wunderbar'
 require 'whimsy/asf'
+require 'whimsy/asf/nominated-members'
 require 'nokogiri'
 require 'date'
 require 'wunderbar/bootstrap'
@@ -34,11 +35,7 @@ _html do
     meeting =
       File.dirname(Dir[File.join(meetings, '*', 'nominated-members.txt')].max)
 
-    txt = File.read(File.join(meeting, 'nominated-members.txt'))
-    nominations = txt.scan(/^---+\n\s*\w+.*<(\S+)@apache.org>/).flatten
-    nominations += txt.scan(/^---+\n\s*\w+.*\(([a-z]+)\)/).flatten
-    nominations += txt.scan(/^---+\n+\s*([a-z]+)\s/).flatten
-    nominations += txt.scan(/^---+\n\s*\w+.*\(([a-z]+)@apache\.org\)/).flatten
+    nominations = ASF::MemberFiles.member_nominees.map {|k,v| k}
 
     # determine which list to report on, based on the URI
     request = ENV['REQUEST_URI']
@@ -284,6 +281,8 @@ _html do
                 _td do
                   _a date, href: minutes
                 end
+              else
+                _td '-'
               end
             end
           end


Mime
View raw message