activesambaldap 0.0.2 → 0.0.3

data/NEWS.en

@@ -2,12 +2,20 @@
 
 = NEWS.en
 
-$Id: NEWS.en 70 2007-01-29 03:45:14Z kou $
+$Id: NEWS.en 93 2007-05-26 07:29:06Z kou $
 
-== 0.0.2: 2006-01-29
+== 0.0.3: 2007-05-26
+
+  * Fixed a typo of Ruby/ActiveLDAP's RubyGems name.
+  * Supported Ruby/AtiveLDAP 0.8.2.
+  * Integrated ActiveLdap::User, ActiveLdap::Computer and ActiveLdap::Group
+    with ActiveLdap::SambaUser, ActiveLdap::SambaComputer and
+    ActiveLdap::SambaGroup.
+
+== 0.0.2: 2007-01-29
 
   * Supported ActiveSupport 1.4.0.
-  * Fixed typo of Ruby/ActiveLDAP's RubyGems name.
+  * Fixed a typo of Ruby/ActiveLDAP's RubyGems name.
 
 == 0.0.1: 2006-11-17
 

data/NEWS.ja

@@ -2,9 +2,20 @@
 
 = NEWS.ja
 
-$Id: NEWS.ja 70 2007-01-29 03:45:14Z kou $
+$Id: NEWS.ja 93 2007-05-26 07:29:06Z kou $
 
-== 0.0.2: 2006-01-29
+== 0.0.3: 2007-05-26
+
+  * Ruby/ActiveLDAPのRubyGems名を修正．
+  * Ruby/ActiveLDAP 0.8.2対応。
+  * ActiveSambaLdap::SambaUser,
+    ActiveSambaLdap::SambaComputer,
+    ActiveSambaLdap::SambaGroupを廃止し、
+    ActiveSambaLdap::User,
+    ActiveSambaLdap::Computer,
+    ActiveSambaLdap::Groupへ一本化。
+
+== 0.0.2: 2007-01-29
 
   * ActiveSupport 1.4.0のサポート．
   * Ruby/ActiveLDAPのRubyGems名を修正．

data/README.en

@@ -2,7 +2,7 @@
 
 = README.en
 
-$Id: README.en 63 2006-11-21 13:26:46Z kou $
+$Id: README.en 92 2007-05-02 09:35:00Z kou $
 
 == Name
 
@@ -29,13 +29,15 @@ Ruby's.
 
 asl-devel@rubyforge.org
 
