activesambaldap 0.0.3 → 0.0.4

data/rails/plugin/active_samba_ldap/generators/{scaffold_asl/scaffold_asl_generator.rb → scaffold_active_samba_ldap/scaffold_active_samba_ldap_generator.rb}

@@ -1,7 +1,6 @@
-class ScaffoldAslGenerator < Rails::Generator::Base
+class ScaffoldActiveSambaLdapGenerator < Rails::Generator::Base
   def manifest
     record do |m|
-
       m.template("ldap.yml", File.join("config", "ldap.yml"))
 
       %w(user computer group unix_id_pool idmap ou dc).each do |component|

data/rails/plugin/active_samba_ldap/init.rb

@@ -1,6 +1,18 @@
 require_library_or_gem 'active_samba_ldap'
 ActiveSambaLdap::Base.logger ||= RAILS_DEFAULT_LOGGER
 ldap_configuration_file = File.join(RAILS_ROOT, 'config', 'ldap.yml')
-ActiveSambaLdap::Base.configurations =
-  ActiveSambaLdap::Configuration.read(ldap_configuration_file)
-ActiveSambaLdap::Base.establish_connection
+if File.exist?(ldap_configuration_file)
+  ActiveSambaLdap::Base.configurations =
+    ActiveSambaLdap::Configuration.read(ldap_configuration_file)
+  ActiveSambaLdap::Base.establish_connection
+else
+  ActiveLdap::Base.class_eval do
+    format = _("You should run 'script/generator scaffold_active_samba_ldap' " \
+               "to make %s.")
+    logger.error(format % ldap_configuration_file)
+  end
+end
+
+class ActionView::Base
+  include ActiveLdap::Helper
+end

data/test/asl-test-utils.rb

@@ -12,6 +12,7 @@ require 'active_samba_ldap'
 module AslTestUtils
   def self.included(base)
     base.class_eval do
+      include ActiveSambaLdap::GetTextSupport
       include Configuration
       include Connection
       include Populate
@@ -245,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/command.rb

@@ -1,6 +1,7 @@
 require "thread"
 require "socket"
 require "shellwords"
+require "timeout"
 
 module Command
   class Error < StandardError
@@ -58,7 +59,9 @@ module Command
     in_r.close unless in_r.closed?
     out_w.close unless out_w.closed?
     err_w.close unless err_w.closed?
-    pid, status = Process.waitpid2(pid)
-    [status.exited? && status.exitstatus.zero?, out_r.read, err_r.read]
+    Timeout.timeout(5) do
+      pid, status = Process.waitpid2(pid)
+      [status.exited? && status.exitstatus.zero?, out_r.read, err_r.read]
+    end
   end
 end

data/test/run-test.rb

@@ -1,17 +1,21 @@
 #!/usr/bin/env ruby
 
+$KCODE = 'u'
+
 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"))
 
 require 'test-unit-ext'
 
-ARGV.unshift("--priority")
+unless ARGV.find {|opt| /\A--(?:no-)?priority/ =~ opt}
+  ARGV << "--priority"
+end
 
 if Test::Unit::AutoRunner.respond_to?(:standalone?)
   exit Test::Unit::AutoRunner.run($0, File.dirname($0))

data/test/test-unit-ext.rb

@@ -1,2 +1,4 @@
-require 'test-unit-ext/always-show-result'
-require 'test-unit-ext/priority'
+require "test-unit-ext/always-show-result"
+require "test-unit-ext/priority"
+require "test-unit-ext/backtrace-filter"
+require "test-unit-ext/long-display-for-emacs"

data/test/test-unit-ext/backtrace-filter.rb

@@ -0,0 +1,17 @@
+require 'test/unit/util/backtracefilter'
+
+module Test
+  module Unit
+    module Util
+      module BacktraceFilter
+        TEST_UNIT_EXT_PREFIX = File.dirname(__FILE__)
+
+        alias_method :original_filter_backtrace, :filter_backtrace
+        def filter_backtrace(backtrace, prefix=nil)
+          original_result = original_filter_backtrace(backtrace, prefix)
+          original_filter_backtrace(original_result, TEST_UNIT_EXT_PREFIX)
+        end
+      end
+    end
+  end
+end

data/test/test-unit-ext/long-display-for-emacs.rb

