Hello community,
here is the log from the commit of package perl-Catalyst-Manual for
openSUSE:Factory checked in at 2012-02-20 16:15:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Catalyst-Manual (Old)
and /work/SRC/openSUSE:Factory/.perl-Catalyst-Manual.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Catalyst-Manual", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:Factory/perl-Catalyst-Manual/perl-Catalyst-Manual.changes
2011-10-27 11:22:20.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Catalyst-Manual.new/perl-Catalyst-Manual.changes
2012-02-20 16:15:49.000000000 +0100
@@ -1,0 +2,14 @@
+Fri Feb 17 15:25:22 UTC 2012 - [email protected]
+
+- updated to 5.9003
+ - Mention PSGI in Manual::Ingro RT#74872 (thanks William Blunn).
+ - Better docs of :Global inspired by RT#74869 (thanks William Blunn)
+ - Highlight the importance of uncommenting the template line in the
+ list action
+ - Clarify docs for nginx in non-root - a trailing slash on the
+ location block is very much needed.
+ - Clarified Data::Dumper usage. RT#71410 Thanks to Bill Corr
+ - Mention Chef deployment in Manual::Deployment (thanks to Alexey
+ Melezhik)
+
+-------------------------------------------------------------------
Old:
----
Catalyst-Manual-5.9002.tar.gz
New:
----
Catalyst-Manual-5.9003.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Catalyst-Manual.spec ++++++
--- /var/tmp/diff_new_pack.3cKLkx/_old 2012-02-20 16:15:50.000000000 +0100
+++ /var/tmp/diff_new_pack.3cKLkx/_new 2012-02-20 16:15:50.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package perl-Catalyst-Manual
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,38 +16,20 @@
#
-
Name: perl-Catalyst-Manual
-Version: 5.9002
-Release: 1
-License: GPL-1.0+ or Artistic-1.0
+Version: 5.9003
+Release: 0
%define cpan_name Catalyst-Manual
Summary: The Catalyst developer's manual
-Url: http://search.cpan.org/dist/Catalyst-Manual/
+License: Artistic-1.0 or GPL-1.0+
Group: Development/Libraries/Perl
-Source:
http://www.cpan.org/authors/id/H/HK/HKCLARK/%{cpan_name}-%{version}.tar.gz
+Url: http://search.cpan.org/dist/Catalyst-Manual/
+Source:
http://www.cpan.org/authors/id/B/BO/BOBTFISH/%{cpan_name}-%{version}.tar.gz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
-BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
-BuildRequires: perl(Test::More)
-#BuildRequires: perl(Carp)
-#BuildRequires: perl(Config)
-#BuildRequires: perl(CPAN)
#BuildRequires: perl(CPANPLUS::Backend)
-#BuildRequires: perl(Cwd)
-#BuildRequires: perl(ExtUtils::Manifest)
-#BuildRequires: perl(ExtUtils::MM_Cygwin)
-#BuildRequires: perl(ExtUtils::MM_Unix)
-#BuildRequires: perl(ExtUtils::MM_Win32)
-#BuildRequires: perl(Fcntl)
-#BuildRequires: perl(File::Basename)
-#BuildRequires: perl(File::Find)
-#BuildRequires: perl(FileHandle)
-#BuildRequires: perl(File::Path)
-#BuildRequires: perl(File::Spec)
-#BuildRequires: perl(FindBin)
#BuildRequires: perl(inc::Module::Install) >= 0.87
#BuildRequires: perl(JSON)
#BuildRequires: perl(LWP::Simple)
@@ -56,12 +38,9 @@
#BuildRequires: perl(Module::Install::AuthorRequires)
#BuildRequires: perl(Module::Install::AuthorTests)
#BuildRequires: perl(Module::Install::Base)
-#BuildRequires: perl(Net::FTP)
#BuildRequires: perl(Parse::CPAN::Meta)
-#BuildRequires: perl(Socket)
#BuildRequires: perl(Test::Pod) >= 1.14
#BuildRequires: perl(Test::Pod::Coverage) >= 1.04
-#BuildRequires: perl(vars)
#BuildRequires: perl(YAML::Tiny)
%{perl_requires}
++++++ Catalyst-Manual-5.9002.tar.gz -> Catalyst-Manual-5.9003.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catalyst-Manual-5.9002/Changes
new/Catalyst-Manual-5.9003/Changes
--- old/Catalyst-Manual-5.9002/Changes 2011-09-03 21:23:51.000000000 +0200
+++ new/Catalyst-Manual-5.9003/Changes 2012-02-17 08:45:59.000000000 +0100
@@ -1,5 +1,16 @@
Revision history for Catalyst-Manual
+5.9003 17 Feb 2012
+ - Mention PSGI in Manual::Ingro RT 74872 (thanks William Blunn).
+ - Better docs of :Global inspired by RT 74869 (thanks William Blunn)
+ - Highlight the importance of uncommenting the template line in the
+ list action
+ - Clarify docs for nginx in non-root - a trailing slash on the
+ location block is very much needed.
+ - Clarified Data::Dumper usage. RT#71410 Thanks to Bill Corr
+ - Mention Chef deployment in Manual::Deployment (thanks to Alexey
+ Melezhik)
+
5.9002 3 Sept 2011
- Tutorial
- Switch to 'catalyst' vs. 'root' user in VM
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catalyst-Manual-5.9002/MANIFEST
new/Catalyst-Manual-5.9003/MANIFEST
--- old/Catalyst-Manual-5.9002/MANIFEST 2011-09-03 21:25:47.000000000 +0200
+++ new/Catalyst-Manual-5.9003/MANIFEST 2012-02-17 08:45:26.000000000 +0100
@@ -33,7 +33,6 @@
lib/Catalyst/Manual/Intro.pod
lib/Catalyst/Manual/Plugins.pm
lib/Catalyst/Manual/Tutorial.pod
-lib/Catalyst/Manual/Tutorial/.gitignore
lib/Catalyst/Manual/Tutorial/01_Intro.pod
lib/Catalyst/Manual/Tutorial/02_CatalystBasics.pod
lib/Catalyst/Manual/Tutorial/03_MoreCatalystBasics.pod
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catalyst-Manual-5.9002/META.yml
new/Catalyst-Manual-5.9003/META.yml
--- old/Catalyst-Manual-5.9002/META.yml 2011-09-03 21:25:42.000000000 +0200
+++ new/Catalyst-Manual-5.9003/META.yml 2012-02-17 08:44:04.000000000 +0100
@@ -4,12 +4,13 @@
- 'Catalyst Contributors, see Catalyst.pm'
- 'Kieren Diment <[email protected]>'
build_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.36
Test::More: 0
configure_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.36
distribution_type: module
-generated_by: 'Module::Install version 1.00'
+dynamic_config: 1
+generated_by: 'Module::Install version 1.04'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -22,4 +23,4 @@
resources:
license: http://dev.perl.org/licenses/
repository:
http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Manual/5.80/trunk/
-version: 5.9002
+version: 5.9003
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catalyst-Manual-5.9002/inc/Module/AutoInstall.pm
new/Catalyst-Manual-5.9003/inc/Module/AutoInstall.pm
--- old/Catalyst-Manual-5.9002/inc/Module/AutoInstall.pm 2011-09-03
21:25:42.000000000 +0200
+++ new/Catalyst-Manual-5.9003/inc/Module/AutoInstall.pm 2012-02-17
08:44:04.000000000 +0100
@@ -7,7 +7,7 @@
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.03';
+ $VERSION = '1.04';
}
# special map on pre-defined feature sets
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catalyst-Manual-5.9002/inc/Module/Install/AutoInstall.pm
new/Catalyst-Manual-5.9003/inc/Module/Install/AutoInstall.pm
--- old/Catalyst-Manual-5.9002/inc/Module/Install/AutoInstall.pm
2011-09-03 21:25:42.000000000 +0200
+++ new/Catalyst-Manual-5.9003/inc/Module/Install/AutoInstall.pm
2012-02-17 08:44:04.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -73,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catalyst-Manual-5.9002/inc/Module/Install/Base.pm
new/Catalyst-Manual-5.9003/inc/Module/Install/Base.pm
--- old/Catalyst-Manual-5.9002/inc/Module/Install/Base.pm 2011-09-03
21:25:42.000000000 +0200
+++ new/Catalyst-Manual-5.9003/inc/Module/Install/Base.pm 2012-02-17
08:44:03.000000000 +0100
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
}
# Suspend handler for "redefined" warnings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catalyst-Manual-5.9002/inc/Module/Install/Can.pm
new/Catalyst-Manual-5.9003/inc/Module/Install/Can.pm
--- old/Catalyst-Manual-5.9002/inc/Module/Install/Can.pm 2011-09-03
21:25:42.000000000 +0200
+++ new/Catalyst-Manual-5.9003/inc/Module/Install/Can.pm 2012-02-17
08:44:03.000000000 +0100
@@ -9,7 +9,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catalyst-Manual-5.9002/inc/Module/Install/Fetch.pm
new/Catalyst-Manual-5.9003/inc/Module/Install/Fetch.pm
--- old/Catalyst-Manual-5.9002/inc/Module/Install/Fetch.pm 2011-09-03
21:25:42.000000000 +0200
+++ new/Catalyst-Manual-5.9003/inc/Module/Install/Fetch.pm 2012-02-17
08:44:04.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catalyst-Manual-5.9002/inc/Module/Install/Include.pm
new/Catalyst-Manual-5.9003/inc/Module/Install/Include.pm
--- old/Catalyst-Manual-5.9002/inc/Module/Install/Include.pm 2011-09-03
21:25:42.000000000 +0200
+++ new/Catalyst-Manual-5.9003/inc/Module/Install/Include.pm 2012-02-17
08:44:04.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catalyst-Manual-5.9002/inc/Module/Install/Makefile.pm
new/Catalyst-Manual-5.9003/inc/Module/Install/Makefile.pm
--- old/Catalyst-Manual-5.9002/inc/Module/Install/Makefile.pm 2011-09-03
21:25:42.000000000 +0200
+++ new/Catalyst-Manual-5.9003/inc/Module/Install/Makefile.pm 2012-02-17
08:44:03.000000000 +0100
@@ -8,7 +8,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -219,14 +219,14 @@
# an underscore, even though its own version may contain one!
# Hence the funny regexp to get rid of it. See RT #35800
# for details.
- my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
+ my ($v) = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
$self->build_requires( 'ExtUtils::MakeMaker' => $v );
$self->configure_requires( 'ExtUtils::MakeMaker' => $v );
} else {
# Allow legacy-compatibility with 5.005 by depending on the
# most recent EU:MM that supported 5.005.
- $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 );
- $self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 );
}
# Generate the MakeMaker params
@@ -241,7 +241,6 @@
'all_from' if you prefer) in Makefile.PL.
EOT
- $DB::single = 1;
if ( $self->tests ) {
my @tests = split ' ', $self->tests;
my %seen;
@@ -412,4 +411,4 @@
__END__
-#line 541
+#line 540
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catalyst-Manual-5.9002/inc/Module/Install/Metadata.pm
new/Catalyst-Manual-5.9003/inc/Module/Install/Metadata.pm
--- old/Catalyst-Manual-5.9002/inc/Module/Install/Metadata.pm 2011-09-03
21:25:42.000000000 +0200
+++ new/Catalyst-Manual-5.9003/inc/Module/Install/Metadata.pm 2012-02-17
08:44:03.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -151,15 +151,21 @@
sub install_as_vendor { $_[0]->installdirs('vendor') }
sub dynamic_config {
- my $self = shift;
- unless ( @_ ) {
- warn "You MUST provide an explicit true/false value to
dynamic_config\n";
- return $self;
+ my $self = shift;
+ my $value = @_ ? shift : 1;
+ if ( $self->{values}->{dynamic_config} ) {
+ # Once dynamic we never change to static, for safety
+ return 0;
}
- $self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
+ $self->{values}->{dynamic_config} = $value ? 1 : 0;
return 1;
}
+# Convenience command
+sub static_config {
+ shift->dynamic_config(0);
+}
+
sub perl_version {
my $self = shift;
return $self->{values}->{perl_version} unless @_;
@@ -170,7 +176,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 +521,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 +557,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 +588,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catalyst-Manual-5.9002/inc/Module/Install/Win32.pm
new/Catalyst-Manual-5.9003/inc/Module/Install/Win32.pm
--- old/Catalyst-Manual-5.9002/inc/Module/Install/Win32.pm 2011-09-03
21:25:42.000000000 +0200
+++ new/Catalyst-Manual-5.9003/inc/Module/Install/Win32.pm 2012-02-17
08:44:04.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catalyst-Manual-5.9002/inc/Module/Install/WriteAll.pm
new/Catalyst-Manual-5.9003/inc/Module/Install/WriteAll.pm
--- old/Catalyst-Manual-5.9002/inc/Module/Install/WriteAll.pm 2011-09-03
21:25:42.000000000 +0200
+++ new/Catalyst-Manual-5.9003/inc/Module/Install/WriteAll.pm 2012-02-17
08:44:04.000000000 +0100
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.04';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catalyst-Manual-5.9002/inc/Module/Install.pm
new/Catalyst-Manual-5.9003/inc/Module/Install.pm
--- old/Catalyst-Manual-5.9002/inc/Module/Install.pm 2011-09-03
21:25:41.000000000 +0200
+++ new/Catalyst-Manual-5.9003/inc/Module/Install.pm 2012-02-17
08:44:03.000000000 +0100
@@ -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 = '1.00';
+ $VERSION = '1.04';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -451,7 +451,7 @@
}
sub _cmp ($$) {
- _version($_[0]) <=> _version($_[1]);
+ _version($_[1]) <=> _version($_[2]);
}
# Cloned from Params::Util::_CLASS
@@ -467,4 +467,4 @@
1;
-# Copyright 2008 - 2010 Adam Kennedy.
+# Copyright 2008 - 2011 Adam Kennedy.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Deployment/nginx/FastCGI.pod
new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Deployment/nginx/FastCGI.pod
--- old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Deployment/nginx/FastCGI.pod
2011-08-29 15:34:39.000000000 +0200
+++ new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Deployment/nginx/FastCGI.pod
2012-02-16 21:37:48.000000000 +0100
@@ -42,7 +42,7 @@
fastcgi_param SERVER_ADDR $server_addr;
fastcgi_param SERVER_PORT $server_port;
fastcgi_param SERVER_NAME $server_name;
-
+
# Adjust the socket for your applications!
fastcgi_pass unix:$docroot/myapp.socket;
}
@@ -60,8 +60,13 @@
As an example, if your application is rooted at /myapp, you would configure:
- fastcgi_param SCRIPT_NAME /myapp/;
- fastcgi_param PATH_INFO $fastcgi_script_name;
+ rewrite ^/myapp$ /myapp/ permanent;
+ location /myapp/ {
+ include /etc/nginx/fastcgi_params;
+ fastcgi_param SCRIPT_NAME /myapp/;
+ fastcgi_param PATH_INFO $fastcgi_script_name;
+ fastcgi_pass unix:/tmp/mediaapi.socket;
+ }
C<$fastcgi_script_name> would be "/myapp/path/of/the/action". Catalyst will
process this accordingly and setup the application base as expected.
@@ -69,6 +74,19 @@
This behavior is somewhat different from Apache and lighttpd, but is still
functional.
+Note that the rewrite may not be needed with newer versions of nginx,
+and the paths must be exactly as specified - the trailing slash in the
+location block and the SCRIPT name are important.
+
+=head2 SSL
+
+Make sure that nginx passes this to your fastcgi. To ensure this, you need
+the following in your nginx config for the SSL vhost:
+
+ fastcgi_param HTTPS on
+
+=head1 MORE INFO
+
For more information on nginx, visit:
L<http://nginx.net>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Deployment.pod
new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Deployment.pod
--- old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Deployment.pod
2011-08-29 15:34:39.000000000 +0200
+++ new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Deployment.pod
2012-02-05 20:28:51.000000000 +0100
@@ -21,7 +21,7 @@
FastCGI application on Apache. You will usually want to have a set of
libraries specific to your application installed on your shared host.
-Full details of deploying Catalyst in a shared hosting enviroment are at
+Full details of deploying Catalyst in a shared hosting environment are at
L<Catalyst::Manual::Deployment::SharedHosting>.
=head2 FastCGI
@@ -83,6 +83,14 @@
in conjunction with Catalyst, but there are a number of caveats which
mean that it is not suitable for most deployments.
+=head2 Chef
+
+<LChef|http://www.opscode.com/chef/> is an open-source systems integration
+framework built specifically for automating cloud computing deployments. A
+Cookbooks demonstrating how to deploy a Catalyst application using Chef is
+available at L<http://community.opscode.com/cookbooks/catalyst> and
+L<http://github.com/melezhik/cookbooks/wiki/Catalyst-cookbook-intro>.
+
=head1 AUTHORS
Catalyst Contributors, see Catalyst.pm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/ExtendingCatalyst.pod
new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/ExtendingCatalyst.pod
--- old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/ExtendingCatalyst.pod
2011-09-03 04:30:05.000000000 +0200
+++ new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/ExtendingCatalyst.pod
2011-11-17 10:58:58.000000000 +0100
@@ -240,12 +240,6 @@
Catalyst encounters them by providing your own L<component base
class|/"Component Base Classes">.
-=head2 Creating custom accessors
-
-L<Catalyst::Component> uses L<Class::Accessor::Fast> for accessor
-creation. Please refer to the modules documentation for usage
-information.
-
=head2 Component Configuration
At creation time, the class configuration of your component (the one
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Intro.pod
new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Intro.pod
--- old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Intro.pod 2011-08-29
15:34:39.000000000 +0200
+++ new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Intro.pod 2012-02-17
08:44:57.000000000 +0100
@@ -23,7 +23,7 @@
I<initially> simpler to use, but achieve this by locking the programmer
into a single set of tools. Catalyst's emphasis on flexibility means
that you have to think more to use it. We view this as a feature. For
-example, this leads to Catalyst being more suited to system integration
+example, this leads to Catalyst being better suited to system integration
tasks than other web frameworks.
=head3 MVC
@@ -53,7 +53,7 @@
=item * B<Controller>
Control the whole request phase, check parameters, dispatch actions, flow
-control. Catalyst itself!
+control. This is the meat of where Catalyst works.
=back
@@ -122,6 +122,12 @@
ready server (although you'll probably want to run it behind a front end proxy
if you end up using it).
+=item * PSGI Support
+
+Starting with Catalyst version 5.9 Catalyst ships with L<PSGI> integration
+for even more powerful and flexible testing and deployment options. See
+L<Catalyst::PSGI> for details.
+
=back
=head3 Simplicity
@@ -804,14 +810,18 @@
package MyApp::Controller::Root;
use base 'Catalyst::Controller';
+
# Sets the actions in this controller to be registered with no prefix
# so they function identically to actions created in MyApp.pm
+
__PACKAGE__->config( namespace => '');
+
sub default : Path {
my ( $self, $context ) = @_;
$context->response->status(404);
$context->response->body('404 not found');
}
+
1;
@@ -820,9 +830,9 @@
__PACKAGE__->config( namespace => '' );
makes the controller act as if its namespace is empty. As you'll see
-below, an empty namespace makes many of the URL-matching attributes,
-such as :Path, :Local and :Global matches, match at the start of the
-URL path.
+below, an empty namespace makes many of the URL-matching attributes, such
+as :Path and :Local match at the start of the URL path (i.e. the
+application root).
=back
@@ -850,20 +860,30 @@
=item * Root-level (C<:Global>)
package MyApp::Controller::Foo;
- sub foo : Global { }
-Matches http://localhost:3000/foo - that is, the action is mapped
-directly to the controller namespace, ignoring the function name.
+ sub bar : Global {
+ my ($self, $c) = @_;
+ $c->res->body(
+ $c->res->body('sub bar in Controller::Foo triggered on a request for
'
+ . $c->req->uri));
+ }
-C<:Global> always matches from root: it is sugar for C<:Path('/methodname')>.
-C<:Local> is simply sugar for C<:Path('methodname')>, which takes the package
-namespace as described above.
+1;
- package MyApp::Controller::Root;
- __PACKAGE__->config( namespace => '');
- sub foo : Local { }
+Matches http://localhost:3000/bar - that is, the action is mapped
+directly to the method name, ignoring the controller namespace.
-Use whichever makes the most sense for your application.
+C<:Global> always matches from the application root: it is simply
+shorthandfor C<:Path('/methodname')>. C<:Local> is shorthand for
+C<:Path('methodname')>, which takes the controller namespace as described
+above.
+
+Usage of the C<Global> handler is rare in all but very old Catalyst
+applications (e.g. before Catalyst 5.7). The use cases where C<Global>
+used to make sense are now largely replaced by the C<Chained> dispatch
+type, or by empty C<Path> declarations on an controller action. C<Global>
+is still included in Catalyst for backwards compatibility, although
+legitimate use-cases for it may still exist.
=item * Changing handler behaviour: eating arguments (C<:Args>)
@@ -1099,7 +1119,7 @@
sub auto : Private { }
C<auto>, however, doesn't override like this: providing they exist,
-C<MyApp::auto>, C<MyApp::Controller::Catalog::auto> and
+C<MyApp::Controller::Root::auto>, C<MyApp::Controller::Catalog::auto> and
C<MyApp::Catalog::Order::auto> would be called in turn.
Here are some examples of the order in which the various built-ins
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Tutorial/.gitignore
new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Tutorial/.gitignore
--- old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Tutorial/.gitignore
2011-09-03 04:30:05.000000000 +0200
+++ new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Tutorial/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-_ignore
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Tutorial/04_BasicCRUD.pod
new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Tutorial/04_BasicCRUD.pod
--- old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Tutorial/04_BasicCRUD.pod
2011-09-03 18:32:52.000000000 +0200
+++ new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Tutorial/04_BasicCRUD.pod
2012-02-16 21:37:48.000000000 +0100
@@ -789,6 +789,9 @@
SELECT me.id, me.title, me.rating FROM book me WHERE ( ( me.id = ? ) ): '6'
DELETE FROM book WHERE ( id = ? ): '6'
+If you get the error C<file error - books/delete.tt2: not found> then you
+probably forgot to uncomment the template line in C<sub list> at the end of
+chapter 3.
=head2 Fixing a Dangerous URL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Tutorial/06_Authorization.pod
new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Tutorial/06_Authorization.pod
---
old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Tutorial/06_Authorization.pod
2011-09-03 18:34:19.000000000 +0200
+++
new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Tutorial/06_Authorization.pod
2011-12-20 13:00:42.000000000 +0100
@@ -193,7 +193,7 @@
way to demonstrate that TT templates will not be used if the response
body has already been set. In reality you would probably want to use a
technique that maintains the visual continuity of your template layout
-(for example, using L<Catalyst::Plugin::StateMessage> as shown in the
+(for example, using L<Catalyst::Plugin::StatusMessage> as shown in the
L<last chapter|Catalyst::Manual::Tutorial::05_Authentication> to
redirect to an "unauthorized" page).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Tutorial/07_Debugging.pod
new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Tutorial/07_Debugging.pod
--- old/Catalyst-Manual-5.9002/lib/Catalyst/Manual/Tutorial/07_Debugging.pod
2011-09-03 18:35:19.000000000 +0200
+++ new/Catalyst-Manual-5.9003/lib/Catalyst/Manual/Tutorial/07_Debugging.pod
2012-02-05 20:28:51.000000000 +0100
@@ -109,9 +109,15 @@
$c->log->error
$c->log->fatal
-You can also use L<Data::Dumper> in both Catalyst code
-(C<use Data::Dumper; $c-E<gt>log-E<gt>debug("\$var is: ".Dumper($var));)>)
-and TT templates (C<[% Dumper.dump(book) %]>.
+You can also use Data::Dumper in both Catalyst code and in TT templates.
+For use in Catalyst code:
+
+ use Data::Dumper;
+ $c->log->debug("\$var is: ".Dumper($c->stash->{something}));
+
+and TT templates:
+
+ [% USE Dumper ; Dumper.dump(c.stash.something) %].
B<NOTE:> Whether you are a logging fanatic or not, we strongly recommend
that you take advantage of L<Log::Log4perl> or L<Log::Dispatch>. It's
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Catalyst-Manual-5.9002/lib/Catalyst/Manual.pm
new/Catalyst-Manual-5.9003/lib/Catalyst/Manual.pm
--- old/Catalyst-Manual-5.9002/lib/Catalyst/Manual.pm 2011-09-03
19:07:17.000000000 +0200
+++ new/Catalyst-Manual-5.9003/lib/Catalyst/Manual.pm 2012-02-17
08:45:59.000000000 +0100
@@ -6,7 +6,7 @@
use strict;
use warnings;
-our $VERSION = '5.9002';
+our $VERSION = '5.9003';
=head1 NAME
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