+((<URL:http://rubyforge.org/mailman/listinfo/asl-devel/>))
+
 == Reference manual
 
-((<URL:http://asl.rubyforge.org/>))
+((<URL:http://asl.rubyforge.org/activesambaldap/>))
 
 == Dependency libraries
 
-  * ActiveLdap >= 0.8.0
+  * ActiveLdap >= 0.8.2
 
 == Usage
 
@@ -307,4 +309,21 @@ command before invoke your Samba server.
 
 == Trouble shootings
 
+=== Groups aren't listed
+
+You can list groups by the following command:
+
+  % net rpc group list --user=USER_NAME
+
+If no groups listed by the above command after you execute
+asl-populate, please confirm the following:
+
+  * Is your samba.schema old?
+
+    If your sambaSID entry in your samba.schema doesn't have
+    the following configuration, your samba.schema may be old.
+    Please update your samba.schema.
+
+      SUBSTR caseExactIA5SubstringsMatch
+
 == Thanks

data/README.ja

@@ -2,7 +2,7 @@
 
 = README.ja
 
-$Id: README.ja 63 2006-11-21 13:26:46Z kou $
+$Id: README.ja 91 2007-05-02 09:21:55Z kou $
 
 == 名前
 
@@ -26,13 +26,15 @@ Ruby's.
 
 asl-devel-ja@rubyforge.org
 
+((<URL:http://rubyforge.org/mailman/listinfo/asl-devel-ja/>))
+
 == リファレンスマニュアル
 
-((<URL:http://asl.rubyforge.org/>))
+((<URL:http://asl.rubyforge.org/activesambaldap/>))
 
 == 依存ライブラリ
 
-  * ActiveLdap >= 0.8.0
+  * ActiveLdap >= 0.8.2
 
 == 使用法
 
@@ -303,5 +305,21 @@ LDAP管理ユーザのパスワードを設定しておく必要があります
 
 == トラブルシューティング
 
+=== グループ一覧がでない
+
+以下のコマンドでグループ一覧を表示する事ができます。
+
+  % net rpc group list --user=USER_NAME
+
+もし、asl-populateした後なのに上記のコマンドでひとつもグルー
+プがでない場合は以下のことを確認してください。
+
+  * samba.schemaが古くないか
+
+    sambaSIDのエントリに以下の設定がない場合は古い
+    samba.schemaである可能性があります。最新のものに更新して
+    ください。
+
+      SUBSTR caseExactIA5SubstringsMatch
 
 == 感謝

data/Rakefile

@@ -11,6 +11,7 @@ end
 _binding = binding
 eval(File.read("#{base_dir}/lib/active_samba_ldap.rb"), _binding)
 eval('require_gem_if_need.call("hoe")', _binding)
+required_active_ldap_version = eval('required_active_ldap_version', _binding)
 
 manifest = File.join(base_dir, "Manifest.txt")
 manifest_contents = []
@@ -57,10 +58,9 @@ end
 ENV["VERSION"] = ActiveSambaLdap::VERSION
 project = Hoe.new("activesambaldap", ActiveSambaLdap::VERSION) do |p|
   p.rubyforge_name = "asl"
-  p.name = p.rubyforge_name if ARGV.include?("public_docs")
   p.full_name = "ActiveSambaLdap"
   p.summary = "Samba+LDAP administration tools"
-  p.extra_deps << ["activeldap", ">= 0.8.0"]
+  p.extra_deps << ["ruby-activeldap", required_active_ldap_version]
   p.email = "kou@cozmixng.org"
   p.author = "Kouhei Sutou"
   p.url = "http://asl.rubyforge.org/"
@@ -79,6 +79,7 @@ if ObjectSpace.each_object(Rake::RDocTask) {|rdoc_task|} != 1
   puts "hoe may be changed"
 end
 rdoc_task.main = "README.en"
+rdoc_task.options.delete("-d")
 rdoc_task.options << "--charset=UTF-8"
 rdoc_task.template = "kilmer"
 rdoc_task.rdoc_files -= project.bin_files
@@ -99,5 +100,39 @@ task :tag do
   version = ActiveSambaLdap::VERSION
   message = "Released ActiveSambaLdap #{version}!"
   base = "svn+ssh://#{ENV['USER']}@rubyforge.org/var/svn/asl/"
-  run("svn copy -m #{message.dump} #{base}/trunk #{base}/tags/#{version}")
+  sh 'svn', 'copy', '-m', message, "#{base}trunk", "#{base}tags/#{version}"
+end
+
+
+# # fix Hoe's incorrect guess.
+# project.spec.executables.clear
+# project.bin_files = project.spec.files.grep(/^bin/)
+
+# fix Hoe's install and uninstall task.
+task(:install).instance_variable_get("@actions").clear
+task(:uninstall).instance_variable_get("@actions").clear
+
+task :install do
+  [
+   [project.lib_files, "lib", Hoe::RUBYLIB, 0444],
+   [project.bin_files, "bin", File.join(Hoe::PREFIX, 'bin'), 0555]
+  ].each do |files, prefix, dest, mode|
+    FileUtils.mkdir_p dest unless test ?d, dest
+    files.each do |file|
+      base = File.dirname(file.sub(/^#{prefix}#{File::SEPARATOR}/, ''))
+      _dest = File.join(dest, base)
+      FileUtils.mkdir_p _dest unless test ?d, _dest
+      install file, _dest, :mode => mode
+    end
+  end
+end
+
+desc 'Uninstall the package.'
+task :uninstall do
+  Dir.chdir Hoe::RUBYLIB do
+    rm_f project.lib_files.collect {|f| f.sub(/^lib#{File::SEPARATOR}/, '')}
+  end
+  Dir.chdir File.join(Hoe::PREFIX, 'bin') do
+    rm_f project.bin_files.collect {|f| f.sub(/^bin#{File::SEPARATOR}/, '')}
+  end
 end

data/bin/asl-groupadd

@@ -33,7 +33,7 @@ end
 
 ActiveSambaLdap::Base.establish_connection("update")
 
-class Group < ActiveSambaLdap::SambaGroup
+class Group < ActiveSambaLdap::Group
   ldap_mapping
 end
 

data/bin/asl-groupdel

@@ -27,15 +27,15 @@ end
 
 ActiveSambaLdap::Base.establish_connection("update")
 
-class Group < ActiveSambaLdap::SambaGroup
+class Group < ActiveSambaLdap::Group
   ldap_mapping
 end
 
-class User < ActiveSambaLdap::SambaUser
+class User < ActiveSambaLdap::User
   ldap_mapping
 end
 
-class Computer < ActiveSambaLdap::SambaComputer
+class Computer < ActiveSambaLdap::Computer
   ldap_mapping
 end
 

data/bin/asl-groupmod

@@ -41,15 +41,15 @@ end
 
 ActiveSambaLdap::Base.establish_connection("update")
 
-class Group < ActiveSambaLdap::SambaGroup
+class Group < ActiveSambaLdap::Group
   ldap_mapping
 end
 
-class User < ActiveSambaLdap::SambaUser
+class User < ActiveSambaLdap::User
   ldap_mapping
 end
 
-class Computer < ActiveSambaLdap::SambaComputer
+class Computer < ActiveSambaLdap::Computer
   ldap_mapping
 end
 

data/bin/asl-groupshow

@@ -17,7 +17,7 @@ end
 
 ActiveSambaLdap::Base.establish_connection("reference")
 
-class Group < ActiveSambaLdap::SambaGroup
+class Group < ActiveSambaLdap::Group
   ldap_mapping
 end
 

data/bin/asl-passwd

@@ -40,13 +40,7 @@ end
 
 ActiveSambaLdap::Base.establish_connection("update")
 
-if options.update_samba_password
-  parent = ActiveSambaLdap::SambaUser
-else
-  parent = ActiveSambaLdap::User
-end
-
-class User < parent
+class User < ActiveSambaLdap::User
   ldap_mapping
 end
 

data/bin/asl-populate

@@ -11,16 +11,16 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
   default = ActiveSambaLdap::Configuration::ClassMethods::Private.new({})
   options.start_uid = Integer(default.start_uid)
   options.start_gid = Integer(default.start_gid)
-  options.administrator = ActiveSambaLdap::SambaUser::DOMAIN_ADMIN_NAME
-  admin_rid = ActiveSambaLdap::SambaUser::DOMAIN_ADMIN_RID
-  admins_rid = ActiveSambaLdap::SambaGroup::DOMAIN_ADMINS_RID
-  guest_rid = ActiveSambaLdap::SambaUser::DOMAIN_GUEST_RID
-  guests_rid = ActiveSambaLdap::SambaGroup::DOMAIN_GUESTS_RID
-  options.administrator_uid = ActiveSambaLdap::SambaUser.rid2uid(admin_rid)
-  options.administrator_gid = ActiveSambaLdap::SambaGroup.rid2gid(admins_rid)
-  options.guest = ActiveSambaLdap::SambaUser::DOMAIN_GUEST_NAME
-  options.guest_uid = ActiveSambaLdap::SambaUser.rid2uid(guest_rid)
-  options.guest_gid = ActiveSambaLdap::SambaGroup.rid2gid(guests_rid)
+  options.administrator = ActiveSambaLdap::User::DOMAIN_ADMIN_NAME
+  admin_rid = ActiveSambaLdap::User::DOMAIN_ADMIN_RID
+  admins_rid = ActiveSambaLdap::Group::DOMAIN_ADMINS_RID
+  guest_rid = ActiveSambaLdap::User::DOMAIN_GUEST_RID
+  guests_rid = ActiveSambaLdap::Group::DOMAIN_GUESTS_RID
+  options.administrator_uid = ActiveSambaLdap::User.rid2uid(admin_rid)
+  options.administrator_gid = ActiveSambaLdap::Group.rid2gid(admins_rid)
+  options.guest = ActiveSambaLdap::User::DOMAIN_GUEST_NAME
+  options.guest_uid = ActiveSambaLdap::User.rid2uid(guest_rid)
+  options.guest_gid = ActiveSambaLdap::Group.rid2gid(guests_rid)
   options.export_ldif = nil
   options.import_ldif = nil
 

data/bin/asl-samba-computeradd

@@ -36,15 +36,15 @@ ActiveSambaLdap::Base.establish_connection("update")
 
 
 class User < ActiveSambaLdap::User
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class Computer < ActiveSambaLdap::Computer
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class Group < ActiveSambaLdap::Group
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class UnixIdPool < ActiveSambaLdap::UnixIdPool

data/bin/asl-samba-groupadd

@@ -23,7 +23,7 @@ end
 ActiveSambaLdap::Base.establish_connection("update")
 
 class Group < ActiveSambaLdap::Group
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class UnixIdPool < ActiveSambaLdap::UnixIdPool

data/bin/asl-samba-groupdel

@@ -23,15 +23,15 @@ end
 ActiveSambaLdap::Base.establish_connection("update")
 
 class Group < ActiveSambaLdap::Group
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class User < ActiveSambaLdap::User
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class Computer < ActiveSambaLdap::Computer
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 unless Group.exists?(name)

data/bin/asl-samba-groupmod

@@ -31,15 +31,15 @@ end
 ActiveSambaLdap::Base.establish_connection("update")
 
 class Group < ActiveSambaLdap::Group
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class User < ActiveSambaLdap::User
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class Computer < ActiveSambaLdap::Computer
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 unless Group.exists?(name)

data/bin/asl-samba-useradd

@@ -36,15 +36,15 @@ ActiveSambaLdap::Base.establish_connection("update")
 
 
 class User < ActiveSambaLdap::User
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class Computer < ActiveSambaLdap::Computer
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class Group < ActiveSambaLdap::Group
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class UnixIdPool < ActiveSambaLdap::UnixIdPool

data/bin/asl-samba-userdel

@@ -23,15 +23,15 @@ end
 ActiveSambaLdap::Base.establish_connection("update")
 
 class User < ActiveSambaLdap::User
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class Computer < ActiveSambaLdap::Computer
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class Group < ActiveSambaLdap::Group
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 unless User.exists?(name)

data/bin/asl-samba-usermod

@@ -28,15 +28,15 @@ end
 ActiveSambaLdap::Base.establish_connection("update")
 
 class User < ActiveSambaLdap::User
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class Computer < ActiveSambaLdap::Computer
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 class Group < ActiveSambaLdap::Group
-  ldap_mapping
+  ldap_mapping :recommended_classes => []
 end
 
 options.computer_account = true if /\$$/ =~ name

data/bin/asl-useradd

@@ -72,7 +72,7 @@ argv, opts, options = ActiveSambaLdap::Command.parse_options do |opts, options|
           "permission of home directory") {|options.home_directory_mode|}
   opts.on("--[no-]setup-home-directory",
           "setup home directory",
-          "(#{options.setup_home_directory}") {|options.setup_home_directory|}
+          "(#{options.setup_home_directory})") {|options.setup_home_directory|}
   opts.on("-k", "--skel=DIR", "--skeleton-directory=DIR",
           "skeleton directory") {|options.skeleton_directory|}
 
@@ -148,15 +148,15 @@ end
 ActiveSambaLdap::Base.establish_connection("update")
 
 
-class User < ActiveSambaLdap::SambaUser
+class User < ActiveSambaLdap::User
   ldap_mapping
 end
 
-class Computer < ActiveSambaLdap::SambaComputer
+class Computer < ActiveSambaLdap::Computer
   ldap_mapping
 end
 
-class Group < ActiveSambaLdap::SambaGroup
+class Group < ActiveSambaLdap::Group
   ldap_mapping
 end
 

data/bin/asl-userdel

@@ -41,15 +41,15 @@ end
 
 ActiveSambaLdap::Base.establish_connection("update")
 
-class User < ActiveSambaLdap::SambaUser
+class User < ActiveSambaLdap::User
   ldap_mapping
 end
 
-class Computer < ActiveSambaLdap::SambaComputer
+class Computer < ActiveSambaLdap::Computer
   ldap_mapping
 end
 
-class Group < ActiveSambaLdap::SambaGroup
+class Group < ActiveSambaLdap::Group
   ldap_mapping
 end
 

data/bin/asl-usermod

@@ -141,15 +141,15 @@ end
 
 ActiveSambaLdap::Base.establish_connection("update")
 
-class User < ActiveSambaLdap::SambaUser
+class User < ActiveSambaLdap::User
   ldap_mapping
 end
 
-class Computer < ActiveSambaLdap::SambaComputer
+class Computer < ActiveSambaLdap::Computer
   ldap_mapping
 end
 
-class Group < ActiveSambaLdap::SambaGroup
+class Group < ActiveSambaLdap::Group
   ldap_mapping
 end
 

data/bin/asl-usershow

@@ -17,7 +17,7 @@ end
 
 ActiveSambaLdap::Base.establish_connection("reference")
 
-class User < ActiveSambaLdap::SambaUser
+class User < ActiveSambaLdap::User
   ldap_mapping
 end
 

data/lib/active_samba_ldap/{account.rb → account_entry.rb}

@@ -5,7 +5,7 @@ require 'English'
 require 'active_samba_ldap/base'
 
 module ActiveSambaLdap
-  module Account
+  module AccountEntry
     NAME_RE_SRC = "(?!\\d)[\\w @_\\-\\.]+"
 
     def self.included(base)
@@ -40,6 +40,7 @@ module ActiveSambaLdap
           :groups_many => "memberUid",
           :prefix => default_prefix,
           :classes => default_classes,
+          :recommended_classes => default_recommended_classes,
         }
       end
 
@@ -51,6 +52,10 @@ module ActiveSambaLdap
         ["top", "inetOrgPerson", "posixAccount"]
       end
 
+      def default_recommended_classes
+        []
+      end
+
       def primary_group_options(options)
         {
           :class => options[:primary_group_class],

data/lib/active_samba_ldap/base.rb

@@ -103,6 +103,14 @@ module ActiveSambaLdap
     end
   end
 
+  class NotSambaAavialableError < Error
+    attr_reader :object
+    def initialize(object)
+      @object = object
+      super("#{@object.inspect} is not Samba available")
+    end
+  end
+
   class Base < ActiveLdap::Base
     include Reloadable
 

data/lib/active_samba_ldap/command.rb

@@ -1,6 +1,8 @@
 require 'optparse'
 require 'ostruct'
 
+require 'active_samba_ldap'
+
 module ActiveSambaLdap
   module Command
     module_function

data/lib/active_samba_ldap/computer.rb

@@ -1,13 +1,24 @@
-require 'active_samba_ldap/account'
-require 'active_samba_ldap/computer_account'
+require 'active_samba_ldap/base'
+require 'active_samba_ldap/entry'
+require 'active_samba_ldap/samba_entry'
+require 'active_samba_ldap/account_entry'
+require 'active_samba_ldap/computer_account_entry'
+require 'active_samba_ldap/samba_account_entry'
 
 module ActiveSambaLdap
   class Computer < Base
     include Reloadable
 
     include Entry
+    include SambaEntry
 
-    include Account
-    include ComputerAccount
+    include AccountEntry
+    include ComputerAccountEntry
+    include SambaAccountEntry
+
+    private
+    def default_account_flags
+      "[W]"
+    end
   end
 end

data/lib/active_samba_ldap/{computer_account.rb → computer_account_entry.rb}

@@ -1,6 +1,6 @@
 module ActiveSambaLdap
-  module ComputerAccount
-    NAME_RE = /\A#{Account::NAME_RE_SRC}\$\z/
+  module ComputerAccountEntry
+    NAME_RE = /\A#{AccountEntry::NAME_RE_SRC}\$\z/
 
     def self.included(base)
       super

data/lib/active_samba_ldap/configuration.rb

@@ -48,6 +48,15 @@ module ActiveSambaLdap
         end
       end
 
+      def remove_connection_related_configuration(config)
+        target_keys = Private::VARIABLES.collect do |name|
+          name.to_sym
+        end - ActiveLdap::Adapter::Base::VALID_ADAPTER_CONFIGURATION_KEYS
+        super(config).reject do |key, value|
+          target_keys.include?(key)
+        end
+      end
+
       def merge_configuration(config)
         config = config.symbolize_keys
         config = (configurations["common"] || {}).symbolize_keys.merge(config)
@@ -220,13 +229,13 @@ module ActiveSambaLdap
         end
 
         def default_user_gid
-          rid = ActiveSambaLdap::SambaGroup::DOMAIN_USERS_RID
-          ActiveSambaLdap::SambaGroup.rid2gid(rid)
+          rid = ActiveSambaLdap::Group::DOMAIN_USERS_RID
+          ActiveSambaLdap::Group.rid2gid(rid)
         end
 
         def default_computer_gid
-          rid = ActiveSambaLdap::SambaGroup::DOMAIN_COMPUTERS_RID
-          ActiveSambaLdap::SambaGroup.rid2gid(rid)
+          rid = ActiveSambaLdap::Group::DOMAIN_COMPUTERS_RID
+          ActiveSambaLdap::Group.rid2gid(rid)
         end
 
         def skeleton_directory