activesambaldap 0.0.3 → 0.0.4

data/bin/asl-userdel

@@ -3,6 +3,8 @@
 require 'active_samba_ldap'
 require 'active_samba_ldap/command'
 
+include ActiveSambaLdap::GetTextSupport
+
 argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   options.remove_home_directory = false
   options.interactive = false
@@ -11,17 +13,19 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   opts.banner += " USER_NAME"
 
   opts.on("-c", "--[no-]computer-account",
-          "is a Windows Workstation",
-          "(otherwise, Windows user)",
+          _("is a Windows Workstation"),
+          _("(otherwise, Windows user)"),
           "(#{options.computer_account})") {|options.computer_account|}
 
   opts.on("-r", "--[no-]remove-home-directory",
-          "remove home directory (#{options.remove_home_directory})") do |bool|
+          _("remove home directory"),
+          "(#{options.remove_home_directory})") do |bool|
     options.remove_home_directory = bool
   end
 
   opts.on("-i", "--[no-]interactive",
-          "do interactively (#{options.interactive})") do |bool|
+          _("do interactively"),
+          "(#{options.interactive})") do |bool|
     options.interactive = bool
   end
 end
@@ -35,7 +39,7 @@ else
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 
@@ -53,15 +57,20 @@ class Group < ActiveSambaLdap::Group
   ldap_mapping
 end
 
-member_class = options.computer_account ? Computer : User
-member_type = member_class.name.downcase
+if options.computer_account
+  member_class = Computer
+  member_type = _("computer")
+else
+  member_class = User
+  member_type = _("user")
+end
 
 if options.computer_account
   name = name.chomp("$") + "$"
 end
 
 unless member_class.exists?(name)
-  $stderr.puts "#{member_type} '#{name}' doesn't exist."
+  $stderr.puts(_("%s doesn't exist: %s") % [member_type, name])
   exit 1
 end
 member = member_class.find(name)

data/bin/asl-usermod

@@ -6,6 +6,8 @@ require 'fileutils'
 require 'active_samba_ldap'
 require 'active_samba_ldap/command'
 
+include ActiveSambaLdap::GetTextSupport
+
 argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   options.computer_account = false
   options.gecos = nil
@@ -20,7 +22,7 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   options.supplementary_groups = nil
   options.shell = nil
   options.given_name = nil
-  options.canonical_name = nil
+  options.common_name = nil
   options.surname = nil
 
   options.expire_date = nil
@@ -39,94 +41,94 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   opts.banner += " USER_NAME"
 
   opts.on("-c", "--[no-]computer-account",
-          "is a Windows Workstation",
-          "(otherwise, Windows user)",
+          _("is a Windows Workstation"),
+          _("(otherwise, Windows user)"),
           "(#{options.computer_account})") {|options.computer_account|}
 
-  opts.on("--gecos=GECOS", "gecos") {|options.gecos|}
+  opts.on("--gecos=GECOS", _("gecos")) {|options.gecos|}
   opts.on("-d", "--home-directory=HOME_DIR",
-          "home directory") {|options.home_directory|}
+          _("home directory")) {|options.home_directory|}
   opts.on("-m", "--[no-]move-home-directory",
-          "move home directory (#{options.move_home_directory})") do |bool|
+          _("move home directory"),
+          "(#{options.move_home_directory})") do |bool|
     options.move_home_directory = bool
   end
   opts.on("-r", "--rename=NEW_NAME",
-          "new user name (cn and dn are updated)") do |name|
+          _("new user name (cn and dn are updated)")) do |name|
     options.new_user_name = name
   end
-  opts.on("-u", "--uid=UID", Integer, "uid") {|options.uid|}
+  opts.on("-u", "--uid=UID", Integer, _("uid")) {|options.uid|}
   opts.on("--[no-]allow-non-unique-uid",
-          "uid can be non unique " +
+          _("uid can be non unique "),
           "(#{options.allow_non_unique_uid_number})") do |bool|
     options.allow_non_unique_uid_number = bool
   end
   opts.on("-g", "--gid=GID", "gid") {|options.gid|}
   opts.on("-G", "--groups=GID1,GID2,GID3", Array,
-          "supplementary groups (comma separated)") do |groups|
+          _("supplementary groups (comma separated)")) do |groups|
     options.supplementary_groups = groups
   end
   opts.on("--[no-]merge-groups",
-          "replace supplementary groups " +
+          _("replace supplementary groups "),
           "(#{!options.merge_groups})") {|options.merge_groups|}
