activesambaldap 0.0.3 → 0.0.4

data/bin/asl-purge

@@ -7,11 +7,13 @@ require 'time'
 require 'active_samba_ldap'
 require 'active_samba_ldap/command'
 
+include ActiveSambaLdap::GetTextSupport
+
 argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 

data/bin/asl-samba-computeradd

@@ -3,14 +3,16 @@
 require 'active_samba_ldap'
 require 'active_samba_ldap/command'
 
+include ActiveSambaLdap::GetTextSupport
+
 argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   options.ou = nil
 
   opts.banner += " COMPUTER_NAME"
 
   opts.on("-o", "--ou=OU",
-          "add the user in the organizational unit OU",
-          "(relative to the user suffix)") do |ou|
+          _("add the user in the organizational unit OU"),
+          _("(relative to the user suffix)")) do |ou|
     if /^ou=/ =~ ou
       options.ou = ou
     else
@@ -28,7 +30,7 @@ else
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 
@@ -52,12 +54,12 @@ class UnixIdPool < ActiveSambaLdap::UnixIdPool
 end
 
 unless Computer.valid_name?(name)
-  $stderr.puts "'#{name}' is illegal computer name"
+  $stderr.puts(_("illegal computer name: %s") % name)
   exit 1
 end
 
 if Computer.exists?(name)
-  $stderr.puts "computer '#{name}' already exists."
+  $stderr.puts(_("computer already exists: %s") % name)
   exit 1
 end
 
@@ -73,7 +75,7 @@ computer = nil
 begin
   computer = Computer.create(:uid => name, :group_class => Group)
 rescue ActiveSambaLdap::UidNumberAlreadyExists
-  $stderr.puts "UID '#{uid_number}' already exists"
+  $stderr.puts(_("UID already exists: %s") % uid_number)
   exit 1
 rescue ActiveSambaLdap::GidNumberDoesNotExist,
   ActiveSambaLdap::GroupDoesNotExist,

data/bin/asl-samba-groupadd

@@ -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 += " GROUP_NAME"
 end
@@ -16,7 +18,7 @@ else
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 
@@ -31,7 +33,7 @@ class UnixIdPool < ActiveSambaLdap::UnixIdPool
 end
 
 if Group.exists?(name)
-  $stderr.puts "group '#{name}' already exists."
+  $stderr.puts(_("group already exists: %s") % name)
   exit 1
 end
 

data/bin/asl-samba-groupdel

@@ -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 += " GROUP_NAME"
 end
@@ -16,7 +18,7 @@ else
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 
@@ -35,7 +37,7 @@ class Computer < ActiveSambaLdap::Computer
 end
 
 unless Group.exists?(name)
-  $stderr.puts "group '#{name}' doesn't exist."
+  $stderr.puts(_("group doesn't exist: %s") % name)
   exit 1
 end
 group = Group.find(name)

data/bin/asl-samba-groupmod

@@ -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.members_to_add = nil
   options.members_to_delete = nil
@@ -10,9 +12,9 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   opts.banner += " GROUP_NAME"
 
   opts.on("-a", "--add-members=MEMBER1,MEMBER2,MEBMER3", Array,
-          "add members (comma delimited)") {|options.members_to_add|}
+          _("add members (comma delimited)")) {|options.members_to_add|}
   opts.on("-d", "--delete-members=MEMBER1,MEMBER2,MEBMER3", Array,
-          "delete members (comma delimited)") {|options.members_to_delete|}
+          _("delete members (comma delimited)")) {|options.members_to_delete|}
 end
 
 name = nil
@@ -24,7 +26,7 @@ else
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 
@@ -43,7 +45,7 @@ class Computer < ActiveSambaLdap::Computer
 end
 
 unless Group.exists?(name)
-  $stderr.puts "group '#{name}' doesn't exist."
+  $stderr.puts(_("group doesn't exist: %s") % name)
   exit 1
 end
 group = Group.find(name)
