This is an automated email from the ASF dual-hosted git repository.
rubys 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 8a53f62 split out template
8a53f62 is described below
commit 8a53f62a78b942ee7089d8c2ffc1cd1de0ab7696
Author: Sam Ruby <[email protected]>
AuthorDate: Thu May 24 12:08:03 2018 -0400
split out template
---
.../agenda/templates/committers_report.text.erb | 95 ++++++++++++++++++++
www/board/agenda/views/committers_report.text.rb | 100 +--------------------
2 files changed, 96 insertions(+), 99 deletions(-)
diff --git a/www/board/agenda/templates/committers_report.text.erb
b/www/board/agenda/templates/committers_report.text.erb
new file mode 100644
index 0000000..195d43f
--- /dev/null
+++ b/www/board/agenda/templates/committers_report.text.erb
@@ -0,0 +1,95 @@
+From: [email protected]
+To: [email protected]
+Reply-To: [email protected]
+Subject: ASF Board Meeting Summary - <%= @date.strftime('%B %d, %Y') %>
+
+The <%= @date.strftime('%B') %> board meeting took place on the <%=
@date.day.ordinalize %>.
+
+<%#
+
+ ###### attendance
+
+%>
+The following directors were present:
+
+ <%= @attendance[:director].join(", ") %>
+
+The following officers were present:
+
+ <%= @attendance[:officer].join(", ") %>
+
+The following guests were present:
+
+ <%= @attendance[:guest].join(", ") %>
+
+<%#
+
+ ###### previous meeting minutes
+
+%>
+<% unless @approved_minutes.empty? %>
+The <%= @approved_minutes.join(", ").sub(/, ([^,]*)$/, ' and \1') %> minutes
were <%= (@approved_minutes.length > 1 ? "all " : "") %>approved.
+Minutes will be posted to http://www.apache.org/foundation/records/minutes/
+
+<% end %>
+<% unless @other_minutes.empty? %>
+<% @other_minutes.each do |month, disposition| %>
+The <%= month %> minutes were <%= disposition %>.
+<% end %>
+
+<% end %>
+<%#
+
+ ###### missing reports
+
+%>
+<% unless @missing_reports.empty? %>
+The following reports were not received and are expected next month:
+
+<% @missing_reports.each do |report| %>
+ Report from the Apache <%= report['title'] %> Project [<%= report['owner']
%>]
+<% end %>
+
+<% end %>
+<%#
+
+ ###### rejected reports
+
+%>
+<% if @rejected.empty? %>
+All of the received reports to the board were approved.
+<% else %>
+The following reports were not accepted:
+
+<% @rejected.each do |report| %>
+ Report from the Apache <%= report %> Project
+<% end %>
+
+All of the remaining reports received by board were approved.
+<% end %>
+
+<%#
+
+ ###### resolutions
+
+%>
+<% unless @approved_resolutions.empty? %>
+The following resolutions were passed unanimously:
+
+<% @approved_resolutions.each() do |resolution| %>
+ <%= resolution %>
+<% end %>
+
+<% end %>
+<% unless @other_resolutions.empty? %>
+<% @other_resolutions.each do |title, disposition| %>
+The <%= title %> resolution was <%= disposition %>.
+<% end %>
+
+<% end %>
+<%#
+
+ ###### next meeting
+
+%>
+The next board meeting will be on the <%= @next_meeting %>.
diff --git a/www/board/agenda/views/committers_report.text.rb
b/www/board/agenda/views/committers_report.text.rb
index 573fe0a..a3aacd0 100644
--- a/www/board/agenda/views/committers_report.text.rb
+++ b/www/board/agenda/views/committers_report.text.rb
@@ -74,103 +74,5 @@ next_meeting = ASF::Board.nextMeeting
next_meeting.strftime('%B')
##### Write the report
-template = <<REPORT
-PLEASE EDIT THIS, IT IS ONLY AN ESTIMATE.
-From: [email protected]
-To: [email protected]
-Reply-To: [email protected]
-Subject: ASF Board Meeting Summary - #{@date.strftime('%B %d, %Y')}
-
-The #{@date.strftime('%B')} board meeting took place on the
#{@date.day.ordinalize}.
-
-<%#
-
- ###### attendance
-
-%>
-The following directors were present:
-
- <%= @attendance[:director].join(", ") %>
-
-The following officers were present:
-
- <%= @attendance[:officer].join(", ") %>
-
-The following guests were present:
-
- <%= @attendance[:guest].join(", ") %>
-
-<%#
-
- ###### previous meeting minutes
-
-%>
-<% unless @approved_minutes.empty? %>
-The <%= @approved_minutes.join(", ").sub(/, ([^,]*)$/, ' and \1') %> minutes
were <%= (@approved_minutes.length > 1 ? "all " : "") %>approved.
-Minutes will be posted to http://www.apache.org/foundation/records/minutes/
-
-<% end %>
-<% unless @other_minutes.empty? %>
-<% @other_minutes.each do |month, disposition| %>
-The <%= month %> minutes were <%= disposition %>.
-<% end %>
-
-<% end %>
-<%#
-
- ###### missing reports
-
-%>
-<% unless @missing_reports.empty? %>
-The following reports were not received and are expected next month:
-
-<% @missing_reports.each do |report| %>
- Report from the Apache <%= report['title'] %> Project [<%= report['owner']
%>]
-<% end %>
-
-<% end %>
-<%#
-
- ###### rejected reports
-
-%>
-<% if @rejected.empty? %>
-All of the received reports to the board were approved.
-<% else %>
-The following reports were not accepted:
-
-<% @rejected.each do |report| %>
- Report from the Apache <%= report %> Project
-<% end %>
-
-All of the remaining reports received by board were approved.
-<% end %>
-
-<%#
-
- ###### resolutions
-
-%>
-<% unless @approved_resolutions.empty? %>
-The following resolutions were passed unanimously:
-
-<% @approved_resolutions.each() do |resolution| %>
- <%= resolution %>
-<% end %>
-
-<% end %>
-<% unless @other_resolutions.empty? %>
-<% @other_resolutions.each do |title, disposition| %>
-The <%= title %> resolution was <%= disposition %>.
-<% end %>
-
-<% end %>
-<%#
-
- ###### next meeting
-
-%>
-The next board meeting will be on the #{@next_meeting}.
-REPORT
-
+template = File.read('templates/committers_report.text.erb').untaint
Erubis::Eruby.new(template).result(binding)
--
To stop receiving notification emails like this one, please contact
[email protected].
