activesambaldap 0.0.3 → 0.0.4

data/NEWS.en

@@ -2,7 +2,14 @@
 
 = NEWS.en
 
-$Id: NEWS.en 93 2007-05-26 07:29:06Z kou $
+$Id: NEWS.en 119 2007-09-16 13:14:27Z kou $
+
+== 0.0.4: 2007-09-16
+
+  * Supported Ruby/ActiveLdap 0.8.3.1.
+  * Supported Ruby-GetText-Package.
+  * scaffold_asl -> scaffold_active_samba_ldap
+  * Improved Rails support.
 
 == 0.0.3: 2007-05-26
 

data/NEWS.ja

@@ -2,7 +2,14 @@
 
 = NEWS.ja
 
-$Id: NEWS.ja 93 2007-05-26 07:29:06Z kou $
+$Id: NEWS.ja 119 2007-09-16 13:14:27Z kou $
+
+== 0.0.4: 2007-09-16
+
+  * Ruby/ActiveLdap 0.8.3.1対応。
+  * Ruby-GetText-Package対応。
+  * scaffold_asl -> scaffold_active_samba_ldap
+  * Rails対応を強化。
 
 == 0.0.3: 2007-05-26
 

data/README.en

@@ -2,7 +2,7 @@
 
 = README.en
 
-$Id: README.en 92 2007-05-02 09:35:00Z kou $
+$Id: README.en 120 2007-09-16 13:17:37Z kou $
 
 == Name
 
@@ -37,7 +37,7 @@ asl-devel@rubyforge.org
 
 == Dependency libraries
 
-  * ActiveLdap >= 0.8.2
+  * ActiveLdap >= 0.8.3.1
 
 == Usage
 
@@ -50,11 +50,12 @@ the following URL because the URL is for trunk.
 
 Next, scaffold the environment of ActiveSambaLdap for Rails.
 
-  % script/generate scaffold_asl
+  % script/generate scaffold_active_samba_ldap
 
-Modify config/ldap.yml generated by scaffold_asl to adapt
-to your environment. See "Options in configuration file"
-section to find available options.
+Modify config/ldap.yml generated by
+scaffold_active_samba_ldap to adapt to your environment. See
+"Options in configuration file" section to find available
+options.
 
 ==== Populate
 
@@ -327,3 +328,5 @@ asl-populate, please confirm the following:
       SUBSTR caseExactIA5SubstringsMatch
 
 == Thanks
+
+  * Henrik Krög: He reported some bugs.

data/README.ja

@@ -2,7 +2,7 @@
 
 = README.ja
 
-$Id: README.ja 91 2007-05-02 09:21:55Z kou $
+$Id: README.ja 120 2007-09-16 13:17:37Z kou $
 
 == 名前
 
@@ -34,7 +34,7 @@ asl-devel-ja@rubyforge.org
 
 == 依存ライブラリ
 
-  * ActiveLdap >= 0.8.2
+  * ActiveLdap >= 0.8.3.1
 
 == 使用法
 
@@ -47,7 +47,7 @@ trunk用ですので，環境にあわせて変更してください．
 
 次に，Rails用ActiveSambaLdap環境を構築します．
 
-  % script/generate scaffold_asl
+  % script/generate scaffold_active_samba_ldap
 
 config/ldap.ymlが生成されるので，環境にあわせて編集します．
 指定できるオプションは，以下の「設定ファイルのオプション」の
@@ -323,3 +323,5 @@ LDAP管理ユーザのパスワードを設定しておく必要があります
       SUBSTR caseExactIA5SubstringsMatch
 
 == 感謝
+
+  * Henrik Krög: バグを報告してくれました。

data/Rakefile

@@ -9,7 +9,8 @@ truncate_base_dir = Proc.new do |x|
 end
 
 _binding = binding
-eval(File.read("#{base_dir}/lib/active_samba_ldap.rb"), _binding)
+file = "#{base_dir}/lib/active_samba_ldap.rb"
+eval(File.read(file), _binding, file)
 eval('require_gem_if_need.call("hoe")', _binding)
 required_active_ldap_version = eval('required_active_ldap_version', _binding)
 
@@ -88,7 +89,10 @@ rdoc_task.rdoc_files += project.bin_files.collect {|x| "#{x}.help"}
 project.bin_files.each do |bin|
   bin_help = "#{bin}.help"
   File.open(bin_help, "w") do |f|
+    lang = ENV["LANG"]
+    ENV["LANG"] = "C"
     f.puts(`#{RUBY} -I #{File.join(base_dir, 'lib')} #{bin} --help`)
+    ENV["LANG"] = lang
   end
   at_exit do
     FileUtils.rm_f(bin_help)
@@ -103,6 +107,8 @@ task :tag do
   sh 'svn', 'copy', '-m', message, "#{base}trunk", "#{base}tags/#{version}"
 end
 
