r38008 - in /trunk/libtest-poe-server-tcp-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/Test/POE/Server/ t/
nhandler-guest at users.alioth.debian.org
nhandler-guest at users.alioth.debian.org
Thu Jun 11 11:55:29 UTC 2009
Author: nhandler-guest
Date: Thu Jun 11 11:54:58 2009
New Revision: 38008
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=38008
Log:
* New upstream release
* debian/watch:
- Update to ignore development releases.
- Remove comments
* debian/control:
- Add myself to Uploaders list
* debian/copyright:
- Update Module::Install section to match:
http://pkg-perl.alioth.debian.org/copyright.html#module__install
Added:
trunk/libtest-poe-server-tcp-perl/inc/Module/Install/AutoLicense.pm
- copied unchanged from r38007, branches/upstream/libtest-poe-server-tcp-perl/current/inc/Module/Install/AutoLicense.pm
trunk/libtest-poe-server-tcp-perl/inc/Module/Install/GithubMeta.pm
- copied unchanged from r38007, branches/upstream/libtest-poe-server-tcp-perl/current/inc/Module/Install/GithubMeta.pm
Modified:
trunk/libtest-poe-server-tcp-perl/Changes
trunk/libtest-poe-server-tcp-perl/LICENSE
trunk/libtest-poe-server-tcp-perl/MANIFEST
trunk/libtest-poe-server-tcp-perl/META.yml
trunk/libtest-poe-server-tcp-perl/Makefile.PL
trunk/libtest-poe-server-tcp-perl/debian/changelog
trunk/libtest-poe-server-tcp-perl/debian/control
trunk/libtest-poe-server-tcp-perl/debian/copyright
trunk/libtest-poe-server-tcp-perl/debian/watch
trunk/libtest-poe-server-tcp-perl/inc/Module/Install.pm
trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Base.pm
trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Can.pm
trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Fetch.pm
trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Makefile.pm
trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Metadata.pm
trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Win32.pm
trunk/libtest-poe-server-tcp-perl/inc/Module/Install/WriteAll.pm
trunk/libtest-poe-server-tcp-perl/lib/Test/POE/Server/TCP.pm
trunk/libtest-poe-server-tcp-perl/t/09_client_info.t
Modified: trunk/libtest-poe-server-tcp-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/Changes?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/Changes (original)
+++ trunk/libtest-poe-server-tcp-perl/Changes Thu Jun 11 11:54:58 2009
@@ -1,5 +1,8 @@
Test::POE::Server::TCP
======================
+
+1.06 Wed Jun 10 21:47:29 BST 2009
+ - Added client_wheel method to get at the erm client wheel
1.04 Thu Apr 30 15:09:08 BST 2009
- Applied patch from Martijn van Beers that adds pause/resume
Modified: trunk/libtest-poe-server-tcp-perl/LICENSE
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/LICENSE?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/LICENSE (original)
+++ trunk/libtest-poe-server-tcp-perl/LICENSE Thu Jun 11 11:54:58 2009
@@ -1,9 +1,9 @@
-This software is copyright (c) 2008 by Chris Williams, Rocco Caputo, Ann Barcomb and Jos Boumans.
+This software is copyright (c) 2009 by Chris Williams, Rocco Caputo, Ann Barcomb and Jos Boumans.
This is free software; you can redistribute it and/or modify it under
-the same terms as perl itself.
-
-Terms of Perl itself
+the same terms as the Perl 5 programming language system itself.
+
+Terms of the Perl programming language system itself
a) the GNU General Public License as published by the Free
Software Foundation; either version 1, or (at your option) any
@@ -12,7 +12,7 @@
--- The GNU General Public License, Version 1, February 1989 ---
-This software is Copyright (c) 2008 by Chris Williams, Rocco Caputo, Ann Barcomb and Jos Boumans.
+This software is Copyright (c) 2009 by Chris Williams, Rocco Caputo, Ann Barcomb and Jos Boumans.
This is free software, licensed under:
@@ -270,7 +270,7 @@
--- The Artistic License 1.0 ---
-This software is Copyright (c) 2008 by Chris Williams, Rocco Caputo, Ann Barcomb and Jos Boumans.
+This software is Copyright (c) 2009 by Chris Williams, Rocco Caputo, Ann Barcomb and Jos Boumans.
This is free software, licensed under:
Modified: trunk/libtest-poe-server-tcp-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/MANIFEST?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/MANIFEST (original)
+++ trunk/libtest-poe-server-tcp-perl/MANIFEST Thu Jun 11 11:54:58 2009
@@ -1,9 +1,11 @@
Changes
examples/synopsis.pl
inc/Module/Install.pm
+inc/Module/Install/AutoLicense.pm
inc/Module/Install/Base.pm
inc/Module/Install/Can.pm
inc/Module/Install/Fetch.pm
+inc/Module/Install/GithubMeta.pm
inc/Module/Install/Makefile.pm
inc/Module/Install/Metadata.pm
inc/Module/Install/Win32.pm
Modified: trunk/libtest-poe-server-tcp-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/META.yml?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/META.yml (original)
+++ trunk/libtest-poe-server-tcp-perl/META.yml Thu Jun 11 11:54:58 2009
@@ -9,7 +9,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.85'
+generated_by: 'Module::Install version 0.91'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -20,6 +20,10 @@
- examples
- inc
- t
+provides:
+ Test::POE::Server::TCP:
+ file: lib/Test/POE/Server/TCP.pm
+ version: 1.06
requires:
POE: 1.004
POE::Filter: 0
@@ -28,6 +32,7 @@
POE::Wheel::SocketFactory: 0
perl: 5.6.0
resources:
+ homepage: http://github.com/bingos/test-poe-server-tcp/tree
license: http://dev.perl.org/licenses/
repository: git://github.com/bingos/test-poe-server-tcp.git
-version: 1.04
+version: 1.06
Modified: trunk/libtest-poe-server-tcp-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/Makefile.PL?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/Makefile.PL (original)
+++ trunk/libtest-poe-server-tcp-perl/Makefile.PL Thu Jun 11 11:54:58 2009
@@ -6,6 +6,7 @@
version_from 'lib/Test/POE/Server/TCP.pm';
abstract_from 'lib/Test/POE/Server/TCP.pm';
license 'perl';
+auto_license holder => 'Chris Williams, Rocco Caputo, Ann Barcomb and Jos Boumans';
perl_version '5.006';
build_requires 'Test::More' => 0.47;
build_requires 'Text::ParseWords' => 0;
@@ -14,5 +15,6 @@
requires 'POE::Filter::Line' => 0;
requires 'POE::Wheel::ReadWrite' => 0;
requires 'POE::Filter' => 0;
-eval "auto_set_repository";
+auto_provides;
+githubmeta;
WriteAll();
Modified: trunk/libtest-poe-server-tcp-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/debian/changelog?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/debian/changelog (original)
+++ trunk/libtest-poe-server-tcp-perl/debian/changelog Thu Jun 11 11:54:58 2009
@@ -1,8 +1,16 @@
-libtest-poe-server-tcp-perl (1.04-2) UNRELEASED; urgency=low
+libtest-poe-server-tcp-perl (1.06-1) UNRELEASED; urgency=low
- * debian/watch: Update to ignore development releases.
+ * New upstream release
+ * debian/watch:
+ - Update to ignore development releases.
+ - Remove comments
+ * debian/control:
+ - Add myself to Uploaders list
+ * debian/copyright:
+ - Update Module::Install section to match:
+ http://pkg-perl.alioth.debian.org/copyright.html#module__install
- -- Nathan Handler <nhandler at ubuntu.com> Sat, 06 Jun 2009 01:37:40 +0000
+ -- Nathan Handler <nhandler at ubuntu.com> Thu, 11 Jun 2009 11:35:59 +0000
libtest-poe-server-tcp-perl (1.04-1) unstable; urgency=low
Modified: trunk/libtest-poe-server-tcp-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/debian/control?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/debian/control (original)
+++ trunk/libtest-poe-server-tcp-perl/debian/control Thu Jun 11 11:54:58 2009
@@ -6,7 +6,8 @@
libtest-pod-perl, libtest-pod-coverage-perl, netbase
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Antonio Radici <antonio at dyne.org>,
- gregor herrmann <gregoa at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>
+ gregor herrmann <gregoa at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>,
+ Nathan Handler <nhandler at ubuntu.com>
Standards-Version: 3.8.1
Homepage: http://search.cpan.org/dist/Test-POE-Server-TCP/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libtest-poe-server-tcp
Modified: trunk/libtest-poe-server-tcp-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/debian/copyright?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/debian/copyright (original)
+++ trunk/libtest-poe-server-tcp-perl/debian/copyright Thu Jun 11 11:54:58 2009
@@ -10,9 +10,11 @@
License-Alias: Perl
License: Artistic | GPL-1+
-Files: inc/*
-Copyright:
- (c) 2002-2009 Brian Ingerson, Audrey Tang and Adam Kennedy
+Files: inc/Module/*
+Copyright: 2002-2009, Adam Kennedy <adamk at cpan.org>
+ 2002-2009, Audrey Tang <autrijus at autrijus.org>
+ 2002-2009, Brian Ingerson <ingy at cpan.org>
+License-Alias: Perl
License: Artistic | GPL-1+
Files: debian/*
Modified: trunk/libtest-poe-server-tcp-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/debian/watch?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/debian/watch (original)
+++ trunk/libtest-poe-server-tcp-perl/debian/watch Thu Jun 11 11:54:58 2009
@@ -1,4 +1,2 @@
-# format version number, currently 3; this line is compulsory!
version=3
-# URL to the package page followed by a regex to search
http://search.cpan.org/dist/Test-POE-Server-TCP/ .*/Test-POE-Server-TCP-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
Modified: trunk/libtest-poe-server-tcp-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/inc/Module/Install.pm?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/inc/Module/Install.pm (original)
+++ trunk/libtest-poe-server-tcp-perl/inc/Module/Install.pm Thu Jun 11 11:54:58 2009
@@ -28,7 +28,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.85';
+ $VERSION = '0.91';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -353,7 +353,7 @@
if ( $] >= 5.006 ) {
open( FH, '<', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "< $_[0]" ) or die "open($_[0]): $!";
}
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
@@ -384,7 +384,7 @@
if ( $] >= 5.006 ) {
open( FH, '>', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "> $_[0]" ) or die "open($_[0]): $!";
}
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
Modified: trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Base.pm?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Base.pm Thu Jun 11 11:54:58 2009
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';
}
# Suspend handler for "redefined" warnings
@@ -13,42 +13,34 @@
$SIG{__WARN__} = sub { $w };
}
-### This is the ONLY module that shouldn't have strict on
-# use strict;
-
-#line 45
+#line 42
sub new {
- my ($class, %args) = @_;
-
- foreach my $method ( qw(call load) ) {
- next if defined &{"$class\::$method"};
- *{"$class\::$method"} = sub {
- shift()->_top->$method(@_);
- };
+ my $class = shift;
+ unless ( defined &{"${class}::call"} ) {
+ *{"${class}::call"} = sub { shift->_top->call(@_) };
}
-
- bless( \%args, $class );
+ unless ( defined &{"${class}::load"} ) {
+ *{"${class}::load"} = sub { shift->_top->load(@_) };
+ }
+ bless { @_ }, $class;
}
-#line 66
+#line 61
sub AUTOLOAD {
- my $self = shift;
local $@;
- my $autoload = eval {
- $self->_top->autoload
- } or return;
- goto &$autoload;
+ my $func = eval { shift->_top->autoload } or return;
+ goto &$func;
}
-#line 83
+#line 75
sub _top {
$_[0]->{_top};
}
-#line 98
+#line 90
sub admin {
$_[0]->_top->{admin}
@@ -56,7 +48,7 @@
Module::Install::Base::FakeAdmin->new;
}
-#line 114
+#line 106
sub is_admin {
$_[0]->admin->VERSION;
@@ -83,4 +75,4 @@
1;
-#line 162
+#line 154
Modified: trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Can.pm?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Can.pm Thu Jun 11 11:54:58 2009
@@ -2,16 +2,16 @@
package Module::Install::Can;
use strict;
-use Module::Install::Base;
-use Config ();
-use File::Spec ();
-use ExtUtils::MakeMaker ();
+use Config ();
+use File::Spec ();
+use ExtUtils::MakeMaker ();
+use Module::Install::Base ();
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
- @ISA = qw{Module::Install::Base};
}
# check if we can load some module
Modified: trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Fetch.pm?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Fetch.pm Thu Jun 11 11:54:58 2009
@@ -2,13 +2,13 @@
package Module::Install::Fetch;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
- @ISA = qw{Module::Install::Base};
}
sub get_file {
Modified: trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Makefile.pm?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Makefile.pm Thu Jun 11 11:54:58 2009
@@ -2,14 +2,14 @@
package Module::Install::Makefile;
use strict 'vars';
-use Module::Install::Base;
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION $ISCORE @ISA};
+use ExtUtils::MakeMaker ();
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
- @ISA = qw{Module::Install::Base};
}
sub Makefile { $_[0] }
Modified: trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Metadata.pm?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Metadata.pm Thu Jun 11 11:54:58 2009
@@ -2,18 +2,17 @@
package Module::Install::Metadata;
use strict 'vars';
-use Module::Install::Base;
+use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
- @ISA = qw{Module::Install::Base};
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
}
my @boolean_keys = qw{
sign
- mymeta
};
my @scalar_keys = qw{
@@ -440,21 +439,21 @@
/ixms ) {
my $license_text = $1;
my @phrases = (
- 'under the same (?:terms|license) as perl itself' => 'perl', 1,
- 'GNU general public license' => 'gpl', 1,
- 'GNU public license' => 'gpl', 1,
- 'GNU lesser general public license' => 'lgpl', 1,
- 'GNU lesser public license' => 'lgpl', 1,
- 'GNU library general public license' => 'lgpl', 1,
- 'GNU library public license' => 'lgpl', 1,
- 'BSD license' => 'bsd', 1,
- 'Artistic license' => 'artistic', 1,
- 'GPL' => 'gpl', 1,
- 'LGPL' => 'lgpl', 1,
- 'BSD' => 'bsd', 1,
- 'Artistic' => 'artistic', 1,
- 'MIT' => 'mit', 1,
- 'proprietary' => 'proprietary', 0,
+ 'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1,
+ 'GNU general public license' => 'gpl', 1,
+ 'GNU public license' => 'gpl', 1,
+ 'GNU lesser general public license' => 'lgpl', 1,
+ 'GNU lesser public license' => 'lgpl', 1,
+ 'GNU library general public license' => 'lgpl', 1,
+ 'GNU library public license' => 'lgpl', 1,
+ 'BSD license' => 'bsd', 1,
+ 'Artistic license' => 'artistic', 1,
+ 'GPL' => 'gpl', 1,
+ 'LGPL' => 'lgpl', 1,
+ 'BSD' => 'bsd', 1,
+ 'Artistic' => 'artistic', 1,
+ 'MIT' => 'mit', 1,
+ 'proprietary' => 'proprietary', 0,
);
while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
$pattern =~ s{\s+}{\\s+}g;
@@ -506,17 +505,29 @@
}
}
+sub test_requires_from {
+ my $self = shift;
+ my $content = Module::Install::_readperl($_[0]);
+ my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+ while ( @requires ) {
+ my $module = shift @requires;
+ my $version = shift @requires;
+ $self->test_requires( $module => $version );
+ }
+}
+
# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
# numbers (eg, 5.006001 or 5.008009).
# Also, convert double-part versions (eg, 5.8)
sub _perl_version {
my $v = $_[-1];
- $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
+ $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
$v =~ s/(\.\d\d\d)000$/$1/;
$v =~ s/_.+$//;
if ( ref($v) ) {
- $v = $v + 0; # Numify
+ # Numify
+ $v = $v + 0;
}
return $v;
}
@@ -526,21 +537,56 @@
######################################################################
-# MYMETA.yml Support
+# MYMETA Support
sub WriteMyMeta {
die "WriteMyMeta has been deprecated";
}
-sub write_mymeta {
- my $self = shift;
-
- # If there's no existing META.yml there is nothing we can do
- return unless -f 'META.yml';
+sub write_mymeta_yaml {
+ my $self = shift;
# We need YAML::Tiny to write the MYMETA.yml file
unless ( eval { require YAML::Tiny; 1; } ) {
return 1;
+ }
+
+ # Generate the data
+ my $meta = $self->_write_mymeta_data or return 1;
+
+ # Save as the MYMETA.yml file
+ print "Writing MYMETA.yml\n";
+ YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+}
+
+sub write_mymeta_json {
+ my $self = shift;
+
+ # We need JSON to write the MYMETA.json file
+ unless ( eval { require JSON; 1; } ) {
+ return 1;
+ }
+
+ # Generate the data
+ my $meta = $self->_write_mymeta_data or return 1;
+
+ # Save as the MYMETA.yml file
+ print "Writing MYMETA.json\n";
+ Module::Install::_write(
+ 'MYMETA.json',
+ JSON->new->pretty(1)->canonical->encode($meta),
+ );
+}
+
+sub _write_mymeta_data {
+ my $self = shift;
+
+ # If there's no existing META.yml there is nothing we can do
+ return undef unless -f 'META.yml';
+
+ # We need Parse::CPAN::Meta to load the file
+ unless ( eval { require Parse::CPAN::Meta; 1; } ) {
+ return undef;
}
# Merge the perl version into the dependencies
@@ -558,7 +604,7 @@
}
# Load the advisory META.yml file
- my @yaml = YAML::Tiny::LoadFile('META.yml');
+ my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
my $meta = $yaml[0];
# Overwrite the non-configure dependency hashs
@@ -572,9 +618,7 @@
$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
}
- # Save as the MYMETA.yml file
- print "Writing MYMETA.yml\n";
- YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+ return $meta;
}
1;
Modified: trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Win32.pm?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libtest-poe-server-tcp-perl/inc/Module/Install/Win32.pm Thu Jun 11 11:54:58 2009
@@ -2,12 +2,12 @@
package Module::Install::Win32;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
- @ISA = qw{Module::Install::Base};
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libtest-poe-server-tcp-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/inc/Module/Install/WriteAll.pm?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libtest-poe-server-tcp-perl/inc/Module/Install/WriteAll.pm Thu Jun 11 11:54:58 2009
@@ -2,11 +2,11 @@
package Module::Install::WriteAll;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';;
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
@@ -41,8 +41,18 @@
# The Makefile write process adds a couple of dependencies,
# so write the META.yml files after the Makefile.
- $self->Meta->write if $args{meta};
- $self->Meta->write_mymeta if $self->mymeta;
+ if ( $args{meta} ) {
+ $self->Meta->write;
+ }
+
+ # Experimental support for MYMETA
+ if ( $ENV{X_MYMETA} ) {
+ if ( $ENV{X_MYMETA} eq 'JSON' ) {
+ $self->Meta->write_mymeta_json;
+ } else {
+ $self->Meta->write_mymeta_yaml;
+ }
+ }
return 1;
}
Modified: trunk/libtest-poe-server-tcp-perl/lib/Test/POE/Server/TCP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/lib/Test/POE/Server/TCP.pm?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/lib/Test/POE/Server/TCP.pm (original)
+++ trunk/libtest-poe-server-tcp-perl/lib/Test/POE/Server/TCP.pm Thu Jun 11 11:54:58 2009
@@ -7,7 +7,7 @@
use Carp qw(carp croak);
use vars qw($VERSION);
-$VERSION = '1.04';
+$VERSION = '1.06';
sub spawn {
my $package = shift;
@@ -147,6 +147,13 @@
return \%hash;
}
+sub client_wheel {
+ my $self = shift;
+ my $id = shift || return;
+ return unless $self->_conn_exists( $id );
+ return $self->{clients}->{ $id }->{wheel};
+}
+
sub _get_filters {
my ($client_filter, $client_infilter, $client_outfilter) = @_;
if (defined $client_infilter or defined $client_outfilter) {
@@ -675,6 +682,11 @@
'sockaddr', our address;
'sockport', our TCP port;
+=item C<client_wheel>
+
+Retrieve the L<POE::Wheel::ReadWrite> object of a given client. Requires a valid client ID as a parameter. This enables one to
+manipulate the given L<POE::Wheel::ReadWrite> object, say to switch L<POE::Filter>.
+
=item C<disconnect>
Places a client connection in pending disconnect state. Requires a valid client ID as a parameter. Set this, then send an applicable message to the client using send_to_client() and the client connection will be terminated.
Modified: trunk/libtest-poe-server-tcp-perl/t/09_client_info.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-poe-server-tcp-perl/t/09_client_info.t?rev=38008&op=diff
==============================================================================
--- trunk/libtest-poe-server-tcp-perl/t/09_client_info.t (original)
+++ trunk/libtest-poe-server-tcp-perl/t/09_client_info.t Thu Jun 11 11:54:58 2009
@@ -3,7 +3,7 @@
use POE qw(Wheel::SocketFactory Wheel::ReadWrite Filter::Line);
use Test::POE::Server::TCP;
-plan tests => 15;
+plan tests => 16;
my @data = (
'This is a test',
@@ -91,6 +91,7 @@
my @orig = @_[ARG1..$#_];
my @test = $heap->{testd}->client_info( $id );
my $test = $heap->{testd}->client_info( $id );
+ isa_ok( $heap->{testd}->client_wheel( $id ), 'POE::Wheel::ReadWrite' );
ok( $test[$_] eq $orig[$_], "Client Address: " . $orig[$_] ) for 0 .. 3;
my @test2 = map { $test->{$_} } qw(peeraddr peerport sockaddr sockport);
ok( $test2[$_] eq $orig[$_], "Client Address: " . $orig[$_] ) for 0 .. 3;
More information about the Pkg-perl-cvs-commits
mailing list