# Needs to be here for PAR
require Catalyst;
- if ( $name =~ /[^\w\:]/ ) {
+ if ( $name =~ /[^\w:]/ || $name =~ /^\d/ || $name =~ /\b:\b|:{3,}/) {
warn "Error: Invalid application name.\n";
return 0;
}
$self->{script } = File::Spec->catdir( $self->{dir}, 'script' );
$self->{appprefix } = Catalyst::Utils::appprefix($name);
$self->{appenv } = Catalyst::Utils::class2env($name);
- $self->{startperl } = "#!$Config{perlpath} -w";
+ $self->{startperl } = -r '/usr/bin/env'
+ ? '#!/usr/bin/env perl'
+ : "#!$Config{perlpath} -w";
$self->{scriptgen } = $Catalyst::Devel::CATALYST_SCRIPT_GEN || 4;
$self->{catalyst_version} = $Catalyst::VERSION;
$self->{author } = $self->{author} = $ENV{'AUTHOR'}
$self->_mk_server;
$self->_mk_test;
$self->_mk_create;
+ $self->_mk_information;
}
return $self->{dir};
}
$self->mk_file( $path, $output );
}
+sub _mk_information {
+ my $self = shift;
+ print qq/Change to application directory and Run "perl Makefile.PL" to make sure your install is complete\n/;
+}
+
sub _mk_dirs {
my $self = shift;
$self->mk_dir( $self->{dir} );
will try to execute Catalyst::Helper::View::TT->mk_compclass and
Catalyst::Helper::View::TT->mk_comptest.
-See L<Catalyst::Helper::View::TT> and L<Catalyst::Helper::Model::DBIC> for
-examples.
+See L<Catalyst::Helper::View::TT> and
+L<Catalyst::Helper::Model::DBIC::Schema> for examples.
All helper classes should be under one of the following namespaces.
Catalyst::Helper::View::
Catalyst::Helper::Controller::
+=head2 COMMON HELPERS
+
+=over
+
+=item *
+
+L<Catalyst::Helper::Model::DBIC::Schema> - DBIx::Class models
+
+=item *
+
+L<Catalyst::Helper::View::TT> - Template Toolkit view
+
+=item *
+
+L<Catalyst::Helper::Model::LDAP>
+
+=item *
+
+L<Catalyst::Helper::Model::Adaptor> - wrap any class into a Catalyst model
+
+=back
+
+=head3 NOTE
+
+The helpers will read author name from /etc/passwd by default. + To override, please export the AUTHOR variable.
+
+=head1 METHODS
+
=head2 mk_compclass
This method in your Helper module is called with C<$helper>
There is no fallback for this method.
-=head1 METHODS
+=head1 INTERNAL METHODS
These are the methods that the Helper classes can call on the
<$helper> object passed to them.
-=head2 render_file
+=head2 render_file ($file, $path, $vars)
-Render and create a file from a template in DATA using
-Template Toolkit.
+Render and create a file from a template in DATA using Template
+Toolkit. $file is the relevent chunk of the __DATA__ section, $path is
+the path to the file and $vars is the hashref as expected by
+L<Template Toolkit|Template>.
-=head2 get_file
+=head2 get_file ($class, $file)
Fetch file contents from the DATA section. This is used internally by
-L</render_file>.
+L</render_file>. $class is the name of the class to get the DATA
+section from. __PACKAGE__ or ( caller(0) )[0] might be sensible
+values for this.
=head2 mk_app
Create the main application skeleton. This is called by L<catalyst.pl>.
-=head2 mk_component
+=head2 mk_component ($app)
This method is called by L<create.pl> to make new components
for your application.
-=head3 mk_dir
+=head3 mk_dir ($path)
Surprisingly, this function makes a directory.
-=head2 mk_file
+=head2 mk_file ($file, $content)
Writes content to a file. Called by L</render_file>.
-=head2 next_test
+=head2 next_test ($test_name)
Calculates the name of the next numbered test file and returns it.
+Don't give the number or the .t suffix for the test name.
=head1 NOTE
=head1 LICENSE
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=begin pod_to_ignore
use strict;
use warnings;
-use Catalyst::Runtime '5.70';
+use Catalyst::Runtime 5.80;
# Set flags and add plugins for the application
#
# -Debug: activates the debug mode for very useful log messages
# ConfigLoader: will load the configuration from a Config::General file in the
# application's home directory
-# Static::Simple: will serve static files from the application's root
+# Static::Simple: will serve static files from the application's root
# directory
use parent qw/Catalyst/;
Static::Simple/;
our $VERSION = '0.01';
-# Configure the application.
+# Configure the application.
#
# Note that settings in [% appprefix %].conf (or other external
# configuration file that you set up manually) take precedence
# over this when using ConfigLoader. Thus configuration
# details given here can function as a default configuration,
-# with a external configuration file acting as an override for
+# with an external configuration file acting as an override for
# local deployment.
__PACKAGE__->config( name => '[% name %]' );
=head1 LICENSE
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
my ( $self, $c ) = @_;
$c->response->body( 'Page not found' );
$c->response->status(404);
-
}
=head2 end
Attempt to render a view, if needed.
-=cut
+=cut
sub end : ActionClass('RenderView') {}
=head1 LICENSE
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
1;
__makefile__
+[% startperl %]
# IMPORTANT: if you delete this file your app will not work as
-# expected. you have been warned
+# expected. You have been warned.
use inc::Module::Install;
name '[% dir %]';
auto_install;
WriteAll;
__config__
-# rename this file to [% name %].yml and put a : in front of "name" if
-# you want to use yaml like in old versions of Catalyst
+# rename this file to [% name %].yml and put a ':' in front of 'name' if
+# you want to use YAML like in old versions of Catalyst
name [% name %]
__readme__
Run script/[% appprefix %]_server.pl to test the application.
0.01 [% time %]
- initial revision, generated by Catalyst
__apptest__
+[% startperl %]
use strict;
use warnings;
use Test::More tests => 2;
ok( request('/')->is_success, 'Request should succeed' );
__podtest__
+[% startperl %]
use strict;
use warnings;
use Test::More;
all_pod_files_ok();
__podcoveragetest__
+[% startperl %]
use strict;
use warnings;
use Test::More;
=head1 COPYRIGHT
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
my $help = 0;
my ( $listen, $nproc, $pidfile, $manager, $detach, $keep_stderr );
-
+
GetOptions(
'help|?' => \$help,
'listen|l=s' => \$listen,
pod2usage(1) if $help;
-[% name %]->run(
- $listen,
+[% name %]->run(
+ $listen,
{ nproc => $nproc,
- pidfile => $pidfile,
+ pidfile => $pidfile,
manager => $manager,
detach => $detach,
- keep_stderr => $keep_stderr,
+ keep_stderr => $keep_stderr,
}
);
=head1 SYNOPSIS
[% appprefix %]_fastcgi.pl [options]
-
+
Options:
-? -help display this help and exits
-l -listen Socket path to listen on
=head1 COPYRIGHT
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
__server__
[% startperl %]
-BEGIN {
+BEGIN {
$ENV{CATALYST_ENGINE} ||= 'HTTP';
$ENV{CATALYST_SCRIPT_GEN} = [% scriptgen %];
require Catalyst::Engine::HTTP;
-}
+}
use strict;
use warnings;
my $port = $ENV{[% appenv %]_PORT} || $ENV{CATALYST_PORT} || 3000;
my $keepalive = 0;
my $restart = $ENV{[% appenv %]_RELOAD} || $ENV{CATALYST_RELOAD} || 0;
-my $restart_delay = 1;
-my $restart_regex = '(?:/|^)(?!\.#).+(?:\.yml$|\.yaml$|\.conf|\.pm)$';
-my $restart_directory = undef;
-my $follow_symlinks = 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' => \$fork,
+ 'fork|f' => \$fork,
'help|?' => \$help,
'host=s' => \$host,
'port=s' => \$port,
'keepalive|k' => \$keepalive,
'restart|r' => \$restart,
- 'restartdelay|rd=s' => \$restart_delay,
- 'restartregex|rr=s' => \$restart_regex,
- 'restartdirectory=s@' => \$restart_directory,
+ '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 ( $restart && $ENV{CATALYST_ENGINE} eq 'HTTP' ) {
- $ENV{CATALYST_ENGINE} = 'HTTP::Restarter';
-}
if ( $debug ) {
$ENV{CATALYST_DEBUG} = 1;
}
-# This is require instead of use so that the above environment
-# variables can be set at runtime.
-require [% name %];
-
-[% name %]->run( $port, $host, {
- argv => \@argv,
- 'fork' => $fork,
- keepalive => $keepalive,
- restart => $restart,
- restart_delay => $restart_delay,
- restart_regex => qr/$restart_regex/,
- restart_directory => $restart_directory,
- follow_symlinks => $follow_symlinks,
-} );
+# 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 [% name %];
+
+ [% name %]->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,
+ );
+
+ $restarter->run_and_watch;
+}
+else {
+ $runner->();
+}
1;
-r -restart restart when files get modified
(defaults to false)
-rd -restartdelay delay between file checks
+ (ignored if you have Linux::Inotify2 installed)
-rr -restartregex regex match files that trigger
a restart when modified
(defaults to '\.yml$|\.yaml$|\.conf|\.pm$')
(defaults to '[SCRIPT_DIR]/..')
-follow_symlinks follow symlinks in search directories
(defaults to false. this is a no-op on Win32)
+ -background run the process in the background
+ -pidfile specify filename for pid file
+
See also:
perldoc Catalyst::Manual
perldoc Catalyst::Manual::Intro
=head1 COPYRIGHT
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
=head1 COPYRIGHT
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
use warnings;
use Getopt::Long;
use Pod::Usage;
-eval "use Catalyst::Devel;";
+eval "use Catalyst::Helper;";
if ($@) {
die <<END;
perl -MCPAN -e 'install Catalyst::Devel'
perl -MCPANPLUS -e 'install Catalyst::Devel'
END
+}
my $force = 0;
my $mech = 0;
Examples:
[% appprefix %]_create.pl controller My::Controller
- [% appprefix %]_create.pl controller My::Controller BindLex
[% appprefix %]_create.pl -mechanize controller My::Controller
[% appprefix %]_create.pl view My::View
[% appprefix %]_create.pl view MyView TT
=head1 COPYRIGHT
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
=cut
-=head2 index
+=head2 index
=cut
=head1 LICENSE
-This library is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut
projects / catagits/Catalyst-Devel.git / blobdiff