*** empty log message ***

diff --git a/MANIFEST b/MANIFEST
index eb049cc..7eb734d 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -34,9 +34,8 @@ lib/plugins/10url
 lib/plugins/11url_session
 lib/plugins/20mail
 lib/plugins/20phone
-lib/plugins/30prefectures
-lib/plugins/31distinct
 lib/plugins/32address
+lib/plugins/33distinct
 lib/plugins/99keyword
 lib/public/favicon.ico
 lib/public/robots.txt

diff --git a/t/02_Config.t b/t/02_Config.t
index c045c11..c794d5f 100644 (file)
--- a/t/02_Config.t
+++ b/t/02_Config.t
@@ -1,5 +1,5 @@
 # -*- mode: perl; coding: utf-8 -*-
-# $Id: 02_Config.t,v 1.2 2008-08-03 02:58:19 morimoto Exp $
+# $Id: 02_Config.t,v 1.3 2008-08-03 03:27:38 morimoto Exp $
 # $Source: /home/ishikawa/work/keitairc/tmp/keitairc/t/02_Config.t,v $
 # Copyright (c) 2003-2008 Jun Morimoto <morimoto@mrmt.net>
 # This program is covered by the GNU General Public License 2
@@ -17,7 +17,7 @@ use Cwd;
 use Keitairc::Log;
 
 my $version = '10.1';
-my @argv = ("$FindBin::Bin/../etc/dot.keitairc");
+my @argv = ("$FindBin::Bin/02_Config/dot.keitairc");
 my $c = new Keitairc::Config($version, @argv);
 isa_ok($c, 'AppConfig');
 ok($c->version() eq $version, 'version');
@@ -41,9 +41,9 @@ ok($c->cookie_ttl() == 86400 * 3, 'cookie_ttl');
 ok($c->session_ttl() == 60 * 30, 'session_ttl');
 ok($c->pid_dir() eq '/var/run', 'pid_dir');
 ok($c->pid_file() eq 'keitairc.pid', 'pid_file');
-ok($c->plugin_dir() eq getcwd() . '/lib/plugins:/usr/share/keitairc/lib/plugins', 'plugin_dir');
-ok($c->template_dir() eq getcwd() . '/lib/templates:/usr/share/keitairc/lib/templates', 'template_dir');
-ok($c->public_dir() eq getcwd() . '/lib/public:/usr/share/keitairc/lib/public', 'public_dir');
+ok($c->plugin_dir() eq '/usr/share/keitairc/lib/plugins', 'plugin_dir');
+ok($c->template_dir() eq '/usr/share/keitairc/lib/templates', 'template_dir');
+ok($c->public_dir() eq '/usr/share/keitairc/lib/public', 'public_dir');
 ok($c->reverse_message(), 'reverse_message');
 ok($c->reverse_recent(), 'reverse_recent');
 ok($c->reverse_unread(), 'reverse_unread');

diff --git a/t/02_Config/dot.keitairc b/t/02_Config/dot.keitairc
new file mode 100644 (file)
index 0000000..bc66c26
--- /dev/null
+++ b/t/02_Config/dot.keitairc
@@ -0,0 +1,35 @@
+# WARNING: This file is a part of keitairc test suite
+# $Id: dot.keitairc,v 1.1 2008-08-03 03:27:38 morimoto Exp $
+# $Source: /home/ishikawa/work/keitairc/tmp/keitairc/t/02_Config/dot.keitairc,v $
+
+irc_nick = adr
+irc_desc = Andre Limmoenman
+irc_username = andre
+irc_server = irc.example.com
+irc_port = 6667
+irc_password = javel
+irc_charset = iso-2022-jp-1
+web_port = 8080
+web_title = keitairc
+web_root = /
+web_charset = shiftjis
+web_host = your-keitairc-server.example.com
+web_password = 1234
+web_lines = 100
+cookie_ttl = 259200
+pid_dir = /var/run
+ping_delay = 30
+reconnect_delay = 10
+session_ttl = 1800
+pid_file = keitairc.pid
+plugin_dir = /usr/share/keitairc/lib/plugins
+template_dir = /usr/share/keitairc/lib/templates
+public_dir = /usr/share/keitairc/lib/public
+reverse_message = 1
+reverse_recent = 1
+reverse_unread = 1
+show_joinleave = 1
+fontsize = +0
+mobile_fontsize = -1
+follow_nick = 1
+debug = 0