[whimsy] branch master updated: No longer needed

2022-03-23 Thread sebb
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 0076ff7  No longer needed
0076ff7 is described below

commit 0076ff7856f3b57ff6948f7c9b39e6a54a1b2f53
Author: Sebb 
AuthorDate: Wed Mar 23 23:44:47 2022 +

No longer needed
---
 .github/workflows/test.yml | 28 
 1 file changed, 28 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 9ae3600..000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: dummy
-# Try to see if can use 
-on:
-  push:
-
-  workflow_dispatch:
-
-jobs:
-  test:
-strategy:
-  fail-fast: false
-  matrix:
-os: [ubuntu-20.04, 'macos-latest']
-ruby: [2.7]
-runs-on: ${{ matrix.os }}
-steps:
-- uses: ruby/setup-ruby@v1
-  with:
-ruby-version: ${{ matrix.ruby }}
-- name: setup agenda 1
-  run: |
-set -v
-which -a ruby
-ruby --version
-sudo which -a ruby
-sudo ruby --version
-# try to run local version of ruby
-sudo $(dirname $(which ruby))/ruby --version


[whimsy] branch master updated: Update Ubuntu version

2022-03-23 Thread sebb
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 4739535  Update Ubuntu version
4739535 is described below

commit 47395350e80aadabfe01d56f4b1085385e899b8b
Author: Sebb 
AuthorDate: Wed Mar 23 23:44:15 2022 +

Update Ubuntu version
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index decfe48..2c2274f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,8 @@ os:
   - linux
   - osx
 
+dist: focal
+
 # Additionally test lib on focal
 jobs:
   include:


[whimsy] branch master updated: What are we running?

2022-03-23 Thread sebb
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 5462ba4  What are we running?
5462ba4 is described below

commit 5462ba4c663bb563bed8b06d36db61bf09f90032
Author: Sebb 
AuthorDate: Wed Mar 23 23:23:15 2022 +

What are we running?
---
 .github/workflows/unittestagenda.yml | 2 ++
 .travis.yml  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index e3dd74c..ca8d5e5 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -42,6 +42,8 @@ jobs:
   # need to run the ruby that has all the gems installed
   run: |
 sudo $(dirname $(which ruby))/ruby -I $PWD/lib -r whimsy/asf -e 
"ASF::LDAP.configure"
+gem list
+ruby --version
 - name: test agenda code
   run: |
 cd www/board/agenda
diff --git a/.travis.yml b/.travis.yml
index fa84129..decfe48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,8 @@ sudo: required
 before_script:
   - export rvmsudo_secure_path=1
   - rvmsudo ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
+  - gem list
+  - ruby --version
 
 
 # Notification #


[whimsy] branch master updated: Is this it?

2022-03-23 Thread sebb
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 3ee62ed  Is this it?
3ee62ed is described below

commit 3ee62edeea8983f9641a0b234082a7264ad5018c
Author: Sebb 
AuthorDate: Wed Mar 23 23:10:49 2022 +

Is this it?
---
 .github/workflows/unittestagenda.yml | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 8c26d5b..e3dd74c 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -38,14 +38,11 @@ jobs:
 cd www/board/agenda
 npm install
 bundle install
-- name: install ldap for sudo
-  # trying to sort out missing/incompatible ldap under sudo
-  run: |
-sudo gem install ruby-ldap
 - name: setup agenda 2
+  # need to run the ruby that has all the gems installed
   run: |
-sudo -E ruby -I $PWD/lib -I$(dirname $(gem which wunderbar)) -r 
whimsy/asf -e "ASF::LDAP.configure"
+sudo $(dirname $(which ruby))/ruby -I $PWD/lib -r whimsy/asf -e 
"ASF::LDAP.configure"
 - name: test agenda code
   run: |
 cd www/board/agenda
-# bundle exec rake
+bundle exec rake


[whimsy] branch master updated: Try to run local version of ruby

2022-03-23 Thread sebb
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 e390726  Try to run local version of ruby
e390726 is described below

commit e390726a81feb6be26e5cee28da9bcefed14e39b
Author: Sebb 
AuthorDate: Wed Mar 23 23:07:13 2022 +

Try to run local version of ruby
---
 .github/workflows/test.yml | 28 
 1 file changed, 28 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000..9ae3600
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,28 @@
+name: dummy
+# Try to see if can use 
+on:
+  push:
+
+  workflow_dispatch:
+
+jobs:
+  test:
+strategy:
+  fail-fast: false
+  matrix:
+os: [ubuntu-20.04, 'macos-latest']
+ruby: [2.7]
+runs-on: ${{ matrix.os }}
+steps:
+- uses: ruby/setup-ruby@v1
+  with:
+ruby-version: ${{ matrix.ruby }}
+- name: setup agenda 1
+  run: |
+set -v
+which -a ruby
+ruby --version
+sudo which -a ruby
+sudo ruby --version
+# try to run local version of ruby
+sudo $(dirname $(which ruby))/ruby --version


[whimsy] branch master updated: Doh - wrong gem

2022-03-23 Thread sebb
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 329d66e  Doh - wrong gem
329d66e is described below

commit 329d66e27b142ff92e2af0e35264936e3a170635
Author: Sebb 
AuthorDate: Wed Mar 23 22:55:28 2022 +

Doh - wrong gem
---
 .github/workflows/unittestagenda.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 3026150..8c26d5b 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -41,7 +41,7 @@ jobs:
 - name: install ldap for sudo
   # trying to sort out missing/incompatible ldap under sudo
   run: |
-sudo gem install ldap
+sudo gem install ruby-ldap
 - name: setup agenda 2
   run: |
 sudo -E ruby -I $PWD/lib -I$(dirname $(gem which wunderbar)) -r 
whimsy/asf -e "ASF::LDAP.configure"


[whimsy] branch master updated: Keep trying

2022-03-23 Thread sebb
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 dba5bc5  Keep trying
dba5bc5 is described below

commit dba5bc5e035d0385b08e05fea6731d086da227bd
Author: Sebb 
AuthorDate: Wed Mar 23 22:52:18 2022 +

Keep trying
---
 .github/workflows/unittestagenda.yml | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 20edcd0..3026150 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -11,9 +11,9 @@ on:
 jobs:
   test:
 strategy:
-  fail-fast: true
+  fail-fast: false
   matrix:
-os: [ubuntu-20.04]
+os: [ubuntu-20.04, 'macos-latest']
 ruby: [2.7]
 runs-on: ${{ matrix.os }}
 steps:
@@ -38,14 +38,13 @@ jobs:
 cd www/board/agenda
 npm install
 bundle install
+- name: install ldap for sudo
+  # trying to sort out missing/incompatible ldap under sudo
+  run: |
+sudo gem install ldap
 - name: setup agenda 2
   run: |
-gem which wunderbar
-gem which ldap
-sudo gem which ldap
-echo ${{ matrix.ruby }}
-echo ---
-sudo -E ruby -I $PWD/lib -I$(dirname $(gem which wunderbar)) 
-I$(dirname $(sudo gem which ldap)) -r whimsy/asf -e "ASF::LDAP.configure"
+sudo -E ruby -I $PWD/lib -I$(dirname $(gem which wunderbar)) -r 
whimsy/asf -e "ASF::LDAP.configure"
 - name: test agenda code
   run: |
 cd www/board/agenda


[whimsy] branch master updated: Is there an ldap in ubuntu?

2022-03-23 Thread sebb
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 acf6ba2  Is there an ldap in ubuntu?
 new 3c0bcdf  Merge branch 'master' of 
https://gitbox.apache.org/repos/asf/whimsy
acf6ba2 is described below

commit acf6ba2b00869caad4a67e6929889d1fc070ee10
Author: Sebb 
AuthorDate: Wed Mar 23 22:41:27 2022 +

Is there an ldap in ubuntu?
---
 .github/workflows/unittestagenda.yml | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index a19f5ac..20edcd0 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -13,7 +13,7 @@ jobs:
 strategy:
   fail-fast: true
   matrix:
-os: [macos-latest, ubuntu-20.04]
+os: [ubuntu-20.04]
 ruby: [2.7]
 runs-on: ${{ matrix.os }}
 steps:
@@ -42,7 +42,10 @@ jobs:
   run: |
 gem which wunderbar
 gem which ldap