@@ -0,0 +1,25 @@
+require 'test/unit/failure'
+require 'test/unit/error'
+
+module Test
+  module Unit
+    BACKTRACE_INFO_RE = /.+:\d+:in `.+?'/
+    class Failure
+      alias_method :original_long_display, :long_display
+      def long_display
+        extract_backtraces_re =
+          /^    \[(#{BACKTRACE_INFO_RE}(?:\n     #{BACKTRACE_INFO_RE})+)\]:$/
+        original_long_display.gsub(extract_backtraces_re) do |backtraces|
+          $1.gsub(/^     (#{BACKTRACE_INFO_RE})/, '\1') + ':'
+        end
+      end
+    end
+
+    class Error
+      alias_method :original_long_display, :long_display
+      def long_display
+        original_long_display.gsub(/^    (#{BACKTRACE_INFO_RE})/, '\1')
+      end
+    end
+  end
+end

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

@@ -28,7 +28,9 @@ module Test
         end
 
         def priority(name, *tests)
-          unless private_methods.include?(priority_check_method_name(name))
+          singleton_class = (class << self; self; end)
+          priority_check_method = priority_check_method_name(name)
+          unless singleton_class.private_method_defined?(priority_check_method)
             raise ArgumentError, "unknown priority: #{name}"
           end
           if tests.empty?
@@ -94,27 +96,38 @@ module Test
         original_run(result, &block)
       ensure
         if passed?
-          FileUtils.rm_f(not_passed_file)
+          FileUtils.touch(passed_file)
         else
-          FileUtils.touch(not_passed_file)
+          FileUtils.rm_f(passed_file)
         end
       end
 
       private
       def previous_test_success?
-        not File.exist?(not_passed_file)
+        File.exist?(passed_file)
       end
 
       def result_dir
         dir = File.join(File.dirname($0), ".test-result",
-                        self.class.name, @method_name.to_s)
+                        self.class.name, escaped_method_name)
         dir = File.expand_path(dir)
         FileUtils.mkdir_p(dir)
         dir
       end
 
-      def not_passed_file
-        File.join(result_dir, "not-passed")
+      def passed_file
+        File.join(result_dir, "passed")
+      end
+
+      def escaped_method_name
+        @method_name.to_s.gsub(/[!?]$/) do |matched|
+          case matched
+          when "!"
+            ".destructive"
+          when "?"
+            ".predicate"
+          end
+        end
       end
     end
 

data/test/test_asl_groupadd.rb

@@ -9,14 +9,14 @@ class AslGroupAddTest < 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("group-name"))
   end
 
   def test_exist_group
     make_dummy_group do |group|
       assert(@group_class.exists?(group.cn))
-      assert_equal([false, "", "group '#{group.cn}' already exists.\n"],
+      assert_equal([false, "", _("group already exists: %s") % group.cn + "\n"],
                    run_command(group.cn))
       assert(@group_class.exists?(group.cn))
     end

data/test/test_asl_groupdel.rb

@@ -9,12 +9,12 @@ class AslGroupDelTest < 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("group-name"))
   end
 
   def test_not_exist_group
-    assert_equal([false, "", "group 'not-exist' doesn't exist.\n"],
+    assert_equal([false, "", _("group doesn't exist: %s") % 'not-exist' + "\n"],
                  run_command("not-exist"))
   end
 
@@ -36,9 +36,9 @@ class AslGroupDelTest < Test::Unit::TestCase
   def test_primary_group_of_user
     make_dummy_group do |group|
       make_dummy_user(:gid_number => group.gid_number) do |user, password|
-        message = "cannot destroy group '#{group.cn}' due to members "
-        message << "who belong to the group as primary group"
-        message << ": #{user.uid}\n"
+        format = _("cannot destroy group '%s' due to members " \
+                   "who belong to the group as primary group: %s")
+        message = format % [group.cn, user.uid] + "\n"
         assert_equal([false, "", message], run_command(group.cn))
       end
     end
@@ -47,9 +47,9 @@ class AslGroupDelTest < Test::Unit::TestCase
   def test_primary_group_of_user_with_force
     make_dummy_group do |group|
       make_dummy_user(:gid_number => group.gid_number) do |user, password|
-        message = "cannot change primary group from '#{group.cn}' "
-        message << "to other group due to no other belonged groups"
-        message << ": #{user.uid}\n"
+        format = _("cannot change primary group from '%s' " \
+                   "to other group due to no other belonged groups: %s")
+        message = format % [group.cn, user.uid] + "\n"
         assert_equal([false, "", message], run_command(group.cn, "--force"))
       end
     end
@@ -75,9 +75,9 @@ class AslGroupDelTest < Test::Unit::TestCase
         make_dummy_group do |group2|
           group2.users << user
           assert_equal(group.gid_number, user.gid_number)
-          message = "cannot destroy group '#{group.cn}' due to members "
-          message << "who belong to the group as primary group"
-          message << ": #{user.uid}\n"
+          format = _("cannot destroy group '%s' due to members " \
+                     "who belong to the group as primary group: %s")
+          message = format % [group.cn, user.uid] + "\n"
           assert_equal([false, "", message], run_command(group.cn))
           user.reload
           assert_equal(group.gid_number, user.gid_number)

data/test/test_asl_groupmod.rb

@@ -9,7 +9,7 @@ class AslGroupModTest < Test::Unit::TestCase
   end
 
   def test_not_exist_group
-    assert_equal([false, "", "group 'not-exist' doesn't exist.\n"],
+    assert_equal([false, "", _("group doesn't exist: %s") % 'not-exist' + "\n"],
                  run_command("not-exist"))
   end
 
@@ -120,7 +120,7 @@ class AslGroupModTest < Test::Unit::TestCase
         new_rid = (2 * Integer(new_gid_number) + 1001).to_s
         new_samba_sid = old_samba_sid.sub(/#{Regexp.escape(old_rid)}$/, new_rid)
 
-        message = "gid number '#{new_gid_number}' already exists\n"
+        message = _("gid number already exists: %s") % new_gid_number + "\n"
         args = ["--gid", new_gid_number]
         assert_asl_groupmod_failed(group.cn, message, *args)
 
@@ -225,19 +225,20 @@ class AslGroupModTest < Test::Unit::TestCase
 
   def test_duplicate_members
     make_dummy_group do |group|
-      base = "there are duplicated members in adding and deleting members:"
+      format = _("there are duplicated members in " \
+                 "adding and deleting members: %s")
       assert_asl_groupmod_failed(group.cn,
-                                 "#{base} user\n",
+                                 "#{format % 'user'}\n",
                                  "--add-members", "user",
                                  "--delete-members", "user")
 
       assert_asl_groupmod_failed(group.cn,
-                                 "#{base} user2\n",
+                                 "#{format % 'user2'}\n",
                                  "--add-members", "user1,user2,user3",
                                  "--delete-members", "user2")
 
       assert_asl_groupmod_failed(group.cn,
-                                 "#{base} user2, user3\n",
+                                 "#{format % 'user2, user3'}\n",
                                  "--add-members", "user1,user2,user3",
                                  "--delete-members", "user2,user3,user4")
     end

data/test/test_asl_groupshow.rb

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

data/test/test_asl_passwd.rb

@@ -9,7 +9,7 @@ class AslPasswdTest < Test::Unit::TestCase
   end
 
   def test_unknown_user
-    assert_equal([false, "", "user 'unknown' doesn't exist.\n"],
+    assert_equal([false, "", _("user doesn't exist: %s") % 'unknown' + "\n"],
                  run_command("unknown"))
   end
 
@@ -103,9 +103,9 @@ class AslPasswdTest < Test::Unit::TestCase
                                           *args)
     assert_equal([true,
                   [
-                   "Enter your current password: ",
-                   "New password: ",
-                   "Retype new password: ",
+                   _("Enter your current password: "),
+                   _("New password: "),
+                   _("Retype new password: "),
                   ].join("\n") + "\n",
                   "",
                  ],
@@ -113,13 +113,14 @@ class AslPasswdTest < Test::Unit::TestCase
   end
 
   def assert_change_password_with_wrong_current_password(name, password, *args)
+    input_password = Proc.new do |input, output|
+      output.puts(password)
+      output.flush
+    end
     assert_equal([false,
-                  "Enter your current password: \n",
-                  "password isn't match\n",
+                  _("Enter your current password: ") + "\n",
+                  _("password doesn't match.") + "\n",
                  ],
-                 run_command_as_normal_user(name, *args) do |input, output|
-                   output.puts(password)
-                   output.flush
-                 end)
+                 run_command_as_normal_user(name, *args, &input_password))
   end
 end

data/test/test_asl_populate.rb

@@ -9,7 +9,7 @@ class AslPopulateTest < 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)
   end
 
@@ -63,8 +63,8 @@ class AslPopulateTest < Test::Unit::TestCase
     name ||= @user_class::DOMAIN_ADMIN_NAME
     assert_equal([true,
                   [
-                   "Password for #{name}: ",
-                   "Retype password for #{name}: ",
+                   _("Password for %s: ") % name,
+                   _("Retype password for %s: ") % name,
                   ].join("\n") + "\n",
                   "",
                  ],
@@ -79,10 +79,10 @@ class AslPopulateTest < Test::Unit::TestCase
     password = "password"
     assert_equal([false,
                   [
-                   "Password for #{name}: ",
-                   "Retype password for #{name}: ",
+                   _("Password for %s: ") % name,
+                   _("Retype password for %s: ") % name,
                   ].join("\n") + "\n",
-                  "Passwords don't match.\n",
+                  _("Passwords don't match.") + "\n",
                  ],
                  run_command(*args) do |input, output|
                    output.puts(password)

data/test/test_asl_purge.rb

@@ -9,7 +9,7 @@ class AslPurgeTest < 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)
   end