@@ -51,9 +53,8 @@ group = Group.find(name)
 if options.members_to_add and options.members_to_delete
   duplicated_members = options.members_to_add & options.members_to_delete
   unless duplicated_members.empty?
-    message = "there are duplicated members in adding and deleting members: "
-    message << duplicated_members.join(", ")
-    $stderr.puts message
+    format = _("there are duplicated members in adding and deleting members: %s")
+    $stderr.puts(format % duplicated_members.join(", "))
     exit 1
   end
 end

data/bin/asl-samba-useradd

@@ -3,14 +3,16 @@
 require 'active_samba_ldap'
 require 'active_samba_ldap/command'
 
+include ActiveSambaLdap::GetTextSupport
+
 argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   options.ou = nil
 
   opts.banner += " USER_NAME"
 
   opts.on("-o", "--ou=OU",
-          "add the user in the organizational unit OU",
-          "(relative to the user suffix)") do |ou|
+          _("add the user in the organizational unit OU"),
+          _("(relative to the user suffix)")) do |ou|
     if /^ou=/ =~ ou
       options.ou = ou
     else
@@ -28,7 +30,7 @@ else
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 
@@ -52,12 +54,12 @@ class UnixIdPool < ActiveSambaLdap::UnixIdPool
 end
 
 unless User.valid_name?(name)
-  $stderr.puts "'#{name}' is illegal user name"
+  $stderr.puts(_("illegal user name: %s") % name)
   exit 1
 end
 
 if User.exists?(name)
-  $stderr.puts "user '#{name}' already exists."
+  $stderr.puts(_("user already exists: %s") % name)
   exit 1
 end
 
@@ -70,7 +72,7 @@ user = nil
 begin
   user = User.create(:uid => name, :group_class => Group)
 rescue ActiveSambaLdap::UidNumberAlreadyExists
-  $stderr.puts "UID '#{uid_number}' already exists"
+  $stderr.puts(_("UID already exists: %s") % uid_number)
   exit 1
 rescue ActiveSambaLdap::GidNumberDoesNotExist,
   ActiveSambaLdap::GroupDoesNotExist,

data/bin/asl-samba-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|
   opts.banner += " USER_NAME"
 end
@@ -16,7 +18,7 @@ else
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 
@@ -35,7 +37,7 @@ class Group < ActiveSambaLdap::Group
 end
 
 unless User.exists?(name)
-  $stderr.puts "user '#{name}' doesn't exist."
+  $stderr.puts(_("user doesn't exist: %s") % name)
   exit 1
 end
 

data/bin/asl-samba-usermod

@@ -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.computer_account = false
   options.gid = nil
@@ -10,11 +12,11 @@ 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("-g", "--gid=GID", "gid") {|options.gid|}
+  opts.on("-g", "--gid=GID", _("gid")) {|options.gid|}
 end
 
 name = nil
@@ -41,21 +43,26 @@ 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")
+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)
 
 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"]
@@ -64,7 +71,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

data/bin/asl-useradd

@@ -5,6 +5,8 @@ require 'time'
 require 'active_samba_ldap'
 require 'active_samba_ldap/command'
 
+include ActiveSambaLdap::GetTextSupport
+
 argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   options.ou = nil
   options.computer_account = false
@@ -28,7 +30,7 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   options.samba_logon_script = nil
   options.samba_profile_path = nil
   options.samba_account_flags = nil
-  options.canonical_name = nil
+  options.common_name = nil
   options.given_name = nil
   options.surname = nil
   options.mail_addresses = nil
@@ -37,8 +39,8 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   opts.banner += " USER_NAME"
 
   opts.on("-o", "--ou=OU",
-          "add the user in the organizational unit OU",
-          "(relative to the user suffix)") do |ou|
+          _("add the user in the organizational unit OU"),
+          _("(relative to the user suffix)")) do |ou|
     if /^ou=/ =~ ou
       options.ou = ou
     else
@@ -46,88 +48,86 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
     end
   end
   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("-u", "--uid=UID", Integer, "uid") {|options.uid|}
-  opts.on("-g", "--gid=GID", "gid") {|options.gid|}
+  opts.on("-u", "--uid=UID", Integer, _("uid")) {|options.uid|}
+  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-]create-group",
-          "create a group for the user",
+          _("create a group for the user"),
           "(#{options.create_group})") {|options.create_group|}
   opts.on("-c", "--comment=COMMENT",
-          "set the GECOS field for the new user account") {|options.comment|}
-  opts.on("-s", "--shell=SHELL", "shell") {|options.shell|}
-  opts.on("-G", "--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|}
+          _("set the GECOS field for the new user account")) {|options.comment|}
+  opts.on("-s", "--shell=SHELL", _("shell")) {|options.shell|}
+  opts.on("-G", "--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.on("-d", "--home-directory=HOME_DIR",
-          "home directory") {|options.home_directory|}
+          _("home directory")) {|options.home_directory|}
   opts.on("--home-directory-mode=MODE",
-          "permission of home directory") {|options.home_directory_mode|}
+          _("permission of home directory")) {|options.home_directory_mode|}
   opts.on("--[no-]setup-home-directory",
-          "setup home directory",
+          _("setup home directory"),
           "(#{options.setup_home_directory})") {|options.setup_home_directory|}
   opts.on("-k", "--skel=DIR", "--skeleton-directory=DIR",
-          "skeleton directory") {|options.skeleton_directory|}
+          _("skeleton directory")) {|options.skeleton_directory|}
 
   opts.on("--time=TIME", Integer,
-          "wait TIME seconds before exiting",
+          _("wait TIME seconds before exiting"),
           "(#{options.time})") {|options.time|}
 
   opts.separator("")
-  opts.separator("For samba accounts:")
+  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=UNC",
-          "sambaHomePath",
-          "(SMB home share, like '\\\\PDC\\user'") do |unc|
+          _("sambaHomePath"),
+          _("(SMB home share, like '\\\\PDC\\user'")) do |unc|
     options.samba_home_unc = unc
   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|}
+          _("sambaAcctFlags"),
+          _("(samba account control bits, " \
+            "like '[NDHTUMWSLXI]')")) {|options.samba_account_flags|}
 
 #   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
@@ -141,7 +141,7 @@ else
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 
@@ -164,21 +164,22 @@ class UnixIdPool < ActiveSambaLdap::UnixIdPool
   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")
   name = name.chomp("$") + "$"
+else
+  member_class = User
+  member_type = _("user")
 end
 
 unless member_class.valid_name?(name)
-  $stderr.puts "'#{name}' is illegal #{member_type} name"
+  $stderr.puts(_("illegal %s name: %s") % [name, member_type])
   exit 1
 end
 
 if member_class.exists?(name)
-  $stderr.puts "#{member_type} '#{name}' already exists."
+  $stderr.puts(_("%s already exists: %s") % [member_type, name])
   exit 1
 end
 
@@ -191,7 +192,7 @@ create_options = {
   :home_directory => options.home_directory,
   :login_shell => options.shell,
   :given_name => options.given_name,
-  :cn => options.canonical_name,
+  :cn => options.common_name,
   :sn => options.surname,
   :gecos => options.comment,
   :samba_acct_flags => options.samba_account_flags,
@@ -220,7 +221,7 @@ member = nil
 begin
   member = member_class.create(create_options)
 rescue ActiveSambaLdap::UidNumberAlreadyExists
-  $stderr.puts "UID '#{uid_number}' already exists"
+  $stderr.puts(_("UID already exists: %s") % uid_number)
   exit 1
 rescue ActiveSambaLdap::GidNumberDoesNotExist,
   ActiveSambaLdap::GroupDoesNotExist,