-sudo -E ruby -I $PWD/lib -I$(dirname $(gem which wunderbar)) 
-I$(dirname $(gem which ldap)) -r whimsy/asf -e "ASF::LDAP.configure"
+sudo gem which ldap
+echo ${{ matrix.ruby }}
+echo ---
+sudo -E ruby -I $PWD/lib -I$(dirname $(gem which wunderbar)) 
-I$(dirname $(sudo gem which ldap)) -r whimsy/asf -e "ASF::LDAP.configure"
 - name: test agenda code
   run: |
 cd www/board/agenda


[whimsy] branch master updated: Fix word case in `MACOSX.md` (#141)

2022-03-23 Thread sebb
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 5e5958b  Fix word case in `MACOSX.md` (#141)
5e5958b is described below

commit 5e5958be55d69baa152acef8e0ab370a9433bf95
Author: John Bampton 
AuthorDate: Thu Mar 24 08:18:04 2022 +1000

Fix word case in `MACOSX.md` (#141)
---
 MACOSX.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MACOSX.md b/MACOSX.md
index 2455007..3bdf28c 100644
--- a/MACOSX.md
+++ b/MACOSX.md
@@ -5,7 +5,7 @@ Step by step instruction on getting a full Whimsy test 
environment up and
 running on Mac OS/X.  Not all steps are required for every tool, but steps
 common to many tools are included here, and additional steps required for
 specific tools are linked at the bottom of these instructions.
-See Also the general [DEVELOPMENT.md](./DEVELOPMENT.md) configuration notes.
+See also the general [DEVELOPMENT.md](./DEVELOPMENT.md) configuration notes.
 
 :dizzy: **New!** For a simpler way to setup a Mac OSX machine, please 
 check out the [setupmymac script](./SETUPMYMAC.md), which automates 


[whimsy] branch master updated: Now cannot find ldap under sudo

2022-03-23 Thread sebb
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 f360e90  Now cannot find ldap under sudo
f360e90 is described below

commit f360e90542101d245de7ca772756a7d82d218cf9
Author: Sebb 
AuthorDate: Wed Mar 23 22:14:15 2022 +

Now cannot find ldap under sudo

travis: [skip ci]
---
 .github/workflows/unittestagenda.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 1bf3374..a19f5ac 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -40,7 +40,9 @@ jobs:
 bundle install
 - name: setup agenda 2
   run: |
-sudo -E ruby -I $PWD/lib -I$(dirname $(gem which wunderbar)) -r 
whimsy/asf -e "ASF::LDAP.configure"
+gem which wunderbar
+gem which ldap
+sudo -E ruby -I $PWD/lib -I$(dirname $(gem which wunderbar)) 
-I$(dirname $(gem which ldap)) -r whimsy/asf -e "ASF::LDAP.configure"
 - name: test agenda code
   run: |
 cd www/board/agenda


[whimsy] branch master updated: constant may not have been defined

2022-03-23 Thread rubys
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 8a0e5ae  constant may not have been defined
8a0e5ae is described below

commit 8a0e5ae461b432088590d2dba0d32e1e7567d0c1
Author: Sam Ruby 
AuthorDate: Wed Mar 23 15:20:23 2022 -0400

constant may not have been defined
---
 lib/whimsy/asf/meeting-util.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/whimsy/asf/meeting-util.rb b/lib/whimsy/asf/meeting-util.rb
index 3376875..08dd35c 100644
--- a/lib/whimsy/asf/meeting-util.rb
+++ b/lib/whimsy/asf/meeting-util.rb
@@ -198,10 +198,11 @@ module ASF
 
 # return the current status of all inactive members
 def self.tracker(meetingsMissed)
-  cur_mtg_dir = MeetingUtil.get_latest(ASF::SVN['Meetings'])
+  meetings = ASF::SVN['Meetings']
+  cur_mtg_dir = MeetingUtil.get_latest(meetings)
   current_status = self.current_status(cur_mtg_dir)
 
-  _attendance, matrix, _dates, _nameMap = 
MeetingUtil.get_attend_matrices(MEETINGS)
+  _attendance, matrix, _dates, _nameMap = 
MeetingUtil.get_attend_matrices(meetings)
   inactive = matrix.select do |id, _name, _first, missed|
 id and missed >= meetingsMissed
   end


[whimsy] branch master updated: move meeting-util to lib/whimsy

2022-03-23 Thread rubys
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 51136af  move meeting-util to lib/whimsy
51136af is described below

commit 51136af09f206a954692464b4c392771f57f2a79
Author: Sam Ruby 
AuthorDate: Wed Mar 23 15:07:44 2022 -0400

move meeting-util to lib/whimsy
---
 lib/whimsy/asf/meeting-util.rb| 223 ++
 www/members/board-nominations.cgi |   4 +-
 www/members/inactive.cgi  |  10 +-
 www/members/list-traffic.cgi  |   4 +-
 www/members/meeting-util.rb   | 221 -
 www/members/meeting.cgi   |  26 ++---
 www/members/nominations.cgi   |   4 +-
 www/members/non-participants.cgi  |  10 +-
 www/members/proxy.cgi |  10 +-
 9 files changed, 257 insertions(+), 255 deletions(-)

diff --git a/lib/whimsy/asf/meeting-util.rb b/lib/whimsy/asf/meeting-util.rb
new file mode 100644
index 000..3376875
--- /dev/null
+++ b/lib/whimsy/asf/meeting-util.rb
@@ -0,0 +1,223 @@
+#!/usr/bin/env ruby
+# Utility methods and structs related to Member's Meetings
+# NOTE: Assumes 21st century '2*'
+$LOAD_PATH.unshift '/srv/whimsy/lib' if __FILE__ == $PROGRAM_NAME
+require 'whimsy/asf'
+require 'json'
+
+module ASF
+  class MeetingUtil
+RECORDS = ASF::SVN.svnurl!('Meetings')
+MEETING_FILES = { # Filename in meeting dir, pathname to another deployed 
tool, or URL
+  'README.txt' => 'README For Meeting Process And Roll Call',
+  'nomination_of_board.txt' => 'How To Nominate Someone For Board',
+  'nomination_of_members.txt' => 'How To Nominate A New Member',
+  '/members/proxy.cgi' => 'How To Submit A Proxy/Check Your Proxies',
+  'https://www.apache.org/foundation/governance/meetings' => 'How Voting 
Via Email Works',
+  'agenda.txt' => 'Official Meeting Agenda',
+  'board_ballot.txt' => 'Official Board Candidate Ballots',
+  'nominated-members.txt' => 'Official New Member Nominees/Seconds',
+  'proxies' => 'Official List Of Meeting Proxies',
+  'record' => 'Official List Of Voting Members',
+  'attend' => 'Official List Of Meeting Attendees (afterwards)',
+  'voter-tally' => 'Official List Of Who Voted (afterwards)',
+  'raw_board_votes.txt' => 'Official List Of Votes For Board (afterwards)',
+  'raw-irc-log' => 'ASFBot logs all postings on #asfmembers during meeting'
+}
+
+# Calculate how many members required to attend first half for quorum
+def self.calculate_quorum(mtg_dir)
+  begin
+begin
+  num_members = File.read(File.join(mtg_dir, 'record')).each_line.count
+rescue
+  num_members = ASF::Member.list.length - ASF::Member.status.length
+end
+quorum_need = (num_members + 2) / 3
+num_proxies = Dir[File.join(mtg_dir, 'proxies-received', '*')].count
+attend_irc = quorum_need - num_proxies
+  rescue StandardError => e
+# Ensure we can't break rest of script
+puts "ERROR: #{e}"
+return 0, 0, 0, 0
+  end
+  return num_members, quorum_need, num_proxies, attend_irc
+end
+
+# get list of proxy volunteers
+def self.getVolunteers(mtg_dir)
+  lines = IO.read(File.join(mtg_dir, 'proxies'))
+  # split by  underlines, then by blank lines; pick second para and 
drop leading spaces
+  lines.split(/^---/)[1].split(/\n\n/)[1].scan(/^\ 
+(\S.*$)/).flatten
+end
+# Get info about current users's proxying
+# @return "help text", ["id | name (proxy)", ...] if they are a proxy for 
other(s)
+# @return "You have already submitted a proxy form" to someone else
+# @return nil otherwise
+def self.is_user_proxied(mtg_dir, id)
+  user = ASF::Person.find(id)
+  lines = IO.read(File.join(mtg_dir, 'proxies'))
+  proxylist = lines.scan(/\s\s(.{25})(.*?)\((.*?)\)/) # [["Shane Curcuru   
 ", "David Fisher ", "wave"], ...]
+  help = nil
+  copypasta = [] # theiravailid | Their Name in Rolls (proxy)
+  begin
+proxylist.each do |arr|
+  if user.cn == arr[0].strip
+copypasta << "#{arr[2].ljust(12)} | #{arr[1].strip} (proxy)"
+  elsif user.id == arr[2]
+help = "NOTE: You have already submitted a proxy form for 
#{arr[0].strip} to mark your attendance (be sure they know to mark you at Roll 
Call)! "
+  end
+end
+  rescue StandardError => e
+(help ||= "") << "ERROR, could not read LDAP, proxy data may not be 
correct: #{e.message}"
+  end
+  if copypasta.empty?
+return help
+  else
+(help ||= "") << "During the meeting, to mark your proxies' 
attendance, AFTER the 2. Roll Call is called, you may copy/paste the below 
lines to mark your and your proxies attendance."
+

[whimsy] branch master updated: minor refactoring and cleanup of inactive helpblock

2022-03-23 Thread rubys
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 a128be7  minor refactoring and cleanup of inactive helpblock
a128be7 is described below

commit a128be788146006ca56d8405748e4d40c3b617c3
Author: Sam Ruby 
AuthorDate: Wed Mar 23 14:51:23 2022 -0400

minor refactoring and cleanup of inactive helpblock
---
 www/members/inactive.cgi | 28 
 www/members/meeting-util.rb  | 15 +++
 www/members/non-participants.cgi | 10 +-
 3 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/www/members/inactive.cgi b/www/members/inactive.cgi
index 3c9cd64..276c856 100755
--- a/www/members/inactive.cgi
+++ b/www/members/inactive.cgi
@@ -62,16 +62,7 @@ _html do
 begin
   tracker = JSON.parse(IO.read(File.join(latest, 'non-participants.json')))
 rescue Errno::ENOENT => err
-  meetingsMissed = @meetingsMissed
-  _attendance, matrix, _dates, _nameMap = 
MeetingUtil.get_attend_matrices(MEETINGS)
-  inactive = matrix.select do |id, _name, _first, missed|
-id and missed >= meetingsMissed
-  end
-
-  current_status = MeetingUtil.current_status(latest)
-  tracker = inactive.map {|id, name, _first, missed|
-[id, {'name' => name, 'missed' => missed, 'status' => 
current_status[id]}]
-  }.to_h
+  tracker = MeetingUtil.tracker(@meetingsMissed)
 end
 
 # determine user's name as found in members.txt
@@ -96,16 +87,13 @@ _html do
 MeetingUtil::RECORDS => 'Official Past Meeting Records'
   },
   helpblock: -> {
-_p do
-  _ "This page shows your personal attendance record at past Member's 
meetings, as of meeting #{latest}."
-  _ %{
-It is also a poll of members who have not participated in
-ASF Members Meetings or Elections in the past three years, and
-if you have been inactive, asks you if you wish to remain active 
or go emeritus.  Inactive members
-(only) will see a form below and can
-indicate their choice and provide feedback on meetings by pushing 
one of the buttons below.
-  }
-end
+_p "This page shows your personal attendance record at past Member's 
meetings, as of meeting #{latest}."
+_p %{
+  Inactive members (only) will see a button to request a proxy for the 
next meeting, and
+  a second button that they can use to request to go emeritus.  They 
also
+  will see the text of an issue that will be placed before the 
membership
+  for a vote should they not take either of these two options.
+}
   }
 ) do
 
