activesambaldap 0.0.4 → 0.0.5

data/NEWS.en

@@ -2,7 +2,11 @@
 
 = NEWS.en
 
-$Id: NEWS.en 119 2007-09-16 13:14:27Z kou $
+$Id: NEWS.en 132 2007-11-19 11:53:22Z kou $
+
+== 0.0.5: 2007-11-19
+
+  * Supported Ruby/ActiveLdap 0.9.0.
 
 == 0.0.4: 2007-09-16
 

data/NEWS.ja

@@ -2,7 +2,11 @@
 
 = NEWS.ja
 
-$Id: NEWS.ja 119 2007-09-16 13:14:27Z kou $
+$Id: NEWS.ja 132 2007-11-19 11:53:22Z kou $
+
+== 0.0.5: 2007-11-19
+
+  * Ruby/ActiveLdap 0.9.0対応。
 
 == 0.0.4: 2007-09-16
 

data/README.en

@@ -2,7 +2,7 @@
 
 = README.en
 
-$Id: README.en 120 2007-09-16 13:17:37Z kou $
+$Id: README.en 132 2007-11-19 11:53:22Z kou $
 
 == Name
 
@@ -37,7 +37,7 @@ asl-devel@rubyforge.org
 
 == Dependency libraries
 
-  * ActiveLdap >= 0.8.3.1
+  * ActiveLdap >= 0.9.0
 
 == Usage
 
@@ -330,3 +330,4 @@ asl-populate, please confirm the following:
 == Thanks
 
   * Henrik Krög: He reported some bugs.
+  * Olivier DIRRENBERGER: He reported a bug.

data/README.ja

@@ -2,7 +2,7 @@
 
 = README.ja
 
-$Id: README.ja 120 2007-09-16 13:17:37Z kou $
+$Id: README.ja 132 2007-11-19 11:53:22Z kou $
 
 == 名前
 
@@ -34,7 +34,7 @@ asl-devel-ja@rubyforge.org
 
 == 依存ライブラリ
 
-  * ActiveLdap >= 0.8.3.1
+  * ActiveLdap >= 0.9.0
 
 == 使用法
 
@@ -325,3 +325,4 @@ LDAP管理ユーザのパスワードを設定しておく必要があります
 == 感謝
 
   * Henrik Krög: バグを報告してくれました。
+  * Olivier DIRRENBERGER: バグを報告してくれました。

data/bin/asl-passwd

@@ -57,14 +57,8 @@ user = User.find(name)
 unless Process.uid.zero?
   prompt = _("Enter your current password: ")
   old_password = ActiveSambaLdap::Command.read_password(prompt)
-
-  auth_class = Class.new(ActiveSambaLdap::Base)
-  config = ActiveSambaLdap::Base.configurations["reference"].symbolize_keys
   begin
-    auth_class.establish_connection(config.merge(:bind_dn => user.dn,
-                                                 :password => old_password,
-                                                 :allow_anonymous => false))
-    auth_class.remove_connection
+    user.bind(old_password)
   rescue ActiveLdap::AuthenticationError
     $stderr.puts(_("password doesn't match."))
     exit 1

data/bin/asl-samba-usermod

@@ -64,18 +64,13 @@ member = member_class.find(name)
 unless Process.uid.zero?
   password = ActiveSambaLdap::Command.read_password(_("Enter your password: "))
 
-  auth_class = Class.new(ActiveSambaLdap::Base)
-  config = ActiveSambaLdap::Base.configurations["reference"]
   begin
-    auth_class.establish_connection(config.merge(:bind_dn => member.dn,
-                                                 :password => password,
-                                                 :allow_anonymous => false))
+    member.bind(password)
   rescue ActiveLdap::AuthenticationError
-    $stderr.puts(_("password isn't match."))
+    $stderr.puts(_("password doesn't match."))
     exit 1
-  ensure
-    auth_class.remove_connection
   end
+  member.remove_connection
 end
 
 if options.gid

data/bin/asl-usermod

@@ -175,18 +175,13 @@ member = member_class.find(name)
 unless Process.uid.zero?
   password = ActiveSambaLdap::Command.read_password(_("Enter your password: "))
 
-  auth_class = Class.new(ActiveSambaLdap::Base)
-  config = ActiveSambaLdap::Base.configurations["reference"]
   begin
-    auth_class.establish_connection(config.merge(:bind_dn => member.dn,
-                                                 :password => password,
-                                                 :allow_anonymous => false))
+    member.bind(password)
   rescue ActiveLdap::AuthenticationError
-    $stderr.puts(_("password isn't match."))
+    $stderr.puts(_("password doesn't match."))
     exit 1
-  ensure
-    auth_class.remove_connection
   end
+  member.remove_connection
 end
 
 if options.uid

data/lib/active_samba_ldap/account_entry.rb

@@ -144,7 +144,7 @@ module ActiveSambaLdap
                      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

data/lib/active_samba_ldap/configuration.rb

@@ -57,10 +57,10 @@ module ActiveSambaLdap
         end
       end
 
-      def merge_configuration(config)
+      def merge_configuration(config, *rest)
         config = config.symbolize_keys
         config = (configurations["common"] || {}).symbolize_keys.merge(config)
-        ValidHash.new.merge(super(Private.new(config).merge))
+        ValidHash.new.merge(super(Private.new(config).merge, *rest))
       end
 
       def required_configuration_variables(*names)

data/lib/active_samba_ldap/samba_account_entry.rb

@@ -25,7 +25,7 @@ module ActiveSambaLdap
     end
 
     # FAR_FUTURE_TIME = Time.parse("2050/01/01").to_i.to_s
-    FAR_FUTURE_TIME = Time.parse("2038/01/19").to_i.to_s
+    FAR_FUTURE_TIME = Time.parse("2038/01/18").to_i.to_s
     ACCOUNT_FLAGS_RE = /\A\[([NDHTUMWSLXI ]+)\]\z/
 
     module ClassMethods

data/lib/active_samba_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveSambaLdap
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/active_samba_ldap.rb

@@ -8,8 +8,8 @@ require_gem_if_need = Proc.new do |library_name, gem_name, *options|
   end
 end
 
-required_active_ldap_version = ">= 0.8.3.1"
-require_gem_if_need.call("active_ldap", "ruby-activeldap",
+required_active_ldap_version = ">= 0.9.0"
+require_gem_if_need.call("active_ldap", "activeldap",
                          required_active_ldap_version)
 
 if Dependencies.respond_to?(:load_paths)

data/po/active-samba-ldap.pot

@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Ruby/ActiveSambaLdap 0.0.4\n"
-"POT-Creation-Date: 2007-09-16 22:22+0900\n"
+"Project-Id-Version: Ruby/ActiveSambaLdap 0.0.5\n"
+"POT-Creation-Date: 2007-09-16 22:47+0900\n"
 "PO-Revision-Date: 2007-09-08 11:51+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -196,19 +196,19 @@ msgstr ""
 msgid "Enter your current password: "
 msgstr ""
 
-#: bin/asl-passwd:69
+#: bin/asl-passwd:63 bin/asl-samba-usermod:70 bin/asl-usermod:181
 msgid "password doesn't match."
 msgstr ""
 
-#: bin/asl-passwd:74
+#: bin/asl-passwd:68
 msgid "New password: "
 msgstr ""
 
-#: bin/asl-passwd:75
+#: bin/asl-passwd:69
 msgid "Retype new password: "
 msgstr ""
 
-#: bin/asl-passwd:78
+#: bin/asl-passwd:72
 msgid "New passwords don't match."
 msgstr ""
 
@@ -328,7 +328,7 @@ msgstr ""
 msgid "illegal %s name: %s"
 msgstr ""
 
-#: bin/asl-useradd:182 bin/asl-usermod:314
+#: bin/asl-useradd:182 bin/asl-usermod:308
 msgid "%s already exists: %s"
 msgstr ""
 
@@ -348,10 +348,6 @@ msgstr ""
 msgid "Enter your password: "
 msgstr ""
 
-#: bin/asl-samba-usermod:74 bin/asl-usermod:185
-msgid "password isn't match."
-msgstr ""
-
 #: bin/asl-populate:30
 msgid "first uid number to allocate"
 msgstr ""
@@ -450,7 +446,7 @@ msgstr ""
 msgid "enable this user"
 msgstr ""
 
-#: bin/asl-usermod:240 bin/asl-usermod:244
+#: bin/asl-usermod:234 bin/asl-usermod:238
 msgid "not implemented."
 msgstr ""
 

data/po/ja/active-samba-ldap.po

@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Ruby/ActiveSambaLdap 0.0.4\n"
-"POT-Creation-Date: 2007-09-16 22:22+0900\n"
-"PO-Revision-Date: 2007-09-16 22:21+0900\n"
+"Project-Id-Version: Ruby/ActiveSambaLdap 0.0.5\n"
+"POT-Creation-Date: 2007-09-16 22:47+0900\n"
+"PO-Revision-Date: 2007-09-16 22:47+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -202,19 +202,19 @@ msgstr "何もしません。"
 msgid "Enter your current password: "
 msgstr "現在のパスワードを入力してください: "
 
-#: bin/asl-passwd:69
+#: bin/asl-passwd:63 bin/asl-samba-usermod:70 bin/asl-usermod:181
 msgid "password doesn't match."
 msgstr "パスワードが合っていません。"
 
-#: bin/asl-passwd:74
+#: bin/asl-passwd:68
 msgid "New password: "
 msgstr "新しいパスワード: "
 
-#: bin/asl-passwd:75
+#: bin/asl-passwd:69
 msgid "Retype new password: "
 msgstr "新しいパスワードをもう一度入力してください: "
 
-#: bin/asl-passwd:78
+#: bin/asl-passwd:72
 msgid "New passwords don't match."
 msgstr "新しいパスワードが合っていません。"
 
@@ -334,7 +334,7 @@ msgstr "(Sambaのアカウント制御ビット。例: '[NDHTUMWSLXI]')"
 msgid "illegal %s name: %s"
 msgstr "不正な%s名: %s"
 
-#: bin/asl-useradd:182 bin/asl-usermod:314
+#: bin/asl-useradd:182 bin/asl-usermod:308
 msgid "%s already exists: %s"
 msgstr "すでに存在する%sです: %s"
 
@@ -354,10 +354,6 @@ msgstr "追加用メンバーと削除用メンバーに重複しているメン
 msgid "Enter your password: "
 msgstr "あなたのパスワードを入力してください: "
 
-#: bin/asl-samba-usermod:74 bin/asl-usermod:185
-msgid "password isn't match."
-msgstr "パスワードが合っていません。"
-
 #: bin/asl-populate:30
 msgid "first uid number to allocate"
 msgstr "最初に割り当てるUID番号"
@@ -456,7 +452,7 @@ msgstr "このユーザを無効にする"
 msgid "enable this user"
 msgstr "このユーザを有効にする"
 
-#: bin/asl-usermod:240 bin/asl-usermod:244
+#: bin/asl-usermod:234 bin/asl-usermod:238
 msgid "not implemented."
 msgstr "実装されていません。"
 

data/test/asl-test-utils.rb

@@ -114,7 +114,7 @@ module AslTestUtils
       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 @@ module AslTestUtils
       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 @@ module AslTestUtils
       @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))
