From null at cozmixng.org Thu Jul 9 09:35:16 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 09 Jul 2009 22:35:16 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r156: * work with the current hoe. Message-ID: <20090709133517.3D2271D1C88@mail.cozmixng.org> retro 2009-07-09 22:35:16 +0900 (Thu, 09 Jul 2009) New Revision: 156 Log: * work with the current hoe. Modified files: trunk/Rakefile Modified: trunk/Rakefile (+16 -63) =================================================================== --- trunk/Rakefile 2009-06-22 14:38:28 +09:00 (rev 155) +++ trunk/Rakefile 2009-07-09 22:35:16 +09:00 (rev 156) @@ -43,19 +43,6 @@ entry.gsub(/(\A\n+|\n+\z)/, '') + "\n" end -class Hoe - attr_accessor :full_name - - alias_method :announcement_original, :announcement - def announcement - name_orig = name - self.name = full_name - announcement_original - ensure - self_name = name_orig - end -end - # For Hoe's no user friendly default behavior. :< File.open("README.txt", "w") {|file| file << "= Dummy README\n== XXX\n"} FileUtils.cp("NEWS.en", "History.txt") @@ -65,22 +52,22 @@ end ENV["VERSION"] = ActiveSambaLdap::VERSION -project = Hoe.new("activesambaldap", ActiveSambaLdap::VERSION) do |p| - p.rubyforge_name = "asl" - p.full_name = "ActiveSambaLdap" - p.summary = "Samba+LDAP administration tools" - p.extra_deps << ["activeldap", required_active_ldap_version] - p.email = "kou at cozmixng.org" - p.author = "Kouhei Sutou" - p.url = "http://asl.rubyforge.org/" - p.rdoc_pattern = /^(lib|bin)|txt$|\.(en|ja)$/ +project = Hoe.spec("activesambaldap") do + self.version = ActiveSambaLdap::VERSION + self.rubyforge_name = "asl" + self.name = "ActiveSambaLdap" + self.summary = "Samba+LDAP administration tools" + self.extra_deps << ["activeldap", required_active_ldap_version] + self.email = ["kou at clear-code.com"] + self.author = "Kouhei Sutou" + self.url = "http://asl.rubyforge.org/" news_of_current_release = File.read("NEWS.en").split(/^==\s.*$/)[1] - p.changes = cleanup_white_space(news_of_current_release) + self.changes = cleanup_white_space(news_of_current_release) entries = File.read("README.en").split(/^==\s(.*)$/) whats_this = cleanup_white_space(entries[entries.index("What\'s this?") + 1]) - p.summary, p.description, = whats_this.split(/\n\n+/, 3) + self.summary, self.description, = whats_this.split(/\n\n+/, 3) end @@ -93,9 +80,9 @@ rdoc_task.main = rdoc_main rdoc_task.options.delete("-d") rdoc_task.options << "--charset=UTF-8" -rdoc_task.template = "kilmer" -rdoc_task.rdoc_files -= project.bin_files -rdoc_task.rdoc_files += project.bin_files.collect {|x| "#{x}.help"} +rdoc_task.rdoc_files -= project.spec.executables +rdoc_task.rdoc_files += project.spec.executables.collect {|x| "bin/#{x}.help"} +rdoc_task.rdoc_files += project.spec.files.find_all {|x| /\.(en|ja)\z/ =~ x} rdoc_task.rdoc_files.reject! {|file| /\Atest-unit\// =~ file} rdoc_options = rdoc_task.option_list @@ -104,8 +91,8 @@ project.spec.rdoc_options = rdoc_options project.spec.extra_rdoc_files = rdoc_task.rdoc_files - -project.bin_files.each do |bin| +project.spec.executables.each do |bin| + bin = "bin/#{bin}" bin_help = "#{bin}.help" File.open(bin_help, "w") do |f| lang = ENV["LANG"] @@ -129,40 +116,6 @@ desc "Distribute new release." task :dist => [:publish_docs, :release, :tag, :announce] -# # 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 - - desc "Update *.po/*.pot files and create *.mo from *.po files" task :gettext => ["gettext:po:update", "gettext:mo:create"] From null at cozmixng.org Thu Jul 9 09:35:19 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 09 Jul 2009 22:35:19 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r157: * use setup_connection instead of establish_connection. Message-ID: <20090709133520.062DF1D1C93@mail.cozmixng.org> retro 2009-07-09 22:35:18 +0900 (Thu, 09 Jul 2009) New Revision: 157 Log: * use setup_connection instead of establish_connection. Modified files: trunk/README.en trunk/README.ja trunk/bin/asl-groupadd trunk/bin/asl-groupdel trunk/bin/asl-groupmod trunk/bin/asl-groupshow trunk/bin/asl-passwd trunk/bin/asl-populate trunk/bin/asl-purge trunk/bin/asl-samba-computeradd trunk/bin/asl-samba-groupadd trunk/bin/asl-samba-groupdel trunk/bin/asl-samba-groupmod trunk/bin/asl-samba-useradd trunk/bin/asl-samba-userdel trunk/bin/asl-samba-usermod trunk/bin/asl-useradd trunk/bin/asl-userdel trunk/bin/asl-usermod trunk/bin/asl-usershow trunk/rails/init.rb trunk/test/asl-test-utils.rb trunk/test/test_asl_usershow.rb trunk/test/test_password.rb trunk/test/test_user_home_directory.rb Modified: trunk/bin/asl-populate (+1 -1) =================================================================== --- trunk/bin/asl-populate 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-populate 2009-07-09 22:35:18 +09:00 (rev 157) @@ -61,7 +61,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") entries, opts = ActiveSambaLdap::Base.populate(options.marshal_dump) Modified: trunk/bin/asl-passwd (+1 -1) =================================================================== --- trunk/bin/asl-passwd 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-passwd 2009-07-09 22:35:18 +09:00 (rev 157) @@ -42,7 +42,7 @@ exit end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class User < ActiveSambaLdap::User ldap_mapping Modified: trunk/test/asl-test-utils.rb (+2 -2) =================================================================== --- trunk/test/asl-test-utils.rb 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/test/asl-test-utils.rb 2009-07-09 22:35:18 +09:00 (rev 157) @@ -53,7 +53,7 @@ module Connection def setup super - ActiveSambaLdap::Base.establish_connection(update_configuration) + ActiveSambaLdap::Base.setup_connection(update_configuration) end def teardown @@ -76,7 +76,7 @@ def teardown super - ActiveSambaLdap::Base.establish_connection(update_configuration) + ActiveSambaLdap::Base.setup_connection(update_configuration) ActiveSambaLdap::Base.purge ActiveSambaLdap::Base.load(@dumped_data) end Modified: trunk/bin/asl-userdel (+1 -1) =================================================================== --- trunk/bin/asl-userdel 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-userdel 2009-07-09 22:35:18 +09:00 (rev 157) @@ -43,7 +43,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class User < ActiveSambaLdap::User ldap_mapping Modified: trunk/bin/asl-samba-computeradd (+1 -1) =================================================================== --- trunk/bin/asl-samba-computeradd 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-samba-computeradd 2009-07-09 22:35:18 +09:00 (rev 157) @@ -34,7 +34,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class User < ActiveSambaLdap::User Modified: trunk/bin/asl-purge (+1 -1) =================================================================== --- trunk/bin/asl-purge 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-purge 2009-07-09 22:35:18 +09:00 (rev 157) @@ -17,7 +17,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") ActiveSambaLdap::Base.purge Modified: trunk/README.en (+8 -8) =================================================================== --- trunk/README.en 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/README.en 2009-07-09 22:35:18 +09:00 (rev 157) @@ -155,21 +155,21 @@ The following options are available: : base - Same as the option of ActiveLdap::Base.establish_connection. + Same as the option of ActiveLdap::Base.setup_connection. : host - Same as the option of ActiveLdap::Base.establish_connection. + Same as the option of ActiveLdap::Base.setup_connection. : port - Same as the option of ActiveLdap::Base.establish_connection. + Same as the option of ActiveLdap::Base.setup_connection. : scope - Same as the option of ActiveLdap::Base.establish_connection. + Same as the option of ActiveLdap::Base.setup_connection. : bind_dn - Same as the option of ActiveLdap::Base.establish_connection. + Same as the option of ActiveLdap::Base.setup_connection. : password - Same as the option of ActiveLdap::Base.establish_connection. + Same as the option of ActiveLdap::Base.setup_connection. : method - Same as the option of ActiveLdap::Base.establish_connection. + Same as the option of ActiveLdap::Base.setup_connection. : allow_anonymous - Same as the option of ActiveLdap::Base.establish_connection. + Same as the option of ActiveLdap::Base.setup_connection. : sid SID(Security Identifier) of your Samba server. Modified: trunk/test/test_password.rb (+2 -2) =================================================================== --- trunk/test/test_password.rb 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/test/test_password.rb 2009-07-09 22:35:18 +09:00 (rev 157) @@ -31,7 +31,7 @@ klass = Class.new(@user_class) assert_nothing_raised do configuration = reference_configuration.merge(:password_hash_type => type) - klass.establish_connection(configuration) + klass.setup_connection(configuration) klass.ldap_mapping end yield(klass, klass.configuration[:password_hash_type]) if block_given? @@ -43,7 +43,7 @@ klass = Class.new(@user_class) assert_raises(ActiveSambaLdap::InvalidConfigurationValueError) do configuration = reference_configuration.merge(:password_hash_type => type) - klass.establish_connection(configuration) + klass.setup_connection(configuration) end ensure klass.remove_connection Modified: trunk/bin/asl-useradd (+1 -1) =================================================================== --- trunk/bin/asl-useradd 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-useradd 2009-07-09 22:35:18 +09:00 (rev 157) @@ -145,7 +145,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class User < ActiveSambaLdap::User Modified: trunk/bin/asl-groupdel (+1 -1) =================================================================== --- trunk/bin/asl-groupdel 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-groupdel 2009-07-09 22:35:18 +09:00 (rev 157) @@ -28,7 +28,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class Group < ActiveSambaLdap::Group ldap_mapping Modified: trunk/bin/asl-groupadd (+1 -1) =================================================================== --- trunk/bin/asl-groupadd 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-groupadd 2009-07-09 22:35:18 +09:00 (rev 157) @@ -34,7 +34,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class Group < ActiveSambaLdap::Group ldap_mapping Modified: trunk/rails/init.rb (+1 -1) =================================================================== --- trunk/rails/init.rb 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/rails/init.rb 2009-07-09 22:35:18 +09:00 (rev 157) @@ -14,7 +14,7 @@ if File.exist?(ldap_configuration_file) ActiveSambaLdap::Base.configurations = ActiveSambaLdap::Configuration.read(ldap_configuration_file) - ActiveSambaLdap::Base.establish_connection + ActiveSambaLdap::Base.setup_connection else ActiveLdap::Base.class_eval do format = _("You should run 'script/generator scaffold_active_samba_ldap' " \ Modified: trunk/bin/asl-usermod (+1 -1) =================================================================== --- trunk/bin/asl-usermod 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-usermod 2009-07-09 22:35:18 +09:00 (rev 157) @@ -141,7 +141,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class User < ActiveSambaLdap::User ldap_mapping Modified: trunk/bin/asl-groupmod (+1 -1) =================================================================== --- trunk/bin/asl-groupmod 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-groupmod 2009-07-09 22:35:18 +09:00 (rev 157) @@ -41,7 +41,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class Group < ActiveSambaLdap::Group ldap_mapping Modified: trunk/README.ja (+8 -8) =================================================================== --- trunk/README.ja 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/README.ja 2009-07-09 22:35:18 +09:00 (rev 157) @@ -147,21 +147,21 @@ ??????????????????? : base - ActiveLdap::Base.establish_connection?????????? + ActiveLdap::Base.setup_connection?????????? : host - ActiveLdap::Base.establish_connection?????????? + ActiveLdap::Base.setup_connection?????????? : port - ActiveLdap::Base.establish_connection?????????? + ActiveLdap::Base.setup_connection?????????? : scope - ActiveLdap::Base.establish_connection?????????? + ActiveLdap::Base.setup_connection?????????? : bind_dn - ActiveLdap::Base.establish_connection?????????? + ActiveLdap::Base.setup_connection?????????? : password - ActiveLdap::Base.establish_connection?????????? + ActiveLdap::Base.setup_connection?????????? : method - ActiveLdap::Base.establish_connection?????????? + ActiveLdap::Base.setup_connection?????????? : allow_anonymous - ActiveLdap::Base.establish_connection?????????? + ActiveLdap::Base.setup_connection?????????? : sid Samba????SID(Security Identifier)? Modified: trunk/bin/asl-samba-userdel (+1 -1) =================================================================== --- trunk/bin/asl-samba-userdel 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-samba-userdel 2009-07-09 22:35:18 +09:00 (rev 157) @@ -22,7 +22,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class User < ActiveSambaLdap::User ldap_mapping :recommended_classes => [] Modified: trunk/test/test_user_home_directory.rb (+2 -2) =================================================================== --- trunk/test/test_user_home_directory.rb 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/test/test_user_home_directory.rb 2009-07-09 22:35:18 +09:00 (rev 157) @@ -23,7 +23,7 @@ klass = Class.new(@user_class) assert_nothing_raised do config = reference_configuration.merge(:user_home_directory_mode => type) - klass.establish_connection(config) + klass.setup_connection(config) klass.ldap_mapping end yield(klass, klass.configuration[:user_home_directory_mode]) if block_given? @@ -35,7 +35,7 @@ klass = Class.new(@user_class) assert_raises(ActiveSambaLdap::InvalidConfigurationValueError) do config = reference_configuration.merge(:user_home_directory_mode => type) - klass.establish_connection(config) + klass.setup_connection(config) end ensure klass.remove_connection Modified: trunk/bin/asl-usershow (+1 -1) =================================================================== --- trunk/bin/asl-usershow 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-usershow 2009-07-09 22:35:18 +09:00 (rev 157) @@ -17,7 +17,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("reference") +ActiveSambaLdap::Base.setup_connection("reference") class User < ActiveSambaLdap::User ldap_mapping Modified: trunk/bin/asl-samba-useradd (+1 -1) =================================================================== --- trunk/bin/asl-samba-useradd 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-samba-useradd 2009-07-09 22:35:18 +09:00 (rev 157) @@ -34,7 +34,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class User < ActiveSambaLdap::User Modified: trunk/bin/asl-samba-groupdel (+1 -1) =================================================================== --- trunk/bin/asl-samba-groupdel 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-samba-groupdel 2009-07-09 22:35:18 +09:00 (rev 157) @@ -22,7 +22,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class Group < ActiveSambaLdap::Group ldap_mapping :recommended_classes => [] Modified: trunk/bin/asl-groupshow (+1 -1) =================================================================== --- trunk/bin/asl-groupshow 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-groupshow 2009-07-09 22:35:18 +09:00 (rev 157) @@ -17,7 +17,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("reference") +ActiveSambaLdap::Base.setup_connection("reference") class Group < ActiveSambaLdap::Group ldap_mapping Modified: trunk/bin/asl-samba-usermod (+1 -1) =================================================================== --- trunk/bin/asl-samba-usermod 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-samba-usermod 2009-07-09 22:35:18 +09:00 (rev 157) @@ -27,7 +27,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class User < ActiveSambaLdap::User ldap_mapping :recommended_classes => [] Modified: trunk/bin/asl-samba-groupadd (+1 -1) =================================================================== --- trunk/bin/asl-samba-groupadd 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-samba-groupadd 2009-07-09 22:35:18 +09:00 (rev 157) @@ -22,7 +22,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class Group < ActiveSambaLdap::Group ldap_mapping :recommended_classes => [] Modified: trunk/test/test_asl_usershow.rb (+2 -2) =================================================================== --- trunk/test/test_asl_usershow.rb 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/test/test_asl_usershow.rb 2009-07-09 22:35:18 +09:00 (rev 157) @@ -10,12 +10,12 @@ def test_exist_user make_dummy_user do |user, password| - user.class.establish_connection("reference") + user.class.setup_connection("reference") begin user = user.class.find(user.uid) assert_equal([true, user.to_ldif, ""], run_command(user.uid)) ensure - user.class.establish_connection("update") + user.class.setup_connection("update") end end end Modified: trunk/bin/asl-samba-groupmod (+1 -1) =================================================================== --- trunk/bin/asl-samba-groupmod 2009-07-09 22:24:18 +09:00 (rev 156) +++ trunk/bin/asl-samba-groupmod 2009-07-09 22:35:18 +09:00 (rev 157) @@ -30,7 +30,7 @@ exit 1 end -ActiveSambaLdap::Base.establish_connection("update") +ActiveSambaLdap::Base.setup_connection("update") class Group < ActiveSambaLdap::Group ldap_mapping :recommended_classes => [] From null at cozmixng.org Thu Jul 9 09:35:22 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Thu, 09 Jul 2009 22:35:22 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r158: * require ActiveLdap 1.1.0. Message-ID: <20090709133523.0FC121D1C88@mail.cozmixng.org> retro 2009-07-09 22:35:22 +0900 (Thu, 09 Jul 2009) New Revision: 158 Log: * require ActiveLdap 1.1.0. Modified files: trunk/README.en trunk/README.ja trunk/lib/active_samba_ldap.rb Modified: trunk/lib/active_samba_ldap.rb (+1 -1) =================================================================== --- trunk/lib/active_samba_ldap.rb 2009-07-09 22:30:45 +09:00 (rev 157) +++ trunk/lib/active_samba_ldap.rb 2009-07-09 22:35:22 +09:00 (rev 158) @@ -8,7 +8,7 @@ end end -required_active_ldap_version = ">= 1.0.1" +required_active_ldap_version = ">= 1.1.0" require_gem_if_need.call("active_ldap", "activeldap", required_active_ldap_version) Modified: trunk/README.en (+1 -1) =================================================================== --- trunk/README.en 2009-07-09 22:30:45 +09:00 (rev 157) +++ trunk/README.en 2009-07-09 22:35:22 +09:00 (rev 158) @@ -37,7 +37,7 @@ == Dependency libraries - * ActiveLdap >= 1.0.1 + * ActiveLdap >= 1.1.0 == Usage Modified: trunk/README.ja (+1 -1) =================================================================== --- trunk/README.ja 2009-07-09 22:30:45 +09:00 (rev 157) +++ trunk/README.ja 2009-07-09 22:35:22 +09:00 (rev 158) @@ -34,7 +34,7 @@ == ??????? - * ActiveLdap >= 1.0.1 + * ActiveLdap >= 1.1.0 == ??? From null at cozmixng.org Fri Jul 10 20:50:12 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 11 Jul 2009 09:50:12 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r159: * format as RDoc. Message-ID: <20090711005012.87AB71D1C88@mail.cozmixng.org> retro 2009-07-11 09:50:10 +0900 (Sat, 11 Jul 2009) New Revision: 159 Log: * format as RDoc. Modified files: trunk/README.en trunk/README.ja trunk/Rakefile Modified: trunk/Rakefile (+13 -1) =================================================================== --- trunk/Rakefile 2009-07-09 22:32:12 +09:00 (rev 158) +++ trunk/Rakefile 2009-07-11 09:50:10 +09:00 (rev 159) @@ -66,7 +66,7 @@ self.changes = cleanup_white_space(news_of_current_release) entries = File.read("README.en").split(/^==\s(.*)$/) - whats_this = cleanup_white_space(entries[entries.index("What\'s this?") + 1]) + whats_this = cleanup_white_space(entries[entries.index("Description") + 1]) self.summary, self.description, = whats_this.split(/\n\n+/, 3) end @@ -105,6 +105,18 @@ end end +task :docs do + css_file = "doc/rdoc.css" + css = File.read(css_file) + reset_spacing = Regexp.escape("*{ padding: 0; margin: 0; }") + customized_css = css.sub(/#{reset_spacing}/, '') + if css != customized_css + File.open(css_file, "w") do |output| + output.print(customized_css) + end + end +end + desc 'Tag the repository for release.' task :tag do version = ActiveSambaLdap::VERSION Modified: trunk/README.en (+110 -79) =================================================================== --- trunk/README.en 2009-07-09 22:32:12 +09:00 (rev 158) +++ trunk/README.en 2009-07-11 09:50:10 +09:00 (rev 159) @@ -1,5 +1,3 @@ -# -*- rd -*- - = README.en $Id$ @@ -8,7 +6,7 @@ ActiveSambaLdap -== What's this? +== Description ActiveSambaLdap is a library and a management tool for Samba + LDAP environment. @@ -19,26 +17,30 @@ == Author -Kouhei Sutou +Kouhei Sutou == Licence Ruby's. +== Dependency libraries + +* ActiveLdap >= 1.1.0 + +== Install + + % sudo gem install activesambaldap + == Mailing list asl-devel at rubyforge.org -(()) +http://rubyforge.org/mailman/listinfo/asl-devel/ == Reference manual -(()) +http://asl.rubyforge.org/activesambaldap/ -== Dependency libraries - - * ActiveLdap >= 1.1.0 - == Usage === Use with Rails @@ -96,10 +98,10 @@ configuration files. In the above example, configuration files are read by the following order: - * /etc/activesambaldap/config.yaml - * /etc/activesambaldap/bind.yaml - * /home/kou/.activesambaldap.conf - * /home/kou/.activesambaldap.bind +* /etc/activesambaldap/config.yaml +* /etc/activesambaldap/bind.yaml +* /home/kou/.activesambaldap.conf +* /home/kou/.activesambaldap.bind The reason why bind.yaml and *.bind are read after config.yaml and *.conf is for security. You should write @@ -154,110 +156,139 @@ The following options are available: -: base +[_base_] Same as the option of ActiveLdap::Base.setup_connection. -: host +[_host_] Same as the option of ActiveLdap::Base.setup_connection. -: port +[_port_] Same as the option of ActiveLdap::Base.setup_connection. -: scope +[_scope_] Same as the option of ActiveLdap::Base.setup_connection. -: bind_dn +[_bind_dn_] Same as the option of ActiveLdap::Base.setup_connection. -: password +[_password_] Same as the option of ActiveLdap::Base.setup_connection. -: method +[_method_] Same as the option of ActiveLdap::Base.setup_connection. -: allow_anonymous +[_allow_anonymous_] Same as the option of ActiveLdap::Base.setup_connection. -: sid +[_sid_] SID(Security Identifier) of your Samba server. -: smb_conf +[_smb_conf_] The path of smb.conf for your Samba server. -: samba_domain +[_samba_domain_] Domain name of your Samba server. -: samba_netbios_name +[_samba_netbios_name_] NetBIOS name of your Samba server. -: password_hash_type +[_password_hash_type_] Algorithm for hashing password in LDAP. Available - algorithms are :crypt, :md5, :smd5, :sha and - :ssha. Default algorithm is :ssha. + algorithms are +:crypt+, +:md5+, +:smd5+, +:sha+ and + +:ssha+. Password in LDAP is used for recognition in UNIX not Samba. -: users_suffix + Default algorithm: +:ssha+ + +[_users_suffix_] Tree for user entries in LDAP. Specify relative path for - base. For example: ou=Users -: groups_suffix + base. + + For example: "ou=Users" + +[_groups_suffix_] Tree for group entries in LDAP. Specify relative path for - base. For example: ou=Groups -: computers_suffix + base. + + For example: "ou=Groups" + +[_computers_suffix_] Tree for computer entries in LDAP. Specify relative path for - base. For example: ou=Computers -: idmap_suffix + base. + + For example: "ou=Computers" + +[_idmap_suffix_] Tree for idmap entries in LDAP. Specify relative path for - base. For example: ou=Idmap + base. -: start_uid + For example: "ou=Idmap" + +[_start_uid_] UID (User Identifier) for making new user. Next new user's default UID is incremented after making new - user. Default is 10000. + user. -: start_gid + Default: 10000 + +[_start_gid_] GID (Group Identifier) for making new group. Next new group's default GID is incremented after making new - group. Default is 10000. + group. -: user_login_shell - Default login shell for new user. Default is /bin/false. -: user_home_directory + Default: 10000 + +[_user_login_shell_] + Default login shell for new user. + + Default: "/bin/false" + +[_user_home_directory_] Default home directory for new user. %U is substituted - with the user name. Default is /home/%U. -: user_home_directory_mode - Default permission of user's home directory. Default is - 0755 (octal notation). + with the user name. -: user_gecos + Default: "/home/%U" +[_user_home_directory_mode_] + Default permission of user's home directory. + + Default: 0755 (octal notation) + +[_user_gecos_] Default GECOS field value for new user. %U is substituted with user name. -: user_home_unc +[_user_home_unc_] Default path for user's home in Windows. The path should be specified by UNC (Universal Naming Convention). %U is - substituted with user name. Default is "\\NetBIOS name - of your Samba server\%U". + substituted with user name. -: user_profile + Default: "\\\\NetBIOS name of your Samba server\\%U". + +[_user_profile_] Default path of user profile specified by UNC (Universal Naming Convention). %U is substituted by - the user name. Default is "\\NetBIOS name Samba - server\profiles\%U". + the user name. -: user_home_drive - Default drive name of user's home. Default is H:. + Default: "\\\\NetBIOS name Samba server\\profiles\\%U" -: user_logon_script +[_user_home_drive_] + Default drive name of user's home. + + Default: "H:" + +[_user_logon_script_] Default script name that is invoked when user - logon. Default is logon.bat. + logon. -# : mail_domain + Default: "logon.bat" -: skeleton_directory +[_skeleton_directory_] Default skeleton directory for making user's home - directory. Default is /etc/skel. + directory. -: default_user_gid - Default GID of group to which user belongs. Default is - 'Domain Users' group. + Default: "/etc/skel" -: default_computer_gid - Default GID of group to which computer belongs. Default - is 'Domain Computers' group. +[_default_user_gid_] + Default GID of group to which user belongs. -# : default_max_password_age + Default: "Domain Users" group +[_default_computer_gid_] + Default GID of group to which computer belongs. + + Default: "Domain Computers" group + ==== Populate You need to populate your Samba + LDAP environment by @@ -267,7 +298,7 @@ % sudo asl-populate You can use the following command if you don't need to root -authorization((-root authorization check may be needed...-)). +authorization. (root authorization check may be needed...) % fakeroot asl-populate @@ -319,17 +350,17 @@ If no groups listed by the above command after you execute asl-populate, please confirm the following: - * Is your samba.schema old? +* 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. + 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 + SUBSTR caseExactIA5SubstringsMatch == Thanks - * Henrik Kr?g: He reported some bugs. - * Olivier DIRRENBERGER: He reported a bug. - * Francesco Malvezzi: He reported some bugs. - * Kazuhiro NISHIYAMA: He reported some bugs. +* Henrik Kr?g: He reported some bugs. +* Olivier DIRRENBERGER: He reported a bug. +* Francesco Malvezzi: He reported some bugs. +* Kazuhiro NISHIYAMA: He reported some bugs. Modified: trunk/README.ja (+110 -79) =================================================================== --- trunk/README.ja 2009-07-09 22:32:12 +09:00 (rev 158) +++ trunk/README.ja 2009-07-11 09:50:10 +09:00 (rev 159) @@ -1,5 +1,3 @@ -# -*- rd -*- - = README.ja $Id$ @@ -8,7 +6,7 @@ ActiveSambaLdap -== ????? +== ?? ActiveSambaLdap?Samba?LDAP???????????? ActiveRecord?????????????smbldap-tools???? @@ -16,26 +14,30 @@ == ?? -Kouhei Sutou +Kouhei Sutou == ????? Ruby's. +== ??????? + +* ActiveLdap >= 1.1.0 + +== ?????? + + % sudo gem install activesambaldap + == ???????? asl-devel-ja at rubyforge.org -(()) +http://rubyforge.org/mailman/listinfo/asl-devel-ja/ == ??????????? -(()) +http://asl.rubyforge.org/activesambaldap/ -== ??????? - - * ActiveLdap >= 1.1.0 - == ??? === Rails??? @@ -90,10 +92,10 @@ ?????????????????????????????? ??????? - * /etc/activesambaldap/config.yaml - * /etc/activesambaldap/bind.yaml - * /home/kou/.activesambaldap.conf - * /home/kou/.activesambaldap.bind +* /etc/activesambaldap/config.yaml +* /etc/activesambaldap/bind.yaml +* /home/kou/.activesambaldap.conf +* /home/kou/.activesambaldap.bind config.yaml?*.conf???bind.yaml?*.bind????????? ?????????????????????????????? @@ -146,109 +148,138 @@ ??????????????????? -: base +[_base_] ActiveLdap::Base.setup_connection?????????? -: host +[_host_] ActiveLdap::Base.setup_connection?????????? -: port +[_port_] ActiveLdap::Base.setup_connection?????????? -: scope +[_scope_] ActiveLdap::Base.setup_connection?????????? -: bind_dn +[_bind_dn_] ActiveLdap::Base.setup_connection?????????? -: password +[_password_] ActiveLdap::Base.setup_connection?????????? -: method +[_method_] ActiveLdap::Base.setup_connection?????????? -: allow_anonymous +[_allow_anonymous_] ActiveLdap::Base.setup_connection?????????? -: sid +[_sid_] Samba????SID(Security Identifier)? -: smb_conf +[_smb_conf_] Samba???????smb.conf?????? -: samba_domain +[_samba_domain_] Samba???????? -: samba_netbios_name +[_samba_netbios_name_] Samba????NetBIOS? -: password_hash_type +[_password_hash_type_] LDAP?????????????????????????? - ?????????:crypt, :md5, :smd5, :sha, :ssha??? - ?????:ssha??? + ???????? + ?+:crypt+, +:md5+, +:smd5+, +:sha+, +:ssha+??? LDAP????????Samba?????????UNIX????? ???????????? -: users_suffix + ?????: +:ssha+ + +[_users_suffix_] LDAP??????????????????base?????? - ????????: ou=Users -: groups_suffix + ??????? + + ?: "ou=Users" + +[_groups_suffix_] LDAP???????????????????base?????? - ????????: ou=Groups -: computers_suffix + ??????? + + ?: "ou=Groups" + +[_computers_suffix_] LDAP?????????????????????base?????? - ????????: ou=Computers -: idmap_suffix + ??????? + + ?: "ou=Computers" + +[_idmap_suffix_] LDAP??idmap?????????????base?????? - ????????: ou=Idmap + ??????? -: start_uid + ?: "ou=Idmap" + +[_start_uid_] ??????????????????????UID(User - Identifier)????UID?1?????????????? - 10000? + Identifier)????UID?1???????? -: start_gid + ?????: +10000+ + +[_start_gid_] ??????????????????????GID(Group - Identifier)????GID?1?????????????? - 10000? + Identifier)????GID?1???????? -: user_login_shell - ????????????????????????? - /bin/false? -: user_home_directory + ?????: +10000+ + +[_user_login_shell_] + ??????????????????? + + ?????: "/bin/false" + +[_user_home_directory_] ?????????????????????%U?????? - ????????????/home/%U? -: user_home_directory_mode + ?????? + + ?????: "/home/%U" + +[_user_home_directory_mode_] ???????????????????????????? - ???????????????0755?8???? + ????????? -: user_gecos + ?????: +0755+?8??? + +[_user_gecos_] ????GECOS????????%U???????????? -: user_home_unc +[_user_home_unc_] Windows??????????????????? UNC(Universal Naming Convention)??????%U????? - ?????????????\\Samba????NetBIOS?\%U? + ??????? -: user_profile + ?????: "\\\\Samba????NetBIOS?\\%U" + +[_user_profile_] ?????????????? UNC(Universal Naming Convention)??????%U????? - ?????????????\\Samba????NetBIOS?\profiles\%U? + ??????? -: user_home_drive - ?????????????????????????H:? + ?????: "\\\\Samba????NetBIOS?\\profiles\\%U" -: user_logon_script +[_user_home_drive_] + ??????????????????? + + ?????: "H:" + +[_user_logon_script_] ???????????????????????????? - ??????logon.bat? -# : mail_domain + ?????: "logon.bat" -: skeleton_directory +[_skeleton_directory_] ???????????????????????????? - ??????????/etc/skel? + ???? -: default_user_gid - ?????????????????????????Domain - Users????? + ?????: "/etc/skel" -: default_computer_gid - ???????????????????????????? - Domain Computers????? +[_default_user_gid_] + ??????????????????? -# : default_max_password_age + ?????: "Domain Users"???? +[_default_computer_gid_] + ?????????????????????? + + ?????: "Domain Computers"???? + ==== ??? asl-*????Samba + LDAP?????????????? @@ -258,7 +289,7 @@ % sudo asl-populate ???root????????????????????????? -???????((-root?????????????????-))? +?????????root?????????????????? % fakeroot asl-populate @@ -314,17 +345,17 @@ ???asl-populate????????????????????? ??????????????????????? - * samba.schema?????? +* samba.schema?????? - sambaSID??????????????????? - samba.schema?????????????????????? - ????? + sambaSID??????????????????? + samba.schema?????????????????????? + ????? - SUBSTR caseExactIA5SubstringsMatch + SUBSTR caseExactIA5SubstringsMatch == ?? - * Henrik Kr?g: ????????????? - * Olivier DIRRENBERGER: ????????????? - * Francesco Malvezzi: ????????????? - * Kazuhiro NISHIYAMA: ????????????? +* Henrik Kr?g: ????????????? +* Olivier DIRRENBERGER: ????????????? +* Francesco Malvezzi: ????????????? +* Kazuhiro NISHIYAMA: ????????????? From null at cozmixng.org Fri Jul 10 20:50:14 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 11 Jul 2009 09:50:14 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r160: * fix markup. Message-ID: <20090711005014.E4F431D1C8E@mail.cozmixng.org> retro 2009-07-11 09:50:13 +0900 (Sat, 11 Jul 2009) New Revision: 160 Log: * fix markup. Modified files: trunk/README.en trunk/README.ja Modified: trunk/README.en (+1 -1) =================================================================== --- trunk/README.en 2009-07-11 09:40:41 +09:00 (rev 159) +++ trunk/README.en 2009-07-11 09:50:13 +09:00 (rev 160) @@ -311,7 +311,7 @@ You need to configure you smb.conf like the following if you want to administrate with -(()) +Srvtools[http://support.microsoft.com/kb/173673/] from Windows or make Samba server domain controller. Use asl-samba-* for those propose. Modified: trunk/README.ja (+4 -4) =================================================================== --- trunk/README.ja 2009-07-11 09:40:41 +09:00 (rev 159) +++ trunk/README.ja 2009-07-11 09:50:13 +09:00 (rev 160) @@ -301,10 +301,10 @@ ==== smb.conf??? -(())? -???Windows???????????????????Samba?? -???????????????????????????? -smb.conf????????????asl-samba-*?????? +Srvtools[http://support.microsoft.com/kb/173673/]???? +Windows???????????????????Samba????? +?????????????????????????smb.conf? +???????????asl-samba-*?????? ??????????????????????Srvtools ??? ???????????add machine script???????script From null at cozmixng.org Fri Jul 10 20:50:16 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 11 Jul 2009 09:50:16 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r161: * format as RDoc. Message-ID: <20090711005016.658131D1C91@mail.cozmixng.org> retro 2009-07-11 09:50:16 +0900 (Sat, 11 Jul 2009) New Revision: 161 Log: * format as RDoc. Modified files: trunk/NEWS.en trunk/NEWS.ja Modified: trunk/NEWS.en (+15 -17) =================================================================== --- trunk/NEWS.en 2009-07-11 09:43:32 +09:00 (rev 160) +++ trunk/NEWS.en 2009-07-11 09:50:16 +09:00 (rev 161) @@ -1,38 +1,36 @@ -# -*- rd -*- - = NEWS.en $Id$ == 0.0.6: 2008-06-18 - * Supported ActiveLdap 1.0.1. - * Supported ActiveSupport 2.1.0. +* Supported ActiveLdap 1.0.1. +* Supported ActiveSupport 2.1.0. == 0.0.5: 2007-11-19 - * Supported Ruby/ActiveLdap 0.9.0. +* Supported Ruby/ActiveLdap 0.9.0. == 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. +* 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 - * 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. +* 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 a typo of Ruby/ActiveLDAP's RubyGems name. +* Supported ActiveSupport 1.4.0. +* Fixed a typo of Ruby/ActiveLDAP's RubyGems name. == 0.0.1: 2006-11-17 - * Initial release. +* Initial release. Modified: trunk/NEWS.ja (+18 -20) =================================================================== --- trunk/NEWS.ja 2009-07-11 09:43:32 +09:00 (rev 160) +++ trunk/NEWS.ja 2009-07-11 09:50:16 +09:00 (rev 161) @@ -1,42 +1,40 @@ -# -*- rd -*- - = NEWS.ja $Id$ == 0.0.6: 2008-06-18 - * ActiveLdap 1.0.1??? - * ActiveSupport 2.1.0??? +* ActiveLdap 1.0.1??? +* ActiveSupport 2.1.0??? == 0.0.5: 2007-11-19 - * Ruby/ActiveLdap 0.9.0??? +* Ruby/ActiveLdap 0.9.0??? == 0.0.4: 2007-09-16 - * Ruby/ActiveLdap 0.8.3.1??? - * Ruby-GetText-Package??? - * scaffold_asl -> scaffold_active_samba_ldap - * Rails?????? +* Ruby/ActiveLdap 0.8.3.1??? +* Ruby-GetText-Package??? +* scaffold_asl -> scaffold_active_samba_ldap +* Rails?????? == 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????? +* 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????? +* ActiveSupport 1.4.0?????? +* Ruby/ActiveLDAP?RubyGems????? == 0.0.1: 2006-11-17 - * ???????? +* ???????? From null at cozmixng.org Fri Jul 10 20:50:18 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 11 Jul 2009 09:50:18 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r162: * update metadata. Message-ID: <20090711005018.A0C091D1C88@mail.cozmixng.org> retro 2009-07-11 09:50:17 +0900 (Sat, 11 Jul 2009) New Revision: 162 Log: * update metadata. Modified files: trunk/po/ja/active-samba-ldap.po Modified: trunk/po/ja/active-samba-ldap.po (+5 -5) =================================================================== --- trunk/po/ja/active-samba-ldap.po 2009-07-11 09:43:43 +09:00 (rev 161) +++ trunk/po/ja/active-samba-ldap.po 2009-07-11 09:50:17 +09:00 (rev 162) @@ -1,15 +1,15 @@ # Japanese translations for Ruby/ActiveSambaLdap. -# Copyright (C) 2007 Kouhei Sutou +# Copyright (C) 2007-2009 Kouhei Sutou # This file is distributed under the same license as the Ruby/ActiveSambaLdap # package. -# Kouhei Sutou , 2007. +# Kouhei Sutou , 2007. # msgid "" msgstr "" -"Project-Id-Version: Ruby/ActiveSambaLdap 0.0.5\n" +"Project-Id-Version: Ruby/ActiveSambaLdap 0.0.7\n" "POT-Creation-Date: 2007-09-16 22:47+0900\n" -"PO-Revision-Date: 2007-09-16 22:47+0900\n" -"Last-Translator: Kouhei Sutou \n" +"PO-Revision-Date: 2009-07-11 09:41+0900\n" +"Last-Translator: Kouhei Sutou \n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From null at cozmixng.org Sat Jul 11 23:20:11 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Sun, 12 Jul 2009 12:20:11 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r163: * add an entry for 0.0.7. Message-ID: <20090712032012.A6D0C1D1C98@mail.cozmixng.org> retro 2009-07-12 12:20:10 +0900 (Sun, 12 Jul 2009) New Revision: 163 Log: * add an entry for 0.0.7. Modified files: trunk/NEWS.en trunk/NEWS.ja Modified: trunk/NEWS.en (+4 -0) =================================================================== --- trunk/NEWS.en 2009-07-11 09:44:03 +09:00 (rev 162) +++ trunk/NEWS.en 2009-07-12 12:20:10 +09:00 (rev 163) @@ -2,6 +2,10 @@ $Id$ +== 0.0.7: 2009-07-18 + +* Supported ActiveLdap 1.1.0. + == 0.0.6: 2008-06-18 * Supported ActiveLdap 1.0.1. Modified: trunk/NEWS.ja (+4 -0) =================================================================== --- trunk/NEWS.ja 2009-07-11 09:44:03 +09:00 (rev 162) +++ trunk/NEWS.ja 2009-07-12 12:20:10 +09:00 (rev 163) @@ -2,6 +2,10 @@ $Id$ +== 0.0.7: 2009-07-18 + +* ActiveLdap 1.1.0??? + == 0.0.6: 2008-06-18 * ActiveLdap 1.0.1??? From null at cozmixng.org Fri Jul 17 18:40:11 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 18 Jul 2009 07:40:11 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r164: * 0.0.7 -> 0.0.8. Message-ID: <20090717224011.258491D1C9B@mail.cozmixng.org> retro 2009-07-18 07:40:10 +0900 (Sat, 18 Jul 2009) New Revision: 164 Log: * 0.0.7 -> 0.0.8. Modified files: trunk/lib/active_samba_ldap/version.rb Modified: trunk/lib/active_samba_ldap/version.rb (+1 -1) =================================================================== --- trunk/lib/active_samba_ldap/version.rb 2009-07-12 12:10:44 +09:00 (rev 163) +++ trunk/lib/active_samba_ldap/version.rb 2009-07-18 07:40:10 -15:00 (rev 164) @@ -1,3 +1,3 @@ module ActiveSambaLdap - VERSION = "0.0.7" + VERSION = "0.0.8" end From null at cozmixng.org Fri Jul 17 18:40:12 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 18 Jul 2009 07:40:12 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r165: * Rails plugin isn't needed. Message-ID: <20090717224012.E885C1D1CA2@mail.cozmixng.org> retro 2009-07-18 07:40:12 +0900 (Sat, 18 Jul 2009) New Revision: 165 Log: * Rails plugin isn't needed. Modified files: trunk/README.en trunk/README.ja Modified: trunk/README.en (+1 -6) =================================================================== --- trunk/README.en 2009-07-18 07:33:58 -15:00 (rev 164) +++ trunk/README.en 2009-07-18 07:40:12 -15:00 (rev 165) @@ -45,13 +45,8 @@ === Use with Rails -First, install ActiveSambaLdap plugin for Rails. And modify -the following URL because the URL is for trunk. +Scaffold the environment of ActiveSambaLdap for Rails. - % script/plugin install svn://rubyforge.org/var/svn/asl/trunk/rails/plugin/active_samba_ldap - -Next, scaffold the environment of ActiveSambaLdap for Rails. - % script/generate scaffold_active_samba_ldap Modify config/ldap.yml generated by Modified: trunk/README.ja (+1 -6) =================================================================== --- trunk/README.ja 2009-07-18 07:33:58 -15:00 (rev 164) +++ trunk/README.ja 2009-07-18 07:40:12 -15:00 (rev 165) @@ -42,13 +42,8 @@ === Rails??? -???Rails????????????????????URL? -trunk?????????????????????? +Rails?ActiveSambaLdap????????? - % script/plugin install svn://rubyforge.org/var/svn/asl/trunk/rails/plugin/active_samba_ldap - -???Rails?ActiveSambaLdap????????? - % script/generate scaffold_active_samba_ldap config/ldap.yml?????????????????????? From null at cozmixng.org Fri Jul 17 18:40:14 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 18 Jul 2009 07:40:14 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r166: * fix paths. Message-ID: <20090717224014.E0E991D1CA4@mail.cozmixng.org> retro 2009-07-18 07:40:14 +0900 (Sat, 18 Jul 2009) New Revision: 166 Log: * fix paths. Modified files: trunk/html/index.html Modified: trunk/html/index.html (+2 -2) =================================================================== --- trunk/html/index.html 2009-07-18 07:35:02 -15:00 (rev 165) +++ trunk/html/index.html 2009-07-18 07:40:14 -15:00 (rev 166) @@ -12,10 +12,10 @@ From null at cozmixng.org Fri Jul 17 19:10:12 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 18 Jul 2009 08:10:12 +0900 Subject: [asl-commit] ActiveSambaLdap (0.0.7) r167: * release 0.0.7. Message-ID: <20090717231012.A5ED41D1CA4@mail.cozmixng.org> retro 2009-07-18 08:10:12 +0900 (Sat, 18 Jul 2009) New Revision: 167 Log: * release 0.0.7. Copied directories: tags/0.0.7/ (from rev 163, trunk/) Copied: tags/0.0.7/ (from rev 163, trunk/) From null at cozmixng.org Wed Jul 22 07:55:10 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Wed, 22 Jul 2009 20:55:10 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r168: * [#26692] scaffold_active_samba_ldap doesn't work with Rails 2.2.2. Message-ID: <20090722115510.CBAC31D1CAF@mail.cozmixng.org> retro 2009-07-22 20:55:10 +0900 (Wed, 22 Jul 2009) New Revision: 168 Log: * [#26692] scaffold_active_samba_ldap doesn't work with Rails 2.2.2. Reported by Orlando Marquina. Thanks!!! Modified files: trunk/NEWS.en trunk/NEWS.ja trunk/README.en trunk/README.ja trunk/rails_generators/scaffold_active_samba_ldap/scaffold_active_samba_ldap_generator.rb Modified: trunk/NEWS.en (+5 -0) =================================================================== --- trunk/NEWS.en 2009-07-18 08:03:07 -15:00 (rev 167) +++ trunk/NEWS.en 2009-07-22 20:55:10 +09:00 (rev 168) @@ -2,6 +2,11 @@ $Id$ +== 0.0.8: 20XX-XX-XX + +* [#26692] scaffold_active_samba_ldap doesn't work with Rails 2.2.2. + [Orlando Marquina] + == 0.0.7: 2009-07-18 * Supported ActiveLdap 1.1.0. Modified: trunk/README.en (+1 -0) =================================================================== --- trunk/README.en 2009-07-18 08:03:07 -15:00 (rev 167) +++ trunk/README.en 2009-07-22 20:55:10 +09:00 (rev 168) @@ -359,3 +359,4 @@ * Olivier DIRRENBERGER: He reported a bug. * Francesco Malvezzi: He reported some bugs. * Kazuhiro NISHIYAMA: He reported some bugs. +* Orlando Marquina: He reported a bug. Modified: trunk/NEWS.ja (+5 -0) =================================================================== --- trunk/NEWS.ja 2009-07-18 08:03:07 -15:00 (rev 167) +++ trunk/NEWS.ja 2009-07-22 20:55:10 +09:00 (rev 168) @@ -2,6 +2,11 @@ $Id$ +== 0.0.8: 20XX-XX-XX + +* [#26692] scaffold_active_samba_ldap?Rails 2.2.2?????????? + [Orlando Marquina] + == 0.0.7: 2009-07-18 * ActiveLdap 1.1.0??? Modified: trunk/rails_generators/scaffold_active_samba_ldap/scaffold_active_samba_ldap_generator.rb (+1 -1) =================================================================== --- trunk/rails_generators/scaffold_active_samba_ldap/scaffold_active_samba_ldap_generator.rb 2009-07-18 08:03:07 -15:00 (rev 167) +++ trunk/rails_generators/scaffold_active_samba_ldap/scaffold_active_samba_ldap_generator.rb 2009-07-22 20:55:10 +09:00 (rev 168) @@ -9,7 +9,7 @@ end component = "samba" - controller_class_name = "#{Inflector.camelize(component)}Controller" + controller_class_name = "#{component.camelize}Controller" options = {:assigns => {:controller_class_name => controller_class_name}} m.template("#{component}_controller.rb", Modified: trunk/README.ja (+1 -0) =================================================================== --- trunk/README.ja 2009-07-18 08:03:07 -15:00 (rev 167) +++ trunk/README.ja 2009-07-22 20:55:10 +09:00 (rev 168) @@ -354,3 +354,4 @@ * Olivier DIRRENBERGER: ????????????? * Francesco Malvezzi: ????????????? * Kazuhiro NISHIYAMA: ????????????? +* Orlando Marquina: ????????????? From null at cozmixng.org Fri Jul 31 20:55:11 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 01 Aug 2009 09:55:11 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r169: * scaffold_active_samba_ldap follows the ActiveSambaLdap changes. [#26814] Message-ID: <20090801005511.F01BD1D1C6D@mail.cozmixng.org> retro 2009-08-01 09:55:11 +0900 (Sat, 01 Aug 2009) New Revision: 169 Log: * scaffold_active_samba_ldap follows the ActiveSambaLdap changes. [#26814] Reported by Orlando Marquina. Thanks!!! Modified files: trunk/NEWS.en trunk/NEWS.ja trunk/README.en trunk/rails_generators/scaffold_active_samba_ldap/templates/computer.rb trunk/rails_generators/scaffold_active_samba_ldap/templates/group.rb trunk/rails_generators/scaffold_active_samba_ldap/templates/user.rb Modified: trunk/NEWS.en (+2 -0) =================================================================== --- trunk/NEWS.en 2009-07-22 20:46:26 +09:00 (rev 168) +++ trunk/NEWS.en 2009-08-01 09:55:11 +09:00 (rev 169) @@ -6,6 +6,8 @@ * [#26692] scaffold_active_samba_ldap doesn't work with Rails 2.2.2. [Orlando Marquina] +* [#26814] scaffold_active_samba_ldap generates wrong class name. + [Orlando Marquina] == 0.0.7: 2009-07-18 Modified: trunk/rails_generators/scaffold_active_samba_ldap/templates/computer.rb (+1 -1) =================================================================== --- trunk/rails_generators/scaffold_active_samba_ldap/templates/computer.rb 2009-07-22 20:46:26 +09:00 (rev 168) +++ trunk/rails_generators/scaffold_active_samba_ldap/templates/computer.rb 2009-08-01 09:55:11 +09:00 (rev 169) @@ -1,3 +1,3 @@ -class Computer < ActiveSambaLdap::SambaComputer +class Computer < ActiveSambaLdap::Computer ldap_mapping end Modified: trunk/README.en (+1 -1) =================================================================== --- trunk/README.en 2009-07-22 20:46:26 +09:00 (rev 168) +++ trunk/README.en 2009-08-01 09:55:11 +09:00 (rev 169) @@ -359,4 +359,4 @@ * Olivier DIRRENBERGER: He reported a bug. * Francesco Malvezzi: He reported some bugs. * Kazuhiro NISHIYAMA: He reported some bugs. -* Orlando Marquina: He reported a bug. +* Orlando Marquina: He reported some bugs. Modified: trunk/NEWS.ja (+2 -0) =================================================================== --- trunk/NEWS.ja 2009-07-22 20:46:26 +09:00 (rev 168) +++ trunk/NEWS.ja 2009-08-01 09:55:11 +09:00 (rev 169) @@ -6,6 +6,8 @@ * [#26692] scaffold_active_samba_ldap?Rails 2.2.2?????????? [Orlando Marquina] +* [#26814] scaffold_active_samba_ldap????????????????????? + [Orlando Marquina] == 0.0.7: 2009-07-18 Modified: trunk/rails_generators/scaffold_active_samba_ldap/templates/group.rb (+1 -1) =================================================================== --- trunk/rails_generators/scaffold_active_samba_ldap/templates/group.rb 2009-07-22 20:46:26 +09:00 (rev 168) +++ trunk/rails_generators/scaffold_active_samba_ldap/templates/group.rb 2009-08-01 09:55:11 +09:00 (rev 169) @@ -1,3 +1,3 @@ -class Group < ActiveSambaLdap::SambaGroup +class Group < ActiveSambaLdap::Group ldap_mapping end Modified: trunk/rails_generators/scaffold_active_samba_ldap/templates/user.rb (+1 -1) =================================================================== --- trunk/rails_generators/scaffold_active_samba_ldap/templates/user.rb 2009-07-22 20:46:26 +09:00 (rev 168) +++ trunk/rails_generators/scaffold_active_samba_ldap/templates/user.rb 2009-08-01 09:55:11 +09:00 (rev 169) @@ -1,3 +1,3 @@ -class User < ActiveSambaLdap::SambaUser +class User < ActiveSambaLdap::User ldap_mapping end From null at cozmixng.org Fri Jul 31 21:25:11 2009 From: null at cozmixng.org (null at cozmixng.org) Date: Sat, 01 Aug 2009 10:25:11 +0900 Subject: [asl-commit] ActiveSambaLdap (trunk) r170: * use .html.erb instead of .rhtml. Message-ID: <20090801012511.6B5001D1C25@mail.cozmixng.org> retro 2009-08-01 10:25:10 +0900 (Sat, 01 Aug 2009) New Revision: 170 Log: * use .html.erb instead of .rhtml. Suggested by Kazuhiro NISHIYAMA. Thanks!!! Copied files: trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_index.html.erb (from rev 167, trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_index.rhtml) trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_populate.html.erb (from rev 167, trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_populate.rhtml) trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_purge.html.erb (from rev 167, trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_purge.rhtml) Removed files: trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_index.rhtml trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_populate.rhtml trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_purge.rhtml Copied: trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_purge.html.erb (+0 -0) =================================================================== Deleted: trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_purge.rhtml (+0 -10) =================================================================== --- trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_purge.rhtml 2009-08-01 09:47:17 +09:00 (rev 169) +++ trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_purge.rhtml 2009-08-01 10:25:10 +09:00 (rev 170) @@ -1,10 +0,0 @@ - - - <%= controller_class_name %>: <%%= controller.action_name %> - - -

