[whimsy] branch master updated: remove director information - now in LDAP

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git

The following commit(s) were added to refs/heads/master by this push:
       new  12d8cf0   remove director information - now in LDAP
12d8cf0 is described below

commit 12d8cf06a446ef4730e8f5f2a10dce7445024e5d
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Wed Sep 28 15:37:05 2016 -0400

    remove director information - now in LDAP
---
 lib/whimsy/asf/rack.rb                    | 12 ------------
 www/board/agenda/test/stresstest.rb       | 10 ++++++++--
 www/classic/board/agenda/views/main._html |  3 ++-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/lib/whimsy/asf/rack.rb b/lib/whimsy/asf/rack.rb
index 5958a7b..1521cde 100644
--- a/lib/whimsy/asf/rack.rb
+++ b/lib/whimsy/asf/rack.rb
@@ -5,18 +5,6 @@ require 'thread'
 
 module ASF
   module Auth
-    DIRECTORS = {
-      'curcuru'     => 'sc',
-      'bdelacretaz' => 'bd',
-      'isabel'      => 'id',
-      'marvin'      => 'mh',
-      'jim'         => 'jj',
-      'mattmann'    => 'cm',
-      'brett'       => 'bp',
-      'gstein'      => 'gs',
-      'markt'       => 'mt'
-    }
-
     # decode HTTP authorization, when present
     def self.decode(env)
       class << env; attr_accessor :user, :password; end
diff --git a/www/board/agenda/test/stresstest.rb b/www/board/agenda/test/stresstest.rb
index 216f945..bf287e4 100644
--- a/www/board/agenda/test/stresstest.rb
+++ b/www/board/agenda/test/stresstest.rb
@@ -27,7 +27,10 @@ end
 end
 
 # everybody approve tomcat
-threads = ASF::Auth::DIRECTORS.map do |userid, initials|
+threads = ASF::Service['board'].members.map do |person|
+  userid = person.id
+  initials = person.public_name.gsub(/[^A-Z]/, '').downcase
+
   Thread.new do
     File.unlink "test/work/data/#{userid}.yml" rescue nil
 
@@ -58,7 +61,10 @@ threads.each {|thread| thread.join}
 agenda = File.read('test/work/board/board_agenda_2015_02_18.txt')
 approvals = agenda[/Tomcat\.\s+approved: (.*)/, 1]
 print approvals.inspect + ' ...'
-if approvals.split(/,\s*/).sort == ASF::Auth::DIRECTORS.values.sort
+expected = ASF::Service['board'].members.map do |person|
+   person.public_name.gsub(/[^A-Z]/, '').downcase
+end
+if approvals.split(/,\s*/).sort == expected.sort
   puts 'success'
 else
   puts 'failure'
diff --git a/www/classic/board/agenda/views/main._html b/www/classic/board/agenda/views/main._html
index c9c9162..6e7f585 100755
--- a/www/classic/board/agenda/views/main._html
+++ b/www/classic/board/agenda/views/main._html
@@ -87,7 +87,8 @@ _html ng_app: 'AsfBoardAgenda', ng_controller: 'Layout' do
     userid = userid.dup.untaint if userid =~ /\A[-\w]+\Z/
     _main :ng_view, autoscroll: 'true', data_agenda: @agenda,
       data_drafts: @drafts.join(' '),
-      data_availid: userid, data_initials: ASF::Auth::DIRECTORS[userid],
+      data_availid: userid, data_initials: 
+        ASF::Person.find(userid).public_name.gsub(/[^A-Z]/, '').downcase,
       data_firstname: Etc.getpwnam(userid)[4].split(',').first.split(' ').
         first.force_encoding('utf-8')
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].