whimsy-asf 0.0.73 → 0.0.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1f7cf605fc94048d38e36363b37cb1b755489f3
-  data.tar.gz: 3a97687ee0fd9c7bdcab1c50b5e991acfc39ab4c
+  metadata.gz: 6a3cda4938653e84801388a33933a5ff5753ccd8
+  data.tar.gz: cbd46d98523e091ae41001899b2b88c086a8bc73
 SHA512:
-  metadata.gz: b49f938b3364194b81f6b07f1d05d717e0d23a69f03c9aadfe1f517934f8e2ee1bf56d1daea87523e6312395c47ca6489e05270415a54b3525a244e2c3a992a1
-  data.tar.gz: 403d04025690120efc53aafe7f2394c8e16ec02b7ba85f0e95fd67c3e1ccc649fd337bf0ca65d1d7941d33e22be856b4bf39388714e189dc89937f41aedce193
+  metadata.gz: e098ec455420ce5293b5457c9056c63ceb44f3187a0242f9d5e0798cd314b1ea8f4ea734f042359ec442e9e4e49578ff4bb948e29742b349db8c99a4e3d52620
+  data.tar.gz: fd7b79fddc1883e8a57248496867ecef4ddd7aaf918d927796df7cacd4c6a9f049906547d74e62420ac749ef90733f5e215248693b5a78673ee4309a1dd662b0

data/asf.version

@@ -1 +1 @@
-0.0.73
+0.0.74

data/lib/whimsy/asf/committee.rb

@@ -48,9 +48,13 @@ module ASF
       board = ASF::SVN['private/committers/board']
       file = "#{board}/committee-info.txt"
       return unless File.exist? file
+
+      list = Hash.new {|hash, name| hash[name] = find(name)}
+
       if @committee_info and File.mtime(file) == @committee_mtime
         return @committee_info 
       end
+
       @committee_mtime = File.mtime(file)
       @@svn_change = Time.parse(
         `svn info #{file}`[/Last Changed Date: (.*) \(/, 1]).gmtime
@@ -62,15 +66,16 @@ module ASF
       # extract the committee chairs (e-mail address is required here)
       head.scan(/^[ \t]+(\w.*?)[ \t][ \t]+(.*)[ \t]+<(.*?)@apache\.org>/).
         each do |committee, name, id|
-          find(committee).chairs << {name: name, id: id}
+          list[committee].chairs << {name: name, id: id}
         end
+
       # Extract the non-PMC committees (e-mail address may be absent)
       @nonpmcs = head.sub(/.*?also has/m,'').
         scan(/^[ \t]+(\w.*?)(?:[ \t][ \t]|[ \t]?$)/).flatten.uniq.
-        map {|name| find(name)}
+        map {|name| list[name]}
 
       info.each do |roster|
-        committee = find(@@namemap.call(roster[/(\w.*?)\s+\(/,1]))
+        committee = list[@@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
@@ -85,7 +90,7 @@ module ASF
       report.scan(/^([^\n]+)\n---+\n(.*?)\n\n/m).each do |period, committees|
         committees.scan(/^   \s*(.*)/).each do |committee|
           committee, comment = committee.first.split(/\s+#\s+/,2)
-          committee = find(committee)
+          committee = list[committee]
           if comment
             committee.report = "#{period}: #{comment}"
           elsif period == 'Next month'
@@ -96,7 +101,7 @@ module ASF
         end
       end
 
-      @committee_info = ASF::Committee.collection.values
+      @committee_info = list.values
     end
 
     def self.nonpmcs

data/lib/whimsy/asf/ldap.rb

@@ -172,6 +172,8 @@ module ASF
 
     # pre-fetch a given attribute, for a given list of people
     def self.preload(attributes, people={})
+      list = Hash.new {|hash, name| hash[name] = find(name)}
+
       attributes = [attributes].flatten
 
       if people.empty?
@@ -183,14 +185,16 @@ module ASF
       zero = Hash[attributes.map {|attribute| [attribute,nil]}]
 
       data = ASF.search_one(base, filter, attributes + ['uid'])
-      data = Hash[data.map! {|hash| [find(hash['uid'].first), hash]}]
+      data = Hash[data.map! {|hash| [list[hash['uid'].first], hash]}]
       data.each {|person, hash| person.attrs.merge!(zero.merge(hash))}
 
       if people.empty?
-        (collection.values - data.keys).each do |person| 
+        (list.values - data.keys).each do |person|
           person.attrs.merge! zero
         end
       end
+
+      list.values
     end
 
     def attrs

data/lib/whimsy/asf/mail.rb

@@ -8,8 +8,8 @@ module ASF
       list = Hash.new
 
       # load info from LDAP
-      ASF::Person.preload(['mail', 'asf-altEmail'])
-      ASF::Person.collection.each do |name, person|
+      people = ASF::Person.preload(['mail', 'asf-altEmail'])
+      people.each do |name, person|
         (person.mail+person.alt_email).each do |mail|
           list[mail.downcase] = person
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whimsy-asf
 version: !ruby/object:Gem::Version
-  version: 0.0.73
+  version: 0.0.74
 platform: ruby
 authors:
 - Sam Ruby
@@ -14,84 +14,84 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wunderbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -137,12 +137,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []