diff -Nru libcatalyst-devel-perl-1.31/Changes libcatalyst-devel-perl-1.36/Changes --- libcatalyst-devel-perl-1.31/Changes 2011-01-20 01:08:53.000000000 +0000 +++ libcatalyst-devel-perl-1.36/Changes 2011-10-25 00:58:27.000000000 +0000 @@ -1,5 +1,41 @@ This file documents the revision history for Perl extension Catalyst-Devel. +1.36 2011-10-24 17:58:00 + - New apps send an X-Catalyst header by default (this can be + disabled by changing the config in the generated app) + - Fix leaking temporary files in tests. RT#59166 + - Fix generated Makefile.PL to always contain unix style paths, + even on Win32. RT#65456 + - Fix tests generated for controllers generated with --mechanize + to work with newer versions of Test::WWW::Mechanize::Catalyst + - bump Module::Install dep to 1.02 + - Removed stderr hiding from 'make catalyst_par' to display errors + from PAR::Packer + +1.35 2011-09-05 13:05:00 + - Stop requiring Starman and MooseX::Daemonize on Win32 as they're + optional components in Catalyst::Runtime and won't install + on Windows. + - Fix test to work on Windows. + +1.34 2011-08-16 09:02:00 + - Bump required version of Catalyst to 5.9 + - Merge psgi support. catalyst.pl will now generate a default + myapp.psgi file with the default middlewares applied. + - Fix scripts being generated mode 0700, rather than 0755 + - Fix duplicate 'use Test::More' statement in generated components. + - Fix Pod for catalyst_ignore function in Module::Install::Catalyst + RT#68563 + +1.33 2011-03-24 15:10:00 + - Fix a regression introduced in 1.32 that caused Catalyst::Restarter + to not work at all. + +1.32 2011-03-22 09:17:00 + - Fix RT#65907: missing build require: Test::Exception + - Fix RT#57019: Fix bundling of File::Copy::Recursive in inc/ + by Module::Install::Catalyst + 1.31 2011-01-20 01:08:00 - Fix for copying generated files into installed apps + tests to ensure it keeps working. abraxxa++ diff -Nru libcatalyst-devel-perl-1.31/debian/changelog libcatalyst-devel-perl-1.36/debian/changelog --- libcatalyst-devel-perl-1.31/debian/changelog 2011-02-27 22:19:07.000000000 +0000 +++ libcatalyst-devel-perl-1.36/debian/changelog 2011-10-25 12:52:26.000000000 +0000 @@ -1,3 +1,27 @@ +libcatalyst-devel-perl (1.36-1) unstable; urgency=low + + [ Jonathan Yu ] + * New upstream release 1.32 + * Upstream replaces Test::Exception with Test::Fatal + * Bump to debhelper compat 8 + + [ Ansgar Burchardt ] + * debian/control: Convert Vcs-* fields to Git. + + [ Salvatore Bonaccorso ] + * debian/copyright: Replace DEP5 Format-Specification URL from + svn.debian.org to anonscm.debian.org URL. + + [ gregor herrmann ] + * New upstream releases 1.33, 1.34, 1.36. + * Set Standards-Version to 3.9.2 (no changes). + * Bump (build) dependency on libcatalyst-perl, add starman and + libmoosex-daemonize-perl to Suggests, bump version of + libmodule-install-perl, add perl as an alternative for Test::More. + * Bump years of copyright for inc/Module/*. + + -- gregor herrmann Tue, 25 Oct 2011 14:40:19 +0200 + libcatalyst-devel-perl (1.31-2) unstable; urgency=low * Add build dependency on libtest-exception-perl (closes: #615622). diff -Nru libcatalyst-devel-perl-1.31/debian/compat libcatalyst-devel-perl-1.36/debian/compat --- libcatalyst-devel-perl-1.31/debian/compat 2010-03-07 13:58:08.000000000 +0000 +++ libcatalyst-devel-perl-1.36/debian/compat 2011-10-25 12:52:26.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru libcatalyst-devel-perl-1.31/debian/control libcatalyst-devel-perl-1.36/debian/control --- libcatalyst-devel-perl-1.31/debian/control 2011-02-27 22:12:19.000000000 +0000 +++ libcatalyst-devel-perl-1.36/debian/control 2011-10-25 12:52:26.000000000 +0000 @@ -1,30 +1,51 @@ Source: libcatalyst-devel-perl Section: perl Priority: optional -Build-Depends: debhelper (>= 7) -Build-Depends-Indep: perl, libmoosex-emulate-class-accessor-fast-perl, - libnamespace-autoclean-perl, libcatalyst-modules-perl, libtemplate-perl, - libmodule-install-perl (>= 0.91), libfile-changenotify-perl, libmoose-perl, - libconfig-general-perl (>= 2.42), libpath-class-perl, libfile-sharedir-perl, - libcatalyst-perl (>= 5.80015), libfile-copy-recursive-perl, - libnamespace-clean-perl, libtest-simple-perl (>= 0.94), - libipc-run3-perl, libyaml-tiny-perl, libtest-exception-perl +Build-Depends: debhelper (>= 8) +Build-Depends-Indep: perl, + libcatalyst-modules-perl, + libcatalyst-perl (>= 5.90001), + libconfig-general-perl (>= 2.42), + libfile-changenotify-perl, + libfile-copy-recursive-perl, + libfile-sharedir-perl, + libipc-run3-perl, + libmodule-install-perl (>= 1.02), + libmoose-perl, + libmoosex-emulate-class-accessor-fast-perl, + libnamespace-autoclean-perl, + libnamespace-clean-perl, + libpath-class-perl, + libtemplate-perl, + libtest-fatal-perl, + libyaml-tiny-perl, + perl (>= 5.11.1) | libtest-simple-perl (>= 0.94) Maintainer: Debian Perl Group Uploaders: Jonathan Yu , gregor herrmann , Ansgar Burchardt -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://search.cpan.org/dist/Catalyst-Devel/ -Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libcatalyst-devel-perl/ -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libcatalyst-devel-perl/ +Vcs-Git: git://git.debian.org/pkg-perl/packages/libcatalyst-devel-perl.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libcatalyst-devel-perl.git Package: libcatalyst-devel-perl Architecture: all -Depends: ${perl:Depends}, ${misc:Depends}, libcatalyst-perl (>= 5.80015), - libmoosex-emulate-class-accessor-fast-perl, libtemplate-perl, libmoose-perl, - libnamespace-clean-perl, libnamespace-autoclean-perl, libfile-sharedir-perl, - libfile-changenotify-perl, libfile-copy-recursive-perl, libpath-class-perl, - libconfig-general-perl (>= 2.42), libyaml-tiny-perl -Suggests: libmodule-install-perl (>= 0.91) +Depends: ${perl:Depends}, ${misc:Depends}, + libcatalyst-perl (>= 5.90001), + libconfig-general-perl (>= 2.42), + libfile-changenotify-perl, + libfile-copy-recursive-perl, + libfile-sharedir-perl, + libmoose-perl, + libmoosex-emulate-class-accessor-fast-perl, + libnamespace-autoclean-perl, + libnamespace-clean-perl, + libpath-class-perl, + libtemplate-perl, + libyaml-tiny-perl +Suggests: libmodule-install-perl (>= 1.02), + libmoosex-daemonize-perl, + starman Breaks: libcatalyst-modules-perl (<< 39) Replaces: libcatalyst-modules-perl (<< 39) Description: collection of development tools for Catalyst diff -Nru libcatalyst-devel-perl-1.31/debian/copyright libcatalyst-devel-perl-1.36/debian/copyright --- libcatalyst-devel-perl-1.31/debian/copyright 2011-02-27 22:17:13.000000000 +0000 +++ libcatalyst-devel-perl-1.36/debian/copyright 2011-10-25 12:52:26.000000000 +0000 @@ -1,4 +1,4 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135 Maintainer: Catalyst Development Team Source: http://search.cpan.org/dist/Catalyst-Devel/ Name: Catalyst-Devel @@ -10,14 +10,14 @@ information for the libcatalyst-perl package. Files: inc/Module/* -Copyright: 2002-2010, Adam Kennedy - 2002-2010, Audrey Tang - 2002-2010, Brian Ingerson +Copyright: 2002-2011, Adam Kennedy + 2002-2011, Audrey Tang + 2002-2011, Brian Ingerson License: Artistic or GPL-1+ Files: debian/* Copyright: 2010, Jonathan Yu - 201-20110, gregor herrmann + 2010-2011, gregor herrmann License: Artistic or GPL-1+ License: Artistic diff -Nru libcatalyst-devel-perl-1.31/inc/Module/AutoInstall.pm libcatalyst-devel-perl-1.36/inc/Module/AutoInstall.pm --- libcatalyst-devel-perl-1.31/inc/Module/AutoInstall.pm 2011-01-20 01:09:10.000000000 +0000 +++ libcatalyst-devel-perl-1.36/inc/Module/AutoInstall.pm 2011-10-25 00:58:49.000000000 +0000 @@ -17,11 +17,14 @@ ); # various lexical flags -my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS ); +my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $InstallDepsTarget, $HasCPANPLUS ); my ( - $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps + $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps, + $UpgradeDeps ); -my ( $PostambleActions, $PostambleUsed ); +my ( $PostambleActions, $PostambleActionsNoTest, $PostambleActionsUpgradeDeps, + $PostambleActionsUpgradeDepsNoTest, $PostambleActionsListDeps, + $PostambleActionsListAllDeps, $PostambleUsed, $NoTest); # See if it's a testing or non-interactive session _accept_default( $ENV{AUTOMATED_TESTING} or ! -t STDIN ); @@ -31,6 +34,10 @@ $AcceptDefault = shift; } +sub _installdeps_target { + $InstallDepsTarget = shift; +} + sub missing_modules { return @Missing; } @@ -63,6 +70,11 @@ __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) ); exit 0; } + elsif ( $arg =~ /^--upgradedeps=(.*)$/ ) { + $UpgradeDeps = 1; + __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) ); + exit 0; + } elsif ( $arg =~ /^--default(?:deps)?$/ ) { $AcceptDefault = 1; } @@ -125,7 +137,7 @@ # check entirely since we don't want to have to load (and configure) # an old CPAN just for a cosmetic message - $UnderCPAN = _check_lock(1) unless $SkipInstall; + $UnderCPAN = _check_lock(1) unless $SkipInstall || $InstallDepsTarget; while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) { my ( @required, @tests, @skiptests ); @@ -207,6 +219,7 @@ $CheckOnly or ($mandatory and $UnderCPAN) or $AllDeps + or $InstallDepsTarget or _prompt( qq{==> Auto-install the } . ( @required / 2 ) @@ -237,10 +250,17 @@ } } - if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) { + if ( @Missing and not( $CheckOnly or $UnderCPAN) ) { require Config; - print -"*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n"; + my $make = $Config::Config{make}; + if ($InstallDepsTarget) { + print +"*** To install dependencies type '$make installdeps' or '$make installdeps_notest'.\n"; + } + else { + print +"*** Dependencies will be installed the next time you type '$make'.\n"; + } # make an educated guess of whether we'll need root permission. print " (You may need to do that as the 'root' user.)\n" @@ -271,6 +291,10 @@ sub _check_lock { return unless @Missing or @_; + if ($ENV{PERL5_CPANM_IS_RUNNING}) { + return _running_under('cpanminus'); + } + my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING}; if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) { @@ -332,6 +356,11 @@ } } + if ($UpgradeDeps) { + push @modules, @installed; + @installed = (); + } + return @installed unless @modules; # nothing to do return @installed if _check_lock(); # defer to the CPAN shell @@ -463,6 +492,11 @@ } else { die "*** Cannot convert option $key = '$value' to CPANPLUS version.\n"; } + push @config, 'prereqs', $value; + } elsif ( $key eq 'force' ) { + push @config, $key, $value; + } elsif ( $key eq 'notest' ) { + push @config, 'skiptest', $value; } else { die "*** Cannot convert option $key to CPANPLUS version.\n"; } @@ -497,10 +531,14 @@ # set additional options while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) { ( $args{$opt} = $arg, next ) - if $opt =~ /^force$/; # pseudo-option + if $opt =~ /^(?:force|notest)$/; # pseudo-option $CPAN::Config->{$opt} = $arg; } + if ($args{notest} && (not CPAN::Shell->can('notest'))) { + die "Your version of CPAN is too old to support the 'notest' pragma"; + } + local $CPAN::Config->{prerequisites_policy} = 'follow'; while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) { @@ -519,8 +557,16 @@ delete $INC{$inc}; } - my $rv = $args{force} ? CPAN::Shell->force( install => $pkg ) - : CPAN::Shell->install($pkg); + my $rv = do { + if ($args{force}) { + CPAN::Shell->force( install => $pkg ) + } elsif ($args{notest}) { + CPAN::Shell->notest( install => $pkg ) + } else { + CPAN::Shell->install($pkg) + } + }; + $rv ||= eval { $CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, ) ->{install} @@ -763,6 +809,35 @@ : "\$(NOECHO) \$(NOOP)" ); + my $deps_list = join( ',', @Missing, @Existing ); + + $PostambleActionsUpgradeDeps = + "\$(PERL) $0 --config=$config --upgradedeps=$deps_list"; + + my $config_notest = + join( ',', (UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config}), + 'notest', 1 ) + if $Config; + + $PostambleActionsNoTest = ( + ($missing and not $UnderCPAN) + ? "\$(PERL) $0 --config=$config_notest --installdeps=$missing" + : "\$(NOECHO) \$(NOOP)" + ); + + $PostambleActionsUpgradeDepsNoTest = + "\$(PERL) $0 --config=$config_notest --upgradedeps=$deps_list"; + + $PostambleActionsListDeps = + '@$(PERL) -le "print for @ARGV" ' + . join(' ', map $Missing[$_], grep $_ % 2 == 0, 0..$#Missing); + + my @all = (@Missing, @Existing); + + $PostambleActionsListAllDeps = + '@$(PERL) -le "print for @ARGV" ' + . join(' ', map $all[$_], grep $_ % 2 == 0, 0..$#all); + return %args; } @@ -797,11 +872,15 @@ sub postamble { $PostambleUsed = 1; + my $fragment; - return <<"END_MAKE"; + $fragment .= <<"AUTO_INSTALL" if !$InstallDepsTarget; config :: installdeps \t\$(NOECHO) \$(NOOP) +AUTO_INSTALL + + $fragment .= <<"END_MAKE"; checkdeps :: \t\$(PERL) $0 --checkdeps @@ -809,12 +888,28 @@ installdeps :: \t$PostambleActions +installdeps_notest :: +\t$PostambleActionsNoTest + +upgradedeps :: +\t$PostambleActionsUpgradeDeps + +upgradedeps_notest :: +\t$PostambleActionsUpgradeDepsNoTest + +listdeps :: +\t$PostambleActionsListDeps + +listalldeps :: +\t$PostambleActionsListAllDeps + END_MAKE + return $fragment; } 1; __END__ -#line 1071 +#line 1178 diff -Nru libcatalyst-devel-perl-1.31/inc/Module/Install/AutoInstall.pm libcatalyst-devel-perl-1.36/inc/Module/Install/AutoInstall.pm --- libcatalyst-devel-perl-1.31/inc/Module/Install/AutoInstall.pm 2011-01-20 01:09:10.000000000 +0000 +++ libcatalyst-devel-perl-1.36/inc/Module/Install/AutoInstall.pm 2011-10-25 00:58:49.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.99'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -48,6 +48,14 @@ while (my ($mod, $ver) = splice(@requires, 0, 2)) { $seen{$mod}{$ver}++; } + my @build_requires = map @$_, map @$_, grep ref, $self->build_requires; + while (my ($mod, $ver) = splice(@build_requires, 0, 2)) { + $seen{$mod}{$ver}++; + } + my @configure_requires = map @$_, map @$_, grep ref, $self->configure_requires; + while (my ($mod, $ver) = splice(@configure_requires, 0, 2)) { + $seen{$mod}{$ver}++; + } my @deduped; while (my ($mod, $ver) = splice(@features_require, 0, 2)) { @@ -65,6 +73,17 @@ ); } +sub installdeps_target { + my ($self, @args) = @_; + + $self->include('Module::AutoInstall'); + require Module::AutoInstall; + + Module::AutoInstall::_installdeps_target(1); + + $self->auto_install(@args); +} + sub auto_install_now { my $self = shift; $self->auto_install(@_); diff -Nru libcatalyst-devel-perl-1.31/inc/Module/Install/Base.pm libcatalyst-devel-perl-1.36/inc/Module/Install/Base.pm --- libcatalyst-devel-perl-1.31/inc/Module/Install/Base.pm 2011-01-20 01:09:10.000000000 +0000 +++ libcatalyst-devel-perl-1.36/inc/Module/Install/Base.pm 2011-10-25 00:58:49.000000000 +0000 @@ -4,7 +4,7 @@ use strict 'vars'; use vars qw{$VERSION}; BEGIN { - $VERSION = '0.99'; + $VERSION = '1.02'; } # Suspend handler for "redefined" warnings diff -Nru libcatalyst-devel-perl-1.31/inc/Module/Install/Can.pm libcatalyst-devel-perl-1.36/inc/Module/Install/Can.pm --- libcatalyst-devel-perl-1.31/inc/Module/Install/Can.pm 2011-01-20 01:09:10.000000000 +0000 +++ libcatalyst-devel-perl-1.36/inc/Module/Install/Can.pm 2011-10-25 00:58:49.000000000 +0000 @@ -9,7 +9,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.99'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libcatalyst-devel-perl-1.31/inc/Module/Install/Fetch.pm libcatalyst-devel-perl-1.36/inc/Module/Install/Fetch.pm --- libcatalyst-devel-perl-1.31/inc/Module/Install/Fetch.pm 2011-01-20 01:09:12.000000000 +0000 +++ libcatalyst-devel-perl-1.36/inc/Module/Install/Fetch.pm 2011-10-25 00:58:50.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.99'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libcatalyst-devel-perl-1.31/inc/Module/Install/Include.pm libcatalyst-devel-perl-1.36/inc/Module/Install/Include.pm --- libcatalyst-devel-perl-1.31/inc/Module/Install/Include.pm 2011-01-20 01:09:10.000000000 +0000 +++ libcatalyst-devel-perl-1.36/inc/Module/Install/Include.pm 2011-10-25 00:58:49.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.99'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libcatalyst-devel-perl-1.31/inc/Module/Install/Makefile.pm libcatalyst-devel-perl-1.36/inc/Module/Install/Makefile.pm --- libcatalyst-devel-perl-1.31/inc/Module/Install/Makefile.pm 2011-01-20 01:09:10.000000000 +0000 +++ libcatalyst-devel-perl-1.36/inc/Module/Install/Makefile.pm 2011-10-25 00:58:49.000000000 +0000 @@ -8,7 +8,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.99'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libcatalyst-devel-perl-1.31/inc/Module/Install/Metadata.pm libcatalyst-devel-perl-1.36/inc/Module/Install/Metadata.pm --- libcatalyst-devel-perl-1.31/inc/Module/Install/Metadata.pm 2011-01-20 01:09:10.000000000 +0000 +++ libcatalyst-devel-perl-1.36/inc/Module/Install/Metadata.pm 2011-10-25 00:58:49.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.99'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -170,7 +170,7 @@ # Normalize the version $version = $self->_perl_version($version); - # We don't support the reall old versions + # We don't support the really old versions unless ( $version >= 5.005 ) { die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; } @@ -515,6 +515,7 @@ 'GNU Free Documentation license' => 'unrestricted', 1, 'GNU Affero General Public License' => 'open_source', 1, '(?:Free)?BSD license' => 'bsd', 1, + 'Artistic license 2\.0' => 'artistic_2', 1, 'Artistic license' => 'artistic', 1, 'Apache (?:Software )?license' => 'apache', 1, 'GPL' => 'gpl', 1, @@ -550,9 +551,9 @@ sub _extract_bugtracker { my @links = $_[0] =~ m#L<( - \Qhttp://rt.cpan.org/\E[^>]+| - \Qhttp://github.com/\E[\w_]+/[\w_]+/issues| - \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list + https?\Q://rt.cpan.org/\E[^>]+| + https?\Q://github.com/\E[\w_]+/[\w_]+/issues| + https?\Q://code.google.com/p/\E[\w_\-]+/issues/list )>#gx; my %links; @links{@links}=(); @@ -581,7 +582,7 @@ sub requires_from { my $self = shift; my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; + my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg; while ( @requires ) { my $module = shift @requires; my $version = shift @requires; diff -Nru libcatalyst-devel-perl-1.31/inc/Module/Install/Share.pm libcatalyst-devel-perl-1.36/inc/Module/Install/Share.pm --- libcatalyst-devel-perl-1.31/inc/Module/Install/Share.pm 2011-01-20 01:09:10.000000000 +0000 +++ libcatalyst-devel-perl-1.36/inc/Module/Install/Share.pm 2011-10-25 00:58:49.000000000 +0000 @@ -8,7 +8,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.99'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -22,7 +22,7 @@ } unless ( defined $dir and -d $dir ) { require Carp; - Carp::croak("Illegal or missing directory install_share param"); + Carp::croak("Illegal or missing directory install_share param: '$dir'"); } # Split by type diff -Nru libcatalyst-devel-perl-1.31/inc/Module/Install/Win32.pm libcatalyst-devel-perl-1.36/inc/Module/Install/Win32.pm --- libcatalyst-devel-perl-1.31/inc/Module/Install/Win32.pm 2011-01-20 01:09:12.000000000 +0000 +++ libcatalyst-devel-perl-1.36/inc/Module/Install/Win32.pm 2011-10-25 00:58:50.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.99'; + $VERSION = '1.02'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libcatalyst-devel-perl-1.31/inc/Module/Install/WriteAll.pm libcatalyst-devel-perl-1.36/inc/Module/Install/WriteAll.pm --- libcatalyst-devel-perl-1.31/inc/Module/Install/WriteAll.pm 2011-01-20 01:09:12.000000000 +0000 +++ libcatalyst-devel-perl-1.36/inc/Module/Install/WriteAll.pm 2011-10-25 00:58:50.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.99'; + $VERSION = '1.02'; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } diff -Nru libcatalyst-devel-perl-1.31/inc/Module/Install.pm libcatalyst-devel-perl-1.36/inc/Module/Install.pm --- libcatalyst-devel-perl-1.31/inc/Module/Install.pm 2011-01-20 01:09:10.000000000 +0000 +++ libcatalyst-devel-perl-1.36/inc/Module/Install.pm 2011-10-25 00:58:48.000000000 +0000 @@ -31,7 +31,7 @@ # This is not enforced yet, but will be some time in the next few # releases once we can make sure it won't clash with custom # Module::Install extensions. - $VERSION = '0.99'; + $VERSION = '1.02'; # Storage for the pseudo-singleton $MAIN = undef; @@ -230,8 +230,12 @@ sub new { my ($class, %args) = @_; - delete $INC{'FindBin.pm'}; - require FindBin; + delete $INC{'FindBin.pm'}; + { + # to suppress the redefine warning + local $SIG{__WARN__} = sub {}; + require FindBin; + } # ignore the prefix on extension modules built from top level. my $base_path = Cwd::abs_path($FindBin::Bin); @@ -463,4 +467,4 @@ 1; -# Copyright 2008 - 2010 Adam Kennedy. +# Copyright 2008 - 2011 Adam Kennedy. diff -Nru libcatalyst-devel-perl-1.31/lib/Catalyst/Devel.pm libcatalyst-devel-perl-1.36/lib/Catalyst/Devel.pm --- libcatalyst-devel-perl-1.31/lib/Catalyst/Devel.pm 2011-01-20 01:05:13.000000000 +0000 +++ libcatalyst-devel-perl-1.36/lib/Catalyst/Devel.pm 2011-10-25 00:58:30.000000000 +0000 @@ -4,7 +4,7 @@ use warnings; # Change Catalyst::Helper also. -our $VERSION = '1.31'; +our $VERSION = '1.36'; our $CATALYST_SCRIPT_GEN = 40; $VERSION = eval $VERSION; diff -Nru libcatalyst-devel-perl-1.31/lib/Catalyst/Helper.pm libcatalyst-devel-perl-1.36/lib/Catalyst/Helper.pm --- libcatalyst-devel-perl-1.31/lib/Catalyst/Helper.pm 2011-01-20 01:05:13.000000000 +0000 +++ libcatalyst-devel-perl-1.36/lib/Catalyst/Helper.pm 2011-10-25 00:58:30.000000000 +0000 @@ -19,7 +19,7 @@ with 'MooseX::Emulate::Class::Accessor::Fast'; # Change Catalyst/Devel.pm also -our $VERSION = '1.31'; +our $VERSION = '1.36'; my %cache; @@ -121,10 +121,9 @@ my $gen_app = ( $self->{scripts} || $self->{makefile} ) ? 0 : 1; if ($gen_app) { - for ( qw/ _mk_dirs _mk_config _mk_appclass _mk_rootclass _mk_readme - _mk_changes _mk_apptest _mk_podtest _mk_podcoveragetest + for ( qw/ _mk_dirs _mk_config _mk_psgi _mk_appclass _mk_rootclass + _mk_readme _mk_changes _mk_apptest _mk_podtest _mk_podcoveragetest _mk_images _mk_favicon/ ) { - $self->$_; } } @@ -132,7 +131,7 @@ $self->_mk_makefile; } if ($gen_scripts) { - for ( qw/ _mk_cgi _mk_fastcgi _mk_server + for ( qw/ _mk_cgi _mk_fastcgi _mk_server _mk_test _mk_create _mk_information / ) { $self->$_; @@ -141,7 +140,7 @@ return $self->{dir}; } -## not much of this can really be changed, mk_compclass must be left for +## not much of this can really be changed, mk_compclass must be left for ## backcompat sub mk_component { my $self = shift; @@ -272,7 +271,7 @@ binmode $f; print $f $content; print qq/created "$file"\n/; - return 1; + return $file; } Catalyst::Exception->throw( message => qq/Couldn't create "$file", "$!"/ ); @@ -303,20 +302,20 @@ ## compatability. otherwise, we'd have no way to pass stuff from __DATA__ sub render_file { - my ( $self, $file, $path, $vars ) = @_; + my ( $self, $file, $path, $vars, $perms ) = @_; my $template = $self->get_file( ( caller(0) )[0], $file ); - $self->render_file_contents($template, $path, $vars); + $self->render_file_contents($template, $path, $vars, $perms); } sub render_sharedir_file { - my ( $self, $file, $path, $vars ) = @_; + my ( $self, $file, $path, $vars, $perms ) = @_; my $template = $self->get_sharedir_file( $file ); die("Cannot get template from $file for $self\n") unless $template; - $self->render_file_contents($template, $path, $vars); + $self->render_file_contents($template, $path, $vars, $perms); } sub render_file_contents { - my ( $self, $template, $path, $vars ) = @_; + my ( $self, $template, $path, $vars, $perms ) = @_; $vars ||= {}; my $t = Template->new; return 0 unless $template; @@ -324,7 +323,9 @@ $t->process( \$template, { %{$self}, %$vars }, \$output ) || Catalyst::Exception->throw( message => qq/Couldn't process "$template", / . $t->error() ); - $self->mk_file( $path, $output ); + my $file = $self->mk_file( $path, $output ); + chmod $perms, file($file) if defined $perms; + return $file; } sub _mk_information { @@ -387,7 +388,7 @@ sub _mk_makefile { my $self = shift; - $self->{path} = dir( 'lib', split( '::', $self->{name} ) ); + $self->{path} = join('/', 'lib', split( '::', $self->{name} ) ); $self->{path} .= '.pm'; my $dir = $self->{dir}; $self->render_sharedir_file( 'Makefile.PL.tt', file($dir, "Makefile.PL") ); @@ -400,6 +401,14 @@ } } +sub _mk_psgi { + my $self = shift; + my $dir = $self->{dir}; + my $appprefix = $self->{appprefix}; + $self->render_sharedir_file( 'myapp.psgi.tt', + file( $dir, "$appprefix.psgi" ) ); +} + sub _mk_config { my $self = shift; my $dir = $self->{dir}; @@ -443,40 +452,40 @@ my $self = shift; my $script = $self->{script}; my $appprefix = $self->{appprefix}; - $self->render_sharedir_file( file('script', 'myapp_cgi.pl.tt'), file($script,"$appprefix\_cgi.pl") ); - chmod 0700, file($script,"$appprefix\_cgi.pl"); + $self->render_sharedir_file( file('script', 'myapp_cgi.pl.tt'), + file($script,"$appprefix\_cgi.pl"), undef, 0755 ); } sub _mk_fastcgi { my $self = shift; my $script = $self->{script}; my $appprefix = $self->{appprefix}; - $self->render_sharedir_file( file('script', 'myapp_fastcgi.pl.tt'), file($script, "$appprefix\_fastcgi.pl") ); - chmod 0700, file($script, "$appprefix\_fastcgi.pl"); + $self->render_sharedir_file( file('script', 'myapp_fastcgi.pl.tt'), + file($script, "$appprefix\_fastcgi.pl"), undef, 0755 ); } sub _mk_server { my $self = shift; my $script = $self->{script}; my $appprefix = $self->{appprefix}; - $self->render_sharedir_file( file('script', 'myapp_server.pl.tt'), file($script, "$appprefix\_server.pl") ); - chmod 0700, file($script, "$appprefix\_server.pl"); + $self->render_sharedir_file( file('script', 'myapp_server.pl.tt'), + file($script, "$appprefix\_server.pl"), undef, 0755 ); } sub _mk_test { my $self = shift; my $script = $self->{script}; my $appprefix = $self->{appprefix}; - $self->render_sharedir_file( file('script', 'myapp_test.pl.tt'), file($script, "$appprefix\_test.pl") ); - chmod 0700, file($script, "$appprefix\_test.pl"); + $self->render_sharedir_file( file('script', 'myapp_test.pl.tt'), + file($script, "$appprefix\_test.pl"), undef, 0755 ); } sub _mk_create { my $self = shift; my $script = $self->{script}; my $appprefix = $self->{appprefix}; - $self->render_sharedir_file( file('script', 'myapp_create.pl.tt'), file($script, "$appprefix\_create.pl") ); - chmod 0700, file($script, "$appprefix\_create.pl"); + $self->render_sharedir_file( file('script', 'myapp_create.pl.tt'), + file($script, "$appprefix\_create.pl"), undef, 0755 ); } sub _mk_compclass { @@ -658,12 +667,13 @@ These are the methods that the Helper classes can call on the <$helper> object passed to them. -=head2 render_file ($file, $path, $vars) +=head2 render_file ($file, $path, $vars, $perms) 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