activesambaldap 0.0.3 → 0.0.4

data/lib/active_samba_ldap/command.rb

@@ -5,6 +5,8 @@ require 'active_samba_ldap'
 
 module ActiveSambaLdap
   module Command
+    include ActiveSambaLdap::GetTextSupport
+
     module_function
     def parse_options(argv=nil)
       argv ||= ARGV.dup
@@ -13,22 +15,22 @@ module ActiveSambaLdap
       opts = OptionParser.new do |opts|
         yield(opts, options)
 
-        opts.separator ""
-        opts.separator "Common options:"
+        opts.separator("")
+        opts.separator(_("Common options:"))
 
         opts.on_tail("--config=CONFIG",
-                     "Specify configuration file",
-                     "Default configuration files:",
+                     _("Specify configuration file"),
+                     _("Default configuration files:"),
                      *configuration_files.collect {|x| "  #{x}"}) do |file|
           configuration_files << file
         end
 
-        opts.on_tail("-h", "--help", "Show this message") do
+        opts.on_tail("-h", "--help", _("Show this message")) do
           puts opts
           exit
         end
 
-        opts.on_tail("--version", "Show version") do
+        opts.on_tail("--version", _("Show version")) do
           puts VERSION
           exit
         end
@@ -50,7 +52,9 @@ module ActiveSambaLdap
     def read_password(prompt, input=$stdin, output=$stdout)
       output.print prompt
       system "/bin/stty -echo" if input.tty?
-      input.gets.chomp
+      password = input.gets
+      password = password.chomp if password
+      password
     ensure
       system "/bin/stty echo" if input.tty?
       output.puts

data/lib/active_samba_ldap/configuration.rb

@@ -42,7 +42,7 @@ module ActiveSambaLdap
       class ValidHash < Hash
         def [](name)
           if Private.required_variables.include?(name) and !has_key?(name)
-            raise RequiredVariableIsNotSet.new(name)
+            raise MissingRequiredVariableError.new(name)
           end
           super(name)
         end
@@ -73,11 +73,13 @@ module ActiveSambaLdap
           end
         end
         unless missing_variables.empty?
-          raise RequiredVariablesAreNotSet.new(missing_variables)
+          raise MissingRequiredVariableError.new(missing_variables)
         end
       end
 
       class Private
+        include ActiveSambaLdap::GetTextSupport
+
         VARIABLES = %w(base host port scope bind_dn
                        password method allow_anonymous
 
@@ -105,7 +107,7 @@ module ActiveSambaLdap
           end
 
           def compute_required_variables
-            not_required_variables = %w(base ldap_scope)
+            not_required_variables = %w(base scope ldap_scope)
             (VARIABLES - public_methods - not_required_variables).collect do |x|
               x.to_sym
             end
@@ -305,7 +307,7 @@ module ActiveSambaLdap
             types = AVAILABLE_HASH_TYPES.collect {|x| x.inspect}.join(", ")
             raise InvalidConfigurationValueError.new("password_hash_type",
                                                      type,
-                                                     "must be in #{types}")
+                                                     _("must be in %s") % types)
           end
         end
 

data/lib/active_samba_ldap/entry.rb

@@ -9,10 +9,11 @@ module ActiveSambaLdap
       def create(attributes=nil)
         pool = nil
         number_key = nil
-        ensure_ou((attributes || {})[dn_attribute.to_sym])
+        attributes ||= {}
+        attributes = attributes.stringify_keys
+        ensure_ou(attributes[dn_attribute])
         entry = super do |entry|
-          options = attributes || {}
-          options, pool, number_key = prepare_create_options(entry, options)
+          options, pool, number_key = prepare_create_options(entry, attributes)
           entry.fill_default_values(options)
           yield entry if block_given?
         end
@@ -35,7 +36,7 @@ module ActiveSambaLdap
         prefixes = [prefix]
         ou.split(/\s*,\s*/).reverse_each do |entry|
           name, value = entry.split(/\s*=\s*/, 2).collect {|x| x.strip}
-          raise ArgumentError, "#{ou} must be only ou" if name != "ou"
+          raise ArgumentError, _("%s must be only ou") % ou if name != "ou"
           ou_class = Class.new(ActiveSambaLdap::Ou)
           ou_class.ldap_mapping :prefix => prefixes.join(',')
           prefixes.unshift(entry)

data/lib/active_samba_ldap/get_text_support.rb

@@ -0,0 +1,12 @@
+module ActiveSambaLdap
+  module GetTextSupport
+    class << self
+      def included(base)
+        base.class_eval do
+          include(ActiveLdap::GetText)
+          bindtextdomain("active-samba-ldap")
+        end
+      end
+    end
+  end
+end

data/lib/active_samba_ldap/group_entry.rb

@@ -98,14 +98,15 @@ module ActiveSambaLdap
       end
 
       def prepare_create_options(group, options)
-        prepare_create_options_for_number(:gid_number, group, options)
+        prepare_create_options_for_number("gid_number", group, options)
       end
     end
 
     def fill_default_values(options={})
-      gid_number = options[:gid_number]
+      options = options.stringify_keys
+      gid_number = options["gid_number"]
       change_gid_number(gid_number) if gid_number
-      self.description ||= options[:description] || cn
+      self.description ||= options["description"] || cn
     end
 
     def members

data/lib/active_samba_ldap/populate.rb

@@ -153,7 +153,7 @@ module ActiveSambaLdap
             group = nil
           else
             user = user_class.new(name)
-            user.fill_default_values(:uid_number => uid, :group => group)
+            user.fill_default_values("uid_number" => uid, "group" => group)
             user.save!
             group.users << user
           end

data/lib/active_samba_ldap/samba_account_entry.rb

@@ -91,7 +91,7 @@ module ActiveSambaLdap
       self.samba_logoff_time ||= FAR_FUTURE_TIME
       self.samba_kickoff_time ||= nil
 
-      password = options[:password]
+      password = options["password"]
       change_samba_password(password) if password
       self.samba_lm_password ||= "XXX"
       self.samba_nt_password ||= "XXX"
@@ -100,21 +100,21 @@ module ActiveSambaLdap
       account_flags_is_not_set = samba_acct_flags.nil?
       self.samba_acct_flags ||= default_account_flags
 
-      can_change_password = options[:can_change_password]
+      can_change_password = options["can_change_password"]
       if can_change_password
         self.enable_password_change
       elsif account_flags_is_not_set or can_change_password == false
         self.disable_password_change
       end
 
-      must_change_password = options[:must_change_password]
+      must_change_password = options["must_change_password"]
       if must_change_password
         self.enable_forcing_password_change
       elsif account_flags_is_not_set or must_change_password == false
         self.disable_forcing_password_change
       end
 
-      enable_account = options[:enable]
+      enable_account = options["enable"]
       if enable_account
         self.enable
       elsif account_flags_is_not_set or enable_account == false

data/lib/active_samba_ldap/samba_group_entry.rb

@@ -92,8 +92,9 @@ module ActiveSambaLdap
 
     def fill_default_values(options={})
       if samba_available?
-        change_type(options[:group_type] || "domain") unless samba_group_type
-        self.display_name ||= options[:display_name] || cn
+        options = options.stringify_keys
+        change_type(options["group_type"] || "domain") unless samba_group_type
+        self.display_name ||= options["display_name"] || cn
       end
       super
     end
@@ -134,7 +135,7 @@ module ActiveSambaLdap
       elsif TYPES.values.include?(type.to_i)
         # pass
       else
-        raise ArgumentError, "invalid type: #{type}"
+        raise ArgumentError, _("invalid type: %s") % type
       end
       self.samba_group_type = type.to_s
     end

data/lib/active_samba_ldap/user.rb

@@ -20,6 +20,7 @@ module ActiveSambaLdap
       result = super
       return result unless samba_available?
 
+      options = options.stringify_keys
       subst = Proc.new do |key|
         value = options[key]
         if value
@@ -29,10 +30,10 @@ module ActiveSambaLdap
         end
       end
 
-      self.samba_home_path ||= subst[:user_home_unc]
-      self.samba_home_drive ||= subst[:user_home_drive].sub(/([^:])$/, "\\1:")
-      self.samba_profile_path ||= subst[:user_profile]
-      self.samba_logon_script ||= subst[:user_logon_script]
+      self.samba_home_path ||= subst["user_home_unc"]
+      self.samba_home_drive ||= subst["user_home_drive"].sub(/([^:])$/, "\\1:")
+      self.samba_profile_path ||= subst["user_profile"]
+      self.samba_logon_script ||= subst["user_logon_script"]
     end
 
     private

