X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconfig.t;h=7e753cbe1bf2d5ad7a7afaf7389c040a4a73da5f;hb=refs%2Fheads%2Fmaster;hp=1f50bb86a0963bd5ac63e0817701a45c796846a5;hpb=6e07def560b211d9a1a3221862e72b7aeb4a31b3;p=public-inbox.git

diff --git a/t/config.t b/t/config.t
index 1f50bb86..ba83e63f 100644
--- a/t/config.t
+++ b/t/config.t
@@ -1,22 +1,33 @@
-# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
-use warnings;
-use Test::More;
-use PublicInbox::Config;
+use v5.10.1;
 use PublicInbox::TestCommon;
 use PublicInbox::Import;
+use_ok 'PublicInbox';
+ok(defined(eval('$PublicInbox::VERSION')), 'VERSION defined');
+use_ok 'PublicInbox::Config';
 my ($tmpdir, $for_destroy) = tmpdir();
 
 {
 	PublicInbox::Import::init_bare($tmpdir);
-	my @cmd = ('git', "--git-dir=$tmpdir", qw(config foo.bar), "hi\nhi");
+	my $inboxdir = "$tmpdir/new\nline";
+	my @cmd = ('git', "--git-dir=$tmpdir",
+		qw(config publicinbox.foo.inboxdir), $inboxdir);
 	is(xsys(@cmd), 0, "set config");
 
 	my $tmp = PublicInbox::Config->new("$tmpdir/config");
 
-	is("hi\nhi", $tmp->{"foo.bar"}, "config read correctly");
-	is("true", $tmp->{"core.bare"}, "used --bare repo");
+	is($tmp->{'publicinbox.foo.inboxdir'}, $inboxdir,
+		'config read correctly');
+	is($tmp->{'core.bare'}, 'true', 'init used --bare repo');
+
+	my @warn;
+	local $SIG{__WARN__} = sub { push @warn, @_ };
+	$tmp = PublicInbox::Config->new("$tmpdir/config");
+	is($tmp->lookup_name('foo'), undef, 'reject invalid inboxdir');
+	like("@warn", qr/^E:.*must not contain `\\n'/sm,
+		'warned about newline');
 }
 
 {
@@ -31,9 +42,7 @@ my ($tmpdir, $for_destroy) = tmpdir();
 		'url' => [ 'http://example.com/meta' ],
 		-primary_address => 'meta@public-inbox.org',
 		'name' => 'meta',
-		feedmax => 25,
 		-httpbackend_limiter => undef,
-		nntpserver => undef,
 	}, "lookup matches expected output");
 
 	is($cfg->lookup('blah@example.com'), undef,
@@ -48,10 +57,8 @@ my ($tmpdir, $for_destroy) = tmpdir();
 		'inboxdir' => '/home/pi/test-main.git',
 		'domain' => 'public-inbox.org',
 		'name' => 'test',
-		feedmax => 25,
 		'url' => [ 'http://example.com/test' ],
 		-httpbackend_limiter => undef,
-		nntpserver => undef,
 	}, "lookup matches expected output for test");
 }
 
@@ -90,20 +97,31 @@ EOF
 	my $str = <<EOF;
 $pfx.address=test\@example.com
 $pfx.inboxdir=/path/to/non/existent
+$pfx.newsgroup=inbox.test
 publicinbox.nntpserver=news.example.com
 EOF
 	my $cfg = PublicInbox::Config->new(\$str);
 	my $ibx = $cfg->lookup_name('test');
-	is($ibx->{nntpserver}, 'news.example.com', 'global NNTP server');
+	is_deeply($ibx->nntp_url({ www => { pi_cfg => $cfg }}),
+		[ 'nntp://news.example.com/inbox.test' ],
+		'nntp_url uses global NNTP server');
 
 	$str = <<EOF;
 $pfx.address=test\@example.com
 $pfx.inboxdir=/path/to/non/existent
+$pfx.newsgroup=inbox.test
 $pfx.nntpserver=news.alt.example.com
+publicinbox.nntpserver=news.example.com
+publicinbox.imapserver=imaps://mail.example.com
 EOF
 	$cfg = PublicInbox::Config->new(\$str);
 	$ibx = $cfg->lookup_name('test');
-	is($ibx->{nntpserver}, 'news.alt.example.com','per-inbox NNTP server');
+	is_deeply($ibx->nntp_url({ www => { pi_cfg => $cfg }}),
+		[ 'nntp://news.alt.example.com/inbox.test' ],
+		'nntp_url uses per-inbox NNTP server');
+	is_deeply($ibx->imap_url({ www => { pi_cfg => $cfg }}),
+		[ 'imaps://mail.example.com/inbox.test' ],
+		'nntp_url uses per-inbox NNTP server');
 }
 
 # no obfuscate domains
@@ -151,7 +169,7 @@ my $xre = join('|', keys %X);
 for my $s (@invalid) {
 	my $d = $s;
 	$d =~ s/($xre)/$X{$1}/g;
-	ok(!PublicInbox::Config::valid_inbox_name($s), "`$d' name rejected");
+	ok(!PublicInbox::Config::valid_foo_name($s), "`$d' name rejected");
 }
 
 # obviously-valid examples
@@ -167,7 +185,7 @@ my @valid = qw(a a@example a@example.com);
 # '!', '$', '=', '+'
 push @valid, qw[bang! ca$h less< more> 1% (parens) &more eql= +plus], '#hash';
 for my $s (@valid) {
-	ok(PublicInbox::Config::valid_inbox_name($s), "`$s' name accepted");
+	ok(PublicInbox::Config::valid_foo_name($s), "`$s' name accepted");
 }
 
 {
@@ -204,28 +222,43 @@ EOF
 	my $cfg = PublicInbox::Config->new(\$str);
 	my $t1 = $cfg->lookup_name('test1');
 	my $t2 = $cfg->lookup_name('test2');
-	is($t1->{-repo_objs}->[0], $t2->{-repo_objs}->[0],
+	is($cfg->repo_objs($t1)->[0], $cfg->repo_objs($t2)->[0],
 		'inboxes share ::Git object');
 }
 
 {
-	my $check_git = !!$ENV{CHECK_GIT_BOOL};
 	for my $t (qw(TRUE true yes on 1 +1 -1 13 0x1 0x12 0X5)) {
-		is(PublicInbox::Config::_git_config_bool($t), 1, "$t is true");
-		if ($check_git) {
-			is(`git -c test.val=$t config --bool test.val`,
-				"true\n", "$t matches git-config behavior");
-		}
+		is(PublicInbox::Config::git_bool($t), 1, "$t is true");
+		is(xqx([qw(git -c), "test.val=$t",
+			qw(config --bool test.val)]),
+			"true\n", "$t matches git-config behavior");
 	}
 	for my $f (qw(FALSE false no off 0 +0 +000 00 0x00 0X0)) {
-		is(PublicInbox::Config::_git_config_bool($f), 0, "$f is false");
-		if ($check_git) {
-			is(`git -c test.val=$f config --bool test.val`,
-				"false\n", "$f matches git-config behavior");
-		}
+		is(PublicInbox::Config::git_bool($f), 0, "$f is false");
+		is(xqx([qw(git -c), "test.val=$f",
+			qw(config --bool test.val)]),
+			"false\n", "$f matches git-config behavior");
 	}
-	is(PublicInbox::Config::_git_config_bool('bogus'), undef,
+	is(PublicInbox::Config::git_bool('bogus'), undef,
 		'bogus is undef');
 }
 
+SKIP: {
+	# XXX wildcard match requires git 2.26+
+	require_git('1.8.5', 2);
+	my $f = "$tmpdir/urlmatch";
+	open my $fh, '>', $f or BAIL_OUT $!;
+	print $fh <<EOF or BAIL_OUT $!;
+[imap "imap://mail.example.com"]
+	pollInterval = 9
+EOF
+	close $fh or BAIL_OUT;
+	local $ENV{PI_CONFIG} = $f;
+	my $cfg = PublicInbox::Config->new;
+	my $url = 'imap://mail.example.com/INBOX';
+	is($cfg->urlmatch('imap.pollInterval', $url), 9, 'urlmatch hit');
+	is($cfg->urlmatch('imap.idleInterval', $url), undef, 'urlmatch miss');
+};
+
+
 done_testing();