-  opts.on("-s", "--shell=SHELL", "shell") {|options.shell|}
-  opts.on("--given-name=NAME", "given name") {|options.given_name|}
-  opts.on("-N", "--canonical-name=NAME",
-          "canonical name") {|options.canonical_name|}
-  opts.on("-S", "--surname=NAME", "surname") {|options.surname|}
+  opts.on("-s", "--shell=SHELL", _("shell")) {|options.shell|}
+  opts.on("--given-name=NAME", _("given name")) {|options.given_name|}
+  opts.on("-N", "--common-name=NAME",
+          _("common name")) {|options.common_name|}
+  opts.on("-S", "--surname=NAME", _("surname")) {|options.surname|}
 
   opts.separator("")
-  opts.separator("For samba users:")
+  opts.separator(_("For samba accounts:"))
 
-  opts.on("-e", "--expire-date=DATE", "expire date") do |date|
+  opts.on("-e", "--expire-date=DATE", _("expire date")) do |date|
     options.expire_date = Time.parse(date)
   end
   opts.on("-C", "--[no-]can-change-password",
-          "can change password") do |bool|
+          _("can change password")) do |bool|
     options.can_change_password = bool
   end
   opts.on("-M", "--[no-]must-change-password",
-          "must change password") do |bool|
+          _("must change password")) do |bool|
     options.must_change_password = bool
   end
   opts.on("--samba-home-path=PATH",
-          "sambaHomePath",
-          "(SMB home share, like '\\\\PDC\\user'") do |path|
+          _("sambaHomePath"),
+          _("(SMB home share, like '\\\\PDC\\user'")) do |path|
     options.samba_home_path = path
   end
   opts.on("--samba-home-drive=DRIVE",
-          "sambaHomeDrive",
-          "(letter associated with home share,",
-          " like 'H:')") do |drive|
+          _("sambaHomeDrive"),
+          _("(letter associated with home share, like 'H:')")) do |drive|
     options.samba_home_drive = drive
   end
   opts.on("--samba-logon-script=SCRIPT",
-          "sambaLogonScript",
-          "(DOS script to execute on login)") do |script|
+          _("sambaLogonScript"),
+          _("(DOS script to execute on login)")) do |script|
     options.samba_logon_script = script
   end
   opts.on("--samba-profile-path=PATH",
-          "sambaProfilePath",
-          "(profile directory,",
-          " like '\\\\PDC\\profiles\\user')") do |path|
+          _("sambaProfilePath"),
+          _("(profile directory, " \
+            "like '\\\\PDC\\profiles\\user')")) do |path|
     options.samba_profile_path = path
   end
   opts.on("--samba-account-flags=FLAGS",
-          "sambaAcctFlags",
-          "(samba account control bits,",
-          " like '[NDHTUMWSLXI]')") {|options.samba_account_flags|}
-  opts.on("-D", "--[no-]disable-user", "disable an user") do |bool|
+          _("sambaAcctFlags"),
+          _("(samba account control bits, " \
+            "like '[NDHTUMWSLXI]')")) {|options.samba_account_flags|}
+  opts.on("-D", "--[no-]disable-user", _("disable this user")) do |bool|
     options.enable = !bool
   end
-  opts.on("-E", "--[no-]enable-user", "enable an user") do |bool|
+  opts.on("-E", "--[no-]enable-user", _("enable this user")) do |bool|
     options.enable = bool
   end
 #   opts.on("--mail-addresses=ADDRESS1,ADDRESS2,ADDRESS3",
 #           Array,
-#           "mailAddresses (comma separated)") {|options.mail_addresses|}
+#           _("mailAddresses (comma separated)")) {|options.mail_addresses|}
 #   opts.on("--mail-to-addresses=ADDRESS1,ADDRESS2,ADDRESS3",
 #           Array,
-#           "mailToAddresses (forward address)",
-#           "(comma separated)") do |addresses|
+#           _("mailToAddresses (forward address)"),
+#           _("(comma separated)")) do |addresses|
 #     options.mail_to_addresses = addresses
 #   end
 end
@@ -155,21 +157,23 @@ end
 
 options.computer_account = true if /\$$/ =~ name
 
-member_class = options.computer_account ? Computer : User
-member_type = member_class.name.downcase
-
 if options.computer_account
+  member_class = Computer
+  member_type = _("computer")
   name = name.chomp("$") + "$"
+else
+  member_class = User
+  member_type = _("user")
 end
 
 unless member_class.exists?(name)
