ucb_confluence 0.0.9 → 0.0.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ucb_confluence (0.0.8)
+    ucb_confluence (0.0.10)
       rake (= 0.8.7)
       ucb_ldap (>= 1.4.2)
 

data/lib/confluence/jobs/disable_expired_users.rb

@@ -2,10 +2,14 @@
 ##
 # Disables a user's Confluence account if they are considered expired.
 #
+# UCB ldap uids are stored as confluence username.
+#
 module Confluence
   module Jobs
     class DisableExpiredUsers
-      
+
+      MIN_GUEST_ACCOUNT_LDAP_UID = 11000000
+
       def initialize()
         @disabled_users = []
       end
@@ -18,13 +22,24 @@ module Confluence
         disable_expired_users()
         log_job()
       end
-      
+
+      def confluence_admin?(username)
+        username == "conflusa"
+      end
+
+      def guest_account_user?(username)
+        username.to_i > MIN_GUEST_ACCOUNT_LDAP_UID
+      end
+
       ##
       # Disables any users that are expired in LDAP or are no longer in LDAP.
       #
       def disable_expired_users()
         confluence_user_names.each do |name|
-          next if name == "conflusa"      
+
+          next if confluence_admin?(name)
+          next if guest_account_user?(name)
+
           ldap_person = find_in_ldap(name)
           
           if ldap_person.nil? || !eligible_for_confluence?(ldap_person)

data/lib/confluence/version.rb

@@ -1,3 +1,3 @@
 module Confluence
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ucb_confluence
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Steven Hansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-25 00:00:00 Z
+date: 2012-09-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake