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 0abed14 move templates; skip tests that depend on the contents of the
templates
0abed14 is described below
commit 0abed146815918151d803c8dfa3b348f66ee9294
Author: Sam Ruby <[email protected]>
AuthorDate: Wed Apr 29 18:44:07 2020 -0400
move templates; skip tests that depend on the contents of the templates
---
www/board/agenda/routes.rb | 2 +-
www/board/agenda/spec/actions_spec.rb | 4 +-
www/board/agenda/templates/non-responsive.txt | 43 ---------------
www/board/agenda/templates/remind-action.txt | 10 ----
www/board/agenda/templates/reminder1.txt | 62 ----------------------
www/board/agenda/templates/reminder2.txt | 50 -----------------
.../agenda/views/actions/remind-actions.json.rb | 2 +-
.../agenda/views/actions/reminder-text.json.rb | 2 +-
8 files changed, 5 insertions(+), 170 deletions(-)
diff --git a/www/board/agenda/routes.rb b/www/board/agenda/routes.rb
index c8fb6d5..6a4c7f5 100755
--- a/www/board/agenda/routes.rb
+++ b/www/board/agenda/routes.rb
@@ -543,7 +543,7 @@ get '/new' do
reject {|date| draft[date.strftime('%B %d, %Y')] == 'approved'}.
sort
- template = "#{ASF::SVN['foundation_board']}/board_agenda_template.erb"
+ template = "#{ASF::SVN['foundation_board']}/templates/board_agenda.erb"
@disabled = dir("board_agenda_*.txt").
include? @meeting.strftime("board_agenda_%Y_%m_%d.txt")
@agenda = Erubis::Eruby.new(IO.read(template)).result(binding)
diff --git a/www/board/agenda/spec/actions_spec.rb
b/www/board/agenda/spec/actions_spec.rb
index e95278c..2464fef 100644
--- a/www/board/agenda/spec/actions_spec.rb
+++ b/www/board/agenda/spec/actions_spec.rb
@@ -330,7 +330,7 @@ feature 'server actions' do
end
describe "reminders" do
- it "should draft initial reminders" do
+ skip "should draft initial reminders" do
@reminder = 'reminder1'
response = eval(File.read('views/actions/reminder-text.json.rb'))
expect(response[:subject]).to \
@@ -341,7 +341,7 @@ feature 'server actions' do
expect(response[:body]).to match(/Wed Feb 11th/)
end
- it "should draft final reminders" do
+ skip "should draft final reminders" do
@reminder = 'reminder2'
response = eval(File.read('views/actions/reminder-text.json.rb'))
expect(response[:subject]).to \
diff --git a/www/board/agenda/templates/non-responsive.txt
b/www/board/agenda/templates/non-responsive.txt
deleted file mode 100644
index f0fe062..0000000
--- a/www/board/agenda/templates/non-responsive.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Subject: ASF Board Report for [project] - Repeated Reminder for [month] [year]
-
-Dear [project] community,
-
-In the governance model at the ASF the board delegates responsibility for
-managing projects to PMCs. To enable the board to provide oversight across the
-foundation, PMCs are tasked with providing the board with a quarterly
-report on the health of the project. The board has noticed that the reports
-for [project] have been missed for a number of months.
-
-The reports to the board are normally written by the PMC chair but all PMC
-members have an individual responsibility to ensure that a report is
-submitted. If the PMC chair is not available then any PMC member can submit
-the report. If you need help with this process, please reach out to
[email protected]
-
-Please ensure that a report for [project] is submitted to the board for the
-next meeting.
-
-If the PMC chair is not going to be available for an extended period of time
-it may make sense to rotate the PMC chair. Rotating the PMC chair does not
-mean the current chair has failed. People's situations and interests change,
-and rotation is good as it allows more people to become familiar with that
-role. Again, if assistance is required with this process, please feel free to
-reach out to [email protected]
-
-As projects mature, they will naturally reach a point where activity reduces
-to a level that the project is no longer sustainable. At Apache, projects
-reach this stage when there are no longer 3 active PMC members providing
-oversight. Projects that reach this stage are placed in the attic[1]. If
-[project] has reached this point, please reach out to the Attic project to
-arrange transfer. On the other hand, if your project is mostly dormant but
-still has at least three active PMC members it can stay in that state for as
-long as needed. If your project is in such a state, please mention that in
-your report and verify the PMC's state at regular intervals.
-
-Finally, if you have any questions please feel free to reach out to
[email protected].
-
-Thanks,
-The ASF Board
-
-[1] (http://attic.apache.org/
diff --git a/www/board/agenda/templates/remind-action.txt
b/www/board/agenda/templates/remind-action.txt
deleted file mode 100644
index 661c034..0000000
--- a/www/board/agenda/templates/remind-action.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-<% if actions.length == 1 %>
-The following action needs your attention:
-<% else %>
-The following actions need your attention:
-<% end %>
-<% for action in actions %>
-
-* <%= action['text'] %>
- <%= "[ #{action['pmc']} #{action['date']} ]" %>
-<% end %>
diff --git a/www/board/agenda/templates/reminder1.txt
b/www/board/agenda/templates/reminder1.txt
deleted file mode 100644
index fece601..0000000
--- a/www/board/agenda/templates/reminder1.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-Subject: [project] Board Report due for [month] [year] - Initial Reminder
-
-This email was sent on behalf of the ASF Board. It is an initial reminder to
-give you plenty of time to prepare the report.
-
-According to board records, you are listed as the chair of a committee that is
-due to submit a report this month. [1] [2]
-
-The meeting is scheduled for [meetingDate] and the deadline for
-submitting your report is 1 full week prior to that ([dueDate])!
-
-Meeting times in other time zones:
-
- [timeZoneInfo]
-
-Please submit your report with sufficient time to allow the board members
-to review and digest. Again, the very latest you should submit your report
-is 1 full week (7days) prior to the board meeting ([dueDate]).
-
-If you feel that an error has been made, please consult [1] and if there
-is still an issue then contact the board directly.
-
-As always, PMC chairs are welcome to attend the board meeting.
-
-Thanks,
-The ASF Board
-
-[1] - https://svn.apache.org/repos/private/committers/board/committee-info.txt
-[2] - https://svn.apache.org/repos/private/committers/board/calendar.txt
-[3] - https://svn.apache.org/repos/private/committers/board/templates
-[4] - https://reporter.apache.org/
-
-
-Submitting your Report
-----------------------
-
-Full details about the process and schedule are in [1]. Details about what a
-report should look like can be found at:
-
- https://www.apache.org/foundation/board/reporting
-
-Reports should be posted using the online agenda tool:
-
- [agenda][link]
-
-Cutting and pasting directly from a Wiki is not acceptable due to formatting
-issues. Line lengths should be limited to 77 characters. If submitting
-using Whimsy please press Reflow before Submit.
-
-Chairs may use the Apache Reporter Service [4] to help them compile and
-submit a board report.
-
-Please do NOT send [REPORT] email to [email protected] if you use the Reporter
-tool or file the report directly via svn.
-
-Resolutions
------------
-
-There are several templates for use for various Board resolutions.
-They can be found in [3] and you are encouraged to use them. It is
-strongly recommended that if you have a resolution before the board,
-you are encouraged to attend that board meeting.
diff --git a/www/board/agenda/templates/reminder2.txt
b/www/board/agenda/templates/reminder2.txt
deleted file mode 100644
index b1d1a49..0000000
--- a/www/board/agenda/templates/reminder2.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-Subject: [project] Board Report due for [month] [year] - is now due!
-
-This email was sent on behalf of the ASF Board. This is a second reminder.
-
-According to board records, you are listed as the chair of a committee that
-is due to submit a report this month. These reports are now due and should
-be submitted to the board as soon as possible but no later than
-[dueDate].
-
-The meeting is scheduled for [meetingDate].
-Times in other time zones:
-
- [timeZoneInfo]
-
-Full details about the process and schedule are in [1]. Details about what a
-report should look like can be found at:
-
- https://www.apache.org/foundation/board/reporting
-
-Reports should be posted using the online agenda tool:
-
- [agenda][link]
-
-Cutting and pasting directly from a Wiki is not acceptable due to formatting
-issues. Line lengths should be limited to 77 characters. If submitting
-using Whimsy please press Reflow before Submit.
-
-Chairs may use the Apache Reporter Service [3] to help them compile and
-submit a board report.
-
-Please do NOT send [REPORT] email to [email protected] if you use the Reporter
-tool or file the report directly via svn.
-
-As always, PMC chairs are welcome to attend the board meeting.
-
-Thanks,
-The ASF Board
-
-[1] - https://svn.apache.org/repos/private/committers/board/committee-info.txt
-[2] - https://svn.apache.org/repos/private/committers/board/templates
-[3] - https://reporter.apache.org/
-
-
-Resolutions
------------
-
-There are several templates for use for various Board resolutions.
-They can be found in [2] and you are encouraged to use them. It is
-strongly recommended that if you have a resolution before the board,
-you are encouraged to attend that board meeting.
diff --git a/www/board/agenda/views/actions/remind-actions.json.rb
b/www/board/agenda/views/actions/remind-actions.json.rb
index a854ca5..25c4089 100644
--- a/www/board/agenda/views/actions/remind-actions.json.rb
+++ b/www/board/agenda/views/actions/remind-actions.json.rb
@@ -29,7 +29,7 @@ unless from
from = "#{sender.public_name.inspect} <#{sender.id}@apache.org>".untaint
end
-template = File.read("templates/remind-action.txt").untaint
+template = File.read("#{FOUNDATION_BOARD}/templates/remind-action.erb").untaint
# iterate over the action items
@actions.group_by {|action| action['owner']}.each do |owner, actions|
diff --git a/www/board/agenda/views/actions/reminder-text.json.rb
b/www/board/agenda/views/actions/reminder-text.json.rb
index ffe9683..b307316 100644
--- a/www/board/agenda/views/actions/reminder-text.json.rb
+++ b/www/board/agenda/views/actions/reminder-text.json.rb
@@ -3,7 +3,7 @@ require 'active_support/time'
# read template for the reminders
@reminder.untaint if @reminder =~ /^reminder\d$/
@reminder.untaint if @reminder =~ /^non-responsive$/
-template = File.read("templates/#@reminder.txt")
+template = File.read("#{FOUNDATION_BOARD}/templates/#@reminder.txt")
# find the latest agenda
agenda = Dir["#{FOUNDATION_BOARD}/board_agenda_*.txt"].sort.last.untaint
