activesambaldap 0.0.3 → 0.0.4

data/test/test_asl_useradd.rb

@@ -9,9 +9,9 @@ class AslUserAddTest < Test::Unit::TestCase
   end
 
   def test_run_as_normal_user
-    assert_equal([false, "", "need root authority.\n"],
+    assert_equal([false, "", _("need root authority.") + "\n"],
                  run_asl_useradd_as_normal_user("user-name"))
-    assert_equal([false, "", "need root authority.\n"],
+    assert_equal([false, "", _("need root authority.") + "\n"],
                  run_asl_useradd_as_normal_user("computer-name$",
                                                 "--computer-account"))
   end
@@ -19,7 +19,7 @@ class AslUserAddTest < Test::Unit::TestCase
   def test_exist_user
     make_dummy_user do |user, password|
       assert(@user_class.exists?(user.uid))
-      assert_equal([false, "", "user '#{user.uid}' already exists.\n"],
+      assert_equal([false, "", _("user already exists: %s") % user.uid + "\n"],
                    run_asl_useradd(user.uid))
       assert(@user_class.exists?(user.uid))
     end
@@ -29,7 +29,8 @@ class AslUserAddTest < Test::Unit::TestCase
     make_dummy_computer do |computer, password|
       uid = computer.uid
       assert(@computer_class.exists?(uid))
-      assert_equal([false, "", "computer '#{uid}' already exists.\n"],
+      assert_equal([false, "",
+                    _("%s already exists: %s") % [_("computer"), uid] + "\n"],
                    run_asl_useradd(uid, "--computer-account"))
       assert(@computer_class.exists?(uid))
     end
@@ -250,10 +251,10 @@ class AslUserAddTest < Test::Unit::TestCase
     end
   end
 
-  def test_canonical_name_user
+  def test_common_name_user
     ensure_delete_user("test-user") do |uid,|
       cn = "John Kennedy"
-      assert_asl_useradd_successfully(uid, "--canonical-name", cn)
+      assert_asl_useradd_successfully(uid, "--common-name", cn)
       user = @user_class.find(uid)
       assert_equal(uid, user.given_name)
       assert_equal(uid, user.surname)
@@ -261,11 +262,12 @@ class AslUserAddTest < Test::Unit::TestCase
     end
   end
 
-  def test_canonical_name_computer
+  def test_common_name_computer
     ensure_delete_computer("test-computer$") do |uid,|
       cn = "A computer"
-      assert_asl_useradd_successfully(uid, "--computer-account",
-                                      "--canonical-name", cn)
+      assert_asl_useradd_successfully(uid,
+                                      "--computer-account",
+                                      "--common-name", cn)
       computer = @computer_class.find(uid)
       assert_equal(uid, computer.given_name)
       assert_equal(uid, computer.surname)

data/test/test_asl_userdel.rb

@@ -9,12 +9,12 @@ class AslUserDelTest < Test::Unit::TestCase
   end
 
   def test_run_as_normal_user
-    assert_equal([false, "", "need root authority.\n"],
+    assert_equal([false, "", _("need root authority.") + "\n"],
                  run_command_as_normal_user("user-name"))
   end
 
   def test_not_exist_user
-    assert_equal([false, "", "user 'not-exist' doesn't exist.\n"],
+    assert_equal([false, "", _("user doesn't exist: %s") % 'not-exist' + "\n"],
                  run_command("not-exist"))
   end
 
@@ -38,7 +38,8 @@ class AslUserDelTest < Test::Unit::TestCase
 
   def test_user_as_computer
     make_dummy_user do |user, password|
-      assert_equal([false, "", "computer '#{user.uid}$' doesn't exist.\n"],
+      message = _("%s doesn't exist: %s") % [_("computer"), "#{user.uid}$"]
+      assert_equal([false, "", "#{message}\n"],
                    run_command(user.uid, "--computer-account"))
       assert(@user_class.exists?(user.uid))
     end
@@ -46,7 +47,8 @@ class AslUserDelTest < Test::Unit::TestCase
 
   def test_computer_as_user
     make_dummy_computer do |computer, password|
-      assert_equal([false, "", "user '#{computer.uid}' doesn't exist.\n"],
+      message = _("%s doesn't exist: %s") % [_("user"), computer.uid]
+      assert_equal([false, "", "#{message}\n"],
                    run_command(computer.uid))
       assert(@computer_class.exists?(computer.uid))
     end

data/test/test_asl_usermod.rb

@@ -9,7 +9,7 @@ class AslUserModTest < Test::Unit::TestCase
   end
 
   def test_not_exist_user
-    assert_equal([false, "", "user 'not-exist' doesn't exist.\n"],
+    assert_equal([false, "", _("user doesn't exist: %s") % 'not-exist' + "\n"],
                  run_command("not-exist"))
   end
 
@@ -106,7 +106,7 @@ class AslUserModTest < Test::Unit::TestCase
         new_rid = (2 * Integer(new_uid_number) + 1000).to_s
         new_samba_sid = old_samba_sid.sub(/#{Regexp.escape(old_rid)}$/, new_rid)
 
-        message = "uid number '#{new_uid_number}' already exists\n"
+        message = _("uid number already exists: %s") % new_uid_number + "\n"
         args = ["--uid", new_uid_number]
         assert_asl_usermod_failed(user.uid, password, message, *args)
 
@@ -163,7 +163,7 @@ class AslUserModTest < Test::Unit::TestCase
 
         group.destroy
         args = ["--gid", new_gid_number]
-        message = "gid number '#{new_gid_number}' doesn't exist\n"
+        message = _("gid number doesn't exist: %s") % new_gid_number + "\n"
         assert_asl_usermod_failed(user.uid, password, message, *args)
 
         new_user = @user_class.find(user.uid)
@@ -270,7 +270,7 @@ class AslUserModTest < Test::Unit::TestCase
                                          :value => user.uid)
 
           args = ["--groups", new_gid_numbers.join(",")]
-          message = "gid number '#{new_gid_numbers[0]}' doesn't exist\n"
+          message = _("gid number doesn't exist: %s") % new_gid_numbers[0] + "\n"
           assert_asl_usermod_failed(user.uid, password, message, *args)
 
           new_user = @user_class.find(user.uid)
@@ -299,12 +299,12 @@ class AslUserModTest < Test::Unit::TestCase
     end
   end
 
-  def test_canonical_name
+  def test_common_name
     make_dummy_user do |user, password|
       old_cn = user.cn
       new_cn = "new-#{new_cn}"
 
-      args = ["--canonical-name", new_cn]
+      args = ["--common-name", new_cn]
       assert_asl_usermod_successfully(user.uid, password, *args)
 
       new_user = @user_class.find(user.uid)
@@ -523,7 +523,7 @@ class AslUserModTest < Test::Unit::TestCase
   private
   def assert_asl_usermod_successfully(name, password, *args)
     args << name
-    assert_equal([true, "Enter your password: \n", ""],
+    assert_equal([true, _("Enter your password: ") + "\n", ""],
                  run_command_as_normal_user(*args) do |input, output|
                    output.puts password
                    output.puts password
@@ -532,7 +532,7 @@ class AslUserModTest < Test::Unit::TestCase
 
   def assert_asl_usermod_failed(name, password, message, *args)
     args << name
-    assert_equal([false, "Enter your password: \n", message],
+    assert_equal([false, _("Enter your password: ") + "\n", message],
                  run_command_as_normal_user(*args) do |input, output|
                    output.puts password
                    output.puts password

data/test/test_asl_usershow.rb

@@ -21,7 +21,7 @@ class AslUserShowTest < Test::Unit::TestCase
   end
 
   def test_not_exist_user
-    assert_equal([false, "", "user 'not-exist' doesn't exist.\n"],
+    assert_equal([false, "", _("user doesn't exist: %s") % 'not-exist' + "\n"],
                  run_command("not-exist"))
   end
 end

data/test/test_entry.rb

@@ -0,0 +1,21 @@
+require 'asl-test-utils'
+
+class EntryTest < Test::Unit::TestCase
+  include AslTestUtils
+
+  priority :must
+  def test_entry_create
+    assert_created_user("temporary-user1", false)
+    assert_created_user("temporary-user2", true)
+  end
+
+  private
+  def assert_created_user(name, stringify)
+    params = {:uid => name}
+    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,
+                 user.primary_group.gid_number)
+  end
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: activesambaldap
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2007-05-26 00:00:00 +09:00
+  version: 0.0.4
+date: 2007-09-16 00:00:00 +09:00
 summary: ActiveSambaLdap is a library and a management tool for Samba + LDAP environment.
 require_paths: 
 - lib
@@ -52,6 +52,7 @@ files:
 - bin/asl-userdel
 - bin/asl-usermod
 - bin/asl-usershow
+- data/locale/ja/LC_MESSAGES/active-samba-ldap.mo
 - lib/active_samba_ldap.rb
 - lib/active_samba_ldap/account_entry.rb
 - lib/active_samba_ldap/base.rb
@@ -61,6 +62,7 @@ files:
 - lib/active_samba_ldap/configuration.rb
 - lib/active_samba_ldap/dc.rb
 - lib/active_samba_ldap/entry.rb
+- lib/active_samba_ldap/get_text_support.rb
 - lib/active_samba_ldap/group.rb
 - lib/active_samba_ldap/group_entry.rb
 - lib/active_samba_ldap/idmap.rb
@@ -76,21 +78,23 @@ files:
 - lib/active_samba_ldap/version.rb
 - lib/samba/encrypt.rb
 - misc/rd2html.rb
+- po/active-samba-ldap.pot
+- po/ja/active-samba-ldap.po
 - rails/plugin/active_samba_ldap/README
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/scaffold_asl_generator.rb
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/computer.rb
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/dc.rb
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/group.rb
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/idmap.rb
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/ldap.yml
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/ou.rb
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/samba_controller.rb
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/samba_helper.rb
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/samba_index.rhtml
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/samba_populate.rhtml
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/samba_purge.rhtml
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/unix_id_pool.rb
-- rails/plugin/active_samba_ldap/generators/scaffold_asl/templates/user.rb
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/scaffold_active_samba_ldap_generator.rb
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/computer.rb
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/dc.rb
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/group.rb
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/idmap.rb
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/ldap.yml
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/ou.rb
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/samba_controller.rb
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/samba_helper.rb
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/samba_index.rhtml
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/samba_populate.rhtml
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/samba_purge.rhtml
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/unix_id_pool.rb
+- rails/plugin/active_samba_ldap/generators/scaffold_active_samba_ldap/templates/user.rb
 - rails/plugin/active_samba_ldap/init.rb
 - setup.rb
 - test/asl-test-utils.rb
@@ -99,6 +103,8 @@ files:
 - test/run-test.rb
 - test/test-unit-ext.rb
 - test/test-unit-ext/always-show-result.rb
+- test/test-unit-ext/backtrace-filter.rb
+- test/test-unit-ext/long-display-for-emacs.rb
 - test/test-unit-ext/priority.rb
 - test/test_asl_groupadd.rb
 - test/test_asl_groupdel.rb
@@ -111,26 +117,28 @@ files:
 - test/test_asl_userdel.rb
 - test/test_asl_usermod.rb
 - test/test_asl_usershow.rb
+- test/test_entry.rb
 - test/test_group.rb
 - test/test_password.rb
 - test/test_samba_encrypt.rb
 - test/test_user_home_directory.rb
 test_files: 
-- test/test_asl_usershow.rb
-- test/test_asl_groupdel.rb
-- test/test_asl_useradd.rb
-- test/test_samba_encrypt.rb
-- test/test_asl_populate.rb
-- test/test_asl_groupmod.rb
-- test/test_asl_groupshow.rb
-- test/test_asl_purge.rb
-- test/test_asl_passwd.rb
 - test/test_asl_userdel.rb
-- test/test_asl_groupadd.rb
+- test/test_asl_groupmod.rb
 - test/test_asl_usermod.rb
-- test/test_group.rb
+- test/test_entry.rb
+- test/test_asl_useradd.rb
 - test/test_password.rb
+- test/test_asl_groupadd.rb
+- test/test_group.rb
+- test/test_asl_passwd.rb
+- test/test_asl_groupdel.rb
+- test/test_asl_purge.rb
 - test/test_user_home_directory.rb
+- test/test_asl_usershow.rb
+- test/test_asl_groupshow.rb
+- test/test_asl_populate.rb
+- test/test_samba_encrypt.rb
 rdoc_options: 
 - --main
 - README.txt
@@ -167,7 +175,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.2
+        version: 0.8.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -176,5 +184,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.3.0
     version: