whimsy-asf 0.0.38 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ac081e9fe5b3016df52282994b8f68da8518890
-  data.tar.gz: d6481a28efbc25377e27205d9a85d54235f670a0
+  metadata.gz: 06f190516ef3e40fb310ac22b34133f32a255791
+  data.tar.gz: e303401bbe7cfd71f52744f1161cae76221f024b
 SHA512:
-  metadata.gz: 1508584a25f70789f35b9e19048b76290d7814e20182f5057cdfaeaf06be208a69287a4783ee32f2a67b74ea496795979bc6b84ef00996af36adf27e8edf38f4
-  data.tar.gz: 38f18f90879e409b741132b8dd731d7de0dc842709f184efcb6165fa38248522bb2731c846d81f6ebfb0a66a89816b3976414124913aab7466ae0691325f3804
+  metadata.gz: 6f435cd9d666aa86621ba3793df81aca4c723ad7b0f9435f5df75063feeb0ffdaec56e4c14f9d6eaaef446184bae49eafd9a5a1a17dfb8595247efb8d79a8ee2
+  data.tar.gz: c43f9a6d3c93ae455925478e5f26174c29ddc19fbb981493058185f9df79fe3138a1a65849281a8caf402c4088a3334e40a4feb495924e29eee9468fc34f38f8

data/asf.version

@@ -1 +1 @@
-0.0.38
+0.0.39

data/lib/whimsy/asf/agenda/special.rb

@@ -54,39 +54,49 @@ class ASF::Board::Agenda
         (?:\.\.\.|apache\.org|apache\sdot\sorg)>\s*$/x)
 
       whimsy = 'https://whimsy.apache.org'
-      if people.empty?
-        if title =~ /Change (.*?) Chair/ or title =~ /Terminate (\w+)$/
-          committee = ASF::Committee.find($1)
-          attrs['roster'] =
-            "#{whimsy}/roster/committee/#{CGI.escape committee.name}"
-          attrs['stats'] = 
-            "https://reporter.apache.org/?#{CGI.escape committee.name}"
-          attrs['prior_reports'] = minutes(committee.display_name)
-          name1 = text[/heretofore\sappointed\s(\w.*)\sto/,1]
-          sname1 = name1.to_s.downcase.gsub('.', ' ').split(/\s+/)
-          name2 = text[/recommend\s(\w.*)\sas/,1]
-          sname2 = name2.to_s.downcase.gsub('.', ' ').split(/\s+/)
-          next unless committee.names
-          committee.names.each do |id, name|
-            name.sub!(/ .* /,' ') unless text.include? name
-            pname = name.downcase.split(/\s+/)
-            if text.include? name
-              people << [name, id]
-            elsif name1 && sname1.all? {|t1| pname.any? {|t2| t2.start_with? t1}}
-              people << [name1, id]
-            elsif name1 && pname.all? {|t1| sname1.any? {|t2| t2.start_with? t1}}
-              people << [name1, id]
-            elsif name2 && sname2.all? {|t1| pname.any? {|t2| t2.start_with? t1}}
-              people << [name2, id]
-            elsif name2 && pname.all? {|t1| sname2.any? {|t2| t2.start_with? t1}}
-              people << [name2, id]
-            end
+      if title =~ /Change (.*?) Chair/ or title =~ /Terminate (\w+)$/
+        people.clear
+        committee = ASF::Committee.find($1)
+        attrs['roster'] =
+          "#{whimsy}/roster/committee/#{CGI.escape committee.name}"
+        attrs['stats'] = 
+          "https://reporter.apache.org/?#{CGI.escape committee.name}"
+        attrs['prior_reports'] = minutes(committee.display_name)
+
+        ids = text.scan(/\((\w[-.\w]+)\)/).flatten
+        unless ids.empty?
+          ids.each do |id|
+            person = ASF::Person.find(id)
+            people << [person.public_name, id] if person.icla
           end
+        end
 
-          if people.length < 2
-            attrs['warnings'] ||= ['Unable to match expected number of names']
+        name1 = text[/heretofore\sappointed\s(\w.*?)\s(\(|to)/,1]
+        sname1 = name1.to_s.downcase.gsub('.', ' ').split(/\s+/)
+        name2 = text[/recommend\s(\w.*?)\s(\(|as)/,1]
+        sname2 = name2.to_s.downcase.gsub('.', ' ').split(/\s+/)
+
+        next unless committee.names
+        committee.names.each do |id, name|
+          name.sub!(/ .* /,' ') unless text.include? name
+          pname = name.downcase.split(/\s+/)
+          if text.include? name
+            people << [name, id]
+          elsif name1 && sname1.all? {|t1| pname.any? {|t2| t2.start_with? t1}}
+            people << [name1, id]
+          elsif name1 && pname.all? {|t1| sname1.any? {|t2| t2.start_with? t1}}
+            people << [name1, id]
+          elsif name2 && sname2.all? {|t1| pname.any? {|t2| t2.start_with? t1}}
+            people << [name2, id]
+          elsif name2 && pname.all? {|t1| sname2.any? {|t2| t2.start_with? t1}}
+            people << [name2, id]
           end
         end
+
+        if people.length < 2
+          attrs['warnings'] ||= ['Unable to match expected number of names']
+          attrs['names'] = committee.names
+        end
       else
         if title =~ /Establish (.*)/
           name = $1

metadata

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