whimsy-asf 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dc0f1eeac0c67608d3a1f594a9303b2388705a39
+  data.tar.gz: 96077c23112805791e08b9c15313349186dd1119
+SHA512:
+  metadata.gz: c213687cb6f1c156f6e573fe4157c3db38c5e213d513c4192a6fbffaf176d6caa1787924493f6b2b8c1c5635339ecc845c12b397c1630da21a927570e15f7e8e
+  data.tar.gz: 7ca2b80558338cd348cbed060a9aa0716806521a9ec1dd15a868978878f48e52dab6bb4ec9dfa7ab8d59a69c7e21f68fa8cbb8393b5100ef4c6afa54026eec45

data/asf.version

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/whimsy/asf/agenda.rb

@@ -2,6 +2,7 @@ require_relative '../asf'
 
 require 'time'
 require 'tzinfo'
+require 'tzinfo/data'
 require 'digest/md5'
 
 module ASF

data/lib/whimsy/asf/ldap.rb

@@ -1,5 +1,4 @@
 require 'wunderbar'
-require 'rubygems'
 require 'ldap'
 
 module ASF
@@ -8,17 +7,27 @@ module ASF
   def self.init_ldap
     @ldap = nil
     begin
-      conf = '/etc/ldap/ldap.conf'
-      host = File.read(conf).scan(/^uri\s+ldaps:\/\/(\S+?):(\d+)/i).first
+      config = ASF::Config.get(:ldap)
+      if config
+        host = config.scan(/^ldap(s?):\/\/(\S+?):(\d+)\/?$/i).first
+      else
+        conf = '/etc/ldap/ldap.conf'
+        host = File.read(conf).scan(/^uri\s+ldap(s?):\/\/(\S+?):(\d+)/i).first
+      end
+
       if host
-         Wunderbar.info "Connecting to LDAP server: [ldaps://#{host[0]}:#{host[1]}]"
+         Wunderbar.info "Connecting to LDAP server: [ldap#{host[0]}://#{host[1]}:#{host[2]}]"
       end
     rescue Errno::ENOENT
       host = nil
       Wunderbar.error "No LDAP server defined, there must be a LDAP ldaps:// URI in /etc/ldap/ldap.conf"
     end
     begin
-      @ldap = LDAP::SSLConn.new(host.first, host.last.to_i) if host
+      if host.first == 's'
+        @ldap = LDAP::SSLConn.new(host[1], host.last.to_i) if host
+      else
+        @ldap = LDAP::Conn.new(host[1], host.last.to_i) if host
+      end
     rescue LDAP::ResultError=>re
       Wunderbar.error "Error binding to LDAP server: message: ["+ re.message + "]"
     end

metadata

@@ -1,150 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: whimsy-asf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 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: 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.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Whimsy 'model' of the ASF
 test_files: []