+desc "Distribute new release."
+task :dist => [:publish_docs, :release, :tag, :announce]
 
 # # fix Hoe's incorrect guess.
 # project.spec.executables.clear
@@ -136,3 +142,43 @@ task :uninstall do
     rm_f project.bin_files.collect {|f| f.sub(/^bin#{File::SEPARATOR}/, '')}
   end
 end
+
+
+desc "Update *.po/*.pot files and create *.mo from *.po files"
+task :gettext => ["gettext:po:update", "gettext:mo:create"]
+
+namespace :gettext do
+  desc "Setup environment for GetText"
+  task :environment do
+    require "gettext/utils"
+  end
+
+  namespace :po do
+    desc "Update po/pot files (GetText)"
+    task :update => "gettext:environment" do
+      module GetText::RGetText
+        class << self
+          alias_method :generate_pot_original, :generate_pot
+          def generate_pot(ary)
+            ary = ary.collect {|key, *other| [key.gsub(/\\/, "\\\\\\"), *other]}
+            generate_pot_original(ary)
+          end
+        end
+      end
+      files = Dir.glob("{lib,rails}/**/*.rb")
+      files += Dir.glob("bin/asl*")
+      GetText.update_pofiles("active-samba-ldap",
+                             files,
+                             "Ruby/ActiveSambaLdap #{ActiveSambaLdap::VERSION}")
+    end
+  end
+
+  namespace :mo do
+    desc "Create *.mo from *.po (GetText)"
+    task :create => "gettext:environment" do
+      GetText.create_mofiles(false)
+    end
+  end
+end
+
+task(:gem).prerequisites.unshift("gettext:mo:create")

data/bin/asl-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|
   options.gid = nil
   options.group_type = "domain"
@@ -10,11 +12,12 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
 
   opts.banner += " GROUP_NAME"
 
-  opts.on("-g", "--gid=GID", Integer, "GID number") {|options.gid|}
+  opts.on("-g", "--gid=GID", Integer, _("GID number")) {|options.gid|}
   opts.on("-t", "--type=TYPE",
-          "group type (#{options.group_type})") {|options.group_type|}
+          _("group type"),
+          "(#{options.group_type})") {|options.group_type|}
   opts.on("-p", "--[no-]print-gid-number",
-          "print the gid number to stdout",
+          _("print the gid number to stdout"),
           "(#{options.print_gid_number})") {|options.print_gid_number|}
 end
 
@@ -27,7 +30,7 @@ else
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 
@@ -42,7 +45,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-groupdel

@@ -3,13 +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.force = false
 
   opts.banner += " GROUP_NAME"
 
   opts.on("-f", "--[no-]force",
-          "force delete group (#{options.force})") {|options.force|}
+          _("force delete group"),
+          "(#{options.force})") {|options.force|}
 end
 
 name = nil
@@ -21,7 +24,7 @@ else
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 
@@ -40,7 +43,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-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.gid = nil
   options.allow_non_unique_gid_number = false
@@ -12,18 +14,18 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
 
   opts.banner += " GROUP_NAME"
 
-  opts.on("-g", "--gid=GID", "gid") {|options.gid|}
+  opts.on("-g", "--gid=GID", _("GID number")) {|options.gid|}
   opts.on("--[no-]allow-non-unique-gid",
-          "gid can be non unique " +
+          _("gid can be non unique"),
           "(#{options.allow_non_unique_gid_number})") do |bool|
     options.allow_non_unique_gid_number = bool
   end
   opts.on("-r", "--rename=NEW_NAME",
-          "new group name") {|options.new_group_name|}
+          _("new group name")) {|options.new_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
@@ -35,7 +37,7 @@ else
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 
@@ -54,7 +56,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)
@@ -71,9 +73,11 @@ end
 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 =
+      n_("there is duplicated member in adding and deleting members: %s",
+         "there are duplicated members in adding and deleting members: %s",
+         duplicated_members.size)
+    $stderr.puts(format % duplicated_members.join(", "))
     exit 1
   end
 end
@@ -110,7 +114,7 @@ group.save!
 
 if options.new_group_name
   if Group.exists?(options.new_group_name)
-    $stderr.puts "group '#{options.new_group_name}' always exists."
+    $stderr.puts(_("group already exists: %s") % options.new_group_name)
     exit 1
   end
 

data/bin/asl-groupshow

@@ -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
@@ -22,7 +24,7 @@ class Group < ActiveSambaLdap::Group
 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-passwd

@@ -5,6 +5,8 @@ require 'etc'
 require 'active_samba_ldap'
 require 'active_samba_ldap/command'
 
+include ActiveSambaLdap::GetTextSupport
+
 argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   options.update_samba_password = true
   options.update_unix_password = true
@@ -12,12 +14,14 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   opts.banner += " [USER_NAME]"
 
   opts.on("-s", "--[no-]samba-password",
-          "update samba password (#{options.update_samba_password})") do |bool|
+          _("update samba password"),
+          "(#{options.update_samba_password})") do |bool|
     options.update_samba_password = bool
   end
 
   opts.on("-u", "--[no-]unix-password",
-          "update UNIX password (#{options.update_unix_password})") do |bool|
+          _("update UNIX password"),
+          "(#{options.update_unix_password})") do |bool|
     options.update_unix_password = bool
   end
 end
@@ -34,7 +38,7 @@ else
 end
 
 if !options.update_samba_password and !options.update_unix_password
-  $stderr.puts "do nothing"
+  $stderr.puts(_("do nothing."))
   exit
 end
 
@@ -45,13 +49,13 @@ 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)
 
 unless Process.uid.zero?
-  prompt = "Enter your current password: "
+  prompt = _("Enter your current password: ")
   old_password = ActiveSambaLdap::Command.read_password(prompt)
 
   auth_class = Class.new(ActiveSambaLdap::Base)
@@ -60,19 +64,18 @@ unless Process.uid.zero?
     auth_class.establish_connection(config.merge(:bind_dn => user.dn,
                                                  :password => old_password,
                                                  :allow_anonymous => false))
+    auth_class.remove_connection
   rescue ActiveLdap::AuthenticationError
-    $stderr.puts "password isn't match"
+    $stderr.puts(_("password doesn't match."))
     exit 1
-  ensure
-    auth_class.remove_connection
   end
 end
 
-password = ActiveSambaLdap::Command.read_password("New password: ")
-password2 = ActiveSambaLdap::Command.read_password("Retype new password: ")
+password = ActiveSambaLdap::Command.read_password(_("New password: "))
+password2 = ActiveSambaLdap::Command.read_password(_("Retype new password: "))
 
 unless password == password2
-  $stderr.puts "New passwords don't match."
+  $stderr.puts(_("New passwords don't match."))
   exit 1
 end
 

data/bin/asl-populate

@@ -7,6 +7,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|
   default = ActiveSambaLdap::Configuration::ClassMethods::Private.new({})
   options.start_uid = Integer(default.start_uid)
@@ -25,34 +27,37 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   options.import_ldif = nil
 
   opts.on("-u", "--start-uid=UID", Integer,
-          "first uid number to allocate",
+          _("first uid number to allocate"),
           "(#{options.start_uid})") {|options.start_uid|}
   opts.on("-g", "--start-gid=GID", Integer,
-          "first gid number to allocate",
+          _("first gid number to allocate"),
           "(#{options.start_gid})") {|options.start_gid|}
   opts.on("-a", "--administrator=NAME",
-          "administrator login name",
+          _("administrator login name"),
           "(#{options.administrator})") {|options.administrator|}
   opts.on("--administrator-uid=UID", Integer,
-          "administrator's uid number",
+          _("administrator's uid number"),
           "(#{options.administrator_uid})") {|options.administrator_uid|}
   opts.on("--administrator-gid=GID", Integer,
-          "administrator's gid number",
+          _("administrator's gid number"),
           "(#{options.administrator_gid})") {|options.administrator_gid|}
   opts.on("-g", "--guest=NAME",
-          "guest login name (#{options.guest})") {|options.guest|}
+          _("guest login name"),
+          "(#{options.guest})") {|options.guest|}
   opts.on("--guest-uid=UID", Integer,
-          "guest's uid number (#{options.guest_uid})") {|options.guest_uid|}
+          _("guest's uid number"),
+          "(#{options.guest_uid})") {|options.guest_uid|}
   opts.on("--guest-gid=GID", Integer,
-          "guest's gid number (#{options.guest_gid})") {|options.guest_gid|}
+          _("guest's gid number"),
+          "(#{options.guest_gid})") {|options.guest_gid|}
   opts.on("-e", "--export-ldif=LDIF",
-          "export LDIF file") {|options.export_ldif|}
+          _("export LDIF file")) {|options.export_ldif|}
 #   opts.on("-i", "--import-ldif=LDIF",
-#           "import LDIF file") {|options.import_ldif|}
+#           _("import LDIF file")) {|options.import_ldif|}
 end
 
 unless Process.uid.zero?
-  $stderr.puts "need root authority."
+  $stderr.puts(_("need root authority."))
   exit 1
 end
 
@@ -68,12 +73,12 @@ def init_administrator(opts, entries)
   end
   return if admin.new_entry?
 
-  prompt = "Password for #{admin_name}: "
+  prompt = _("Password for %s: ") % admin_name
   password = ActiveSambaLdap::Command.read_password(prompt)
-  prompt2 = "Retype password for #{admin_name}: "
+  prompt2 = _("Retype password for %s: ") % admin_name
   password2 = ActiveSambaLdap::Command.read_password(prompt2)
   unless password == password2
-    $stderr.puts "Passwords don't match."
+    $stderr.puts(_("Passwords don't match."))
     exit 1
   end