-  $stderr.puts "#{member_type} '#{name}' doesn't exist."
+  $stderr.puts(_("%s doesn't exist: %s") % [member_type, name])
   exit 1
 end
 member = member_class.find(name)
 
 unless Process.uid.zero?
-  password = ActiveSambaLdap::Command.read_password("Enter your password: ")
+  password = ActiveSambaLdap::Command.read_password(_("Enter your password: "))
 
   auth_class = Class.new(ActiveSambaLdap::Base)
   config = ActiveSambaLdap::Base.configurations["reference"]
@@ -178,7 +182,7 @@ unless Process.uid.zero?
                                                  :password => password,
                                                  :allow_anonymous => false))
   rescue ActiveLdap::AuthenticationError
-    $stderr.puts "password isn't match"
+    $stderr.puts(_("password isn't match."))
     exit 1
   ensure
     auth_class.remove_connection
@@ -220,8 +224,8 @@ if options.home_directory
   member.home_directory = options.home_directory
 end
 
-if options.canonical_name
-  member.cn = options.canonical_name
+if options.common_name
+  member.cn = options.common_name
 end
 
 if options.surname
@@ -233,11 +237,11 @@ if options.given_name
 end
 
 if options.mail_addresses
-  raise "not implemented"
+  raise _("not implemented.")
 end
 
 if options.mail_to_addresses
-  raise "not implemented"
+  raise _("not implemented.")
 end
 
 if options.supplementary_groups
@@ -307,7 +311,8 @@ if options.new_user_name
     options.new_user_name = options.new_user_name.chomp("$") + "$"
   end
   if member_class.exists?(options.new_user_name)
-    $stderr.puts "#{member_type} '#{options.new_user_name}' always exists."
+    format = _("%s already exists: %s")
+    $stderr.puts(format % [member_type, options.new_user_name])
     exit 1
   end
   new_member = member_class.new(options.new_user_name)

data/bin/asl-usershow

@@ -3,6 +3,8 @@
 require 'active_samba_ldap'
 require 'active_samba_ldap/command'
 
+include ActiveSambaLdap::GetTextSupport
+
 argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   opts.banner += " USER_NAME"
 end
@@ -22,7 +24,7 @@ class User < ActiveSambaLdap::User
 end
 
 unless User.exists?(name)
-  $stderr.puts "user '#{name}' doesn't exist."
+  $stderr.puts(_("user doesn't exist: %s") % name)
   exit 1
 end
 user = User.find(name)

data/lib/active_samba_ldap.rb

@@ -8,7 +8,7 @@ require_gem_if_need = Proc.new do |library_name, gem_name, *options|
   end
 end
 
-required_active_ldap_version = ">= 0.8.2"
+required_active_ldap_version = ">= 0.8.3.1"
 require_gem_if_need.call("active_ldap", "ruby-activeldap",
                          required_active_ldap_version)
 
@@ -17,6 +17,7 @@ if Dependencies.respond_to?(:load_paths)
 end
 
 require 'active_samba_ldap/version'
+require 'active_samba_ldap/get_text_support'
 require 'active_samba_ldap/base'
 require "active_samba_ldap/configuration"
 require 'active_samba_ldap/populate'

data/lib/active_samba_ldap/account_entry.rb

@@ -72,7 +72,7 @@ module ActiveSambaLdap
       end
 
       def prepare_create_options(account, options)
-        prepare_create_options_for_number(:uid_number, account, options)
+        prepare_create_options_for_number("uid_number", account, options)
       end
     end
 
@@ -85,15 +85,16 @@ module ActiveSambaLdap
       self.home_directory ||= substituted_value(:user_home_directory)
       self.login_shell ||= self.class.configuration[:user_login_shell]
 
-      password = options[:password]
+      options = options.stringify_keys
+      password = options["password"]
       change_password(password) if password
       self.user_password ||= "{crypt}x"
 
-      uid_number = options[:uid_number]
+      uid_number = options["uid_number"]
       self.change_uid_number(uid_number) if uid_number
 
-      group = options[:group] || retrieve_default_group(options)
-      self.primary_group = group if group
+      primary_group = options["group"] || retrieve_default_primary_group(options)
+      self.primary_group = primary_group if primary_group
 
       self
     end
@@ -177,20 +178,21 @@ module ActiveSambaLdap
       uid
     end
 
-    def retrieve_default_group(options={})
+    def retrieve_default_primary_group(options={})
       group = nil
 
-      gid_number = options[:gid_number]
-      group_class = options[:group_class]
+      gid_number = options["gid_number"]
+      group_class = options["group_class"]
+      group_class ||= self.class.associated_class(:primary_group)
       unless gid_number
