whimsy-asf 0.0.50 → 0.0.51

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 45f6932c6e7417fecb555f9ba2ad96d089c28912
+  data.tar.gz: 500006bdd3ff482dc2aaa39368f3c6cf3771370f
+SHA512:
+  metadata.gz: 3f00500fb4c782d00b9e81930857289bcb0b98c0a57ab756d482eb8fb368be577e1fec7b1ca482156337eb855203ce0007f11ecf9566a0813a52b18fa01fad0e
+  data.tar.gz: be11a0baa8405604d97a350dd3c4b0a8a2b5a1f8d983efe9fff47db5be5c235e7c49fa15c763d2dc2ac77e1f7fde04a21b786505b6d5e611e805f7e98aa881b7

data/asf.version

@@ -1 +1 @@
-0.0.50
+0.0.51

data/lib/whimsy/asf/icla.rb

@@ -1,52 +1,94 @@
 module ASF
 
   class ICLA
-    include Enumerable
-    ICLA_Struct = Struct.new(:id, :legal_name, :name, :email)
+    attr_accessor :id, :legal_name, :name, :email
 
+    @@mtime = nil
+
+    OFFICERS = ASF::SVN['private/foundation/officers']
+    SOURCE = "#{OFFICERS}/iclas.txt" if OFFICERS
+
+    # flush caches if source file changed
+    def self.refresh
+      if SOURCE and File.mtime(SOURCE) != @@mtime
+        @@mtime = File.mtime(SOURCE)
+        @@id_index = nil
+        @@email_index = nil
+        @@name_index = nil
+
+        @@availids = nil
+      end
+    end
+
+    # load ICLA information for every committer
     def self.preload
-      new.each do |id, legal_name, name, email|
-        if id != 'notinaval'
-          ASF::Person.find(id).icla = 
-            ICLA_Struct.new(id, legal_name, name, email)
-        end 
+      refresh
+      each do |icla|
+        ASF::Person.find(icla.id).icla =  icla unless icla.id == 'notinaval'
       end
     end
 
+    # find ICLA by ID
     def self.find_by_id(value)
       return if value == 'notinavail'
-      new.each do |id, legal_name, name, email|
-        if id == value
-          return ICLA_Struct.new(id, legal_name, name, email)
-        end 
+
+      refresh
+      unless @@id_index
+        @@id_index = {}
+        each {|icla| @@id_index[icla.id] = icla}
       end
-      nil
+
+      @@id_index[value]
     end
 
+    # find ICLA by email
     def self.find_by_email(value)
-      value = value.downcase
-      new.each do |id, legal_name, name, email|
-        if email.downcase == value
-          return ICLA_Struct.new(id, legal_name, name, email)
-        end 
+      refresh
+      unless @@email_index
+        @@email_index = {}
+        each {|icla| @@email_index[icla.email.downcase] = icla}
       end
-      nil
+
+      @@email_index[value.downcase]
     end
 
+    # find ICLA by name
+    def self.find_by_name(value)
+      refresh
+      unless @@name_index
+        @@name_index = {}
+        each {|icla| @@name_index[icla.name] = icla}
+      end
+
+      @@email_index[value]
+    end
+
+    # list of all ids
     def self.availids
-      return @availids if @availids
+      refresh
+      return @@availids if @@availids
       availids = []
-      new.each do |id, legal_name, name, email| 
-        availids << id unless id == 'notinavail'
-      end
+      each {|icla| availids << icla.id unless icla.id == 'notinavail'}
       @availids = availids
     end
 
