You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2017/09/21 23:01:44 UTC
[whimsy] 01/01: Merge branch 'master' into agenda_on_vue
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch agenda_on_vue
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 2cbab49a86c18d9a54fe02f401ab29a64064cf76
Merge: 2d5eb80 b732276
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Thu Sep 21 18:51:53 2017 -0400
Merge branch 'master' into agenda_on_vue
lib/whimsy/asf/agenda.rb | 3 +-
lib/whimsy/asf/committee.rb | 1 +
tools/site-scan.rb | 24 ++--
www/board/agenda/data/reminder1.txt | 5 +-
www/board/agenda/data/reminder2.txt | 5 +-
www/board/agenda/views/actions/todos.json.rb | 8 +-
.../workbench/views/actions/icla2.json.rb | 3 +-
www/site.cgi | 124 ++++++++++++---------
8 files changed, 108 insertions(+), 65 deletions(-)
diff --cc lib/whimsy/asf/agenda.rb
index 30acc90,d13a56c..1a3f063
--- a/lib/whimsy/asf/agenda.rb
+++ b/lib/whimsy/asf/agenda.rb
@@@ -95,14 -95,12 +95,15 @@@ class ASF::Board::Agend
@sections[section][:index] = index if @sections[section]
end
+ # quick exit if none found -- non-standard format agenda
+ return [] if @sections.empty?
+
# look for flags
flagged_reports = Hash[@file[/ \d\. Committee Reports.*?\n\s+A\./m].
- scan(/# (.*?) \[(.*)\]/)]
+ scan(/# (.*?) \[(.*)\]/)] rescue {}
president = @sections.values.find {|item| item['title'] == 'President'}
+ return [] unless president # quick exit if non-standard format agenda
preports = Range.new(*president['report'][/\d+ through \d+\.$/].scan(/\d+/))
# cleanup text and comment whitespace, add flags
@sections.each do |section, hash|
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.