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

diff --git a/t/config.t b/t/config.t
index 7531fd75..3b4b12b3 100644
--- a/t/config.t
+++ b/t/config.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -9,12 +9,12 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 
 {
 	is(system(qw(git init -q --bare), $tmpdir), 0, "git init successful");
-	my @cmd = ('git', "--git-dir=$tmpdir", qw(config foo.bar hihi));
+	my @cmd = ('git', "--git-dir=$tmpdir", qw(config foo.bar), "hi\nhi");
 	is(system(@cmd), 0, "set config");
 
 	my $tmp = PublicInbox::Config->new("$tmpdir/config");
 
-	is("hihi", $tmp->{"foo.bar"}, "config read correctly");
+	is("hi\nhi", $tmp->{"foo.bar"}, "config read correctly");
 	is("true", $tmp->{"core.bare"}, "used --bare repo");
 }
 
@@ -58,30 +58,33 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 {
 	my $cfgpfx = "publicinbox.test";
 	my @altid = qw(serial:gmane:file=a serial:enamg:file=b);
-	my $config = PublicInbox::Config->new({
-		"$cfgpfx.address" => 'test@example.com',
-		"$cfgpfx.mainrepo" => '/path/to/non/existent',
-		"$cfgpfx.altid" => [ @altid ],
-	});
+	my $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=test\@example.com
+$cfgpfx.mainrepo=/path/to/non/existent
+$cfgpfx.altid=serial:gmane:file=a
+$cfgpfx.altid=serial:enamg:file=b
+EOF
 	my $ibx = $config->lookup_name('test');
 	is_deeply($ibx->{altid}, [ @altid ]);
 }
 
 {
 	my $pfx = "publicinbox.test";
-	my %h = (
-		"$pfx.address" => 'test@example.com',
-		"$pfx.mainrepo" => '/path/to/non/existent',
-		"publicinbox.nntpserver" => 'news.example.com',
-	);
-	my %tmp = %h;
-	my $cfg = PublicInbox::Config->new(\%tmp);
+	my $str = <<EOF;
+$pfx.address=test\@example.com
+$pfx.mainrepo=/path/to/non/existent
+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');
 
-	delete $h{'publicinbox.nntpserver'};
-	$h{"$pfx.nntpserver"} = 'news.alt.example.com';
-	$cfg = PublicInbox::Config->new(\%h);
+	$str = <<EOF;
+$pfx.address=test\@example.com
+$pfx.mainrepo=/path/to/non/existent
+$pfx.nntpserver=news.alt.example.com
+EOF
+	$cfg = PublicInbox::Config->new(\$str);
 	$ibx = $cfg->lookup_name('test');
 	is($ibx->{nntpserver}, 'news.alt.example.com','per-inbox NNTP server');
 }
@@ -90,17 +93,15 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 {
 	my $pfx = "publicinbox.test";
 	my $pfx2 = "publicinbox.foo";
-	my %h = (
-		"$pfx.address" => 'test@example.com',
-		"$pfx.mainrepo" => '/path/to/non/existent',
-		"$pfx2.address" => 'foo@example.com',
-		"$pfx2.mainrepo" => '/path/to/foo',
-		lc("publicinbox.noObfuscate") =>
-			'public-inbox.org @example.com z@EXAMPLE.com',
-		"$pfx.obfuscate" => 'true', # :<
-	);
-	my %tmp = %h;
-	my $cfg = PublicInbox::Config->new(\%tmp);
+	my $str = <<EOF;
+$pfx.address=test\@example.com
+$pfx.mainrepo=/path/to/non/existent
+$pfx2.address=foo\@example.com
+$pfx2.mainrepo=/path/to/foo
+publicinbox.noobfuscate=public-inbox.org \@example.com z\@EXAMPLE.com
+$pfx.obfuscate=true
+EOF
+	my $cfg = PublicInbox::Config->new(\$str);
 	my $ibx = $cfg->lookup_name('test');
 	my $re = $ibx->{-no_obfuscate_re};
 	like('meta@public-inbox.org', $re,
@@ -127,10 +128,13 @@ my @invalid = (
 
 );
 
-require Data::Dumper;
+my %X = ("\0" => '\\0', "\b" => '\\b', "\f" => '\\f', "'" => "\\'");
+my $xre = join('|', keys %X);
+
 for my $s (@invalid) {
-	my $d = Data::Dumper->new([$s])->Terse(1)->Indent(0)->Dump;
-	ok(!PublicInbox::Config::valid_inbox_name($s), "$d name rejected");
+	my $d = $s;
+	$d =~ s/($xre)/$X{$1}/g;
+	ok(!PublicInbox::Config::valid_inbox_name($s), "`$d' name rejected");
 }
 
 # obviously-valid examples
@@ -146,8 +150,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) {
-	my $d = Data::Dumper->new([$s])->Terse(1)->Indent(0)->Dump;
-	ok(PublicInbox::Config::valid_inbox_name($s), "$d name accepted");
+	ok(PublicInbox::Config::valid_inbox_name($s), "`$s' name accepted");
 }
 
 {
@@ -169,4 +172,43 @@ for my $s (@valid) {
 	is_deeply(\@result, \@expect);
 }
 
+{
+	my $pfx1 = "publicinbox.test1";
+	my $pfx2 = "publicinbox.test2";
+	my $str = <<EOF;
+$pfx1.address=test\@example.com
+$pfx1.mainrepo=/path/to/non/existent
+$pfx2.address=foo\@example.com
+$pfx2.mainrepo=/path/to/foo
+$pfx1.coderepo=project
+$pfx2.coderepo=project
+coderepo.project.dir=/path/to/project.git
+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],
+		'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");
+		}
+	}
+	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_config_bool('bogus'), undef,
+		'bogus is undef');
+}
+
 done_testing();