Samba + LDAP Management

-

Purged.

- <%%= link_to "Back", :action => nil %> - - Copied: trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_index.html.erb (+0 -0) =================================================================== Deleted: trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_index.rhtml (+0 -17) =================================================================== --- trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_index.rhtml 2009-08-01 09:47:17 +09:00 (rev 169) +++ trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_index.rhtml 2009-08-01 10:25:10 +09:00 (rev 170) @@ -1,17 +0,0 @@ - - - <%= controller_class_name %>: <%%= controller.action_name %> - - -

Samba + LDAP Management

-
    -
  • - <%%= link_to "Populate Samba + LDAP environment", - :action => :populate %> -
  • -
  • - <%%= link_to "Purge Samba + LDAP environment", :action => :purge %> -
  • -
- - Deleted: trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_populate.rhtml (+0 -15) =================================================================== --- trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_populate.rhtml 2009-08-01 09:47:17 +09:00 (rev 169) +++ trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_populate.rhtml 2009-08-01 10:25:10 +09:00 (rev 170) @@ -1,15 +0,0 @@ - - - <%= controller_class_name %>: <%%= controller.action_name %> - - -

Samba + LDAP Management

-

Populated.

-
    - <%% @entries.each do |entry| %> -
  • <%%= h entry.dn %>
  • - <%% end %> -
- <%%= link_to "Back", :action => nil %> - - Copied: trunk/rails_generators/scaffold_active_samba_ldap/templates/samba_populate.html.erb (+0 -0) ===================================================================