@@ -246,7 +246,7 @@ module AslTestUtils
       @lib_dir = File.join(@top_dir, "lib")
       @ruby_args = [
                     "-I", @lib_dir,
-#                     "-I", File.join(@parent_dir, "activeldap", "lib"),
+                    "-I", File.join(@parent_dir, "activeldap", "lib"),
 #                     "-I", File.join(@parent_dir, "ldap", "lib"),
 #                     "-I", File.join(@parent_dir, "ldap"),
                  ]

data/test/run-test.rb

@@ -7,7 +7,7 @@ require "test/unit"
 top_dir = File.join(File.dirname(__FILE__), "..")
 # $LOAD_PATH.unshift(File.join(top_dir, "..", "ldap", "lib"))
 # $LOAD_PATH.unshift(File.join(top_dir, "..", "ldap"))
-# $LOAD_PATH.unshift(File.join(top_dir, "..", "activeldap", "lib"))
+$LOAD_PATH.unshift(File.join(top_dir, "..", "activeldap", "lib"))
 $LOAD_PATH.unshift(File.join(top_dir, "lib"))
 $LOAD_PATH.unshift(File.join(top_dir, "test"))
 

data/test/test-unit-ext/priority.rb

@@ -23,7 +23,9 @@ module Test
           end
         end
 
+        alias_method :method_added_without_priority, :method_added
         def method_added(name)
+          method_added_without_priority(name)
           set_priority(name) if defined?(@priority_initialized)
         end
 
@@ -108,10 +110,18 @@ module Test
       end
 
       def result_dir
-        dir = File.join(File.dirname($0), ".test-result",
-                        self.class.name, escaped_method_name)
+        components = [".test-result", self.class.name, @method_name.to_s]
+        dir = File.join(File.dirname($0), *components)
         dir = File.expand_path(dir)
-        FileUtils.mkdir_p(dir)
+        begin
+          FileUtils.mkdir_p(dir)
+        rescue Errno::EACCES
+          retry_dir = File.join(File.dirname(__FILE__), "..", *components)
+          retry_dir = File.expand_path(retry_dir)
+          raise if retry_dir == dir
+          dir = retry_dir
+          retry
+        end
         dir
       end
 
@@ -163,9 +173,9 @@ module Test
     end
 
     class AutoRunner
-      alias_method :original_options, :options
+      alias_method :options_without_priority, :options
       def options
-        opts = original_options
+        opts = options_without_priority
         opts.on("--[no-]priority", "use priority mode") do |bool|
           TestSuite.priority_mode = bool
         end

data/test/test_asl_useradd.rb

@@ -149,7 +149,7 @@ class AslUserAddTest < Test::Unit::TestCase
             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 @@ class AslUserAddTest < Test::Unit::TestCase
             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)
@@ -442,7 +442,7 @@ class AslUserAddTest < Test::Unit::TestCase
       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
 

data/test/test_asl_usermod.rb

@@ -351,7 +351,7 @@ class AslUserModTest < Test::Unit::TestCase
       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
 
@@ -520,6 +520,14 @@ class AslUserModTest < Test::Unit::TestCase
     end
   end
 
+  def test_wrong_password
+    make_dummy_user do |user, password|
+      assert_asl_usermod_failed(user.uid,
+                                "wrong-#{password}",
+                                _("password doesn't match.") + "\n")
+    end
+  end
+
   private
   def assert_asl_usermod_successfully(name, password, *args)
     args << name

data/test/test_entry.rb

@@ -15,7 +15,7 @@ class EntryTest < Test::Unit::TestCase
     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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: activesambaldap
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2007-09-16 00:00:00 +09:00
+  version: 0.0.5
+date: 2007-11-19 00:00:00 +09:00
 summary: ActiveSambaLdap is a library and a management tool for Samba + LDAP environment.
 require_paths: 
 - lib
@@ -175,7 +175,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.3.1
+        version: 0.9.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe