X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconfig.t;h=ee51c6cc2628d8c663c47a90ab8a3cd12d6d7dc5;hb=d73d783ab2cf14ba28ca63723223d8c85a68cdd5;hp=3b4b12b32c20715ccfa60c6a665b43da9036212a;hpb=1317fb7b4ace03f6d9dfb1a42ee5f9371a1bf913;p=public-inbox.git

diff --git a/t/config.t b/t/config.t
index 3b4b12b3..ee51c6cc 100644
--- a/t/config.t
+++ b/t/config.t
@@ -1,21 +1,32 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 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 File::Temp qw/tempdir/;
-my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::TestCommon;
+use PublicInbox::Import;
+my ($tmpdir, $for_destroy) = tmpdir();
 
 {
-	is(system(qw(git init -q --bare), $tmpdir), 0, "git init successful");
-	my @cmd = ('git', "--git-dir=$tmpdir", qw(config foo.bar), "hi\nhi");
-	is(system(@cmd), 0, "set config");
+	PublicInbox::Import::init_bare($tmpdir);
+	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');
 }
 
 {
@@ -24,10 +35,10 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 
 	my $cfg = PublicInbox::Config->new($f);
 	is_deeply($cfg->lookup('meta@public-inbox.org'), {
-		'mainrepo' => '/home/pi/meta-main.git',
+		'inboxdir' => '/home/pi/meta-main.git',
 		'address' => [ 'meta@public-inbox.org' ],
 		'domain' => 'public-inbox.org',
-		'url' => 'http://example.com/meta',
+		'url' => [ 'http://example.com/meta' ],
 		-primary_address => 'meta@public-inbox.org',
 		'name' => 'meta',
 		feedmax => 25,
@@ -44,11 +55,11 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 		              'sandbox@public-inbox.org',
 			      'test@public-inbox.org'],
 		-primary_address => 'try@public-inbox.org',
-		'mainrepo' => '/home/pi/test-main.git',
+		'inboxdir' => '/home/pi/test-main.git',
 		'domain' => 'public-inbox.org',
 		'name' => 'test',
 		feedmax => 25,
-		'url' => 'http://example.com/test',
+		'url' => [ 'http://example.com/test' ],
 		-httpbackend_limiter => undef,
 		nntpserver => undef,
 	}, "lookup matches expected output for test");
@@ -66,13 +77,29 @@ $cfgpfx.altid=serial:enamg:file=b
 EOF
 	my $ibx = $config->lookup_name('test');
 	is_deeply($ibx->{altid}, [ @altid ]);
+
+	$config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=test\@example.com
+$cfgpfx.mainrepo=/path/to/non/existent
+EOF
+	$ibx = $config->lookup_name('test');
+	is($ibx->{inboxdir}, '/path/to/non/existent', 'mainrepo still works');
+
+	$config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=test\@example.com
+$cfgpfx.inboxdir=/path/to/non/existent
+$cfgpfx.mainrepo=/path/to/deprecated
+EOF
+	$ibx = $config->lookup_name('test');
+	is($ibx->{inboxdir}, '/path/to/non/existent',
+		'inboxdir takes precedence');
 }
 
 {
 	my $pfx = "publicinbox.test";
 	my $str = <<EOF;
 $pfx.address=test\@example.com
-$pfx.mainrepo=/path/to/non/existent
+$pfx.inboxdir=/path/to/non/existent
 publicinbox.nntpserver=news.example.com
 EOF
 	my $cfg = PublicInbox::Config->new(\$str);
@@ -81,7 +108,7 @@ EOF
 
 	$str = <<EOF;
 $pfx.address=test\@example.com
-$pfx.mainrepo=/path/to/non/existent
+$pfx.inboxdir=/path/to/non/existent
 $pfx.nntpserver=news.alt.example.com
 EOF
 	$cfg = PublicInbox::Config->new(\$str);
@@ -95,9 +122,9 @@ EOF
 	my $pfx2 = "publicinbox.foo";
 	my $str = <<EOF;
 $pfx.address=test\@example.com
-$pfx.mainrepo=/path/to/non/existent
+$pfx.inboxdir=/path/to/non/existent
 $pfx2.address=foo\@example.com
-$pfx2.mainrepo=/path/to/foo
+$pfx2.inboxdir=/path/to/foo
 publicinbox.noobfuscate=public-inbox.org \@example.com z\@EXAMPLE.com
 $pfx.obfuscate=true
 EOF
@@ -161,7 +188,7 @@ for my $s (@valid) {
 		push @expect, "$i";
 		print $fh <<"" or die "print: $!";
 [publicinbox "$i"]
-	mainrepo = /path/to/$i.git
+	inboxdir = /path/to/$i.git
 	address = $i\@example.com
 
 	}
@@ -177,9 +204,9 @@ for my $s (@valid) {
 	my $pfx2 = "publicinbox.test2";
 	my $str = <<EOF;
 $pfx1.address=test\@example.com
-$pfx1.mainrepo=/path/to/non/existent
+$pfx1.inboxdir=/path/to/non/existent
 $pfx2.address=foo\@example.com
-$pfx2.mainrepo=/path/to/foo
+$pfx2.inboxdir=/path/to/foo
 $pfx1.coderepo=project
 $pfx2.coderepo=project
 coderepo.project.dir=/path/to/project.git
@@ -192,23 +219,38 @@ EOF
 }
 
 {
-	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: {
+	require_git('1.8.5', 2) or
+		skip 'git 1.8.5+ required for --url-match', 2;
+	my $f = "$tmpdir/urlmatch";
+	open my $fh, '>', $f or BAIL_OUT $!;
+	print $fh <<EOF or BAIL_OUT $!;
+[imap "imap://*.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();