usvn-crowd-sync 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/usvn-crowd-sync

@@ -19,13 +19,14 @@ config = YAML.load(File.new(CROWD_CONFIG_PATH))
 DataMapper.setup(:default, config["usvn_db"])
 
 crowd = Crowd.new(config)
+# 得到所有crowd的组名
 crowd_group_names = crowd.find_all_group_names
 
 crowd_group_names.each do |g|
   puts g
 end
 
-ug_hashcode1 = 0
+ug_hashcode1 = 0  # 用于确认用户组关系是否有修改
 GroupUser.all.each { |ug| ug_hashcode1 += ug.hash }
 
 cached_user_hash = Hash.new
@@ -33,17 +34,13 @@ User.all.each { |u| cached_user_hash[u.login] = u }
 
 groups = Group.create_or_update(crowd_group_names)
 
-User.all(:password => 'a9asdf907aafeqwerqw').each do |u|
-  GroupUser.all(:users_id => u.id).destroy
-end
-
-
 crowd_group_names.each do |gname|
   begin
     user_names = crowd.find_users_in_group(gname)
     g = Group.first(:name => gname.strip)
 
     unless g.nil?
+      userGroups = GroupUser.all(:groups_id => g.id).to_ary
       user_names.each do |name|
         begin
           u = cached_user_hash[name] || User.first(:login => name)
@@ -62,10 +59,16 @@ crowd_group_names.each do |gname|
           if ug.nil?
             GroupUser.create(:users_id => u.id, :groups_id => g.id, :is_leader => 0)
           end
+          # 从已有关系中删除
+          userGroups.delete_if {|ugx| ugx.users_id == u.id}
         rescue Exception => e1
           puts "User Not found #{name}: #{e1}"
         end
       end
+      # 删除多余的关系
+      userGroups.each { |ugx|
+        GroupUser.all(:groups_id => ugx.groups_id, :users_id => ugx.users_id).destroy
+      }
     end
   rescue Exception => e
     puts "Not found #{gname}: #{e}"

data/lib/usvn/usvn_0_x.rb

@@ -47,6 +47,7 @@ class Group
   def self.create_or_update(names)
     groups = []
     names.each do |name|
+      name.strip!
       if name =~ /^[a-zA-Z0-9\-\_]+$/
         g = Group.first(:name => name)
         if g.nil?

data/usvn-crowd-sync.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{usvn-crowd-sync}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["crazycode"]
-  s.date = %q{2011-06-02}
+  s.date = %q{2011-09-13}
   s.default_executable = %q{usvn-crowd-sync}
   s.description = %q{Sync Atlassian crowd's user & groups to USVN.}
   s.email = %q{crazycode@gmail.com}
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/crazycode/usvn-crowd-sync}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Sync Atlassian crowd's user & groups to USVN.}
   s.test_files = [
     "spec/spec_helper.rb",
@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: usvn-crowd-sync
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 21
+  prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - crazycode
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 +08:00
+date: 2011-09-13 00:00:00 +08:00
 default_executable: usvn-crowd-sync
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rspec
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +32,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  name: rspec
-  version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id001
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: bundler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,12 +48,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id002
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: jeweler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +64,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  name: jeweler
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id003
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rcov
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,12 +78,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id004
-  prerelease: false
+  requirement: *id004
+  type: :development
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: data_mapper
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,12 +92,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: data_mapper
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: *id005
   type: :runtime
-  requirement: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: dm-mysql-adapter
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,12 +106,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: dm-mysql-adapter
-  version_requirements: *id006
-  prerelease: false
+  requirement: *id006
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rspec
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,9 +120,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rspec
-  version_requirements: *id007
-  prerelease: false
+  requirement: *id007
+  type: :development
 description: Sync Atlassian crowd's user & groups to USVN.
 email: crazycode@gmail.com
 executables: 
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Sync Atlassian crowd's user & groups to USVN.