whimsy-asf 0.0.76 → 0.0.77

data/lib/whimsy/asf/mail.rb

@@ -48,6 +48,30 @@ module ASF
 
       public_private ? @lists : @lists.keys
     end
+
+    # common configuration for sending mail
+    def self.configure
+      # fetch overrides
+      sendmail = ASF::Config.get(:sendmail)
+
+      if sendmail
+        # convert string keys to symbols
+        options = Hash[sendmail.map {|key, value| [key.to_sym, value.untaint]}]
+
+        # extract delivery method
+        method = options.delete(:delivery_method).to_sym
+      else
+        # provide defaults that work on whimsy-vm* infrastructure.  Since
+        # procmail is configured with a self-signed certificate, verification
+        # isn't a possibility
+        method = :smtp
+        options = {openssl_verify_mode: 'none'}
+      end
+
+      ::Mail.defaults do
+        delivery_method method, options
+      end
+    end
   end
 
   class Person < Base
@@ -93,7 +117,7 @@ module ASF
       when 'executive assistant'
         'ea@apache.org'
       when 'legal affairs'
-        'legal-discuss@apache.org'
+        'legal-internal@apache.org'
       when 'marketing and publicity'
         'press@apache.org'
       when 'tac'

data/lib/whimsy/asf/member.rb

@@ -3,7 +3,8 @@ require 'weakref'
 module ASF
   class Member
     include Enumerable
-    attr_accessor :full
+    @@text = nil
+    @@mtime = 0
 
     def self.find_text_by_id(value)
       new.each do |id, text|
@@ -42,14 +43,14 @@ module ASF
 
     def self.status
       begin
+        @status = nil if @mtime != @@mtime
+        @mtime = @@mtime
         return Hash[@status.to_a] if @status
-      rescue NoMethodError, WeakRef::RefError
+      rescue
       end
 
       status = {}
-      foundation = ASF::SVN['private/foundation']
-      return status unless foundation
-      sections = File.read("#{foundation}/members.txt").split(/(.*\n===+)/)
+      sections = ASF::Member.text.split(/(.*\n===+)/)
       sections.shift(3)
       sections.each_slice(2) do |header, text|
         header.sub!(/s\n=+/,'')
@@ -61,8 +62,7 @@ module ASF
     end
 
     def each
-      foundation = ASF::SVN['private/foundation']
-      File.read("#{foundation}/members.txt").split(/^ \*\) /).each do |section|
+      ASF::Member.text.split(/^ \*\) /).each do |section|
         id = section[/Avail ID: (.*)/,1]
         yield id, section.sub(/\n.*\n===+\s*?\n(.*\n)+.*/,'').strip if id
       end
@@ -84,15 +84,81 @@ module ASF
       file = "#{foundation}/members.txt"
       return Time.parse(`svn info #{file}`[/Last Changed Date: (.*) \(/, 1]).gmtime
     end
+
+    # sort an entire members.txt file
+    def self.sort(source)
+      # split into sections
+      sections = source.split(/^([A-Z].*\n===+\n\n)/)
+
+      # sort sections that contain names
+      sections.map! do |section|
+        next section unless section =~ /^\s\*\)\s/
+
+        # split into entries, and normalize those entries
+        entries = section.split(/^\s\*\)\s/)
+        header = entries.shift
+        entries.map! {|entry| " *) " + entry.strip + "\n\n"}
+
+        # sort the entries
+        entries.sort_by! do |entry|
+          ASF::Person.sortable_name(entry[/\)\s(.*?)\s*(\/\*|$)/, 1])
+        end
+
+        header + entries.join
+      end
+
+      sections.join
+    end
+
+    # cache the contents of members.txt.  Primary purpose isn't performance,
+    # but rather to have a local copy that can be updated and used until
+    # the svn working copy catches up
+    def self.text
+      foundation = ASF::SVN.find('private/foundation')
+      return nil unless foundation
+
+      begin
+        text = @@text[0..-1] if @@text
+      rescue WeakRef::RefError
+        @@mtime = 0
+      end
+
+      if File.mtime("#{foundation}/members.txt").to_i > @@mtime.to_i
+        @@mtime = File.mtime("#{foundation}/members.txt")
+        text = File.read("#{foundation}/members.txt")
+        @@text = WeakRef.new(text)
+      end
+
+      text
+    end
+
+    # update local copy of members.txt
+    def self.text=(text)
+      # normalize text: sort and update active count
+      text = ASF::Member.sort(text)
+      pattern = /^Active.*?^=+\n+(.*?)^Emeritus/m
+      text[/We now number (\d+) active members\./, 1] =
+        text[pattern].scan(/^\s\*\)\s/).length.to_s
+
+      # save
+      @@mtime = Time.now
+      @@text = WeakRef.new(text)
+    end
   end
 
   class Person
-    def members_txt
+    def members_txt(full = false)
+      prefix, suffix = " *) ", "\n\n" if full
       @members_txt ||= ASF::Member.find_text_by_id(id)
+      "#{prefix}#{@members_txt}#{suffix}" if @members_txt
     end
 
     def member_emails
       ASF::Member.emails(members_txt)
     end
+
+    def member_name
+      members_txt[/(\w.*?)\s*(\/|$)/, 1] if members_txt
+    end
   end
 end

data/lib/whimsy/asf/nominees.rb

@@ -7,7 +7,7 @@ module ASF
     def self.member_nominees
       begin
         return Hash[@member_nominees.to_a] if @member_nominees
-      rescue NoMethodError, WeakRef::RefError
+      rescue
       end
 
       meetings = ASF::SVN['private/foundation/Meetings']

data/lib/whimsy/asf/person.rb

@@ -0,0 +1,81 @@
+#
+# support for sorting of names
+#
+
+module ASF
+
+  class Person
+    # sort support
+
+    def self.asciize(name)
+      if name.match /[^\x00-\x7F]/
+        # digraphs.  May be culturally sensitive
+        name.gsub! /\u00df/, 'ss'
+        name.gsub! /\u00e4|a\u0308/, 'ae'
+        name.gsub! /\u00e5|a\u030a/, 'aa'
+        name.gsub! /\u00e6/, 'ae'
+        name.gsub! /\u00f1|n\u0303/, 'ny'
+        name.gsub! /\u00f6|o\u0308/, 'oe'
+        name.gsub! /\u00fc|u\u0308/, 'ue'
+
+        # latin 1
+        name.gsub! /\u00c9/, 'e'
+        name.gsub! /\u00d3/, 'o'
+        name.gsub! /[\u00e0-\u00e5]/, 'a'
+        name.gsub! /\u00e7/, 'c'
+        name.gsub! /[\u00e8-\u00eb]/, 'e'
+        name.gsub! /[\u00ec-\u00ef]/, 'i'
+        name.gsub! /[\u00f2-\u00f6]|\u00f8/, 'o'
+        name.gsub! /[\u00f9-\u00fc]/, 'u'
+        name.gsub! /[\u00fd\u00ff]/, 'y'
+
+        # Latin Extended-A
+        name.gsub! /[\u0100-\u0105]/, 'a'
+        name.gsub! /[\u0106-\u010d]/, 'c'
+        name.gsub! /[\u010e-\u0111]/, 'd'
+        name.gsub! /[\u0112-\u011b]/, 'e'
+        name.gsub! /[\u011c-\u0123]/, 'g'
+        name.gsub! /[\u0124-\u0127]/, 'h'
+        name.gsub! /[\u0128-\u0131]/, 'i'
+        name.gsub! /[\u0132-\u0133]/, 'ij'
+        name.gsub! /[\u0134-\u0135]/, 'j'
+        name.gsub! /[\u0136-\u0138]/, 'k'
+        name.gsub! /[\u0139-\u0142]/, 'l'
+        name.gsub! /[\u0143-\u014b]/, 'n'
+        name.gsub! /[\u014C-\u0151]/, 'o'
+        name.gsub! /[\u0152-\u0153]/, 'oe'
+        name.gsub! /[\u0154-\u0159]/, 'r'
+        name.gsub! /[\u015a-\u0162]/, 's'
+        name.gsub! /[\u0162-\u0167]/, 't'
+        name.gsub! /[\u0168-\u0173]/, 'u'
+        name.gsub! /[\u0174-\u0175]/, 'w'
+        name.gsub! /[\u0176-\u0178]/, 'y'
+        name.gsub! /[\u0179-\u017e]/, 'z'
+
+        # denormalized diacritics
+        name.gsub! /[\u0300-\u036f]/, ''
+      end
+
+      name.strip.gsub /[^\w]+/, '-'
+    end
+
+    SUFFIXES = /^([Jj][Rr]\.?|I{2,3}|I?V|VI{1,3}|[A-Z]\.)$/
+
+    # rearrange line in an order suitable for sorting
+    def self.sortable_name(name)
+      name = name.split.reverse
+      suffix = (name.shift if name.first =~ SUFFIXES)
+      suffix += ' ' + name.shift if name.first =~ SUFFIXES
+      name << name.shift
+      # name << name.shift if name.first=='van'
+      name.last.sub! /^IJ/, 'Ij'
+      name.unshift(suffix) if suffix
+      name.map! {|word| asciize(word)}
+      name.reverse.join(' ').downcase
+    end
+
+    def sortable_name
+      Person.sortable_name(self.public_name)
+    end
+  end
+end

data/lib/whimsy/asf/podlings.rb

@@ -1,10 +1,13 @@
 require 'nokogiri'
+require 'date'
 require_relative '../asf'
 
 module ASF
-  class Podlings
+  class Podling
     include Enumerable
+    attr_accessor :name, :status, :description, :mentors, :champion, :reporting
 
+    # three consecutive months, starting with this one
     def quarter
       [
         Date.today.strftime('%B'),
@@ -13,36 +16,116 @@ module ASF
       ]
     end
 
-    def each
-      incubator_content = ASF::SVN['asf/incubator/public/trunk/content']
-      podlings = Nokogiri::XML(File.read("#{incubator_content}/podlings.xml"))
-      podlings.search('podling').map do |node|
-
-        reporting = node.at('reporting')
-        if reporting
-          group = reporting['group']
-          monthly = reporting.text.split(/,\s*/) if reporting['monthly']
-          reporting = %w(January April July October) if group == '1'
-          reporting = %w(February May August November) if group == '2'
-          reporting = %w(March June September December) if group == '3'
-          reporting.rotate! until quarter.include? reporting.first
-
-          if monthly
-            monthly.shift until monthly.empty? or quarter.include? monthly.first
-            reporting = (monthly + reporting).uniq
-          end
+    # create a podling from a Nokogiri node built from podlings.xml
+    def initialize(node)
+      @name = node['name']
+      @resource = node['resource']
+      @status = node['status']
+      @enddate = node['enddate']
+      @startdate = node['startdate']
+      @description = node.at('description').text
+      @mentors = node.search('mentor').map {|mentor| mentor['username']}
+      @champion = node.at('champion')['availid'] if node.at('champion')
+
+      @reporting = node.at('reporting')
+    end
+
+    # map resource to name
+    def name
+      @resource
+    end
+
+    # also map resource to id
+    def id
+      @resource
+    end
+
+    # map name to display_name
+    def display_name
+      @name || @resource
+    end
+
+    # parse startdate
+    def startdate
+      return unless @startdate
+      return Date.parse("#@startdate-15") if @startdate.length < 8
+      Date.parse(@startdate)
+    rescue ArgumentError
+      nil
+    end
+
+    # parse enddate
+    def enddate
+      return unless @enddate
+      return Date.parse("#@enddate-15") if @enddate.length < 8
+      Date.parse(@enddate)
+    rescue ArgumentError
+      nil
+    end
+
+    # lazy evaluation of reporting
+    def reporting
+      if @reporting.instance_of? Nokogiri::XML::Element
+        group = @reporting['group']
+        monthly = @reporting.text.split(/,\s*/) if @reporting['monthly']
+        @reporting = %w(January April July October) if group == '1'
+        @reporting = %w(February May August November) if group == '2'
+        @reporting = %w(March June September December) if group == '3'
+        @reporting.rotate! until quarter.include? @reporting.first
+
+        if monthly
+          monthly.shift until monthly.empty? or quarter.include? monthly.first
+          @reporting = (monthly + @reporting).uniq
         end
