about summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--lib/PublicInbox/Config.pm60
-rw-r--r--t/config.t73
-rw-r--r--t/config_limiter.t24
-rw-r--r--t/psgi_attach.t8
-rw-r--r--t/psgi_bad_mids.t10
-rw-r--r--t/psgi_mount.t8
-rw-r--r--t/psgi_multipart_not.t10
-rw-r--r--t/psgi_scan_all.t12
-rw-r--r--t/psgi_search.t8
-rw-r--r--t/psgi_text.t8
-rw-r--r--t/psgi_v2.t10
-rw-r--r--t/watch_filter_rubylang.t20
-rw-r--r--t/watch_maildir.t14
-rw-r--r--t/watch_maildir_v2.t28
14 files changed, 148 insertions, 145 deletions
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index c2fa40f9..b7e03af3 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -20,9 +20,14 @@ sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] }
 sub new {
         my ($class, $file) = @_;
         $file = default_file() unless defined($file);
-        $file = ref $file ? $file : git_config_dump($file);
-        my $self = bless $file, $class;
-
+        my $self;
+        if (ref($file) eq 'SCALAR') { # used by some tests
+                open my $fh, '<', $file or die;  # PerlIO::scalar
+                $self = config_fh_parse($fh, "\n", '=');
+        } else {
+                $self = git_config_dump($file);
+        }
+        bless $self, $class;
         # caches
         $self->{-by_addr} ||= {};
         $self->{-by_list_id} ||= {};
@@ -119,22 +124,12 @@ sub lookup_name ($$) {
 
 sub each_inbox {
         my ($self, $cb) = @_;
-        if (my $section_order = $self->{-section_order}) {
-                foreach my $section (@$section_order) {
-                        next if $section !~ m!\Apublicinbox\.([^/]+)\z!;
-                        $self->{"publicinbox.$1.mainrepo"} or next;
-                        my $ibx = lookup_name($self, $1) or next;
-                        $cb->($ibx);
-                }
-        } else {
-                my %seen;
-                foreach my $k (keys %$self) {
-                        $k =~ m!\Apublicinbox\.([^/]+)\.mainrepo\z! or next;
-                        next if $seen{$1};
-                        $seen{$1} = 1;
-                        my $ibx = lookup_name($self, $1) or next;
-                        $cb->($ibx);
-                }
+        # may auto-vivify if config file is non-existent:
+        foreach my $section (@{$self->{-section_order}}) {
+                next if $section !~ m!\Apublicinbox\.([^/]+)\z!;
+                $self->{"publicinbox.$1.mainrepo"} or next;
+                my $ibx = lookup_name($self, $1) or next;
+                $cb->($ibx);
         }
 }
 
@@ -175,19 +170,14 @@ sub default_file {
         config_dir() . '/config';
 }
 
-sub git_config_dump {
-        my ($file) = @_;
-        my (%section_seen, @section_order);
-        return {} unless -e $file;
-        my @cmd = (qw/git config -z -l/, "--file=$file");
-        my $cmd = join(' ', @cmd);
-        my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n";
+sub config_fh_parse ($$$) {
+        my ($fh, $rs, $fs) = @_;
         my %rv;
-        local $/ = "\0";
+        my (%section_seen, @section_order);
+        local $/ = $rs;
         while (defined(my $line = <$fh>)) {
                 chomp $line;
-                my ($k, $v) = split(/\n/, $line, 2);
-
+                my ($k, $v) = split($fs, $line, 2);
                 my ($section) = ($k =~ /\A(\S+)\.[^\.]+\z/);
                 unless (defined $section_seen{$section}) {
                         $section_seen{$section} = 1;
@@ -205,12 +195,22 @@ sub git_config_dump {
                         $rv{$k} = $v;
                 }
         }
-        close $fh or die "failed to close ($cmd) pipe: $?";
         $rv{-section_order} = \@section_order;
 
         \%rv;
 }
 
+sub git_config_dump {
+        my ($file) = @_;
+        return {} unless -e $file;
+        my @cmd = (qw/git config -z -l/, "--file=$file");
+        my $cmd = join(' ', @cmd);
+        my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n";
+        my $rv = config_fh_parse($fh, "\0", "\n");
+        close $fh or die "failed to close ($cmd) pipe: $?";
+        $rv;
+}
+
 sub valid_inbox_name ($) {
         my ($name) = @_;
 
diff --git a/t/config.t b/t/config.t
index a3c74fa2..3b4b12b3 100644
--- a/t/config.t
+++ b/t/config.t
@@ -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,
@@ -174,16 +175,16 @@ for my $s (@valid) {
 {
         my $pfx1 = "publicinbox.test1";
         my $pfx2 = "publicinbox.test2";
-        my $h = {
-                "$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',
-        };
-        my $cfg = PublicInbox::Config->new($h);
+        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],
diff --git a/t/config_limiter.t b/t/config_limiter.t
index 9fafceae..c1fffecf 100644
--- a/t/config_limiter.t
+++ b/t/config_limiter.t
@@ -6,11 +6,11 @@ use Test::More;
 use PublicInbox::Config;
 my $cfgpfx = "publicinbox.test";
 {
-        my $config = PublicInbox::Config->new({
-                "$cfgpfx.address" => 'test@example.com',
-                "$cfgpfx.mainrepo" => '/path/to/non/existent',
-                "$cfgpfx.httpbackendmax" => 12,
-        });
+        my $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=test\@example.com
+$cfgpfx.mainrepo=/path/to/non/existent
+$cfgpfx.httpbackendmax=12
+EOF
         my $ibx = $config->lookup_name('test');
         my $git = $ibx->git;
         my $old = "$git";
@@ -24,16 +24,16 @@ my $cfgpfx = "publicinbox.test";
 }
 
 {
-        my $config = PublicInbox::Config->new({
-                'publicinboxlimiter.named.max' => 3,
-                "$cfgpfx.address" => 'test@example.com',
-                "$cfgpfx.mainrepo" => '/path/to/non/existent',
-                "$cfgpfx.httpbackendmax" => 'named',
-        });
+        my $config = PublicInbox::Config->new(\<<EOF);
+publicinboxlimiter.named.max=3
+$cfgpfx.address=test\@example.com
+$cfgpfx.mainrepo=/path/to/non/existent
+$cfgpfx.httpbackendmax=named
+EOF
         my $ibx = $config->lookup_name('test');
         my $git = $ibx->git;
         ok($git, 'got git object');
-        my $old = "$git";
+        my $old = "$git"; # stringify object ref "Git(0xDEADBEEF)"
         my $lim = $git->{-httpbackend_limiter};
         ok($lim, 'Limiter exists');
         is($lim->{max}, 3, 'limiter has expected slots');
diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index 41695e0d..f5140f44 100644
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -21,10 +21,10 @@ use PublicInbox::Config;
 use PublicInbox::WWW;
 use_ok 'PublicInbox::WwwAttach';
 use Plack::Builder;
-my $config = PublicInbox::Config->new({
-        "$cfgpfx.address" => $addr,
-        "$cfgpfx.mainrepo" => $maindir,
-});
+my $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=$addr
+$cfgpfx.mainrepo=$maindir
+EOF
 is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
 my $git = PublicInbox::Git->new($maindir);
 my $im = PublicInbox::Import->new($git, 'test', $addr);
diff --git a/t/psgi_bad_mids.t b/t/psgi_bad_mids.t
index c561cc36..95196a3f 100644
--- a/t/psgi_bad_mids.t
+++ b/t/psgi_bad_mids.t
@@ -53,11 +53,11 @@ Date: Fri, 02 Oct 1993 00:00:0$i +0000
 }
 $im->done;
 
-my $cfg = {
-        "$cfgpfx.address" => $ibx->{-primary_address},
-        "$cfgpfx.mainrepo" => $mainrepo,
-};
-my $config = PublicInbox::Config->new($cfg);
+my $cfg = <<EOF;
+$cfgpfx.address=$ibx->{-primary_address}
+$cfgpfx.mainrepo=$mainrepo
+EOF
+my $config = PublicInbox::Config->new(\$cfg);
 my $www = PublicInbox::WWW->new($config);
 test_psgi(sub { $www->call(@_) }, sub {
         my ($cb) = @_;
diff --git a/t/psgi_mount.t b/t/psgi_mount.t
index 8da2bc89..7160896b 100644
--- a/t/psgi_mount.t
+++ b/t/psgi_mount.t
@@ -21,10 +21,10 @@ use PublicInbox::Config;
 use PublicInbox::WWW;
 use Plack::Builder;
 use Plack::App::URLMap;
-my $config = PublicInbox::Config->new({
-        "$cfgpfx.address" => $addr,
-        "$cfgpfx.mainrepo" => $maindir,
-});
+my $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=$addr
+$cfgpfx.mainrepo=$maindir
+EOF
 is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
 my $git = PublicInbox::Git->new($maindir);
 my $im = PublicInbox::Import->new($git, 'test', $addr);
diff --git a/t/psgi_multipart_not.t b/t/psgi_multipart_not.t
index ae248de3..2670c47a 100644
--- a/t/psgi_multipart_not.t
+++ b/t/psgi_multipart_not.t
@@ -42,11 +42,11 @@ ok($im->add($mime), 'added broken multipart message');
 $im->done;
 
 my $cfgpfx = "publicinbox.v2test";
-my $cfg = {
-        "$cfgpfx.address" => $ibx->{-primary_address},
-        "$cfgpfx.mainrepo" => $repo,
-};
-my $config = PublicInbox::Config->new($cfg);
+my $cfg = <<EOF;
+$cfgpfx.address=$ibx->{-primary_address}
+$cfgpfx.mainrepo=$repo
+EOF
+my $config = PublicInbox::Config->new(\$cfg);
 my $www = PublicInbox::WWW->new($config);
 
 my ($res, $raw);
diff --git a/t/psgi_scan_all.t b/t/psgi_scan_all.t
index 2f54c820..2e00b6d8 100644
--- a/t/psgi_scan_all.t
+++ b/t/psgi_scan_all.t
@@ -14,13 +14,15 @@ foreach my $mod (@mods) {
 use_ok 'PublicInbox::V2Writable';
 foreach my $mod (@mods) { use_ok $mod; }
 my $tmp = tempdir('pi-scan_all-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-my $cfg = {};
+my $cfg = '';
 
 foreach my $i (1..2) {
         my $cfgpfx = "publicinbox.test-$i";
-        my $addr = $cfg->{"$cfgpfx.address"} = "test-$i\@example.com";
-        my $mainrepo = $cfg->{"$cfgpfx.mainrepo"} = "$tmp/$i";
-        $cfg->{"$cfgpfx.url"} = "http://example.com/$i";
+        my $addr = "test-$i\@example.com";
+        my $mainrepo = "$tmp/$i";
+        $cfg .= "$cfgpfx.address=$addr\n";
+        $cfg .= "$cfgpfx.mainrepo=$mainrepo\n";
+        $cfg .= "$cfgpfx.url=http://example.com/$i\n";
         my $opt = {
                 mainrepo => $mainrepo,
                 name => "test-$i",
@@ -45,7 +47,7 @@ EOF
         ok($im->add($mime), "added message to $i");
         $im->done;
 }
-my $config = PublicInbox::Config->new($cfg);
+my $config = PublicInbox::Config->new(\$cfg);
 use_ok 'PublicInbox::WWW';
 my $www = PublicInbox::WWW->new($config);
 
diff --git a/t/psgi_search.t b/t/psgi_search.t
index 0c4bdcd1..ab6892bc 100644
--- a/t/psgi_search.t
+++ b/t/psgi_search.t
@@ -45,10 +45,10 @@ $im->done;
 PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
 
 my $cfgpfx = "publicinbox.test";
-my $config = PublicInbox::Config->new({
-        "$cfgpfx.address" => 'git@vger.kernel.org',
-        "$cfgpfx.mainrepo" => $tmpdir,
-});
+my $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=git\@vger.kernel.org
+$cfgpfx.mainrepo=$tmpdir
+EOF
 my $www = PublicInbox::WWW->new($config);
 test_psgi(sub { $www->call(@_) }, sub {
         my ($cb) = @_;
diff --git a/t/psgi_text.t b/t/psgi_text.t
index bdc1ebfd..944a6476 100644
--- a/t/psgi_text.t
+++ b/t/psgi_text.t
@@ -21,10 +21,10 @@ use PublicInbox::Config;
 use PublicInbox::WWW;
 use_ok 'PublicInbox::WwwText';
 use Plack::Builder;
-my $config = PublicInbox::Config->new({
-        "$cfgpfx.address" => $addr,
-        "$cfgpfx.mainrepo" => $maindir,
-});
+my $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=$addr
+$cfgpfx.mainrepo=$maindir
+EOF
 is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
 my $www = PublicInbox::WWW->new($config);
 
diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index 3003c5d6..e4f7306e 100644
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -54,11 +54,11 @@ $new_mid = $mids->[1];
 $im->done;
 
 my $cfgpfx = "publicinbox.v2test";
-my $cfg = {
-        "$cfgpfx.address" => $ibx->{-primary_address},
-        "$cfgpfx.mainrepo" => $mainrepo,
-};
-my $config = PublicInbox::Config->new($cfg);
+my $cfg = <<EOF;
+$cfgpfx.address=$ibx->{-primary_address}
+$cfgpfx.mainrepo=$mainrepo
+EOF
+my $config = PublicInbox::Config->new(\$cfg);
 my $www = PublicInbox::WWW->new($config);
 my ($res, $raw, @from_);
 test_psgi(sub { $www->call(@_) }, sub {
diff --git a/t/watch_filter_rubylang.t b/t/watch_filter_rubylang.t
index da383c15..b28d699a 100644
--- a/t/watch_filter_rubylang.t
+++ b/t/watch_filter_rubylang.t
@@ -70,15 +70,15 @@ spam
 EOF
         PublicInbox::Emergency->new($maildir)->prepare(\"$spam");
 
-        my %orig = (
-                "$cfgpfx.address" => $addr,
-                "$cfgpfx.mainrepo" => $mainrepo,
-                "$cfgpfx.watch" => "maildir:$maildir",
-                "$cfgpfx.filter" => 'PublicInbox::Filter::RubyLang',
-                "$cfgpfx.altid" => 'serial:alerts:file=msgmap.sqlite3',
-                "publicinboxwatch.watchspam" => "maildir:$spamdir",
-        );
-        my $config = PublicInbox::Config->new({%orig});
+        my $orig = <<EOF;
+$cfgpfx.address=$addr
+$cfgpfx.mainrepo=$mainrepo
+$cfgpfx.watch=maildir:$maildir
+$cfgpfx.filter=PublicInbox::Filter::RubyLang
+$cfgpfx.altid=serial:alerts:file=msgmap.sqlite3
+publicinboxwatch.watchspam=maildir:$spamdir
+EOF
+        my $config = PublicInbox::Config->new(\$orig);
         my $ibx = $config->lookup_name($v);
         ok($ibx, 'found inbox by name');
 
@@ -108,7 +108,7 @@ EOF
         }
         $w->scan('full');
 
-        $config = PublicInbox::Config->new({%orig});
+        $config = PublicInbox::Config->new(\$orig);
         $ibx = $config->lookup_name($v);
         ($tot, undef) = $ibx->search->reopen->query('b:spam');
         is($tot, 0, 'spam removed');
diff --git a/t/watch_maildir.t b/t/watch_maildir.t
index d164bf35..e65ab9a9 100644
--- a/t/watch_maildir.t
+++ b/t/watch_maildir.t
@@ -35,13 +35,13 @@ ok(POSIX::mkfifo("$maildir/cur/fifo", 0777),
         'create FIFO to ensure we do not get stuck on it :P');
 my $sem = PublicInbox::Emergency->new($spamdir); # create dirs
 
-my $config = PublicInbox::Config->new({
-        "$cfgpfx.address" => $addr,
-        "$cfgpfx.mainrepo" => $git_dir,
-        "$cfgpfx.watch" => "maildir:$maildir",
-        "$cfgpfx.filter" => 'PublicInbox::Filter::Vger',
-        "publicinboxlearn.watchspam" => "maildir:$spamdir",
-});
+my $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=$addr
+$cfgpfx.mainrepo=$git_dir
+$cfgpfx.watch=maildir:$maildir
+$cfgpfx.filter=PublicInbox::Filter::Vger
+publicinboxlearn.watchspam=maildir:$spamdir
+EOF
 
 PublicInbox::WatchMaildir->new($config)->scan('full');
 my $git = PublicInbox::Git->new($git_dir);
diff --git a/t/watch_maildir_v2.t b/t/watch_maildir_v2.t
index f1d6e740..0a5a8017 100644
--- a/t/watch_maildir_v2.t
+++ b/t/watch_maildir_v2.t
@@ -40,14 +40,14 @@ ok(POSIX::mkfifo("$maildir/cur/fifo", 0777),
         'create FIFO to ensure we do not get stuck on it :P');
 my $sem = PublicInbox::Emergency->new($spamdir); # create dirs
 
-my %orig = (
-        "$cfgpfx.address" => $addr,
-        "$cfgpfx.mainrepo" => $mainrepo,
-        "$cfgpfx.watch" => "maildir:$maildir",
-        "$cfgpfx.filter" => 'PublicInbox::Filter::Vger',
-        "publicinboxlearn.watchspam" => "maildir:$spamdir"
-);
-my $config = PublicInbox::Config->new({%orig});
+my $orig = <<EOF;
+$cfgpfx.address=$addr
+$cfgpfx.mainrepo=$mainrepo
+$cfgpfx.watch=maildir:$maildir
+$cfgpfx.filter=PublicInbox::Filter::Vger
+publicinboxlearn.watchspam=maildir:$spamdir
+EOF
+my $config = PublicInbox::Config->new(\$orig);
 my $ibx = $config->lookup_name('test');
 ok($ibx, 'found inbox by name');
 my $srch = $ibx->search;
@@ -146,12 +146,12 @@ More majordomo info at  http://vger.kernel.org/majordomo-info.html\n);
         my $v1pfx = "publicinbox.v1";
         my $v1addr = 'v1-public@example.com';
         is(system(qw(git init -q --bare), $v1repo), 0, 'v1 init OK');
-        my $config = PublicInbox::Config->new({
-                %orig,
-                "$v1pfx.address" => $v1addr,
-                "$v1pfx.mainrepo" => $v1repo,
-                "$v1pfx.watch" => "maildir:$maildir",
-        });
+        my $cfg2 = <<EOF;
+$orig$v1pfx.address=$v1addr
+$v1pfx.mainrepo=$v1repo
+$v1pfx.watch=maildir:$maildir
+EOF
+        my $config = PublicInbox::Config->new(\$cfg2);
         my $both = <<EOF;
 From: user\@example.com
 To: $addr, $v1addr