* [PATCH 00/10] www_coderepo: git viewer w/ search planned
@ 2022-10-04 19:12 7% Eric Wong
2022-10-04 19:12 6% ` [PATCH 01/10] tests: use test_httpd consistently Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2022-10-04 19:12 UTC (permalink / raw)
To: meta
This is to eventually support M:N inbox:coderepo search via
-extindex. For now, it's a JS-free and CSS-optional
cgit-like UI, but perhaps more brutalist :>
It's mainly for wiring /$INBOX/$OID/s/ into /$CODEREPO/$OID/s/,
but Atom feeds and such will be supported.
It'll work better with coderepos with a ".git" name suffix
to avoid conflicts with the inbox name. So [coderepo "git"]
becomes [coderepo "git.git"] in my config file. cgitrc usage
should continue working, I think...
It looks better out-of-the-box on w3m since cgit relies too
much on CSS :>
Example here: https://80x24.org/lore/git.git
Eric Wong (10):
tests: use test_httpd consistently
cgit: use Perl 5.10-isms, optimize, and golf
git: hoist out description
git: move cloneurl + description reading here
www_coderepo: an alternative to cgit
www_coderepo: wire up /$CODEREPO/$OID/s/ endpoint
git: allow ->local_nick to return undef
www_coderepo: wire up snapshot support
www_stream: use git->pub_urls for coderepo links
www_coderepo: start a top nav bar in summary view
MANIFEST | 2 +
lib/PublicInbox/Cgit.pm | 33 ++---
lib/PublicInbox/Config.pm | 2 +-
lib/PublicInbox/ExtSearch.pm | 2 +-
lib/PublicInbox/Git.pm | 53 +++++++--
lib/PublicInbox/GitAsyncCat.pm | 66 ++++++++--
lib/PublicInbox/Inbox.pm | 23 +---
lib/PublicInbox/RepoSnapshot.pm | 95 +++++++++++++++
lib/PublicInbox/SolverGit.pm | 8 +-
lib/PublicInbox/TestCommon.pm | 14 ++-
lib/PublicInbox/ViewVCS.pm | 1 +
lib/PublicInbox/WWW.pm | 12 +-
lib/PublicInbox/WwwCoderepo.pm | 205 ++++++++++++++++++++++++++++++++
lib/PublicInbox/WwwStream.pm | 33 ++---
t/init.t | 2 +-
t/lei-mirror.t | 10 +-
t/psgi_attach.t | 13 +-
t/solver_git.t | 70 ++++++++---
t/www_altid.t | 13 +-
xt/solver.t | 18 +--
20 files changed, 533 insertions(+), 142 deletions(-)
create mode 100644 lib/PublicInbox/RepoSnapshot.pm
create mode 100644 lib/PublicInbox/WwwCoderepo.pm
^ permalink raw reply [relevance 7%]
* [PATCH 01/10] tests: use test_httpd consistently
2022-10-04 19:12 7% [PATCH 00/10] www_coderepo: git viewer w/ search planned Eric Wong
@ 2022-10-04 19:12 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2022-10-04 19:12 UTC (permalink / raw)
To: meta
This allows us to consolidate our checks for
Plack::Test::ExternalServer and enforce our redirect-disabled
LWP::UserAgent.
---
lib/PublicInbox/TestCommon.pm | 14 +++++++++-----
t/psgi_attach.t | 13 +++----------
t/solver_git.t | 17 ++++-------------
t/www_altid.t | 13 +++----------
xt/solver.t | 18 ++++--------------
5 files changed, 23 insertions(+), 52 deletions(-)
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 333791b4..abf4f364 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -743,11 +743,14 @@ sub create_inbox ($$;@) {
$ibx;
}
-sub test_httpd ($$;$) {
- my ($env, $client, $skip) = @_;
- for (qw(PI_CONFIG TMPDIR)) {
- $env->{$_} or BAIL_OUT "$_ unset";
- }
+sub test_httpd ($$;$$) {
+ my ($env, $client, $skip, $cb) = @_;
+ my ($tmpdir, $for_destroy);
+ $env->{TMPDIR} //= do {
+ ($tmpdir, $for_destroy) = tmpdir();
+ $tmpdir;
+ };
+ for (qw(PI_CONFIG)) { $env->{$_} or BAIL_OUT "$_ unset" }
SKIP: {
require_mods(qw(Plack::Test::ExternalServer LWP::UserAgent),
$skip // 1);
@@ -761,6 +764,7 @@ sub test_httpd ($$;$) {
$ua->max_redirect(0);
Plack::Test::ExternalServer::test_psgi(client => $client,
ua => $ua);
+ $cb->() if $cb;
$td->join('TERM');
open my $fh, '<', $err or BAIL_OUT $!;
my $e = do { local $/; <$fh> };
diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index 79665d6f..db551696 100644
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -1,5 +1,5 @@
#!perl -w
-# Copyright (C) 2016-2021 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 v5.10.1;
@@ -97,19 +97,12 @@ my $client = sub {
test_psgi(sub { $www->call(@_) }, $client);
SKIP: {
- require_mods(qw(DBD::SQLite Plack::Test::ExternalServer), 18);
+ require_mods(qw(DBD::SQLite), 18);
$ibx = create_inbox 'test-indexed', indexlevel => 'basic', $creat_cb;
$cfgpath = "$ibx->{inboxdir}/pi_config";
my $env = { PI_CONFIG => $cfgpath };
$www = PublicInbox::WWW->new(PublicInbox::Config->new($cfgpath));
test_psgi(sub { $www->call(@_) }, $client);
- my $sock = tcp_server() or die;
- my ($tmpdir, $for_destroy) = tmpdir();
- my ($out, $err) = map { "$tmpdir/std$_.log" } qw(out err);
- my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
- my $td = start_script($cmd, $env, { 3 => $sock });
- my ($h, $p) = tcp_host_port($sock);
- local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
- Plack::Test::ExternalServer::test_psgi(client => $client);
+ test_httpd($env, $client);
}
done_testing;
diff --git a/t/solver_git.t b/t/solver_git.t
index 958af065..e347c711 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -302,29 +302,20 @@ EOF
'UTF-8 commit shown properly');
};
test_psgi(sub { $www->call(@_) }, $client);
+ my $env = { PI_CONFIG => $cfgpath, TMPDIR => $tmpdir };
+ test_httpd($env, $client, 7, sub {
SKIP: {
- require_mods(qw(Plack::Test::ExternalServer), 7);
- my $env = { PI_CONFIG => $cfgpath };
- my $sock = tcp_server() or die;
- my ($out, $err) = map { "$tmpdir/std$_.log" } qw(out err);
- my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
- my $td = start_script($cmd, $env, { 3 => $sock });
- my ($h, $p) = tcp_host_port($sock);
- my $url = "http://$h:$p";
- local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = $url;
- Plack::Test::ExternalServer::test_psgi(client => $client);
require_cmd('curl', 1) or skip 'no curl', 1;
-
mkdir "$tmpdir/ext" // xbail "mkdir $!";
+ my $rurl = "$ENV{PLACK_TEST_EXTERNALSERVER_URI}/$name";
test_lei({tmpdir => "$tmpdir/ext"}, sub {
- my $rurl = "$url/$name";
lei_ok(qw(blob --no-mail 69df7d5 -I), $rurl);
is(git_sha(1, \$lei_out)->hexdigest, $expect,
'blob contents output');
ok(!lei(qw(blob -I), $rurl, $non_existent),
'non-existent blob fails');
});
- }
+ }});
}
done_testing();
diff --git a/t/www_altid.t b/t/www_altid.t
index 94a2e807..de1e6ed6 100644
--- a/t/www_altid.t
+++ b/t/www_altid.t
@@ -1,5 +1,5 @@
#!perl -w
-# Copyright (C) 2020-2021 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 v5.10.1; use PublicInbox::TestCommon;
use PublicInbox::Config;
@@ -59,14 +59,7 @@ my $client = sub {
};
test_psgi(sub { $www->call(@_) }, $client);
SKIP: {
- require_mods(qw(Plack::Test::ExternalServer), 4);
- my $env = { PI_CONFIG => $cfgpath };
- my $sock = tcp_server() or die;
- my ($out, $err) = map { "$tmpdir/std$_.log" } qw(out err);
- my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
- my $td = start_script($cmd, $env, { 3 => $sock });
- my ($h, $p) = tcp_host_port($sock);
- local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
- Plack::Test::ExternalServer::test_psgi(client => $client);
+ my $env = { PI_CONFIG => $cfgpath, TMPDIR => $tmpdir };
+ test_httpd($env, $client);
}
done_testing;
diff --git a/xt/solver.t b/xt/solver.t
index 32cd43cf..c76e0b0a 100644
--- a/xt/solver.t
+++ b/xt/solver.t
@@ -57,20 +57,10 @@ while (($ibx_name, $urls) = each %$todo) {
}
}
-SKIP: {
- require_mods(qw(Plack::Test::ExternalServer), $nr);
- delete @$todo{@gone};
-
- my $sock = tcp_server() or BAIL_OUT $!;
- my ($tmpdir, $for_destroy) = tmpdir();
- my ($out, $err) = map { "$tmpdir/std$_.log" } qw(out err);
- my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
- my $td = start_script($cmd, undef, { 3 => $sock });
- my ($h, $p) = tcp_host_port($sock);
- local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
- while (($ibx_name, $urls) = each %$todo) {
- Plack::Test::ExternalServer::test_psgi(client => $client);
- }
+delete @$todo{@gone};
+my $env = { PI_CONFIG => PublicInbox::Config->default_file };
+while (($ibx_name, $urls) = each %$todo) {
+ test_httpd($env, $client, $nr);
}
done_testing();
^ permalink raw reply related [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2022-10-04 19:12 7% [PATCH 00/10] www_coderepo: git viewer w/ search planned Eric Wong
2022-10-04 19:12 6% ` [PATCH 01/10] tests: use test_httpd consistently Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).