ucb_confluence 0.0.7 → 0.0.8

data/Gemfile

@@ -2,4 +2,4 @@ source :rubygems
 
 gemspec
 
-gem "bundler", "1.0.18"
+gem "bundler"

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ucb_confluence (0.0.1)
-      rake (>= 0.8.7)
+    ucb_confluence (0.0.8)
+      rake (= 0.8.7)
       ucb_ldap (>= 1.4.2)
 
 GEM
@@ -29,7 +29,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (= 1.0.18)
+  bundler
   diff-lcs (>= 1.1.2)
   rcov (>= 0.9.9)
   rspec (>= 1.3.0)

data/lib/confluence/jobs/ist_ldap_sync.rb

@@ -8,6 +8,8 @@ module Confluence
     class IstLdapSync
       
       IST_GROUP = 'ucb-ist'
+      USER_GROUP = 'confluence-users'
+      DISABLED_SUFFIX = '(ACCOUNT DISABLED)'
 
       def initialize()
         @new_users = []
@@ -45,7 +47,15 @@ module Confluence
             user.join_group(IST_GROUP)
             @modified_users << user
           end
-        end
+
+          # Check if user belongs to users_confluence, if not add them
+          # Remove the (ACCOUNT DISABLED) from their fullname
+          unless user.groups.include?(USER_GROUP)
+            user.fullname=user.fullname.gsub(DISABLED_SUFFIX,"")
+            user.save()
+            user.join_group(USER_GROUP)
+          end
+         end
       end
       
       ##

data/lib/confluence/version.rb

@@ -1,3 +1,3 @@
 module Confluence
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ucb_confluence
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Steven Hansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 Z
+date: 2012-04-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -181,17 +181,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ucb_confluence
-rubygems_version: 1.8.10
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Convenience methods for interacing with Confluence xml-rpc API
 test_files: 
-- spec/confluence/config_spec.rb
-- spec/confluence/confluence_spec.rb
-- spec/confluence/conn_spec.rb
+- spec/spec.opts
 - spec/confluence/group_spec.rb
 - spec/confluence/jobs/disable_expired_users_spec.rb
 - spec/confluence/jobs/ist_ldap_sync_spec.rb
+- spec/confluence/config_spec.rb
+- spec/confluence/confluence_spec.rb
 - spec/confluence/user_spec.rb
-- spec/spec.opts
+- spec/confluence/conn_spec.rb
 - spec/spec_helper.rb