whimsy-asf 0.0.39 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f190516ef3e40fb310ac22b34133f32a255791
-  data.tar.gz: e303401bbe7cfd71f52744f1161cae76221f024b
+  metadata.gz: 600b45a5732c982a3dccb0fab84fc1f5bc1e789e
+  data.tar.gz: f88873c96d276a4be674f1714552bbf2fb994051
 SHA512:
-  metadata.gz: 6f435cd9d666aa86621ba3793df81aca4c723ad7b0f9435f5df75063feeb0ffdaec56e4c14f9d6eaaef446184bae49eafd9a5a1a17dfb8595247efb8d79a8ee2
-  data.tar.gz: c43f9a6d3c93ae455925478e5f26174c29ddc19fbb981493058185f9df79fe3138a1a65849281a8caf402c4088a3334e40a4feb495924e29eee9468fc34f38f8
+  metadata.gz: 41b288dc80b9074e2dd695813acef36efdff5ebaede86fb74776f8a34a9054b363eaf045bce95ae69194f493f758545cab3e3937d9c4e9b0627fefe1595280c8
+  data.tar.gz: 0278a082d398a5ab0834ac65a73d7b078a2e7374abf18853a8b87276e3717c14ed795386b152c81261c6f9e772e6cd2da862997537ba58f0f133c45b63c32076

data/asf.version

@@ -1 +1 @@
-0.0.39
+0.0.40

data/lib/whimsy/asf/committee.rb

@@ -1,13 +1,17 @@
+require 'time'
+
 module ASF
 
   class Base
   end
 
   class Committee < Base
-    attr_accessor :info, :names, :emeritus, :report
+    attr_accessor :info, :emeritus, :report, :roster, :established, :chairs
     def initialize(*args)
       @info = []
       @emeritus = []
+      @chairs = []
+      @roster = {}
       super
     end
 
@@ -44,25 +48,30 @@ module ASF
         return @committee_info 
       end
       @committee_mtime = File.mtime(file)
+      @@svn_change = Time.parse(
+        `svn info #{file}`[/Last Changed Date: (.*) \(/, 1]).gmtime
 
       info = File.read(file).split(/^\* /)
       head, report = info.shift.split(/^\d\./)[1..2]
-      head.scan(/^\s+(\w.*?)\s\s+.*<(\w+)@apache\.org>/).each do |name, id|
-        find(name).chair = ASF::Person.find(id) 
-      end
+      head.scan(/^\s+(\w.*?)\s\s+(.*)\s+<(\w+)@apache\.org>/).
+        each do |committee, name, id|
+          find(committee).chairs << {name: name, id: id}
+        end
       @nonpmcs = head.sub(/.*?also has/m,'').
         scan(/^\s+(\w.*?)\s\s+.*<\w+@apache\.org>/).flatten.uniq.
         map {|name| find(name)}
 
       info.each do |roster|
         committee = find(@@namemap.call(roster[/(\w.*?)\s+\(/,1]))
+        committee.established = roster[/\(est\. (.*?)\)/, 1]
         roster.gsub! /^.*\(\s*emeritus\s*\).*/i do |line|
           committee.emeritus += line.scan(/<(.*?)@apache\.org>/).flatten
           ''
         end
         committee.info = roster.scan(/<(.*?)@apache\.org>/).flatten
-        committee.names = Hash[roster.gsub(/\(\w+\)/, '').
-          scan(/^\s*(.*?)\s*<(.*?)@apache\.org>/).map {|list| list.reverse}]
+        committee.roster = Hash[roster.gsub(/\(\w+\)/, '').
+          scan(/^\s*(.*?)\s*<(.*?)@apache\.org>\s+(\[(.*?)\])?/).
+          map {|list| [list[1], {name: list[0], date: list[3]}]}]
       end
 
       report.scan(/^([^\n]+)\n---+\n(.*?)\n\n/m).each do |period, committees|
@@ -92,9 +101,17 @@ module ASF
       result
     end
 
+    def self.svn_change
+      @@svn_change
+    end
+
     def chair
       Committee.load_committee_info
-      @chair
+      if @chairs.length >= 1
+        ASF::Person.find(@chairs.first[:id])
+      else
+        nil
+      end
     end
 
     def display_name
@@ -106,16 +123,13 @@ module ASF
       @display_name ||= name
     end
 
-    def chair=(person)
-      @chair = person
-    end
-
     def info=(list)
       @info = list
     end
 
-    def names=(hash)
-      @names = hash
+    def names
+      Committee.load_committee_info
+      Hash[@roster.map {|id, info| [id, info[:name]]}]
     end
 
     def nonpmc?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whimsy-asf
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri