From null at cozmixng.org Sat Oct 27 22:25:39 2007 From: null at cozmixng.org (null at cozmixng.org) Date: Sun, 28 Oct 2007 11:25:39 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r130: Message-ID: <20071028022539.96C2E9BE2B@www.cozmixng.org> retro 2007-10-28 11:25:35 +0900 (Sun, 28 Oct 2007) New Revision: 130 Modified files: trunk/NEWS.en trunk/NEWS.ja trunk/README.en trunk/README.ja trunk/lib/active_samba_ldap.rb trunk/lib/active_samba_ldap/account_entry.rb trunk/test/test_asl_useradd.rb trunk/test/test_entry.rb Log: Modified: trunk/NEWS.ja (+4 -0) =================================================================== --- trunk/NEWS.ja 2007-09-25 20:06:46 +09:00 (rev 129) +++ trunk/NEWS.ja 2007-10-28 11:25:35 +09:00 (rev 130) @@ -4,6 +4,10 @@ $Id$ +== 0.0.5: 2007-XX-XX + + * Ruby/ActiveLdap 0.8.4??? + == 0.0.4: 2007-09-16 * Ruby/ActiveLdap 0.8.3.1??? Modified: trunk/lib/active_samba_ldap.rb (+1 -1) =================================================================== --- trunk/lib/active_samba_ldap.rb 2007-09-25 20:06:46 +09:00 (rev 129) +++ trunk/lib/active_samba_ldap.rb 2007-10-28 11:25:35 +09:00 (rev 130) @@ -9,7 +9,7 @@ end required_active_ldap_version = ">= 0.8.4" -require_gem_if_need.call("active_ldap", "ruby-activeldap", +require_gem_if_need.call("active_ldap", "activeldap", required_active_ldap_version) if Dependencies.respond_to?(:load_paths) Modified: trunk/README.en (+1 -1) =================================================================== --- trunk/README.en 2007-09-25 20:06:46 +09:00 (rev 129) +++ trunk/README.en 2007-10-28 11:25:35 +09:00 (rev 130) @@ -37,7 +37,7 @@ == Dependency libraries - * ActiveLdap >= 0.8.3.1 + * ActiveLdap >= 0.8.4 == Usage Modified: trunk/test/test_entry.rb (+1 -1) =================================================================== --- trunk/test/test_entry.rb 2007-09-25 20:06:46 +09:00 (rev 129) +++ trunk/test/test_entry.rb 2007-10-28 11:25:35 +09:00 (rev 130) @@ -15,7 +15,7 @@ params = params.stringify_keys if stringify user = @user_class.create(params) assert(@user_class.exists?(name)) - assert_equal(ActiveSambaLdap::Group::DOMAIN_USERS_RID.to_s, + assert_equal(ActiveSambaLdap::Group::DOMAIN_USERS_RID, user.primary_group.gid_number) end end Modified: trunk/test/test_asl_useradd.rb (+1 -1) =================================================================== --- trunk/test/test_asl_useradd.rb 2007-09-25 20:06:46 +09:00 (rev 129) +++ trunk/test/test_asl_useradd.rb 2007-10-28 11:25:35 +09:00 (rev 130) @@ -442,7 +442,7 @@ expire_date = Time.now + 60 * 24 assert_asl_useradd_successfully(uid, "--expire-date", expire_date.iso8601) user = @user_class.find(uid) - assert_equal(expire_date.to_i.to_s, user.samba_kickoff_time) + assert_equal(expire_date.to_i, user.samba_kickoff_time) end end Modified: trunk/README.ja (+1 -1) =================================================================== --- trunk/README.ja 2007-09-25 20:06:46 +09:00 (rev 129) +++ trunk/README.ja 2007-10-28 11:25:35 +09:00 (rev 130) @@ -34,7 +34,7 @@ == ??????? - * ActiveLdap >= 0.8.3.1 + * ActiveLdap >= 0.8.4 == ??? Modified: trunk/NEWS.en (+4 -0) =================================================================== --- trunk/NEWS.en 2007-09-25 20:06:46 +09:00 (rev 129) +++ trunk/NEWS.en 2007-10-28 11:25:35 +09:00 (rev 130) @@ -4,6 +4,10 @@ $Id$ +== 0.0.5: 2007-XX-XX + + * Supported Ruby/ActiveLdap 0.8.4. + == 0.0.4: 2007-09-16 * Supported Ruby/ActiveLdap 0.8.3.1. Modified: trunk/lib/active_samba_ldap/account_entry.rb (+1 -1) =================================================================== --- trunk/lib/active_samba_ldap/account_entry.rb 2007-09-25 20:06:46 +09:00 (rev 129) +++ trunk/lib/active_samba_ldap/account_entry.rb 2007-10-28 11:25:35 +09:00 (rev 130) @@ -144,7 +144,7 @@ Dir.glob(File.join(skel, "*")) - [File.join(skel, "."), File.join(skel, "..")], dest) - FileUtils.chown_R(uid_number, gid_number, dest) + FileUtils.chown_R(uid_number.to_s, gid_number.to_s, dest) end private From null at cozmixng.org Sat Oct 27 22:45:50 2007 From: null at cozmixng.org (null at cozmixng.org) Date: Sun, 28 Oct 2007 11:45:50 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r131: Message-ID: <20071028024550.1879C9BE26@www.cozmixng.org> retro 2007-10-28 11:45:47 +0900 (Sun, 28 Oct 2007) New Revision: 131 Modified files: trunk/test/asl-test-utils.rb trunk/test/test_asl_useradd.rb trunk/test/test_asl_usermod.rb Log: Modified: trunk/test/asl-test-utils.rb (+3 -3) =================================================================== --- trunk/test/asl-test-utils.rb 2007-10-28 11:23:50 +09:00 (rev 130) +++ trunk/test/asl-test-utils.rb 2007-10-28 11:45:47 +09:00 (rev 131) @@ -114,7 +114,7 @@ home_directory = config[:home_directory] || "/tmp/#{name}-#{Process.pid}" ensure_delete_user(name, home_directory) do password = config[:password] || "password" - uid_number = config[:uid_number] || "100000#{@user_index}" + uid_number = config[:uid_number] || (1000000 + @user_index) default_user_gid = @user_class.configuration[:default_user_gid] gid_number = config[:gid_number] || default_user_gid _wrap_assertion do @@ -152,7 +152,7 @@ home_directory = config[:home_directory] || "/tmp/#{name}-#{Process.pid}" ensure_delete_computer(name, home_directory) do |name, home_directory| password = config[:password] - uid_number = config[:uid_number] || "100000#{@computer_index}" + uid_number = config[:uid_number] || (1000000 + @computer_index) default_computer_gid = @computer_class.configuration[:default_computer_gid] gid_number = config[:gid_number] || default_computer_gid @@ -187,7 +187,7 @@ @group_index += 1 name = config[:name] || "test-group#{@group_index}" ensure_delete_group(name) do - gid_number = config[:gid_number] || "200000#{@group_index}" + gid_number = config[:gid_number] || (2000000 + @group_index) group_type = config[:group_type] || "domain" _wrap_assertion do assert(!@group_class.exists?(name)) Modified: trunk/test/test_asl_usermod.rb (+1 -1) =================================================================== --- trunk/test/test_asl_usermod.rb 2007-10-28 11:23:50 +09:00 (rev 130) +++ trunk/test/test_asl_usermod.rb 2007-10-28 11:45:47 +09:00 (rev 131) @@ -351,7 +351,7 @@ assert_asl_usermod_successfully(user.uid, password, *args) new_user = @user_class.find(user.uid) - assert_equal(new_expire_date.to_i.to_s, new_user.samba_kickoff_time) + assert_equal(new_expire_date.to_i, new_user.samba_kickoff_time) end end Modified: trunk/test/test_asl_useradd.rb (+2 -2) =================================================================== --- trunk/test/test_asl_useradd.rb 2007-10-28 11:23:50 +09:00 (rev 130) +++ trunk/test/test_asl_useradd.rb 2007-10-28 11:45:47 +09:00 (rev 131) @@ -149,7 +149,7 @@ user = @user_class.find(uid) primary_group = @group_class.find(:first, :attribute => "gidNumber", - :value => user.gid_number) + :value => user.gid_number.to_s) groups = @group_class.find(:all, :attribute => "memberUid", :value => uid) @@ -167,7 +167,7 @@ computer = @computer_class.find(uid) primary_group = @group_class.find(:first, :attribute => "gidNumber", - :value => computer.gid_number) + :value => computer.gid_number.to_s) groups = @group_class.find(:all, :attribute => "memberUid", :value => uid)