diff --git a/www/members/meeting-util.rb b/www/members/meeting-util.rb
index 27c9690..da6eae5 100644
--- a/www/members/meeting-util.rb
+++ b/www/members/meeting-util.rb
@@ -194,6 +194,21 @@ class MeetingUtil
   end
 end
   end
+
+  # return the current status of all inactive members
+  def self.tracker(meetingsMissed)
+cur_mtg_dir = MeetingUtil.get_latest(ASF::SVN['Meetings'])
+current_status = self.current_status(cur_mtg_dir)
+
+_attendance, matrix, _dates, _nameMap = 
MeetingUtil.get_attend_matrices(MEETINGS)
+inactive = matrix.select do |id, _name, _first, missed|
+  id and missed >= meetingsMissed
+end
+  
+Hash[inactive.map {|id, name, _first, missed|
+  [id, {'name' => name, 'missed' => missed, 'status' => 
current_status[id]}]
+  }]
+  end
 end
 
 # ## ###  # ##
diff --git a/www/members/non-participants.cgi b/www/members/non-participants.cgi
index 3b53390..bec9235 100755
--- a/www/members/non-participants.cgi
+++ b/www/members/non-participants.cgi
@@ -126,13 +126,5 @@ _html do
 end
 
 _json do
-  meetingsMissed = (@meetingsMissed || 3).to_i
-  _attendance, matrix, _dates, _nameMap = 
MeetingUtil.get_attend_matrices(MEETINGS)
-  inactive = matrix.select do |id, _name, _first, missed|
-id and missed >= meetingsMissed
-  end
-
-  Hash[inactive.map {|id, name, _first, missed|
-[id, {name: name, missed: missed, status: current_status[id]}]
-}]
+  MeetingUtil.tracker((@meetingsMissed || 3).to_i)
 end