+      end
+
+      @reporting
+    end
+
+    # list of podlings
+    def self.list
+      incubator_content = ASF::SVN['asf/incubator/public/trunk/content']
+      podlings_xml = "#{incubator_content}/podlings.xml"
 
-        data = {
-          name: node['name'],
-          status: node['status'],
-          reporting: reporting,
-          description: node.at('description').text,
-          mentors: node.search('mentor').map {|mentor| mentor['username']}
-        }
-        data[:champion] = node.at('champion')['availid'] if node.at('champion')
-        yield node['resource'], data
+      if @mtime != File.mtime(podlings_xml)
+        @list = []
+        podlings = Nokogiri::XML(File.read(podlings_xml))
+        podlings.search('podling').map do |node|
+          @list << new(node)
+        end
       end
+
+      @list
+    end
+
+    # find a podling by name
+    def self.find(name)
+      list.find {|podling| podling.name == name}
+    end
+
+    # below is for backwards compatibility
+
+    # make class itself enumerable
+    class << self
+      include Enumerable
+    end
+
+    # return the entire list as a hash
+    def self.to_h
+      Hash[self.to_a]
+    end
+
+    # provide a list of podling names and descriptions
+    def self.each(&block)
+      list.each {|podling| block.call podling.name, podling}
+    end
+
+    # allow attributes to be accessed as hash
+    def [](name)
+      return self.send name if self.respond_to? name
     end
   end
+
+  # more backwards compatibility
+  Podlings = Podling
 end

data/lib/whimsy/asf/rack.rb

@@ -6,15 +6,15 @@ require 'thread'
 module ASF
   module Auth
     DIRECTORS = {
-      'rbowen'      => 'rb',
       'curcuru'     => 'sc',
       'bdelacretaz' => 'bd',
+      'isabel'      => 'id',
+      'marvin'      => 'mh',
       'jim'         => 'jj',
       'mattmann'    => 'cm',
-      'ke4qqq'      => 'dn',
       'brett'       => 'bp',
-      'rubys'       => 'sr',
-      'gstein'      => 'gs'
+      'gstein'      => 'gs',
+      'markt'       => 'mt'
     }
 
     # decode HTTP authorization, when present

data/lib/whimsy/asf/site.rb

@@ -53,7 +53,7 @@ module ASF
       templates = ASF::SVN['asf/infrastructure/site/trunk/content']
       file = "#{templates}/index.html"
       if not File.exist?(file)
-        Wunderbar.warn "Unable to find 'infrastructure/site/trunk/content'"
+        Wunderbar.error "Unable to find 'infrastructure/site/trunk/content'"
         return {}
       end
       return @@list if not @@list.empty? and File.mtime(file) == @@mtime

data/lib/whimsy/asf/svn.rb

@@ -1,6 +1,8 @@
 require 'uri'
 require 'thread'
 require 'open3'
+require 'fileutils'
+require 'tmpdir'
 
 module ASF
 
@@ -30,6 +32,10 @@ module ASF
     end
 
     def self.[](name)