-        if options[:create_group]
+        if options["create_group"]
           group_name = created_group_name
           if group_class.exists?(group_name)
             group = group_class.find(group_name)
           else
             group = group_class.create(:cn => group_name,
-                                       :pool => options[:pool],
-                                       :pool_class => options[:pool_class])
+                                       :pool => options["pool"],
+                                       :pool_class => options["pool_class"])
           end
         else
           gid_number = default_gid_number

data/lib/active_samba_ldap/base.rb

@@ -2,21 +2,21 @@ require 'active_samba_ldap/reloadable'
 
 module ActiveSambaLdap
   class Error < StandardError
+    include ActiveSambaLdap::GetTextSupport
   end
 
-  class RequiredVariableIsNotSet < Error
-    attr_reader :name
-    def initialize(name)
-      @name = name
-      super("required variable '#{name}' is not set")
-    end
-  end
-
-  class RequiredVariablesAreNotSet < RequiredVariableIsNotSet
+  class MissingRequiredVariableError < Error
     attr_reader :names
     def initialize(names)
+      names = names.to_a
       @names = names
-      super("required variables '#{names.join(', ')}' are not set")
+      super(n_("required variable is not set: %s",
+               "required variables are not set: %s",
+               names.size) % names.join(', '))
+    end
+
+    def name
+      @names.first
     end
   end
 
@@ -24,7 +24,7 @@ module ActiveSambaLdap
     attr_reader :number
     def initialize(number)
       @number = number
-      super("uid number '#{@number}' already exists")
+      super(_("uid number already exists: %s") % number)
     end
   end
 
@@ -32,7 +32,7 @@ module ActiveSambaLdap
     attr_reader :name
     def initialize(name)
       @name = name
-      super("group '#{@name}' doesn't exist")
+      super(_("group doesn't exist: %s") % name)
     end
   end
 
@@ -40,7 +40,7 @@ module ActiveSambaLdap
     attr_reader :number
     def initialize(number)
       @number = number
-      super("gid number '#{@number}' already exists")
+      super(_("gid number already exists: %s") % number)
     end
   end
 
@@ -48,7 +48,7 @@ module ActiveSambaLdap
     attr_reader :number
     def initialize(number)
       @number = number
-      super("gid number '#{@number}' doesn't exist")
+      super(_("gid number doesn't exist: %s") % number)
     end
   end
 
@@ -56,7 +56,7 @@ module ActiveSambaLdap
     attr_reader :number
     def initialize(number)
       @number = number
-      super("sambaSID attribute doesn't exist for gid number '#{@number}'")
+      super(_("sambaSID attribute doesn't exist for gid number '%s'") % number)
     end
   end
 
@@ -65,9 +65,9 @@ module ActiveSambaLdap
     def initialize(group, members)
       @group = group
       @members = members
-      message = "cannot change primary group from '#{group}' to other group "
-      message << "due to no other belonged groups: #{members.join(', ')}"
-      super(message)
+      format = _("cannot change primary group from '%s' to other group " \
+                 "due to no other belonged groups: %s")
+      super(format % [group, members.join(', ')])
     end
   end
 
@@ -76,9 +76,9 @@ module ActiveSambaLdap
     def initialize(group, members)
       @group = group
       @members = members
-      message = "cannot destroy group '#{group}' due to members who belong "
-      message << "to the group as primary group: #{members.join(', ')}"
-      super(message)
+      format = _("cannot destroy group '%s' due to members who belong " \
+                 "to the group as primary group: %s")
+      super(format % [group, members.join(', ')])
     end
   end
 
@@ -88,8 +88,8 @@ module ActiveSambaLdap
       @file = file
       @location = location
       @detail = detail
-      super("found invalid configuration format at #{@file}:#{@location}" +
-            ": #{@detail}")
+      format = _("found invalid configuration format at %s:%s: %s")
+      super(format % [file, location, detail])
     end
   end
 
@@ -99,7 +99,8 @@ module ActiveSambaLdap
       @name = name
       @value = value
       @detail = detail
-      super("the value of #{@name} '#{@value.inspect}' is invalid: #{@detail}")
+      format = _("the value of %s '%s' is invalid: %s")
+      super(format % [name, value.inspect, detail])
     end
   end
 
@@ -107,7 +108,7 @@ module ActiveSambaLdap
     attr_reader :object
     def initialize(object)
       @object = object
-      super("#{@object.inspect} is not Samba available")
+      super(_("%s is not Samba available") % [object.inspect])
     end
   end