X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=script%2Fgitalist_server.pl;h=f634aef68b8994c767a0b047fc9e19c86f0d2141;hb=eef1fb14f8acced2937e0f7f75fca40f51154036;hp=67e2662f16bbceec4b96ce896bf123cdcdddbd84;hpb=4666d5c7808a05b70242119f24c72a479fd732f7;p=catagits%2FGitalist.git

diff --git a/script/gitalist_server.pl b/script/gitalist_server.pl
index 67e2662..f634aef 100755
--- a/script/gitalist_server.pl
+++ b/script/gitalist_server.pl
@@ -1,123 +1,29 @@
-#!/usr/bin/env perl
-
+#!/usr/bin/perl
+use FindBin;
 BEGIN {
-    $ENV{CATALYST_ENGINE} ||= 'HTTP';
-    $ENV{CATALYST_SCRIPT_GEN} = 39;
-    require Catalyst::Engine::HTTP;
+    my $env = "$FindBin::Bin/env";
+    if (-r $env) {
+        do $env or die $@;
+    }
 }
 
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-
-my $debug             = 0;
-my $fork              = 0;
-my $help              = 0;
-my $host              = undef;
-my $port              = $ENV{GITALIST_PORT} || $ENV{CATALYST_PORT} || 3000;
-my $keepalive         = 0;
-my $restart           = $ENV{GITALIST_RELOAD} || $ENV{CATALYST_RELOAD} || 0;
-my $background        = 0;
-my $pidfile           = undef;
-
-my $check_interval;
-my $file_regex;
-my $watch_directory;
-my $follow_symlinks;
-
-my @argv = @ARGV;
-
-GetOptions(
-    'debug|d'             => \$debug,
-    'fork|f'              => \$fork,
-    'help|?'              => \$help,
-    'host=s'              => \$host,
-    'port|p=s'            => \$port,
-    'keepalive|k'         => \$keepalive,
-    'restart|r'           => \$restart,
-    'restartdelay|rd=s'   => \$check_interval,
-    'restartregex|rr=s'   => \$file_regex,
-    'restartdirectory=s@' => \$watch_directory,
-    'followsymlinks'      => \$follow_symlinks,
-    'background'          => \$background,
-    'pidfile=s'           => \$pidfile,
-);
-
-pod2usage(1) if $help;
-
-if ( $debug ) {
-    $ENV{CATALYST_DEBUG} = 1;
+BEGIN {
+    $ENV{CATALYST_SCRIPT_GEN} = 40;
 }
 
-# If we load this here, then in the case of a restarter, it does not
-# need to be reloaded for each restart.
-require Catalyst;
-
-# If this isn't done, then the Catalyst::Devel tests for the restarter
-# fail.
-$| = 1 if $ENV{HARNESS_ACTIVE};
-
-my $runner = sub {
-    # This is require instead of use so that the above environment
-    # variables can be set at runtime.
-    require Gitalist;
-
-    Gitalist->run(
-        $port, $host,
-        {
-            argv       => \@argv,
-            'fork'     => $fork,
-            keepalive  => $keepalive,
-            background => $background,
-            pidfile    => $pidfile,
-        }
-    );
-};
-
-if ( $restart ) {
-    die "Cannot run in the background and also watch for changed files.\n"
-        if $background;
-
-    require Catalyst::Restarter;
-
-    my $subclass = Catalyst::Restarter->pick_subclass;
-
-    my %args;
-    $args{follow_symlinks} = 1
-        if $follow_symlinks;
-    $args{directories} = $watch_directory
-        if defined $watch_directory;
-    $args{sleep_interval} = $check_interval
-        if defined $check_interval;
-    $args{filter} = qr/$file_regex/
-        if defined $file_regex;
-
-    my $restarter = $subclass->new(
-        %args,
-        start_sub => $runner,
-        argv      => \@argv,
-    );
-
-    $restarter->run_and_watch;
-}
-else {
-    $runner->();
-}
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('Gitalist', 'Server');
 
 1;
 
 =head1 NAME
 
-gitalist_server.pl - Catalyst Testserver
+gitalist_server.pl - Catalyst Test Server
 
 =head1 SYNOPSIS
 
 gitalist_server.pl [options]
 
- Options:
    -d -debug          force debug mode
    -f -fork           handle each request in a new process
                       (defaults to false)
@@ -158,3 +64,4 @@ This library is free software. You can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut
+