+      self.find!(name)
+    end
+
+    def self.find(name)
       return @testdata[name] if @testdata[name]
 
       result = repos[(@mock+name.sub('private/','')).to_s.sub(/\/*$/, '')] ||
@@ -39,13 +45,136 @@ module ASF
 
       # recursively try parent directory
       if name.include? '/'
-        base = File.basename(name)
-        result = self[File.dirname(name)]
+        base = File.basename(name).untaint
+        result = find(File.dirname(name))
         if result and File.exist?(File.join(result, base))
           File.join(result, base)
         end
       end
     end
+
+    def self.find!(name)
+      result = self.find(name)
+
+      if not result
+        raise Exception.new("Unable to find svn checkout for #{@base + name}")
+      end
+
+      result
+    end
+
+    # retrieve revision, content for a file in svn
+    def self.get(path, user=nil, password=nil)
+      # build svn info command
+      cmd = ['svn', 'info', path, '--non-interactive']
+
+      # password was supplied, add credentials
+      if password
+        cmd += ['--username', user, '--password', password, '--no-auth-cache']
+      end
+
+      # default the values to return
+      revision = '0'
+      content = nil
+
+      # issue svn info command
+      stdout, status = Open3.capture2(*cmd)
+      if status.success?
+        # extract revision number
+        revision = stdout[/^Revision: (\d+)/, 1]
+
+        # extract contents
+        cmd[1] = 'cat'
+        content, status = Open3.capture2(*cmd)
+      end
+
+      # return results
+      return revision, content
+    end
+
+    # update a file or directory in SVN, working entirely in a temporary
+    # directory
+    def self.update(path, msg, env, _, options={})
+      if File.directory? path
+        dir = path
+        basename = nil
+      else
+        dir = File.dirname(path)
+        basename = File.basename(path)
+      end
+
+      if path.start_with? '/' and not path.include? '..' and File.exist?(path)
+        dir.untaint
+        basename.untaint
+      end
+      
+      tmpdir = Dir.mktmpdir.untaint
+
+      begin
+        # create an empty checkout
+        _.system ['svn', 'checkout', '--depth', 'empty',
+          ['--username', env.user, '--password', env.password],
+          `svn info #{dir}`[/URL: (.*)/, 1], tmpdir]
+
+        # retrieve the file to be updated (may not exist)
+        if basename
+          tmpfile = File.join(tmpdir, basename).untaint
+          _.system ['svn', 'update',
+            ['--username', env.user, '--password', env.password],
+            tmpfile]
+        else
+          tmpfile = nil
+        end
+
+        # determine the new contents
+        if not tmpfile
+          # updating a directory
+          previous_contents = contents = nil
+          yield tmpdir, ''
+        elsif File.file? tmpfile
+          # updating an existing file
+          previous_contents = File.read(tmpfile)
+          contents = yield tmpdir, File.read(tmpfile)
+        else
+          # updating a new file
+          previous_contents = nil
+          contents = yield tmpdir, ''
+          previous_contents = File.read(tmpfile) if File.file? tmpfile
+        end
+     
+        # create/update the temporary copy
+        if contents and not contents.empty?
+          File.write tmpfile, contents
+          if not previous_contents
+            _.system ['svn', 'add',
+              ['--username', env.user, '--password', env.password],
+              tmpfile]
+          end
+        elsif tmpfile and File.file? tmpfile
+          File.unlink tmpfile
+          _.system ['svn', 'delete',
+            ['--username', env.user, '--password', env.password],
+            tmpfile]
+        end
+
+        if options[:dryrun]
+          # show what would have been committed
+          rc = _.system ['svn', 'diff', tmpfile]
+        else
+          # commit the changes
+          rc = _.system ['svn', 'commit', tmpfile || tmpdir,
+            ['--username', env.user, '--password', env.password],
+            '--message', msg.untaint]
+        end
+
+        # fail if there are pending changes
+        unless rc == 0 and `svn st #{tmpfile || tmpdir}`.empty?
+          raise "svn failure #{path.inspect}"
+        end
+      ensure
+        FileUtils.rm_rf tmpdir
+      end
+    end
   end
 
 end