X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist.pm;h=435f7e1751f4f5c57108578a6734693ac38b0f42;hb=4916e60728a5d9642e45cf6957758f110b94803b;hp=7afb8a6da5117d3efe600c4109876d483e11b895;hpb=43ae21992dbe0c847a75e400b058e50e48ef88c6;p=catagits%2FGitalist.git diff --git a/lib/Gitalist.pm b/lib/Gitalist.pm index 7afb8a6..435f7e1 100644 --- a/lib/Gitalist.pm +++ b/lib/Gitalist.pm @@ -11,37 +11,57 @@ use Catalyst qw/ Unicode::Encoding Static::Simple StackTrace + SubRequest /; -our $VERSION = '0.000005'; +our $VERSION = '0.002007'; $VERSION = eval $VERSION; __PACKAGE__->config( name => 'Gitalist', default_view => 'Default', default_model => 'CollectionOfRepos', + use_request_uri_for_path => 1, + disable_component_resolution_regex_fallback => 1, ); __PACKAGE__->setup(); +after prepare_path => sub { + my ($ctx) = @_; + if ($ctx->req->param('a')) { + $ctx->request->uri->path('/legacy' . $ctx->request->uri->path); + } +}; + around uri_for => sub { my ($orig, $c) = (shift, shift); - my $repository_name = $c->stash->{'Repository'} && $c->stash->{'Repository'}->name; - my $hash = ref($_[-1]) eq 'HASH' ? pop @_ : {}; - my $params = Catalyst::Utils::merge_hashes( - { p => $hash->{p} || $repository_name }, - $hash, - ); - delete $params->{p} unless defined $params->{p} && length $params->{p}; - (my $uri = $c->$orig(@_, $params)) - =~ tr[&][;]; + my $uri = $c->$orig(@_); + $$uri =~ tr[&][;] if defined $uri; return $uri; }; +around uri_for_action => sub { + my ($orig, $c) = (shift, shift); + my $uri = $c->$orig(@_); + $$uri =~ s[/fragment\b][] if defined $uri; + return $uri; +}; + +sub uri_with { + my ($self, @args) = @_; + my $uri = $self->request->uri_with(@args); + # Wow this awful. + $uri =~ s[/fragment\b][]; + return $uri; +} + 1; __END__ +=encoding UTF-8 + =head1 NAME Gitalist - A modern git web viewer @@ -53,7 +73,7 @@ Gitalist - A modern git web viewer =head1 INSTALL As Gitalist follows the usual Perl module format the usual approach -for installation should work e.g. +for installation should work, e.g.: perl Makefile.PL make @@ -64,20 +84,22 @@ or cpan -i Gitalist -You can also check gitalist out from git and run it, in this case you'll additionally -need the author modules, but no configuration will be needed as it will default to looking +You can also L +and run it, in this case you'll additionally need the author modules, +but no configuration will be needed as it will default to looking for repositories the directory above the checkout. =head1 DESCRIPTION -Gitalist is a web frontend for git repositories based on gitweb.cgi -and backed by Catalyst. +Gitalist is a web frontend for git repositories based on +L and backed by +L. =head2 History -This project started off as an attempt to port gitweb.cgi to a +This project started off as an attempt to port I to a Catalyst app in a piecemeal fashion. As it turns out, thanks largely -to Florian Ragwitz's earlier effort, it was easier to use gitweb.cgi +to Florian Ragwitz's earlier effort, it was easier to use I as a template for building a new Catalyst application. =head1 GETTING GITALIST @@ -92,9 +114,33 @@ The canonical repository for the master branch is: git://git.shadowcat.co.uk/catagits/Gitalist.git -Gitalist is also mirrored to github, and a number of people have active forks +Gitalist is also mirrored to GitHub at L, +and a number of people have active forks with branches and/or new features in the master branch. +=head1 BOOTSTRAPPING + +As of C<0.002001> Gitalist can now be bootstrapped to run out of its +own directory by installing its prerequisites locally with the help of +L. So instead of installing the prerequisites to the +system path with CPAN they are installed under the Gitalist directory. + +To do this clone Gitalist from the L or grab a snapshot from broquaint's GitHub repository: + + https://github.com/broquaint/Gitalist/downloads + +With the source acquired and unpacked run the following from within the +Gitalist directory: + + perl script/bootstrap.pl + +This will install the necessary modules for the build process which in +turn installs the prerequisites locally. + +B The relevant bootstrap scripts aren't available in the CPAN dist +as the bootstrap scripts should not be installed. + =head1 INITIAL CONFIGURATION Gitalist is configured using L. The supplied sample @@ -123,21 +169,22 @@ by running: cp `perl -Ilib -MGitalist -e'print Gitalist->path_to("gitalist.conf")'` gitalist.conf -You can then edit this confg, adding a repos_dir path and customising other settings as desired. +You can then edit this configuration, adding a C path and customising +other settings as desired. You can then start the Gitalist demo server by setting C<< GITALIST_CONFIG >>. For example: GITALIST_CONFIG=/usr/local/etc/gitalist.conf gitalist_server.pl Alternatively, if you only want to set a repository directory and are otherwise happy with -the default configuration, then you can set the C<< GITALIST_REPOS_DIR >> environment -variable, or pass the C<< --repos_dir >> flag to any of the scripts. +the default configuration, then you can set the C<< GITALIST_REPO_DIR >> environment +variable, or pass the C<< --repo_dir >> flag to any of the scripts. - GITALIST_REPOS_DIR=/home/myuser/code/git gitalist_server.pl - gitalist_server.pl --repos_dir home/myuser/code/git + GITALIST_REPO_DIR=/home/myuser/code/git gitalist_server.pl + gitalist_server.pl --repo_dir home/myuser/code/git -The C<< GITALIST_REPOS_DIR >> environment variable will override the repository directory set -in configuration, and will itself be overridden by he C<< --repos_dir >> flag. +The C<< GITALIST_REPO_DIR >> environment variable will override the repository directory set +in configuration, and will itself be overridden by he C<< --repo_dir >> flag. =head1 RUNNING @@ -146,19 +193,63 @@ to run it in a more production facing environment than using the single threaded server. The recommended deployment method for Gitalist is FastCGI, although Gitalist can also be run -under mod_perl or as pure perl with L. +under L or as pure Perl with L. Assuming that you have installed Gitalist's dependencies into a L, and you are running from a git checkout, adding a trivial FCGI script as C