data/lib/active_samba_ldap/version.rb

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

data/po/active-samba-ldap.pot

@@ -0,0 +1,463 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+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-08 11:51+0900\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: lib/active_samba_ldap/command.rb:19
+msgid "Common options:"
+msgstr ""
+
+#: lib/active_samba_ldap/command.rb:22
+msgid "Specify configuration file"
+msgstr ""
+
+#: lib/active_samba_ldap/command.rb:23
+msgid "Default configuration files:"
+msgstr ""
+
+#: lib/active_samba_ldap/command.rb:28
+msgid "Show this message"
+msgstr ""
+
+#: lib/active_samba_ldap/command.rb:33
+msgid "Show version"
+msgstr ""
+
+#: lib/active_samba_ldap/entry.rb:39
+msgid "%s must be only ou"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:15
+msgid "required variable is not set: %s"
+msgid_plural "required variables are not set: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/active_samba_ldap/base.rb:27
+msgid "uid number already exists: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:35 bin/asl-groupdel:46 bin/asl-groupshow:27
+#: bin/asl-samba-groupmod:48 bin/asl-groupmod:59 bin/asl-samba-groupdel:40
+msgid "group doesn't exist: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:43
+msgid "gid number already exists: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:51
+msgid "gid number doesn't exist: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:59
+msgid "sambaSID attribute doesn't exist for gid number '%s'"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:68
+msgid ""
+"cannot change primary group from '%s' to other group due to no other "
+"belonged groups: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:79
+msgid ""
+"cannot destroy group '%s' due to members who belong to the group as primary "
+"group: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:91
+msgid "found invalid configuration format at %s:%s: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:102
+msgid "the value of %s '%s' is invalid: %s"
+msgstr ""
+
+#: lib/active_samba_ldap/base.rb:111
+msgid "%s is not Samba available"
+msgstr ""
+
+#: lib/active_samba_ldap/configuration.rb:310
+msgid "must be in %s"
+msgstr ""
+
+#: lib/active_samba_ldap/samba_group_entry.rb:138
+msgid "invalid type: %s"
+msgstr ""
+
+#: rails/plugin/active_samba_ldap/init.rb:10
+msgid ""
+"You should run 'script/generator scaffold_active_samba_ldap' to make %s."
+msgstr ""
+
+#: bin/asl-samba-useradd:14 bin/asl-samba-computeradd:14 bin/asl-useradd:42
+msgid "add the user in the organizational unit OU"
+msgstr ""
+
+#: bin/asl-samba-useradd:15 bin/asl-samba-computeradd:15 bin/asl-useradd:43
+msgid "(relative to the user suffix)"
+msgstr ""
+
+#: bin/asl-samba-useradd:33 bin/asl-samba-userdel:21 bin/asl-userdel:42
+#: bin/asl-groupdel:27 bin/asl-samba-computeradd:33 bin/asl-useradd:144
+#: bin/asl-samba-groupmod:29 bin/asl-populate:60 bin/asl-groupmod:40
+#: bin/asl-samba-groupadd:21 bin/asl-purge:16 bin/asl-samba-groupdel:21
+#: bin/asl-groupadd:33
+msgid "need root authority."
+msgstr ""
+
+#: bin/asl-samba-useradd:57
+msgid "illegal user name: %s"
+msgstr ""
+
+#: bin/asl-samba-useradd:62
+msgid "user already exists: %s"
+msgstr ""
+
+#: bin/asl-samba-useradd:75 bin/asl-samba-computeradd:78 bin/asl-useradd:224
+msgid "UID already exists: %s"
+msgstr ""
+
+#: bin/asl-samba-userdel:40 bin/asl-passwd:52 bin/asl-usershow:27
+msgid "user doesn't exist: %s"
+msgstr ""
+
+#: bin/asl-userdel:16 bin/asl-useradd:51 bin/asl-samba-usermod:15
+#: bin/asl-usermod:44
+msgid "is a Windows Workstation"
+msgstr ""
+
+#: bin/asl-userdel:17 bin/asl-useradd:52 bin/asl-samba-usermod:16
+#: bin/asl-usermod:45
+msgid "(otherwise, Windows user)"
+msgstr ""
+
+#: bin/asl-userdel:21
+msgid "remove home directory"
+msgstr ""
+
+#: bin/asl-userdel:27
+msgid "do interactively"
+msgstr ""
+
+#: bin/asl-userdel:62 bin/asl-useradd:169 bin/asl-samba-usermod:48
+#: bin/asl-usermod:162
+msgid "computer"
+msgstr ""
+
+#: bin/asl-userdel:65 bin/asl-useradd:173 bin/asl-samba-usermod:51
+#: bin/asl-usermod:166
+msgid "user"
+msgstr ""
+
+#: bin/asl-userdel:73 bin/asl-samba-usermod:59 bin/asl-usermod:170
+msgid "%s doesn't exist: %s"
+msgstr ""
+
+#: bin/asl-groupdel:14
+msgid "force delete group"
+msgstr ""
+
+#: bin/asl-samba-computeradd:57
+msgid "illegal computer name: %s"
+msgstr ""
+
+#: bin/asl-samba-computeradd:62
+msgid "computer already exists: %s"
+msgstr ""
+
+#: bin/asl-passwd:17
+msgid "update samba password"
+msgstr ""
+
+#: bin/asl-passwd:23
+msgid "update UNIX password"
+msgstr ""
+
+#: bin/asl-passwd:41
+msgid "do nothing."
+msgstr ""
+
+#: bin/asl-passwd:58
+msgid "Enter your current password: "
+msgstr ""
+
+#: bin/asl-passwd:69
+msgid "password doesn't match."
+msgstr ""
+
+#: bin/asl-passwd:74
+msgid "New password: "
+msgstr ""
+
+#: bin/asl-passwd:75
+msgid "Retype new password: "
+msgstr ""
+
+#: bin/asl-passwd:78
+msgid "New passwords don't match."
+msgstr ""
+
+#: bin/asl-useradd:54 bin/asl-usermod:60
+msgid "uid"
+msgstr ""
+
+#: bin/asl-useradd:55 bin/asl-samba-usermod:19
+msgid "gid"
+msgstr ""
+
+#: bin/asl-useradd:57 bin/asl-usermod:68
+msgid "supplementary groups (comma separated)"
+msgstr ""
+
+#: bin/asl-useradd:61
+msgid "create a group for the user"
+msgstr ""
+
+#: bin/asl-useradd:64
+msgid "set the GECOS field for the new user account"
+msgstr ""
+
+#: bin/asl-useradd:65 bin/asl-usermod:74
+msgid "shell"
+msgstr ""
+
+#: bin/asl-useradd:66 bin/asl-usermod:75
+msgid "given name"
+msgstr ""
+
+#: bin/asl-useradd:68 bin/asl-usermod:77
+msgid "common name"
+msgstr ""
+
+#: bin/asl-useradd:69 bin/asl-usermod:78
+msgid "surname"
+msgstr ""
+
+#: bin/asl-useradd:72 bin/asl-usermod:50
+msgid "home directory"
+msgstr ""
+
+#: bin/asl-useradd:74
+msgid "permission of home directory"
+msgstr ""
+
+#: bin/asl-useradd:76
+msgid "setup home directory"
+msgstr ""
+
+#: bin/asl-useradd:79
+msgid "skeleton directory"
+msgstr ""
+
+#: bin/asl-useradd:82
+msgid "wait TIME seconds before exiting"
+msgstr ""
+
+#: bin/asl-useradd:86 bin/asl-usermod:81
+msgid "For samba accounts:"
+msgstr ""
+
+#: bin/asl-useradd:88 bin/asl-usermod:83
+msgid "expire date"
+msgstr ""
+
+#: bin/asl-useradd:92 bin/asl-usermod:87
+msgid "can change password"
+msgstr ""
+
+#: bin/asl-useradd:96 bin/asl-usermod:91
+msgid "must change password"
+msgstr ""
+
+#: bin/asl-useradd:100 bin/asl-usermod:95
+msgid "sambaHomePath"
+msgstr ""
+
+#: bin/asl-useradd:101 bin/asl-usermod:96
+msgid "(SMB home share, like '\\\\PDC\\user'"
+msgstr ""
+
+#: bin/asl-useradd:105 bin/asl-usermod:100
+msgid "sambaHomeDrive"
+msgstr ""
+
+#: bin/asl-useradd:106 bin/asl-usermod:101
+msgid "(letter associated with home share, like 'H:')"
+msgstr ""
+
+#: bin/asl-useradd:110 bin/asl-usermod:105
+msgid "sambaLogonScript"
+msgstr ""
+
+#: bin/asl-useradd:111 bin/asl-usermod:106
+msgid "(DOS script to execute on login)"
+msgstr ""
+
+#: bin/asl-useradd:115 bin/asl-usermod:110
+msgid "sambaProfilePath"
+msgstr ""
+
+#: bin/asl-useradd:116 bin/asl-usermod:111
+msgid "(profile directory, like '\\\\PDC\\profiles\\user')"
+msgstr ""
+
+#: bin/asl-useradd:120 bin/asl-usermod:116
+msgid "sambaAcctFlags"
+msgstr ""
+
+#: bin/asl-useradd:121 bin/asl-usermod:117
+msgid "(samba account control bits, like '[NDHTUMWSLXI]')"
+msgstr ""
+
+#: bin/asl-useradd:177
+msgid "illegal %s name: %s"
+msgstr ""
+
+#: bin/asl-useradd:182 bin/asl-usermod:314
+msgid "%s already exists: %s"
+msgstr ""
+
+#: bin/asl-samba-groupmod:15 bin/asl-groupmod:26
+msgid "add members (comma delimited)"
+msgstr ""
+
+#: bin/asl-samba-groupmod:17 bin/asl-groupmod:28
+msgid "delete members (comma delimited)"
+msgstr ""
+
+#: bin/asl-samba-groupmod:56
+msgid "there are duplicated members in adding and deleting members: %s"
+msgstr ""
+
+#: bin/asl-samba-usermod:65 bin/asl-usermod:176
+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 ""
+
+#: bin/asl-populate:33
+msgid "first gid number to allocate"
+msgstr ""
+
+#: bin/asl-populate:36
+msgid "administrator login name"
+msgstr ""
+
+#: bin/asl-populate:39
+msgid "administrator's uid number"
+msgstr ""
+
+#: bin/asl-populate:42
+msgid "administrator's gid number"
+msgstr ""
+
+#: bin/asl-populate:45
+msgid "guest login name"
+msgstr ""
+
+#: bin/asl-populate:48
+msgid "guest's uid number"
+msgstr ""
+
+#: bin/asl-populate:51
+msgid "guest's gid number"
+msgstr ""
+
+#: bin/asl-populate:54
+msgid "export LDIF file"
+msgstr ""
+
+#: bin/asl-populate:76
+msgid "Password for %s: "
+msgstr ""
+
+#: bin/asl-populate:78
+msgid "Retype password for %s: "
+msgstr ""
+
+#: bin/asl-populate:81
+msgid "Passwords don't match."
+msgstr ""
+
+#: bin/asl-groupmod:17 bin/asl-groupadd:15
+msgid "GID number"
+msgstr ""
+
+#: bin/asl-groupmod:19
+msgid "gid can be non unique"
+msgstr ""
+
+#: bin/asl-groupmod:24
+msgid "new group name"
+msgstr ""
+
+#: bin/asl-groupmod:79
+msgid "there is duplicated member in adding and deleting members: %s"
+msgid_plural "there are duplicated members in adding and deleting members: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bin/asl-groupmod:117 bin/asl-samba-groupadd:36 bin/asl-groupadd:48
+msgid "group already exists: %s"
+msgstr ""
+
+#: bin/asl-usermod:48
+msgid "gecos"
+msgstr ""
+
+#: bin/asl-usermod:52
+msgid "move home directory"
+msgstr ""
+
+#: bin/asl-usermod:57
+msgid "new user name (cn and dn are updated)"
+msgstr ""
+
+#: bin/asl-usermod:62
+msgid "uid can be non unique "
+msgstr ""
+
+#: bin/asl-usermod:72
+msgid "replace supplementary groups "
+msgstr ""
+
+#: bin/asl-usermod:119
+msgid "disable this user"
+msgstr ""
+
+#: bin/asl-usermod:122
+msgid "enable this user"
+msgstr ""
+
+#: bin/asl-usermod:240 bin/asl-usermod:244
+msgid "not implemented."
+msgstr ""
+
+#: bin/asl-groupadd:17
+msgid "group type"
+msgstr ""
+
+#: bin/asl-groupadd:20
+msgid "print the gid number to stdout"
+msgstr ""