activesambaldap 0.0.2 → 0.0.3

data/lib/active_samba_ldap/user.rb

@@ -1,14 +1,43 @@
+require 'active_samba_ldap/base'
 require 'active_samba_ldap/entry'
-require 'active_samba_ldap/account'
-require 'active_samba_ldap/user_account'
+require 'active_samba_ldap/samba_entry'
+require 'active_samba_ldap/account_entry'
+require 'active_samba_ldap/user_account_entry'
+require 'active_samba_ldap/samba_account_entry'
 
 module ActiveSambaLdap
   class User < Base
     include Reloadable
 
     include Entry
+    include SambaEntry
 
-    include Account
-    include UserAccount
+    include AccountEntry
+    include UserAccountEntry
+    include SambaAccountEntry
+
+    def fill_default_values(options={})
+      result = super
+      return result unless samba_available?
+
+      subst = Proc.new do |key|
+        value = options[key]
+        if value
+          substitute_template(value)
+        else
+          substituted_value(key)
+        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]
+    end
+
+    private
+    def default_account_flags
+      "[UH]"
+    end
   end
 end

data/lib/active_samba_ldap/{user_account.rb → user_account_entry.rb}

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

data/lib/active_samba_ldap/version.rb

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

data/lib/active_samba_ldap.rb

@@ -3,12 +3,14 @@ require_gem_if_need = Proc.new do |library_name, gem_name, *options|
     require library_name
   rescue LoadError
     require 'rubygems'
-    require_gem gem_name, *options
+    gem gem_name, *options
     require library_name
   end
 end
 
-require_gem_if_need.call("active_ldap", "ruby-activeldap", ">= 0.8.0")
+required_active_ldap_version = ">= 0.8.2"
+require_gem_if_need.call("active_ldap", "ruby-activeldap",
+                         required_active_ldap_version)
 
 if Dependencies.respond_to?(:load_paths)
   Dependencies.load_paths << File.expand_path(File.dirname(__FILE__))

data/rails/plugin/active_samba_ldap/init.rb

@@ -1,4 +1,4 @@
-require_dependency 'active_samba_ldap'
+require_library_or_gem 'active_samba_ldap'
 ActiveSambaLdap::Base.logger ||= RAILS_DEFAULT_LOGGER
 ldap_configuration_file = File.join(RAILS_ROOT, 'config', 'ldap.yml')
 ActiveSambaLdap::Base.configurations =

data/test/asl-test-utils.rb

@@ -85,11 +85,11 @@ module AslTestUtils
   module TemporaryEntry
     def setup
       super
-      @user_class = Class.new(ActiveSambaLdap::SambaUser)
+      @user_class = Class.new(ActiveSambaLdap::User)
       @user_class.ldap_mapping
-      @computer_class = Class.new(ActiveSambaLdap::SambaComputer)
+      @computer_class = Class.new(ActiveSambaLdap::Computer)
       @computer_class.ldap_mapping
-      @group_class = Class.new(ActiveSambaLdap::SambaGroup)
+      @group_class = Class.new(ActiveSambaLdap::Group)
       @group_class.ldap_mapping
 
       @user_class.set_associated_class(:primary_group, @group_class)

data/test/run-test.rb

@@ -11,6 +11,8 @@ $LOAD_PATH.unshift(File.join(top_dir, "test"))
 
 require 'test-unit-ext'
 
+ARGV.unshift("--priority")
+
 if Test::Unit::AutoRunner.respond_to?(:standalone?)
   exit Test::Unit::AutoRunner.run($0, File.dirname($0))
 else

data/test/test-unit-ext/priority.rb

@@ -79,6 +79,10 @@ module Test
         def run_priority_low?(test_name)
           rand > 0.75
         end
+
+        def run_priority_never?(test_name)
+          false
+        end
       end
 
       def need_to_run?

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: activesambaldap
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-01-29 00:00:00 +09:00
+  version: 0.0.3
+date: 2007-05-26 00:00:00 +09:00
 summary: ActiveSambaLdap is a library and a management tool for Samba + LDAP environment.
 require_paths: 
 - lib
@@ -53,27 +53,26 @@ files:
 - bin/asl-usermod
 - bin/asl-usershow
 - lib/active_samba_ldap.rb
-- lib/active_samba_ldap/account.rb
+- lib/active_samba_ldap/account_entry.rb
 - lib/active_samba_ldap/base.rb
 - lib/active_samba_ldap/command.rb
 - lib/active_samba_ldap/computer.rb
-- lib/active_samba_ldap/computer_account.rb
+- lib/active_samba_ldap/computer_account_entry.rb
 - lib/active_samba_ldap/configuration.rb
-- lib/active_samba_ldap/configuration_files
 - lib/active_samba_ldap/dc.rb
 - lib/active_samba_ldap/entry.rb
 - lib/active_samba_ldap/group.rb
+- lib/active_samba_ldap/group_entry.rb
 - lib/active_samba_ldap/idmap.rb
 - lib/active_samba_ldap/ou.rb
 - lib/active_samba_ldap/populate.rb
 - lib/active_samba_ldap/reloadable.rb
-- lib/active_samba_ldap/samba_account.rb
-- lib/active_samba_ldap/samba_computer.rb
-- lib/active_samba_ldap/samba_group.rb
-- lib/active_samba_ldap/samba_user.rb
+- lib/active_samba_ldap/samba_account_entry.rb
+- lib/active_samba_ldap/samba_entry.rb
+- lib/active_samba_ldap/samba_group_entry.rb
 - lib/active_samba_ldap/unix_id_pool.rb
 - lib/active_samba_ldap/user.rb
-- lib/active_samba_ldap/user_account.rb
+- lib/active_samba_ldap/user_account_entry.rb
 - lib/active_samba_ldap/version.rb
 - lib/samba/encrypt.rb
 - misc/rd2html.rb
@@ -124,16 +123,17 @@ test_files:
 - test/test_asl_populate.rb
 - test/test_asl_groupmod.rb
 - test/test_asl_groupshow.rb
-- test/test_password.rb
+- test/test_asl_purge.rb
 - test/test_asl_passwd.rb
 - test/test_asl_userdel.rb
 - test/test_asl_groupadd.rb
 - test/test_asl_usermod.rb
-- test/test_asl_purge.rb
 - test/test_group.rb
+- test/test_password.rb
 - test/test_user_home_directory.rb
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 extra_rdoc_files: []
 
 executables: 
@@ -161,13 +161,13 @@ requirements: []
 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activeldap
+  name: ruby-activeldap
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.0
+        version: 0.8.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -176,5 +176,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.7
+        version: 1.2.1
     version: 

data/lib/active_samba_ldap/configuration_files

@@ -1,2 +0,0 @@
-/tmp/asl/etc/activesambaldap/config.yaml
-/tmp/asl/etc/activesambaldap/bind.yaml

data/lib/active_samba_ldap/samba_computer.rb

@@ -1,20 +0,0 @@
-require 'active_samba_ldap/account'
-require 'active_samba_ldap/user_account'
-require 'active_samba_ldap/samba_account'
-
-module ActiveSambaLdap
-  class SambaComputer < Base
-    include Reloadable
-
-    include Entry
-
-    include Account
-    include ComputerAccount
-    include SambaAccount
-
-    private
-    def default_account_flags
-      "[W]"
-    end
-  end
-end

data/lib/active_samba_ldap/samba_user.rb

@@ -1,39 +0,0 @@
-require 'active_samba_ldap/entry'
-require 'active_samba_ldap/account'
-require 'active_samba_ldap/user_account'
-require 'active_samba_ldap/samba_account'
-
-module ActiveSambaLdap
-  class SambaUser < Base
-    include Reloadable
-
-    include Entry
-
-    include Account
-    include UserAccount
-    include SambaAccount
-
-    def fill_default_values(options={})
-      super
-
-      subst = Proc.new do |key|
-        value = options[key]
-        if value
-          substitute_template(value)
-        else
-          substituted_value(key)
-        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]
-    end
-
-    private
-    def default_account_flags
-      "[UH]"
-    end
-  end
-end