[whimsy] branch master updated: Standardize backticks in Markdown [skip ci] (#139)

2022-03-23 Thread sebb
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 28361f7  Standardize backticks in Markdown [skip ci] (#139)
28361f7 is described below

commit 28361f792511431e781a79a13b51aa88b1f8cbb3
Author: John Bampton 
AuthorDate: Thu Mar 24 03:45:21 2022 +1000

Standardize backticks in Markdown [skip ci] (#139)

Remove unneeded whitespace
---
 DEVELOPMENT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 2ec88be..8d49d42 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -130,7 +130,7 @@ or read the [detailed MACOSX setup steps](MACOSX.md).
   For openssl, copy from the LAST `BEGIN` to `END` inclusive into the file 
`/etc/ldap/asf-ldap-client.pem`.
   Point to the file in `/etc/ldap/ldap.conf` with a line like the 
following:
 
- ```   TLS_CACERT  /etc/ldap/asf-ldap-client.pem```
+  `TLS_CACERT  /etc/ldap/asf-ldap-client.pem`
 
  If multiple different certificates are needed, they should all be added 
to the same file.
  [The option `TLS_CACERTDIR` is not used Ubuntu for example]


[whimsy] branch master updated: Update `MACOSX.md` to link to `DEVELOPMENT.md` (#140)

2022-03-23 Thread sebb
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 aa26b5a  Update `MACOSX.md` to link to `DEVELOPMENT.md` (#140)
aa26b5a is described below

commit aa26b5a79ab4915bbed7b7a7ba2c00e310efb4bc
Author: John Bampton 
AuthorDate: Thu Mar 24 03:44:42 2022 +1000

Update `MACOSX.md` to link to `DEVELOPMENT.md` (#140)

Add Markdown link
---
 MACOSX.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MACOSX.md b/MACOSX.md
index b391bf9..2455007 100644
--- a/MACOSX.md
+++ b/MACOSX.md
@@ -5,7 +5,7 @@ Step by step instruction on getting a full Whimsy test 
environment up and
 running on Mac OS/X.  Not all steps are required for every tool, but steps
 common to many tools are included here, and additional steps required for
 specific tools are linked at the bottom of these instructions.
-See Also the general DEVELOPMENT.md configuration notes.
+See Also the general [DEVELOPMENT.md](./DEVELOPMENT.md) configuration notes.
 
 :dizzy: **New!** For a simpler way to setup a Mac OSX machine, please 
 check out the [setupmymac script](./SETUPMYMAC.md), which automates 


[whimsy] branch master updated: Test setup on both os

2022-03-23 Thread sebb
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 6c0ea3d  Test setup on both os
6c0ea3d is described below

commit 6c0ea3d6e5966fee80d9b5d260cfb346ea00cce1
Author: Sebb 
AuthorDate: Wed Mar 23 17:35:53 2022 +

Test setup on both os

@travis: [skip ci]
---
 .github/workflows/unittestagenda.yml | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index e2fb751..1bf3374 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -13,7 +13,7 @@ jobs:
 strategy:
   fail-fast: true
   matrix:
-os: [macos-latest]
+os: [macos-latest, ubuntu-20.04]
 ruby: [2.7]
 runs-on: ${{ matrix.os }}
 steps:
@@ -40,16 +40,8 @@ jobs:
 bundle install
 - name: setup agenda 2
   run: |
-gem which wunderbar
-echo '-'
-dirname $(gem which wunderbar)
-echo '-'
-# Fails to find wunderbar:
 sudo -E ruby -I $PWD/lib -I$(dirname $(gem which wunderbar)) -r 
whimsy/asf -e "ASF::LDAP.configure"
-echo '-'
-# try this instead
-sudo ruby $PWD/lib/whimsy/asf/ldap_setup.rb
 - name: test agenda code
   run: |
 cd www/board/agenda
-bundle exec rake
+# bundle exec rake


[whimsy] branch master updated: SYntax

2022-03-23 Thread sebb
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 1862dcb  SYntax
1862dcb is described below

commit 1862dcb9fb9d193a5535e0662454ccb45c6d2140
Author: Sebb 
AuthorDate: Wed Mar 23 17:13:35 2022 +

SYntax

[skip ci]
---
 .github/workflows/unittestagenda.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 4362f49..e2fb751 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -22,7 +22,7 @@ jobs:
 sudo apt-get install libldap2-dev
 sudo apt-get install libsasl2-dev
 sudo apt-get install nodejs
-  if:  ${{ matrix.os }} != 'macos-latest'  
+  if:  matrix.os != 'macos-latest'  
 - uses: actions/setup-node@v2
   with:
 node-version: '14'


[whimsy] branch master updated: Try to find wunderbar

2022-03-23 Thread sebb
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 2ec8bd0  Try to find wunderbar
2ec8bd0 is described below

commit 2ec8bd09a7754af4c249b99b26fc4b664e39700f
Author: Sebb 
AuthorDate: Wed Mar 23 16:52:07 2022 +

Try to find wunderbar
---
 .github/workflows/unittestagenda.yml | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index de73762..4362f49 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -40,14 +40,13 @@ jobs:
 bundle install
 - name: setup agenda 2
   run: |
-ruby -e '$:.each {|l| puts l}'
+gem which wunderbar
 echo '-'
-sudo ruby -e '$:.each {|l| puts l}'
-echo '-'
-sudo -E ruby -e '$:.each {|l| puts l}'
+dirname $(gem which wunderbar)
 echo '-'
 # Fails to find wunderbar:
-# sudo -E ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
+sudo -E ruby -I $PWD/lib -I$(dirname $(gem which wunderbar)) -r 
whimsy/asf -e "ASF::LDAP.configure"
+echo '-'
 # try this instead
 sudo ruby $PWD/lib/whimsy/asf/ldap_setup.rb
 - name: test agenda code


[whimsy] branch master updated: Does macos work?

2022-03-23 Thread sebb
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 c514238  Does macos work?
c514238 is described below

commit c514238532c664ea72cf754d6af80b0736ef70a9
Author: Sebb 
AuthorDate: Wed Mar 23 16:38:09 2022 +

Does macos work?
---
 .github/workflows/unittestagenda.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 93b5a56..de73762 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -13,7 +13,7 @@ jobs:
 strategy:
   fail-fast: true
   matrix:
-os: [ubuntu-20.04]
+os: [macos-latest]
 ruby: [2.7]
 runs-on: ${{ matrix.os }}
 steps:


[whimsy] branch master updated: API breakage in 15+

2022-03-23 Thread sebb
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 75c2029  API breakage in 15+
75c2029 is described below

commit 75c202901fb11ee335992c574d254b533512ad9f
Author: Sebb 
AuthorDate: Wed Mar 23 16:22:18 2022 +

API breakage in 15+
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 34e0837..fa84129 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,9 +38,9 @@ addons:
 
 
 # install recent Node.js
-# Did 16 cause a hang - looks like it, let's try 15?
+# Cannot use version 15 or later; causes hang
 before_install:
-  - nvm install 15
+  - nvm install 14
 
 # configure ASF LDAP
 sudo: required


[whimsy] branch master updated: Can we update nvm to 15

2022-03-23 Thread sebb
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 abdaae2  Can we update nvm to 15
abdaae2 is described below

commit abdaae27ebfe99830b083160acf81d3ab15c6c96
Author: Sebb 
AuthorDate: Wed Mar 23 15:55:31 2022 +

Can we update nvm to 15
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4b31aac..34e0837 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,9 +38,9 @@ addons:
 
 
 # install recent Node.js
-# Did 16 cause a hang?
+# Did 16 cause a hang - looks like it, let's try 15?
 before_install:
-  - nvm install 14
+  - nvm install 15
 
 # configure ASF LDAP
 sudo: required


[whimsy] branch master updated: Looks like nvm 16 might be a problem

2022-03-23 Thread sebb
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 a98301b  Looks like nvm 16 might be a problem
a98301b is described below

commit a98301b41c416428bd29a3db68846464a2845b70
Author: Sebb 
AuthorDate: Wed Mar 23 15:47:32 2022 +

Looks like nvm 16 might be a problem
---
 .github/workflows/unittestagenda.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 3dedc24..93b5a56 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -25,7 +25,7 @@ jobs:
   if:  ${{ matrix.os }} != 'macos-latest'  
 - uses: actions/setup-node@v2
   with:
-node-version: '16'
+node-version: '14'
 - uses: actions/checkout@v2
   with:
 persist-credentials: false


[whimsy] branch master updated: nodejs not found ...

2022-03-23 Thread sebb
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 b8a0f86  nodejs not found ...
b8a0f86 is described below

commit b8a0f8686281439dbdbfa0f150c7e7a8cfdf35ce
Author: Sebb 
AuthorDate: Wed Mar 23 15:43:18 2022 +

nodejs not found ...
---
 .github/workflows/unittestagenda.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 322e35d..3dedc24 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -21,6 +21,7 @@ jobs:
   run: |
 sudo apt-get install libldap2-dev
 sudo apt-get install libsasl2-dev
+sudo apt-get install nodejs
   if:  ${{ matrix.os }} != 'macos-latest'  
 - uses: actions/setup-node@v2
   with:


[whimsy] branch member_data deleted (was 2835afc)

2022-03-23 Thread sebb
This is an automated email from the ASF dual-hosted git repository.

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


 was 2835afc  Sync with master

This change permanently discards the following revisions:

 discard 2835afc  Sync with master
 discard cdabb49  Sync with master
 discard a0aadb8  Merge branch 'member_data' of 
https://gitbox.apache.org/repos/asf/whimsy into member_data
 discard d8cf3ae  Update mem.erb
 discard b54defb  Skywalking uses .crate
 discard 126d171  Update mem.erb
 discard 4bf47ff  Fix failing tests for changed output
 discard 97cd2a9  Simplify member data


[whimsy] branch master updated: Hey-ho

2022-03-23 Thread sebb
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 3b0e55c  Hey-ho
3b0e55c is described below

commit 3b0e55cf901996fb6fc7fb8ebf7d0ab77150a28c
Author: Sebb 
AuthorDate: Wed Mar 23 15:31:32 2022 +

Hey-ho
---
 lib/whimsy/asf/ldap_setup.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/whimsy/asf/ldap_setup.rb b/lib/whimsy/asf/ldap_setup.rb
index 04f3724..dd71140 100644
--- a/lib/whimsy/asf/ldap_setup.rb
+++ b/lib/whimsy/asf/ldap_setup.rb
@@ -5,6 +5,8 @@
 #   sudo ruby /srv/whimsy/lib/whimsy/asf/ldap_setup.rb
 #
 
+require 'open3'
+
 HOSTS = %w(
   ldaps://ldap-us-ro.apache.org:636
   ldaps://ldap-eu-ro.apache.org:636


[whimsy] branch master updated: Last travis run hung

2022-03-23 Thread sebb
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 0c2a0ef  Last travis run hung
0c2a0ef is described below

commit 0c2a0ef4410c64fffd82ef8839a3018cc85ccc0b
Author: Sebb 
AuthorDate: Wed Mar 23 15:30:22 2022 +

Last travis run hung
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 73d99f2..4b31aac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,8 +38,9 @@ addons:
 
 
 # install recent Node.js
+# Did 16 cause a hang?
 before_install:
-  - nvm install 16
+  - nvm install 14
 
 # configure ASF LDAP
 sudo: required


[whimsy] branch master updated: Needs more code

2022-03-23 Thread sebb
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 457ccd4  Needs more code
457ccd4 is described below

commit 457ccd4ab30142157fcf18e0d7a3ef338311a39a
Author: Sebb 
AuthorDate: Wed Mar 23 15:28:52 2022 +

Needs more code
---
 lib/whimsy/asf/ldap_setup.rb | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/whimsy/asf/ldap_setup.rb b/lib/whimsy/asf/ldap_setup.rb
index 95ff71e..04f3724 100644
--- a/lib/whimsy/asf/ldap_setup.rb
+++ b/lib/whimsy/asf/ldap_setup.rb
@@ -16,13 +16,21 @@ ETCLDAP = case
   else '/etc/ldap'
 end
 
+def extract_cert(host=nil)
+  host ||= HOSTS.sample[%r{//(.*?)(/|$)}, 1]
+  puts ['openssl', 's_client', '-connect', host, '-showcerts'].join(' ')
+  out, _, _ = Open3.capture3 'openssl', 's_client',
+'-connect', host, '-showcerts'
+  out.scan(/^-+BEGIN.*?\n-+END[^\n]+\n/m).last
+end
+
 def configure
   cert = Dir["#{ETCLDAP}/asf*-ldap-client.pem"].first
 
   # verify/obtain/write the cert
   unless cert
 cert = "#{ETCLDAP}/asf-ldap-client.pem"
-File.write cert, self.extract_cert
+File.write cert, extract_cert
   end
 
   # read the current configuration file


[whimsy] branch master updated: Hack to get round gem path issue

2022-03-23 Thread sebb
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 99d9d01  Hack to get round gem path issue
99d9d01 is described below

commit 99d9d0151f006fdfcd22498938c0ac201a6d74b4
Author: Sebb 
AuthorDate: Wed Mar 23 15:16:30 2022 +

Hack to get round gem path issue
---
 .github/workflows/unittestagenda.yml |  8 -
 lib/whimsy/asf/ldap_setup.rb | 61 
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 63a9872..322e35d 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -40,9 +40,15 @@ jobs:
 - name: setup agenda 2
   run: |
 ruby -e '$:.each {|l| puts l}'
+echo '-'
 sudo ruby -e '$:.each {|l| puts l}'
+echo '-'
 sudo -E ruby -e '$:.each {|l| puts l}'
-sudo -E ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
+echo '-'
+# Fails to find wunderbar:
+# sudo -E ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
+# try this instead
+sudo ruby $PWD/lib/whimsy/asf/ldap_setup.rb
 - name: test agenda code
   run: |
 cd www/board/agenda
diff --git a/lib/whimsy/asf/ldap_setup.rb b/lib/whimsy/asf/ldap_setup.rb
new file mode 100644
index 000..95ff71e
--- /dev/null
+++ b/lib/whimsy/asf/ldap_setup.rb
@@ -0,0 +1,61 @@
+# update /etc/ldap.conf. Usage:
+#
+#   TEMP HACK for use with github actions to get round gem path issue under 
sudo
+#
+#   sudo ruby /srv/whimsy/lib/whimsy/asf/ldap_setup.rb
+#
+
+HOSTS = %w(
+  ldaps://ldap-us-ro.apache.org:636
+  ldaps://ldap-eu-ro.apache.org:636
+)
+
+ETCLDAP = case
+  when Dir.exist?('/etc/openldap') then '/etc/openldap'
+  when Dir.exist?('/usr/local/etc/openldap') then '/user/local//etc/openldap'
+  else '/etc/ldap'
+end
+
+def configure
+  cert = Dir["#{ETCLDAP}/asf*-ldap-client.pem"].first
+
+  # verify/obtain/write the cert
+  unless cert
+cert = "#{ETCLDAP}/asf-ldap-client.pem"
+File.write cert, self.extract_cert
+  end
+
+  # read the current configuration file
+  ldap_conf = "#{ETCLDAP}/ldap.conf"
+  content = File.read(ldap_conf)
+
+  # ensure that the right cert is used
+  unless content =~ /asf.*-ldap-client\.pem/
+content.gsub!(/^TLS_CACERT/i, '# TLS_CACERT')
+content += "TLS_CACERT #{ETCLDAP}/asf-ldap-client.pem\n"
+  end
+
+  # provide the URIs of the ldap HOSTS
+  content.gsub!(/^URI/, '# URI')
+  content += "uri \n" unless content =~ /^uri /
+  content[/uri (.*)\n/, 1] = HOSTS.join(' ')
+
+  # verify/set the base
+  unless content.include? 'base dc=apache'
+content.gsub!(/^BASE/i, '# BASE')
+content += "base dc=apache,dc=org\n"
+  end
+
+  # ensure TLS_REQCERT is allow (Mac OS/X only)
+  if ETCLDAP.include? 'openldap' and not content.include? 'REQCERT allow'
+content.gsub!(/^TLS_REQCERT/i, '# TLS_REQCERT')
+content += "TLS_REQCERT allow\n"
+  end
+
+  # write the configuration if there were any changes
+  File.write(ldap_conf, content) unless content == File.read(ldap_conf)
+end
+
+if __FILE__ == $0
+  configure
+end


[whimsy] branch master updated: Try to fix loadpath issue

2022-03-23 Thread sebb
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 c13a0d0  Try to fix loadpath issue
c13a0d0 is described below

commit c13a0d00ba2378922cbf8af407de6741d3132b06
Author: Sebb 
AuthorDate: Wed Mar 23 14:20:33 2022 +

Try to fix loadpath issue
---
 .github/workflows/unittestagenda.yml | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index a8f7fdc..63a9872 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -39,8 +39,10 @@ jobs:
 bundle install
 - name: setup agenda 2
   run: |
-# will probably fail without sudo, but let's see if it finds wunderbar
-ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
+ruby -e '$:.each {|l| puts l}'
+sudo ruby -e '$:.each {|l| puts l}'
+sudo -E ruby -e '$:.each {|l| puts l}'
+sudo -E ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
 - name: test agenda code
   run: |
 cd www/board/agenda


[whimsy] branch master updated: Update node

2022-03-23 Thread sebb
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 72e9c3b  Update node
72e9c3b is described below

commit 72e9c3bd0c25d2a69585c79d663b0af208604137
Author: Sebb 
AuthorDate: Wed Mar 23 14:10:21 2022 +

Update node
---
 .github/workflows/unittestagenda.yml | 5 +++--
 .travis.yml  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 5bf63b3..a8f7fdc 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -24,7 +24,7 @@ jobs:
   if:  ${{ matrix.os }} != 'macos-latest'  
 - uses: actions/setup-node@v2
   with:
-node-version: '14'
+node-version: '16'
 - uses: actions/checkout@v2
   with:
 persist-credentials: false
@@ -39,7 +39,8 @@ jobs:
 bundle install
 - name: setup agenda 2
   run: |
-sudo ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
+# will probably fail without sudo, but let's see if it finds wunderbar
+ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
 - name: test agenda code
   run: |
 cd www/board/agenda
diff --git a/.travis.yml b/.travis.yml
index 8823ac0..73d99f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ addons:
 
 # install recent Node.js
 before_install:
-  - nvm install 14
+  - nvm install 16
 
 # configure ASF LDAP
 sudo: required


[whimsy] branch master updated: Duh! needs to be done from home

2022-03-23 Thread sebb
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 a923b22  Duh! needs to be done from home
a923b22 is described below

commit a923b22885d90d427bba6d5c41daef9dc97a9b2b
Author: Sebb 
AuthorDate: Wed Mar 23 14:01:08 2022 +

Duh! needs to be done from home
---
 .github/workflows/unittestagenda.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 4e93465..5bf63b3 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -39,8 +39,6 @@ jobs:
 bundle install
 - name: setup agenda 2
   run: |
-cd www/board/agenda
-ls $PWD/lib
 sudo ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
 - name: test agenda code
   run: |


[whimsy] 02/02: Problems with finding whimsy/asf

2022-03-23 Thread sebb
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

commit 1fcf6e7ee825bbc1b7cb9f66e58e5c3aebb5ebf7
Author: Sebb 
AuthorDate: Wed Mar 23 13:56:22 2022 +

Problems with finding whimsy/asf
---
 .github/workflows/unittestagenda.yml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 7c45fd6..4e93465 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -32,10 +32,17 @@ jobs:
   with:
 ruby-version: ${{ matrix.ruby }}
 bundler-cache: true
-- name: test agenda code
+- name: setup agenda 1
   run: |
 cd www/board/agenda
 npm install
 bundle install
+- name: setup agenda 2
+  run: |
+cd www/board/agenda
+ls $PWD/lib
 sudo ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
+- name: test agenda code
+  run: |
+cd www/board/agenda
 bundle exec rake


[whimsy] 01/02: Pin rubyzip to avoid 3.0 API change

2022-03-23 Thread sebb
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

commit c5db414cedf38a67c8c41f9679a3c9b8d9b5fbe9
Author: Sebb 
AuthorDate: Wed Mar 23 13:51:18 2022 +

Pin rubyzip to avoid 3.0 API change
---
 www/board/agenda/Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/board/agenda/Gemfile b/www/board/agenda/Gemfile
index 5d35062..05e2451 100644
--- a/www/board/agenda/Gemfile
+++ b/www/board/agenda/Gemfile
@@ -11,6 +11,7 @@ else
   gem 'whimsy-asf'
 end
 
+gem 'rubyzip', '~> 2.3.0' # 3.0 is incompatible
 gem 'rake'
 gem 'wunderbar'
 gem 'ruby2js'


[whimsy] branch master updated (d23c215 -> 1fcf6e7)

2022-03-23 Thread sebb
This is an automated email from the ASF dual-hosted git repository.

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


from d23c215  Now works fine
 new c5db414  Pin rubyzip to avoid 3.0 API change
 new 1fcf6e7  Problems with finding whimsy/asf

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/unittestagenda.yml | 9 -
 www/board/agenda/Gemfile | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)


[whimsy] branch master updated: Now works fine

2022-03-23 Thread sebb
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 d23c215  Now works fine
d23c215 is described below

commit d23c2150fd3e490c2a7f6c4381153313449f83ac
Author: Sebb 
AuthorDate: Wed Mar 23 13:42:03 2022 +

Now works fine
---
 .github/workflows/unittestlib.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/unittestlib.yml 
b/.github/workflows/unittestlib.yml
index d582540..490d8bf 100644
--- a/.github/workflows/unittestlib.yml
+++ b/.github/workflows/unittestlib.yml
@@ -7,8 +7,6 @@ on:
 
   workflow_dispatch:
 
-# temporary hack to see if can build ruby-ldap ...
-
 jobs:
   test:
 strategy:


[whimsy] branch master updated: Needs to be done after gem installs

2022-03-23 Thread sebb
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 f80c4ce  Needs to be done after gem installs
f80c4ce is described below

commit f80c4ce09de17b8eaccfddfef4194135218adf91
Author: Sebb 
AuthorDate: Wed Mar 23 13:39:26 2022 +

Needs to be done after gem installs
---
 .github/workflows/unittestagenda.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 2679905..7c45fd6 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -32,12 +32,10 @@ jobs:
   with:
 ruby-version: ${{ matrix.ruby }}
 bundler-cache: true
-- name: LDAP setup
-  run: |
-sudo ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
 - name: test agenda code
   run: |
 cd www/board/agenda
 npm install
 bundle install
+sudo ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
 bundle exec rake


[whimsy] branch master updated: Syntax issue?

2022-03-23 Thread sebb
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 054fe3c  Syntax issue?
054fe3c is described below

commit 054fe3c049c95c21ff4888cc6fde6e058a151451
Author: Sebb 
AuthorDate: Wed Mar 23 13:37:12 2022 +

Syntax issue?
---
 .github/workflows/unittestlib.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unittestlib.yml 
b/.github/workflows/unittestlib.yml
index 75f0f11..d582540 100644
--- a/.github/workflows/unittestlib.yml
+++ b/.github/workflows/unittestlib.yml
@@ -22,7 +22,7 @@ jobs:
   run: |
 sudo apt-get install libldap2-dev
 sudo apt-get install libsasl2-dev
-  if:  ${{ matrix.os }} != 'macos-latest'  
+  if:  matrix.os != 'macos-latest'  
 - uses: actions/checkout@v2
   with:
 persist-credentials: false


[whimsy] branch master updated: Need to set up LDAP

2022-03-23 Thread sebb
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 ca73051  Need to set up LDAP
ca73051 is described below

commit ca730518af88be321dd01064ccc70b55903ff5e0
Author: Sebb 
AuthorDate: Wed Mar 23 13:35:43 2022 +

Need to set up LDAP
---
 .github/workflows/unittestagenda.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 4a32348..2679905 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -32,6 +32,9 @@ jobs:
   with:
 ruby-version: ${{ matrix.ruby }}
 bundler-cache: true
+- name: LDAP setup
+  run: |
+sudo ruby -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
 - name: test agenda code
   run: |
 cd www/board/agenda


[whimsy] branch master updated: Should now work for all?

2022-03-23 Thread sebb
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 5471776  Should now work for all?
5471776 is described below

commit 54717768dfada3f52a2cd07402971d7289a8ed03
Author: Sebb 
AuthorDate: Wed Mar 23 13:31:30 2022 +

Should now work for all?
---
 .github/workflows/unittestlib.yml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unittestlib.yml 
b/.github/workflows/unittestlib.yml
index 0c8b278..75f0f11 100644
--- a/.github/workflows/unittestlib.yml
+++ b/.github/workflows/unittestlib.yml
@@ -14,18 +14,18 @@ jobs:
 strategy:
   fail-fast: true
   matrix:
-os: [ubuntu-20.04]
-ruby: [2.7]
+os: [ubuntu-20.04, macos-latest]
+ruby: [2.7, 3.1]
 runs-on: ${{ matrix.os }}
 steps:
-- uses: actions/checkout@v2
-  with:
-persist-credentials: false
 - name: setup
   run: |
 sudo apt-get install libldap2-dev
 sudo apt-get install libsasl2-dev
   if:  ${{ matrix.os }} != 'macos-latest'  
+- uses: actions/checkout@v2
+  with:
+persist-credentials: false
 - name: ruby
   uses: ruby/setup-ruby@v1
   with:


[whimsy] branch master updated: Problem with npm install

2022-03-23 Thread sebb
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 3edcc2d  Problem with npm install
3edcc2d is described below

commit 3edcc2d605e190f5c2f75f53026e5eeb12592229
Author: Sebb 
AuthorDate: Wed Mar 23 13:30:43 2022 +

Problem with npm install
---
 .github/workflows/unittestagenda.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index f7d8077..4a32348 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -35,5 +35,6 @@ jobs:
 - name: test agenda code
   run: |
 cd www/board/agenda
+npm install
 bundle install
 bundle exec rake


[whimsy] branch master updated: Also need node

2022-03-23 Thread sebb
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 7064f4a  Also need node
7064f4a is described below

commit 7064f4a9943a77b8496aabce02da5766bffd58b4
Author: Sebb 
AuthorDate: Wed Mar 23 13:08:35 2022 +

Also need node
---
 .github/workflows/unittestagenda.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 17c6a8f..f7d8077 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -22,6 +22,9 @@ jobs:
 sudo apt-get install libldap2-dev
 sudo apt-get install libsasl2-dev
   if:  ${{ matrix.os }} != 'macos-latest'  
+- uses: actions/setup-node@v2
+  with:
+node-version: '14'
 - uses: actions/checkout@v2
   with:
 persist-credentials: false


[whimsy] branch master updated: if did not work;

2022-03-23 Thread sebb
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 d27ae70  if did not work;
d27ae70 is described below

commit d27ae70208f59e1d5e4db4b724a1417820ce3e5a
Author: Sebb 
AuthorDate: Wed Mar 23 13:00:15 2022 +

if did not work;
---
 .github/workflows/unittestagenda.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 5cd8ad4..17c6a8f 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -13,7 +13,7 @@ jobs:
 strategy:
   fail-fast: true
   matrix:
-os: [ubuntu-20.04, macos-latest]
+os: [ubuntu-20.04]
 ruby: [2.7]
 runs-on: ${{ matrix.os }}
 steps:


[whimsy] branch master updated: Let's see if we can fix agenda too

2022-03-23 Thread sebb
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 03691c6  Let's see if we can fix agenda too
03691c6 is described below

commit 03691c6f97d2c5fd3a23204784595f88073df51c
Author: Sebb 
AuthorDate: Wed Mar 23 12:57:43 2022 +

Let's see if we can fix agenda too
---
 .github/workflows/unittestagenda.yml | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 1dc557c..5cd8ad4 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -17,7 +17,14 @@ jobs:
 ruby: [2.7]
 runs-on: ${{ matrix.os }}
 steps:
+- name: setup
+  run: |
+sudo apt-get install libldap2-dev
+sudo apt-get install libsasl2-dev
+  if:  ${{ matrix.os }} != 'macos-latest'  
 - uses: actions/checkout@v2
+  with:
+persist-credentials: false
 - uses: ruby/setup-ruby@v1
   with:
 ruby-version: ${{ matrix.ruby }}


[whimsy] branch master updated: Repaid build status (#135)

2022-03-23 Thread sebb
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 e7b9452  Repaid build status (#135)
e7b9452 is described below

commit e7b9452d9c64d4fdbd8eefc11fbcd6e461ff57c5
Author: Brennan Fox 
AuthorDate: Wed Mar 23 08:42:33 2022 -0400

Repaid build status (#135)
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5aba020..dcd92cd 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ ASF data are restricted to committers, Members, or Officers 
of the ASF.
 Every commit pushed to master is deployed within minutes to 
https://whimsy.apache.org/ using 
 [GitPubSub](https://www.apache.org/dev/gitpubsub.html).
 
-[![Build 
Status](https://travis-ci.com/apache/whimsy.svg)](https://travis-ci.com/apache/whimsy)
+[![Build 
Status](https://api.travis-ci.com/apache/whimsy.svg?)](https://app.travis-ci.com/github/apache/whimsy)
 
 How Tos and Get The Code
 ===
@@ -84,7 +84,7 @@ Details for each type of deployed tool or script:
   
  * **Repository checkouts/clones**  An copy of a number of repositories
are updated every 10 minutes via a cron job.  This is controlled
-   by [repository.yml](repository.yml).  The whimsy vm is also subscribed
+   by [repository.yml](repository.yml).  The whimsy VM is also subscribed
to board@ and scans those emails for commit messages and will update
the copy of `foundation/board` when commits happen.
   
@@ -121,7 +121,7 @@ Details for each type of deployed tool or script:

  * **Generated JSON data** files are automatically generated into 
the [`/public`](https://whimsy.apache.org/public/) directory, to 
-   cache freqently used data for whimsy and other applications.  These 
+   cache frequently used data for whimsy and other applications.  These 
are usually run from a cron calling a www/roster/public_*.rb file.
See also an [overview of data dependencies and 
flow](https://whimsy.apache.org/test/dataflow.cgi). 
   


[whimsy] branch master updated (105eab2 -> 94cf935)

2022-03-23 Thread sebb
This is an automated email from the ASF dual-hosted git repository.

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


from 105eab2  Typos
 new 51ace3c  Temp test
 new 94cf935  Reduce matrix for now

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/unittestagenda.yml | 2 +-
 .github/workflows/unittestlib.yml| 7 +--
 2 files changed, 6 insertions(+), 3 deletions(-)


[whimsy] 01/02: Temp test

2022-03-23 Thread sebb
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

commit 51ace3c791337654dfca58cbe486b44e6df66217
Author: Sebb 
AuthorDate: Wed Mar 23 12:11:34 2022 +

Temp test
---
 .github/workflows/unittestlib.yml | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unittestlib.yml 
b/.github/workflows/unittestlib.yml
index 2c49e60..f8c2398 100644
--- a/.github/workflows/unittestlib.yml
+++ b/.github/workflows/unittestlib.yml
@@ -7,15 +7,18 @@ on:
 
   workflow_dispatch:
 
+# temporary hack to see if can build ruby-ldap ...
+
 jobs:
   test:
 strategy:
   fail-fast: true
   matrix:
-os: [ubuntu-20.04, macos-latest]
-ruby: [2.7, 3.1]
+os: [ubuntu-20.04]
+ruby: [2.7]
 runs-on: ${{ matrix.os }}
 steps:
+- run: apt-get install libldap2-dev
 - uses: actions/checkout@v2
 - uses: ruby/setup-ruby@v1
   with:


[whimsy] 02/02: Reduce matrix for now

2022-03-23 Thread sebb
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

commit 94cf93550ba3466495e1af5de5d17fa6fdec94a2
Author: Sebb 
AuthorDate: Wed Mar 23 12:28:28 2022 +

Reduce matrix for now
---
 .github/workflows/unittestagenda.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index c373306..1dc557c 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -14,7 +14,7 @@ jobs:
   fail-fast: true
   matrix:
 os: [ubuntu-20.04, macos-latest]
-ruby: [2.7, 3.1]
+ruby: [2.7]
 runs-on: ${{ matrix.os }}
 steps:
 - uses: actions/checkout@v2


[whimsy] branch master updated: Typos

2022-03-23 Thread sebb
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 105eab2  Typos
105eab2 is described below

commit 105eab29fb0dc139b6385310996040f42e3d9675
Author: Sebb 
AuthorDate: Wed Mar 23 11:33:39 2022 +

Typos
---
 .github/workflows/unittestagenda.yml | 2 +-
 .github/workflows/unittestlib.yml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unittestagenda.yml 
b/.github/workflows/unittestagenda.yml
index 394a317..c373306 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -2,7 +2,7 @@ name: Unit test agenda
 on:
   push:
 paths:
-  - '**/unitestagenda.yml'
+  - '**/unittestagenda.yml'
   - 'www/board/agenda/**'
   - 'lib/**'
 
diff --git a/.github/workflows/unittestlib.yml 
b/.github/workflows/unittestlib.yml
index ac8c113..2c49e60 100644
--- a/.github/workflows/unittestlib.yml
+++ b/.github/workflows/unittestlib.yml
@@ -2,7 +2,7 @@ name: Unit test library methods
 on:
   push:
 paths:
-  - '**/unitestlib.yml'
+  - '**/unittestlib.yml'
   - 'lib/**'
 
   workflow_dispatch:


[whimsy] branch master updated: Add agenda test

2022-03-23 Thread sebb
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 8c17945  Add agenda test
8c17945 is described below

commit 8c17945b1d301f75883057cdeb83f1fa60e5d0cb
Author: Sebb 
AuthorDate: Wed Mar 23 11:27:09 2022 +

Add agenda test
---
 .github/workflows/{unittest.yml => unittestagenda.yml} | 12 +---
 .github/workflows/{unittest.yml => unittestlib.yml}|  7 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/unittest.yml 
b/.github/workflows/unittestagenda.yml
similarity index 69%
copy from .github/workflows/unittest.yml
copy to .github/workflows/unittestagenda.yml
index 6f3c7bc..394a317 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -1,5 +1,11 @@
-name: Unit tests
+name: Unit test agenda
 on:
+  push:
+paths:
+  - '**/unitestagenda.yml'
+  - 'www/board/agenda/**'
+  - 'lib/**'
+
   workflow_dispatch:
 
 jobs:
@@ -16,8 +22,8 @@ jobs:
   with:
 ruby-version: ${{ matrix.ruby }}
 bundler-cache: true
-- name: test library code
+- name: test agenda code
   run: |
-cd lib
+cd www/board/agenda
 bundle install
 bundle exec rake
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittestlib.yml
similarity index 82%
rename from .github/workflows/unittest.yml
rename to .github/workflows/unittestlib.yml
index 6f3c7bc..ac8c113 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittestlib.yml
@@ -1,5 +1,10 @@
-name: Unit tests
+name: Unit test library methods
 on:
+  push:
+paths:
+  - '**/unitestlib.yml'
+  - 'lib/**'
+
   workflow_dispatch:
 
 jobs:


[whimsy] branch master updated: Need some gems

2022-03-23 Thread sebb
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 cd2890f  Need some gems
cd2890f is described below

commit cd2890f2087d4c91f028704f1737403c6102d347
Author: Sebb 
AuthorDate: Wed Mar 23 11:17:34 2022 +

Need some gems
---
 .github/workflows/unittest.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index af0261f..6f3c7bc 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -19,4 +19,5 @@ jobs:
 - name: test library code
   run: |
 cd lib
+bundle install
 bundle exec rake


[whimsy] branch master updated: Quick stop for now

2022-03-23 Thread sebb
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 b3e3bff  Quick stop for now
b3e3bff is described below

commit b3e3bff49a13fa00e81dd57c443f3b541a0bd4e1
Author: Sebb 
AuthorDate: Wed Mar 23 11:15:41 2022 +

Quick stop for now
---
 .github/workflows/unittest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 6929da1..af0261f 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   test:
 strategy:
-  fail-fast: false
+  fail-fast: true
   matrix:
 os: [ubuntu-20.04, macos-latest]
 ruby: [2.7, 3.1]


[whimsy] branch master updated: Initial GH setup

2022-03-23 Thread sebb
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 17b29f1  Initial GH setup
17b29f1 is described below

commit 17b29f15a0e5d1b0342d87f8ac000acd3eaad439
Author: Sebb 
AuthorDate: Wed Mar 23 11:08:13 2022 +

Initial GH setup
---
 .github/workflows/unittest.yml | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
new file mode 100644
index 000..6929da1
--- /dev/null
+++ b/.github/workflows/unittest.yml
@@ -0,0 +1,22 @@
+name: Unit tests
+on:
+  workflow_dispatch:
+
+jobs:
+  test:
+strategy:
+  fail-fast: false
+  matrix:
+os: [ubuntu-20.04, macos-latest]
+ruby: [2.7, 3.1]
+runs-on: ${{ matrix.os }}
+steps:
+- uses: actions/checkout@v2
+- uses: ruby/setup-ruby@v1
+  with:
+ruby-version: ${{ matrix.ruby }}
+bundler-cache: true
+- name: test library code
+  run: |
+cd lib
+bundle exec rake


[whimsy] branch master updated: Sync from member_data

2022-03-23 Thread sebb
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 d45687f  Sync from member_data
 new cf72bc5  Minimise initial info
d45687f is described below

commit d45687f1748c0f9eccbf8e84a3c6c7aa500cd30d
Author: Sebb 
AuthorDate: Tue Mar 22 23:16:52 2022 +

Sync from member_data
---
 lib/spec/lib/member_spec.rb| 15 +--
 lib/whimsy/asf/member.rb   | 14 +++
 .../workbench/views/actions/memapp.json.rb | 13 ++
 www/secretary/workbench/views/forms/memapp.js.rb   | 47 --
 4 files changed, 23 insertions(+), 66 deletions(-)

diff --git a/lib/spec/lib/member_spec.rb b/lib/spec/lib/member_spec.rb
index 743360c..e646b7b 100644
--- a/lib/spec/lib/member_spec.rb
+++ b/lib/spec/lib/member_spec.rb
@@ -46,13 +46,22 @@ describe ASF::Member do
   fields = {fullname: 'Full Name', address: "Line 1\nLine2", availid: 'a-b-c', 
email: 'user@domain.invalid'}
   it "make_entry() should raise error" do
 expect { ASF::Member.make_entry(fields.reject{|k,v| k == :fullname}) }.to 
raise_error(ArgumentError, ':fullname is required')
-expect { ASF::Member.make_entry(fields.reject{|k,v| k == :address}) }.to 
raise_error(ArgumentError, ':address is required')
 expect { ASF::Member.make_entry(fields.reject{|k,v| k == :availid}) }.to 
raise_error(ArgumentError, ':availid is required')
-expect { ASF::Member.make_entry(fields.reject{|k,v| k == :email}) }.to 
raise_error(ArgumentError, ':email is required')
   end
   it "make_entry(fields) should create entry" do
 res = ASF::Member.make_entry(fields)
-expect(res).to eq("Full Name\nLine 1\nLine2\nEmail: 
user@domain.invalid\n Forms on File: ASF Membership Application\n Avail ID: 
a-b-c\n")
+expect(res).to eq(
+<<~MEMAPP
+Full Name
+Line 1
+Line2
+
+Email: user@domain.invalid
+  Tel: 
+ Forms on File: ASF Membership Application
+ Avail ID: a-b-c
+MEMAPP
+)
   end
   it "make_entry({country:}}) should create entry with country" do
 res = ASF::Member.make_entry(fields.merge({country: 'UN'}))
diff --git a/lib/whimsy/asf/member.rb b/lib/whimsy/asf/member.rb
index b8ce310..39b3d1a 100644
--- a/lib/whimsy/asf/member.rb
+++ b/lib/whimsy/asf/member.rb
@@ -201,18 +201,18 @@ module ASF
 #  :fax - optional
 def self.make_entry(fields={})
   fullname = fields[:fullname] or raise ArgumentError.new(":fullname is 
required")
-  address = fields[:address]   or raise ArgumentError.new(":address is 
required")
-  availid = fields[:availid]   or raise ArgumentError.new(":availid is 
required")
-  email = fields[:email]   or raise ArgumentError.new(":email is 
required")
-  country = fields[:country] || ''
-  tele = fields[:tele] || ''
+  address = fields[:address] || ''
+  availid = fields[:availid] or raise ArgumentError.new(":availid is 
required")
+  email = fields[:email] || ''
+  country = fields[:country] || ''
+  tele = fields[:tele] || ''
   fax = fields[:fax] || ''
   [
 fullname, # will be prefixed by ' *) '
 # Each line of address is indented
-(address.gsub(/^/, '').gsub(/\r/, '')),
+(address.gsub(/^/, '').gsub(/\r/, '') unless address.empty?),
 ("#{country}" unless country.empty?),
-"Email: #{email}",
+("Email: #{email}" unless email.empty?),
 ("  Tel: #{tele}" unless tele.empty?),
 ("  Fax: #{fax}"  unless fax.empty?),
 " Forms on File: ASF Membership Application",
diff --git a/www/secretary/workbench/views/actions/memapp.json.rb 
b/www/secretary/workbench/views/actions/memapp.json.rb
index 3ea1113..5b60acc 100644
--- a/www/secretary/workbench/views/actions/memapp.json.rb
+++ b/www/secretary/workbench/views/actions/memapp.json.rb
@@ -13,7 +13,7 @@ message = Mailbox.find(@message)
 fileext = File.extname(@selected).downcase if @signature.empty?
 
 # verify that a membership form under that name stem doesn't already exist
-if "#@filename#{fileext}" =~ /\A\w[-\w]*\.?\w*\z/ # check taint requirements
+if "#{@filename}#{fileext}" =~ /\A\w[-\w]*\.?\w*\z/ # check taint requirements
   # returns name if it matches as stem or fully (e.g. for directory)
   form = ASF::MemApps.search @filename
   if form
@@ -38,15 +38,10 @@ _personalize_email(env.user)
 
 # write attachment (+ signature, if present) to the documents/member_apps
 # directory
-task "svn commit documents/member_apps/#@filename#{fileext} and update 
members.txt" do
+task "svn commit documents/member_apps/#{@filename}#{fileext} and update 
members.txt" do
   # Construct initial entry:
   fields = {
 fullname: 

[whimsy] branch master updated: Tone down snapshot/nightly reporting

2022-03-23 Thread sebb
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 efddf6b  Tone down snapshot/nightly reporting
efddf6b is described below

commit efddf6bf44604b89d7480e8d259e53a837a784ee
Author: Sebb 
AuthorDate: Wed Mar 23 10:28:07 2022 +

Tone down snapshot/nightly reporting
---
 tools/download_check.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/download_check.rb b/tools/download_check.rb
index 17d9a81..f52d175 100755
--- a/tools/download_check.rb
+++ b/tools/download_check.rb
@@ -396,8 +396,9 @@ def _checkDownloadPage(path, tlp, version)
   # ignore trafficcontrol bugfix message
   unless n.include? "Fixed TO log warnings when generating snapshots" 
or
  n.include? "Kafka Raft support for snapshots" or
- n.include? "zkSnapshotC" # ZooKeeper
-E "Found reference to NIGHTLY or SNAPSHOT builds: #{n}"
+ n.include? "zkSnapshotC" or # ZooKeepeer
+ n.include? "/issues.apache.org/jira/browse/" # Daffodil
+W "Found reference to NIGHTLY or SNAPSHOT builds: #{n}"
   end
 end
 break