-    def each(&block)
-      officers = ASF::SVN['private/foundation/officers']
-      if officers and File.exist?("#{officers}/iclas.txt")
-        iclas = File.read("#{officers}/iclas.txt")
-        iclas.scan(/^([-\w]+):(.*?):(.*?):(.*?):/).each(&block)
+    # iterate over all of the ICLAs
+    def self.each(&block)
+      if @@id_index and not @@id_index.empty?
+        @@id_index.values.each(&block)
+      elsif @@email_index and not @@email_index.empty?
+        @@email_index.values.each(&block)
+      elsif @@name_index and not @@name_index.empty?
+        @@name_index.values.each(&block)
+      elsif File.exist?(SOURCE)
+        File.read(SOURCE).scan(/^([-\w]+):(.*?):(.*?):(.*?):/).each do |list|
+          icla = ICLA.new()
+          icla.id = list[0]
+          icla.legal_name = list[1]
+          icla.name = list[2]
+          icla.email = list[3]
+          block.call(icla)
+        end
       end
     end
 
@@ -149,7 +191,7 @@ module ASF
     end
 
     def icla?
-      ICLA.availids.include? name
+      @icla || ICLA.availids.include?(name)
     end
   end
 

data/lib/whimsy/asf/mail.rb

@@ -21,10 +21,11 @@ module ASF
       end
 
       # load all ICLA emails in one pass
-      ASF::ICLA.new.each do |id, legal_name, name, email|
-        list[email.downcase] ||= Person.find(id)
-        next if id == 'notinavail'
-        list["#{id.downcase}@apache.org"] ||= Person.find(id)
+      ASF::ICLA.each do |icla|
+        person = Person.find(icla.id)
+        list[icla.email.downcase] ||= person
+        next if icla.id == 'notinavail'
+        list["#{icla.id.downcase}@apache.org"] ||= person
       end
 
       @list = list

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whimsy-asf
 version: !ruby/object:Gem::Version
-  version: 0.0.50
-  prerelease: 
+  version: 0.0.51
 platform: ruby
 authors:
 - Sam Ruby
@@ -14,153 +13,141 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-ldap
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wunderbar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    This package contains a set of classes which encapsulate access\n
-  \   to a number of data sources such as LDAP, ICLAs, auth lists, etc.\n"
+description: |2
+      This package contains a set of classes which encapsulate access
+      to a number of data sources such as LDAP, ICLAs, auth lists, etc.
 email: rubys@intertwingly.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- asf.version
 - asf.gemspec
+- asf.version
 - lib/whimsy/asf.rb
-- lib/whimsy/asf/rack.rb
 - lib/whimsy/asf/agenda.rb
-- lib/whimsy/asf/svn.rb
-- lib/whimsy/asf/watch.rb
-- lib/whimsy/asf/config.rb
-- lib/whimsy/asf/podlings.rb
-- lib/whimsy/asf/nominees.rb
-- lib/whimsy/asf/auth.rb
-- lib/whimsy/asf/member.rb
-- lib/whimsy/asf/mail.rb
-- lib/whimsy/asf/agenda/special.rb
-- lib/whimsy/asf/agenda/committee.rb
-- lib/whimsy/asf/agenda/minutes.rb
 - lib/whimsy/asf/agenda/attachments.rb
+- lib/whimsy/asf/agenda/back.rb
+- lib/whimsy/asf/agenda/committee.rb
 - lib/whimsy/asf/agenda/exec-officer.rb
 - lib/whimsy/asf/agenda/front.rb
-- lib/whimsy/asf/agenda/back.rb
+- lib/whimsy/asf/agenda/minutes.rb
+- lib/whimsy/asf/agenda/special.rb
+- lib/whimsy/asf/auth.rb
 - lib/whimsy/asf/committee.rb
+- lib/whimsy/asf/config.rb
+- lib/whimsy/asf/icla.rb
 - lib/whimsy/asf/ldap.rb
+- lib/whimsy/asf/mail.rb
+- lib/whimsy/asf/member.rb
+- lib/whimsy/asf/nominees.rb
+- lib/whimsy/asf/podlings.rb
+- lib/whimsy/asf/rack.rb
 - lib/whimsy/asf/site.rb
-- lib/whimsy/asf/icla.rb
+- lib/whimsy/asf/svn.rb
+- lib/whimsy/asf/watch.rb
 homepage: https://whimsy.apache.org/
 licenses:
 - Apache License, Version 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Whimsy 'model' of the ASF
 test_files: []