From: Tomas Doran <bobtfish@bobtfish.net>
Date: Wed, 25 Nov 2009 23:14:14 +0000 (+0000)
Subject: Change to new style scripts
X-Git-Tag: 0.000002~10^2^2~2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=036b1831e295925f6aea46544ce55d14254f1392;p=catagits%2FGitalist.git

Change to new style scripts
---

diff --git a/script/gitalist_cgi.pl b/script/gitalist_cgi.pl
index 791134f..9ef29e6 100755
--- a/script/gitalist_cgi.pl
+++ b/script/gitalist_cgi.pl
@@ -1,14 +1,7 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
-BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
-
-use strict;
-use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use Gitalist;
-
-Gitalist->run;
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('Gitalist', 'CGI');
 
 1;
 
@@ -30,8 +23,8 @@ Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
-
 This library is free software. You can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut
+
diff --git a/script/gitalist_fastcgi.pl b/script/gitalist_fastcgi.pl
index 7670449..37f989b 100755
--- a/script/gitalist_fastcgi.pl
+++ b/script/gitalist_fastcgi.pl
@@ -1,39 +1,7 @@
 #!/usr/bin/env perl
 
-BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' }
-
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use Gitalist;
-
-my $help = 0;
-my ( $listen, $nproc, $pidfile, $manager, $detach, $keep_stderr );
-
-GetOptions(
-    'help|?'      => \$help,
-    'listen|l=s'  => \$listen,
-    'nproc|n=i'   => \$nproc,
-    'pidfile|p=s' => \$pidfile,
-    'manager|M=s' => \$manager,
-    'daemon|d'    => \$detach,
-    'keeperr|e'   => \$keep_stderr,
-);
-
-pod2usage(1) if $help;
-
-Gitalist->run(
-    $listen,
-    {   nproc   => $nproc,
-        pidfile => $pidfile,
-        manager => $manager,
-        detach  => $detach,
-        keep_stderr => $keep_stderr,
-    }
-);
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('Gitalist','FastCGI');
 
 1;
 
diff --git a/script/gitalist_server.pl b/script/gitalist_server.pl
index 67e2662..2e60bce 100755
--- a/script/gitalist_server.pl
+++ b/script/gitalist_server.pl
@@ -1,123 +1,22 @@
 #!/usr/bin/env perl
 
 BEGIN {
-    $ENV{CATALYST_ENGINE} ||= 'HTTP';
-    $ENV{CATALYST_SCRIPT_GEN} = 39;
-    require Catalyst::Engine::HTTP;
+    $ENV{CATALYST_SCRIPT_GEN} = 40;
 }
 
-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;
-}
-
-# 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 +57,4 @@ This library is free software. You can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut
+
diff --git a/script/gitalist_test.pl b/script/gitalist_test.pl
index 35da1af..67621d5 100755
--- a/script/gitalist_test.pl
+++ b/script/gitalist_test.pl
@@ -1,20 +1,7 @@
 #!/usr/bin/env perl
 
-use strict;
-use warnings;
-use Getopt::Long;
-use Pod::Usage;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use Catalyst::Test 'Gitalist';
-
-my $help = 0;
-
-GetOptions( 'help|?' => \$help );
-
-pod2usage(1) if ( $help || !$ARGV[0] );
-
-print request($ARGV[0])->content . "\n";
+use Catalyst::ScriptRunner;
+Catalyst::ScriptRunner->run('Gitalist','Test');
 
 1;