r22665 - in /trunk/libpoe-component-pluggable-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/POE/Component/ lib/POE/Component/Pluggable/
tincho at users.alioth.debian.org
tincho at users.alioth.debian.org
Wed Jul 2 04:42:53 UTC 2008
Author: tincho
Date: Wed Jul 2 04:42:53 2008
New Revision: 22665
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22665
Log:
New upstream release.
Modified:
trunk/libpoe-component-pluggable-perl/Changes
trunk/libpoe-component-pluggable-perl/META.yml
trunk/libpoe-component-pluggable-perl/debian/changelog
trunk/libpoe-component-pluggable-perl/inc/Module/Install.pm
trunk/libpoe-component-pluggable-perl/inc/Module/Install/Base.pm
trunk/libpoe-component-pluggable-perl/inc/Module/Install/Can.pm
trunk/libpoe-component-pluggable-perl/inc/Module/Install/Fetch.pm
trunk/libpoe-component-pluggable-perl/inc/Module/Install/Makefile.pm
trunk/libpoe-component-pluggable-perl/inc/Module/Install/Metadata.pm
trunk/libpoe-component-pluggable-perl/inc/Module/Install/Win32.pm
trunk/libpoe-component-pluggable-perl/inc/Module/Install/WriteAll.pm
trunk/libpoe-component-pluggable-perl/lib/POE/Component/Pluggable.pm
trunk/libpoe-component-pluggable-perl/lib/POE/Component/Pluggable/Pipeline.pm
Modified: trunk/libpoe-component-pluggable-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/Changes?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/Changes (original)
+++ trunk/libpoe-component-pluggable-perl/Changes Wed Jul 2 04:42:53 2008
@@ -1,5 +1,11 @@
POE::Component::Pluggable
=========================
+
+1.10 Thu Jun 26 19:19:37 BST 2008
+ - Report errors if register/unregister calls fail (Hinrik)
+
+1.08 Sat Jun 14 08:41:53 BST 2008
+ - Lower-case the event name before processing it (Hinrik)
1.06 Tue May 27 19:32:46 BST 2008
- Allow changing the _register()/_unregister() prefix (Hinrik)
Modified: trunk/libpoe-component-pluggable-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/META.yml?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/META.yml (original)
+++ trunk/libpoe-component-pluggable-perl/META.yml Wed Jul 2 04:42:53 2008
@@ -5,7 +5,7 @@
build_requires:
Test::More: 0.47
distribution_type: module
-generated_by: 'Module::Install version 0.73'
+generated_by: 'Module::Install version 0.75'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.3.html
@@ -21,4 +21,4 @@
Carp: 0
POE: 1.0002
perl: 5.000
-version: 1.06
+version: 1.10
Modified: trunk/libpoe-component-pluggable-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/debian/changelog?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/debian/changelog (original)
+++ trunk/libpoe-component-pluggable-perl/debian/changelog Wed Jul 2 04:42:53 2008
@@ -1,3 +1,9 @@
+libpoe-component-pluggable-perl (1.10-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- MartÃn Ferrari <tincho at debian.org> Wed, 02 Jul 2008 01:39:58 -0300
+
libpoe-component-pluggable-perl (1.06-2) unstable; urgency=low
* Re-uploading due to a few errors in debian/control.
Modified: trunk/libpoe-component-pluggable-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/inc/Module/Install.pm?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/inc/Module/Install.pm (original)
+++ trunk/libpoe-component-pluggable-perl/inc/Module/Install.pm Wed Jul 2 04:42:53 2008
@@ -30,7 +30,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.73';
+ $VERSION = '0.75';
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
@@ -85,7 +85,7 @@
# Build.PL was formerly supported, but no longer is due to excessive
# difficulty in implementing every single feature twice.
-if ( $0 =~ /Build.PL$/i or -f 'Build.PL' ) { die <<"END_DIE" }
+if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
Module::Install no longer supports Build.PL.
Modified: trunk/libpoe-component-pluggable-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/inc/Module/Install/Base.pm?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libpoe-component-pluggable-perl/inc/Module/Install/Base.pm Wed Jul 2 04:42:53 2008
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.73';
+$VERSION = '0.75';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: trunk/libpoe-component-pluggable-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/inc/Module/Install/Can.pm?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libpoe-component-pluggable-perl/inc/Module/Install/Can.pm Wed Jul 2 04:42:53 2008
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.73';
+ $VERSION = '0.75';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libpoe-component-pluggable-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/inc/Module/Install/Fetch.pm?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libpoe-component-pluggable-perl/inc/Module/Install/Fetch.pm Wed Jul 2 04:42:53 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.73';
+ $VERSION = '0.75';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libpoe-component-pluggable-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/inc/Module/Install/Makefile.pm?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libpoe-component-pluggable-perl/inc/Module/Install/Makefile.pm Wed Jul 2 04:42:53 2008
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.73';
+ $VERSION = '0.75';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libpoe-component-pluggable-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/inc/Module/Install/Metadata.pm?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libpoe-component-pluggable-perl/inc/Module/Install/Metadata.pm Wed Jul 2 04:42:53 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.73';
+ $VERSION = '0.75';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -30,6 +30,7 @@
requires
recommends
bundles
+ resources
};
sub Meta { shift }
@@ -72,7 +73,7 @@
my $version = shift || 0;
push @{ $self->{values}->{configure_requires} }, [ $module, $version ];
}
- $self->{values}{configure_requires};
+ $self->{values}->{configure_requires};
}
sub recommends {
@@ -82,7 +83,7 @@
my $version = shift || 0;
push @{ $self->{values}->{recommends} }, [ $module, $version ];
}
- $self->{values}{recommends};
+ $self->{values}->{recommends};
}
sub bundles {
@@ -92,7 +93,24 @@
my $version = shift || 0;
push @{ $self->{values}->{bundles} }, [ $module, $version ];
}
- $self->{values}{bundles};
+ $self->{values}->{bundles};
+}
+
+# Resource handling
+sub resources {
+ my $self = shift;
+ while ( @_ ) {
+ my $resource = shift or last;
+ my $value = shift or next;
+ push @{ $self->{values}->{resources} }, [ $resource, $value ];
+ }
+ $self->{values}->{resources};
+}
+
+sub repository {
+ my $self = shift;
+ $self->resources( repository => shift );
+ return 1;
}
# Aliases for build_requires that will have alternative
@@ -294,7 +312,7 @@
if (
Module::Install::_read($_[0]) =~ m/
^
- use \s*
+ (?:use|require) \s*
v?
([\d_\.]+)
\s* ;
Modified: trunk/libpoe-component-pluggable-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/inc/Module/Install/Win32.pm?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libpoe-component-pluggable-perl/inc/Module/Install/Win32.pm Wed Jul 2 04:42:53 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.73';
+ $VERSION = '0.75';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libpoe-component-pluggable-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/inc/Module/Install/WriteAll.pm?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libpoe-component-pluggable-perl/inc/Module/Install/WriteAll.pm Wed Jul 2 04:42:53 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.73';
+ $VERSION = '0.75';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libpoe-component-pluggable-perl/lib/POE/Component/Pluggable.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/lib/POE/Component/Pluggable.pm?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/lib/POE/Component/Pluggable.pm (original)
+++ trunk/libpoe-component-pluggable-perl/lib/POE/Component/Pluggable.pm Wed Jul 2 04:42:53 2008
@@ -7,7 +7,7 @@
use POE::Component::Pluggable::Constants qw(:ALL);
use vars qw($VERSION);
-$VERSION='1.06';
+$VERSION='1.10';
sub _pluggable_init {
my ($self, %opts) = @_;
@@ -43,6 +43,7 @@
return;
}
+ $event = lc $event;
my $pipeline = $self->pipeline;
my $prefix = $self->{_pluggable_prefix};
$event =~ s/^\Q$prefix\E//;
@@ -70,10 +71,12 @@
my $alias = ($pipeline->get($plugin))[1];
if ( $plugin->can($sub) ) {
eval { $ret = $plugin->$sub($self, at args) };
- warn "${alias}->$sub call failed with $@\n" if $@ and $self->{_pluggable_debug};
+ chomp $@;
+ warn "$sub call on plugin '$alias' failed: $@\n" if $@ and $self->{_pluggable_debug};
} elsif ( $plugin->can('_default') ) {
eval { $ret = $plugin->_default($self,$sub, at args) };
- warn "${alias}->_default call failed with $@\n" if $@ and $self->{_pluggable_debug};
+ chomp $@;
+ warn "_default call on plugin '$alias' failed: $@\n" if $@ and $self->{_pluggable_debug};
}
return $return if $ret == PLUGIN_EAT_PLUGIN;
Modified: trunk/libpoe-component-pluggable-perl/lib/POE/Component/Pluggable/Pipeline.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-component-pluggable-perl/lib/POE/Component/Pluggable/Pipeline.pm?rev=22665&op=diff
==============================================================================
--- trunk/libpoe-component-pluggable-perl/lib/POE/Component/Pluggable/Pipeline.pm (original)
+++ trunk/libpoe-component-pluggable-perl/lib/POE/Component/Pluggable/Pipeline.pm Wed Jul 2 04:42:53 2008
@@ -5,7 +5,7 @@
use Carp;
use vars qw($VERSION);
-$VERSION = '1.06';
+$VERSION = '1.10';
sub new {
my ($package, $pluggable) = @_;
@@ -23,9 +23,7 @@
$@ = "Plugin named '$alias' already exists ($self->{PLUGS}{$alias})", return
if $self->{PLUGS}{$alias};
- my $return;
- my $register = "$self->{OBJECT}->{_pluggable_reg_prefix}register";
- eval { $return = $plug->$register($self->{OBJECT}) };
+ my $return = $self->_register($alias, $plug);
if ($return) {
push @{ $self->{PIPELINE} }, $plug;
@@ -46,9 +44,8 @@
my $alias = delete $self->{PLUGS}{$plug};
delete $self->{PLUGS}{$alias};
delete $self->{HANDLES}{$plug};
- my $unregister = "$self->{OBJECT}->{_pluggable_reg_prefix}unregister";
-
- eval { $plug->$unregister($self->{OBJECT}) };
+
+ $self->_unregister($alias, $plug);
$self->{OBJECT}->_pluggable_event("$self->{OBJECT}->{_pluggable_prefix}plugin_del" => $alias => $plug);
return wantarray ? ($plug, $alias) : $plug;
@@ -59,10 +56,7 @@
$@ = "Plugin named '$alias' already exists ($self->{PLUGS}{$alias}", return
if $self->{PLUGS}{$alias};
- my $return;
- my $register = "$self->{OBJECT}->{_pluggable_reg_prefix}register";
-
- eval { $return = $plug->$register($self->{OBJECT}) };
+ my $return = $self->_register($alias, $plug);
if ($return) {
unshift @{ $self->{PIPELINE} }, $plug;
@@ -86,8 +80,7 @@
delete $self->{PLUGS}{$alias};
delete $self->{HANDLES}{$plug};
- my $unregister = "$self->{OBJECT}->{_pluggable_reg_prefix}unregister";
- eval { $plug->$unregister($self->{OBJECT}) };
+ $self->_unregister($alias, $plug);
$self->{OBJECT}->_pluggable_event("$self->{OBJECT}->{_pluggable_prefix}plugin_del" => $alias => $plug);
return wantarray ? ($plug, $alias) : $plug;
@@ -106,17 +99,13 @@
delete $self->{PLUGS}{$old_a};
delete $self->{HANDLES}{$old_p};
- my $unregister = "$self->{OBJECT}->{_pluggable_reg_prefix}unregister";
- eval { $old_p->$unregister($self->{OBJECT}) };
+ $self->_unregister($old_a, $old_p);
$self->{OBJECT}->_pluggable_event("$self->{OBJECT}->{_pluggable_prefix}plugin_del" => $old_a => $old_p);
$@ = "Plugin named '$new_a' already exists ($self->{PLUGS}{$new_a}", return
if $self->{PLUGS}{$new_a};
- my $return;
-
- my $register = "$self->{OBJECT}->{_pluggable_reg_prefix}register";
- eval { $return = $new_p->$register($self->{OBJECT}) };
+ my $return = $self->_register($new_a, $new_p);
if ($return) {
$self->{PLUGS}{$new_p} = $new_a;
@@ -152,8 +141,7 @@
++$i;
}
- my $unregister = "$self->{OBJECT}->{_pluggable_reg_prefix}unregister";
- eval { $old_p->$unregister($self->{OBJECT}) };
+ $self->_unregister($old_a, $old_p);
$self->{OBJECT}->_pluggable_event("$self->{OBJECT}->{_pluggable_prefix}plugin_del" => $old_a => $old_p);
return wantarray ? ($old_p, $old_a) : $old_p;
@@ -199,10 +187,7 @@
$@ = "Plugin named '$new_a' already exists ($self->{PLUGS}{$new_a}", return
if $self->{PLUGS}{$new_a};
- my $return;
-
- my $register = "$self->{OBJECT}->{_pluggable_reg_prefix}register";
- eval { $return = $new_p->$register($self->{OBJECT}) };
+ my $return = $self->_register($new_a, $new_p);
if ($return) {
$self->{PLUGS}{$new_p} = $new_a;
@@ -233,10 +218,7 @@
$@ = "Plugin named '$new_a' already exists ($self->{PLUGS}{$new_a}", return
if $self->{PLUGS}{$new_a};
- my $return;
-
- my $register = "$self->{OBJECT}->{_pluggable_reg_prefix}register";
- eval { $return = $new_p->$register($self->{OBJECT}) };
+ my $return = $self->_register($new_a, $new_p);
if ($return) {
$self->{PLUGS}{$new_p} = $new_a;
@@ -291,6 +273,28 @@
splice(@$pipeline, $pos, 0, splice(@$pipeline, $idx, 1));
return $pos;
+}
+
+sub _register {
+ my ($self, $alias, $plug) = @_;
+
+ my $return;
+ my $sub = "$self->{OBJECT}->{_pluggable_reg_prefix}register";
+ eval { $return = $plug->$sub($self->{OBJECT}) };
+ chomp $@;
+ warn "$sub call on plugin '$alias' failed: $@\n" if $@ and $self->{OBJECT}->{_pluggable_debug};
+ return $return;
+}
+
+sub _unregister {
+ my ($self, $alias, $plug) = @_;
+
+ my $return;
+ my $sub = "$self->{OBJECT}->{_pluggable_reg_prefix}unregister";
+ eval { $return = $plug->$sub($self->{OBJECT}) };
+ chomp $@;
+ warn "$sub call on plugin '$alias' failed: $@\n" if $@ and $self->{OBJECT}->{_pluggable_debug};
+ return $return;
}
1;
More information about the Pkg-perl-cvs-commits
mailing list