r15385 - in /trunk/libpoe-filter-ircd-perl: ./ debian/ examples/ inc/ lib/POE/Filter/ t/
rmayorga-guest at users.alioth.debian.org
rmayorga-guest at users.alioth.debian.org
Fri Feb 22 01:14:42 UTC 2008
Author: rmayorga-guest
Date: Fri Feb 22 01:14:40 2008
New Revision: 15385
URL: http://svn.debian.org/wsvn/?sc=1&rev=15385
Log:
PROBLEM: Missing upstream's copyright and license info
* New upstream release
* debian/control
+ Add Build-Depends field and move debhelper to there
+ Raise compat level to 6
+ Set standards-version to 3.7.3 ( no changes requiered )
+ Add Uploaders field and I myself.
+ Add ${misc:Depends} to Depends: field
* debian/rules: sync it with the newest version from dh-make-perl
* Don't install README, it's only have install info.
* remove debian/docs
* full rewrite of debian/copyright
Added:
trunk/libpoe-filter-ircd-perl/examples/
- copied from r15384, branches/upstream/libpoe-filter-ircd-perl/current/examples/
trunk/libpoe-filter-ircd-perl/inc/
- copied from r15384, branches/upstream/libpoe-filter-ircd-perl/current/inc/
trunk/libpoe-filter-ircd-perl/t/00_use.t
- copied unchanged from r15384, branches/upstream/libpoe-filter-ircd-perl/current/t/00_use.t
trunk/libpoe-filter-ircd-perl/t/01_ircd.t
- copied unchanged from r15384, branches/upstream/libpoe-filter-ircd-perl/current/t/01_ircd.t
trunk/libpoe-filter-ircd-perl/t/99_pod.t
- copied unchanged from r15384, branches/upstream/libpoe-filter-ircd-perl/current/t/99_pod.t
trunk/libpoe-filter-ircd-perl/t/99_pod_coverage.t
- copied unchanged from r15384, branches/upstream/libpoe-filter-ircd-perl/current/t/99_pod_coverage.t
trunk/libpoe-filter-ircd-perl/t/99_test_kwalitee.t
- copied unchanged from r15384, branches/upstream/libpoe-filter-ircd-perl/current/t/99_test_kwalitee.t
Removed:
trunk/libpoe-filter-ircd-perl/debian/docs
trunk/libpoe-filter-ircd-perl/t/1.t
trunk/libpoe-filter-ircd-perl/t/2.t
trunk/libpoe-filter-ircd-perl/t/3.t
Modified:
trunk/libpoe-filter-ircd-perl/Changes
trunk/libpoe-filter-ircd-perl/MANIFEST
trunk/libpoe-filter-ircd-perl/META.yml
trunk/libpoe-filter-ircd-perl/Makefile.PL
trunk/libpoe-filter-ircd-perl/debian/changelog
trunk/libpoe-filter-ircd-perl/debian/compat
trunk/libpoe-filter-ircd-perl/debian/control
trunk/libpoe-filter-ircd-perl/debian/copyright
trunk/libpoe-filter-ircd-perl/debian/rules
trunk/libpoe-filter-ircd-perl/lib/POE/Filter/IRCD.pm
Modified: trunk/libpoe-filter-ircd-perl/Changes
URL: http://svn.debian.org/wsvn/trunk/libpoe-filter-ircd-perl/Changes?rev=15385&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/Changes (original)
+++ trunk/libpoe-filter-ircd-perl/Changes Fri Feb 22 01:14:40 2008
@@ -1,6 +1,12 @@
POE::Filter::IRCD
=================
+2.35 Changed test file naming convention
+2.34 Added clone() method as reported by Hinrik Ãrn Sigurðsson.
+2.32 Updated Module::Install to 0.68
+2.31 Fixed abstract_from and build_requires in Makefile.PL
+2.30 Code refactoring. Doc fixes. Updated tests.
+2.2 Switched fully to Module::Install. Documentation amendments.
2.0 Makefile.PL was executable. Fixed.
1.9 Added pod and pod coverage tests. Documentation fixes.
1.8 Added get_pending() method.
Modified: trunk/libpoe-filter-ircd-perl/MANIFEST
URL: http://svn.debian.org/wsvn/trunk/libpoe-filter-ircd-perl/MANIFEST?rev=15385&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/MANIFEST (original)
+++ trunk/libpoe-filter-ircd-perl/MANIFEST Fri Feb 22 01:14:40 2008
@@ -1,9 +1,20 @@
+Changes
+examples/irc.pl
+inc/Module/Install.pm
+inc/Module/Install/Base.pm
+inc/Module/Install/Can.pm
+inc/Module/Install/Fetch.pm
+inc/Module/Install/Makefile.pm
+inc/Module/Install/Metadata.pm
+inc/Module/Install/Win32.pm
+inc/Module/Install/WriteAll.pm
lib/POE/Filter/IRCD.pm
-Changes
-MANIFEST
Makefile.PL
+MANIFEST This list of files
+META.yml
README
-t/1.t
-t/2.t
-t/3.t
-META.yml Module meta-data (added by MakeMaker)
+t/00_use.t
+t/01_ircd.t
+t/99_pod.t
+t/99_pod_coverage.t
+t/99_test_kwalitee.t
Modified: trunk/libpoe-filter-ircd-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libpoe-filter-ircd-perl/META.yml?rev=15385&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/META.yml (original)
+++ trunk/libpoe-filter-ircd-perl/META.yml Fri Feb 22 01:14:40 2008
@@ -1,11 +1,20 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: POE-Filter-IRCD
-version: 2.0
-version_from: lib/POE/Filter/IRCD.pm
-installdirs: site
-requires:
- POE: 0.3202
-
+---
+abstract: A POE-based parser for the IRC protocol.
+author:
+ - Chris Williams <chris at bingosnet.co.uk>
+build_requires:
+ Test::More: 0.47
distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.30
+generated_by: Module::Install version 0.68
+license: perl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
+ version: 1.3
+name: POE-Filter-IRCD
+no_index:
+ directory:
+ - inc
+ - t
+requires:
+ POE: 0.3202
+version: 2.35
Modified: trunk/libpoe-filter-ircd-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libpoe-filter-ircd-perl/Makefile.PL?rev=15385&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/Makefile.PL (original)
+++ trunk/libpoe-filter-ircd-perl/Makefile.PL Fri Feb 22 01:14:40 2008
@@ -1,13 +1,9 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-# Blah!
-
-WriteMakefile(
- 'NAME' => 'POE::Filter::IRCD',
- 'PREREQ_PM' => {
- 'POE' => 0.3202,
- },
- 'VERSION_FROM' => 'lib/POE/Filter/IRCD.pm', # finds $VERSION
- 'dist' => { 'COMPRESS' => 'gzip --best' },
- );
+use inc::Module::Install;
+name 'POE-Filter-IRCD';
+author 'Chris Williams <chris at bingosnet.co.uk>';
+license 'perl';
+version_from 'lib/POE/Filter/IRCD.pm';
+abstract_from 'lib/POE/Filter/IRCD.pm';
+build_requires 'Test::More' => 0.47;
+requires 'POE' => 0.3202;
+WriteAll;
Modified: trunk/libpoe-filter-ircd-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libpoe-filter-ircd-perl/debian/changelog?rev=15385&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/debian/changelog (original)
+++ trunk/libpoe-filter-ircd-perl/debian/changelog Fri Feb 22 01:14:40 2008
@@ -1,5 +1,8 @@
-libpoe-filter-ircd-perl (2.0-2) UNRELEASED; urgency=low
+libpoe-filter-ircd-perl (2.35-1) UNRELEASED; urgency=low
+
+ PROBLEM: Missing upstream's copyright and license info
+ [gregor herrmann]
* Take over for the Debian Perl Group on maintainer's request; cf.
http://lists.debian.org/debian-perl/2008/02/msg00053.html
* debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
@@ -9,7 +12,20 @@
<stevenk at debian.org>).
* Add debian/watch.
- -- gregor herrmann <gregor+debian at comodo.priv.at> Wed, 13 Feb 2008 21:44:27 +0100
+ [Rene Mayorga]
+ * New upstream release
+ * debian/control
+ + Add Build-Depends field and move debhelper to there
+ + Raise compat level to 6
+ + Set standards-version to 3.7.3 ( no changes requiered )
+ + Add Uploaders field and I myself.
+ + Add ${misc:Depends} to Depends: field
+ * debian/rules: sync it with the newest version from dh-make-perl
+ * Don't install README, it's only have install info.
+ * remove debian/docs
+ * full rewrite of debian/copyright
+
+ -- Rene Mayorga <rmayorga at debian.org.sv> Thu, 21 Feb 2008 18:52:14 -0600
libpoe-filter-ircd-perl (2.0-1) unstable; urgency=low
Modified: trunk/libpoe-filter-ircd-perl/debian/compat
URL: http://svn.debian.org/wsvn/trunk/libpoe-filter-ircd-perl/debian/compat?rev=15385&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/debian/compat (original)
+++ trunk/libpoe-filter-ircd-perl/debian/compat Fri Feb 22 01:14:40 2008
@@ -1,1 +1,1 @@
-4
+6
Modified: trunk/libpoe-filter-ircd-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libpoe-filter-ircd-perl/debian/control?rev=15385&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/debian/control (original)
+++ trunk/libpoe-filter-ircd-perl/debian/control Fri Feb 22 01:14:40 2008
@@ -1,16 +1,18 @@
Source: libpoe-filter-ircd-perl
Section: perl
Priority: optional
-Build-Depends-Indep: debhelper (>= 4), perl (>= 5.6.0-17), libpoe-perl
+Build-Depends: debhelper (>= 6)
+Build-Depends-Indep: perl (>= 5.6.0-17), libpoe-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Standards-Version: 3.6.1
+Uploaders: Rene Mayorga <rmayorga at debian.org.sv>
+Standards-Version: 3.7.3
Homepage: http://search.cpan.org/dist/POE-Filter-IRCD/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libpoe-filter-ircd-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/
Package: libpoe-filter-ircd-perl
Architecture: all
-Depends: ${perl:Depends}, libpoe-perl
+Depends: ${perl:Depends}, ${misc:Depends}, libpoe-perl
Description: a POE-based parser for the IRC protocol
POE::Filter::IRCD provides a convient way of parsing and creating IRC
protocol lines using the Perl Object Environment (POE) framework.
Modified: trunk/libpoe-filter-ircd-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libpoe-filter-ircd-perl/debian/copyright?rev=15385&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/debian/copyright (original)
+++ trunk/libpoe-filter-ircd-perl/debian/copyright Fri Feb 22 01:14:40 2008
@@ -1,13 +1,14 @@
+This package was downloaded from: http://search.cpan.org/dist/POE-Filter-IRCD/
-The upstream author is: Dennis Taylor <dennis at funkplanet.com>
+Files: debian/*
+Copyright: © Steve Kowalik <stevenk at debian.org> 2005
+License: GPL-2+
+ The Debian packaging information is under the GPL, version 2 or later
-Copyright:
+Files: *
+ ??????
+ ?????
-The copyright for POE::Component::IRC belongs to Dennis Taylor,
-the poor bastard who wrote this thing up in the first place. It's
-distributed under the same terms as Perl itself (that is, either the
-Artistic License or GPL as you prefer).
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'
-The GPL and Artistic licenses can be found under
-/usr/share/common-licenses/{GPL,Artistic} on Debian systems.
-
Modified: trunk/libpoe-filter-ircd-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libpoe-filter-ircd-perl/debian/rules?rev=15385&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/debian/rules (original)
+++ trunk/libpoe-filter-ircd-perl/debian/rules Fri Feb 22 01:14:40 2008
@@ -1,68 +1,65 @@
#!/usr/bin/make -f
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
+
+PACKAGE=$(shell dh_listpackages)
ifndef PERL
PERL = /usr/bin/perl
endif
+TMP =$(CURDIR)/debian/$(PACKAGE)
+
build: build-stamp
build-stamp:
dh_testdir
-
- # Add here commands to compile the package.
$(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE) OPTIMIZE="-O2 -Wall"
-
- touch $@
-
-test: test-stamp
-test-stamp:
+ $(MAKE)
$(MAKE) test
touch $@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp test-stamp
+ dh_clean build-stamp install-stamp
+ [ ! -f Makefile ] || $(MAKE) realclean
- # Add here commands to clean up after the build process.
- -$(MAKE) realclean
-
- dh_clean
-
-install:
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
+ touch $@
- $(MAKE) install PREFIX=$(CURDIR)/debian/libpoe-filter-ircd-perl/usr
+binary-arch:
+# We have nothing to do here for an architecture-independent package
-
-# Build architecture-dependent files here.
-binary-arch: build install test
-# We have nothing to do by default.
-
-# Build architecture-independent files here.
-binary-indep: build install test
-# dh_testversion
+binary-indep: build install
dh_testdir
dh_testroot
+ dh_installexamples examples/*
dh_installdocs
- dh_installcron
- dh_installman
- dh_installchangelogs -k Changes
- dh_link
- dh_strip
- dh_compress -Xexamples
+ dh_installchangelogs Changes
+ dh_perl
+ dh_compress
dh_fixperms
dh_installdeb
- dh_perl
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
-source diff:
+source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
Modified: trunk/libpoe-filter-ircd-perl/lib/POE/Filter/IRCD.pm
URL: http://svn.debian.org/wsvn/trunk/libpoe-filter-ircd-perl/lib/POE/Filter/IRCD.pm?rev=15385&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/lib/POE/Filter/IRCD.pm (original)
+++ trunk/libpoe-filter-ircd-perl/lib/POE/Filter/IRCD.pm Fri Feb 22 01:14:40 2008
@@ -1,23 +1,22 @@
package POE::Filter::IRCD;
use strict;
-use warnings;
use Carp;
use vars qw($VERSION);
use base qw(POE::Filter);
-$VERSION = '2.0';
+$VERSION = '2.35';
sub _PUT_LITERAL () { 1 }
# Probably some other stuff should go here.
-our $g = {
+my $g = {
space => qr/\x20+/o,
trailing_space => qr/\x20*/o,
};
-our $irc_regex = qr/^
+my $irc_regex = qr/^
(?:
\x3a # : comes before hand
(\S+) # [prefix]
@@ -51,23 +50,20 @@
my $type = shift;
croak "$type requires an even number of parameters" if @_ % 2;
my $buffer = { @_ };
+ $buffer->{uc $_} = delete $buffer->{$_} for keys %{ $buffer };
$buffer->{BUFFER} = [];
- return bless($buffer, $type);
+ return bless $buffer, $type;
}
sub debug {
my $self = shift;
my $value = shift;
- if ( defined ( $value ) ) {
+ if ( defined $value ) {
$self->{DEBUG} = $value;
return $self->{DEBUG};
}
- if ( $self->{DEBUG} ) {
- $self->{DEBUG} = 0;
- } else {
- $self->{DEBUG} = 1;
- }
+ $self->{DEBUG} = $value;
}
sub get {
@@ -75,17 +71,18 @@
my $events = [];
foreach my $raw_line (@$raw_lines) {
- warn "->$raw_line \n" if ( $self->{DEBUG} );
+ warn "->$raw_line \n" if $self->{DEBUG};
if ( my($prefix, $command, $middles, $trailing) = $raw_line =~ m/$irc_regex/ ) {
my $event = { raw_line => $raw_line };
- $event->{'prefix'} = $prefix if ($prefix);
- $event->{'command'} = uc($command);
- $event->{'params'} = [] if ( defined ( $middles ) || defined ( $trailing ) );
- push @{$event->{'params'}}, (split /$g->{'space'}/, $middles) if ( defined ( $middles ) );
- push @{$event->{'params'}}, $trailing if ( defined( $trailing ) );
+ $event->{'prefix'} = $prefix if $prefix;
+ $event->{'command'} = uc $command;
+ $event->{'params'} = [] if defined ( $middles ) || defined ( $trailing );
+ push @{$event->{'params'}}, (split /$g->{'space'}/, $middles) if defined $middles;
+ push @{$event->{'params'}}, $trailing if defined $trailing;
push @$events, $event;
- } else {
- warn "Recieved line $raw_line that is not IRC protocol\n";
+ }
+ else {
+ warn "Received line $raw_line that is not IRC protocol\n";
}
}
return $events;
@@ -101,17 +98,18 @@
my $events = [];
if ( my $raw_line = shift ( @{ $self->{BUFFER} } ) ) {
- warn "->$raw_line \n" if ( $self->{DEBUG} );
+ warn "->$raw_line \n" if $self->{DEBUG};
if ( my($prefix, $command, $middles, $trailing) = $raw_line =~ m/$irc_regex/ ) {
my $event = { raw_line => $raw_line };
- $event->{'prefix'} = $prefix if ($prefix);
- $event->{'command'} = uc($command);
- $event->{'params'} = [] if ( defined ( $middles ) || defined ( $trailing ) );
- push @{$event->{'params'}}, (split /$g->{'space'}/, $middles) if ( defined ( $middles ) );
- push @{$event->{'params'}}, $trailing if ( defined( $trailing ) );
+ $event->{'prefix'} = $prefix if $prefix;
+ $event->{'command'} = uc $command;
+ $event->{'params'} = [] if defined ( $middles ) || defined ( $trailing );
+ push @{$event->{'params'}}, (split /$g->{'space'}/, $middles) if defined $middles;
+ push @{$event->{'params'}}, $trailing if defined $trailing;
push @$events, $event;
- } else {
- warn "Recieved line $raw_line that is not IRC protocol\n";
+ }
+ else {
+ warn "Received line $raw_line that is not IRC protocol\n";
}
}
return $events;
@@ -127,10 +125,10 @@
foreach my $event (@$events) {
if (ref $event eq 'HASH') {
- my $colonify = ( defined $event->{colonify} ? $event->{colonify} : $self->{colonify} );
+ my $colonify = ( defined $event->{colonify} ? $event->{colonify} : $self->{COLONIFY} );
if ( _PUT_LITERAL || _checkargs($event) ) {
my $raw_line = '';
- $raw_line .= (':' . $event->{'prefix'} . ' ') if (exists $event->{'prefix'});
+ $raw_line .= (':' . $event->{'prefix'} . ' ') if exists $event->{'prefix'};
$raw_line .= $event->{'command'};
if ( $event->{'params'} and ref $event->{'params'} eq 'ARRAY' ) {
my $params = [ @{ $event->{'params'} } ];
@@ -140,15 +138,17 @@
$raw_line .= $param . ' ';
$param = shift @$params;
}
- $raw_line .= ':' if ( $param =~ m/\x20/ or $colonify );
+ $raw_line .= ':' if $param =~ m/\x20/ or $colonify;
$raw_line .= $param;
}
push @$raw_lines, $raw_line;
- warn "<-$raw_line \n" if ( $self->{DEBUG} );
- } else {
+ warn "<-$raw_line \n" if $self->{DEBUG};
+ }
+ else {
next;
}
- } else {
+ }
+ else {
warn __PACKAGE__ . " non hashref passed to put(): \"$event\"\n";
push @$raw_lines, $event if ref $event eq 'SCALAR';
}
@@ -156,6 +156,13 @@
return $raw_lines;
}
+sub clone {
+ my $self = shift;
+ my $nself = { };
+ $nself->{$_} = $self->{$_} for keys %{ $self };
+ $nself->{BUFFER} = [ ];
+ return bless $nself, ref $self;
+}
# This thing is far from correct, dont use it.
sub _checkargs {
@@ -180,13 +187,13 @@
=head1 NAME
-POE::Filter::IRCD -- A POE-based parser for the IRC protocol.
+POE::Filter::IRCD - A POE-based parser for the IRC protocol.
=head1 SYNOPSIS
use POE::Filter::IRCD;
- my $filter = POE::Filter::IRCD->new( DEBUG => 1, colonify => 0 );
+ my $filter = POE::Filter::IRCD->new( debug => 1, colonify => 0 );
my $arrayref = $filter->get( [ $hashref ] );
my $arrayref2 = $filter->put( $arrayref );
@@ -199,7 +206,8 @@
=head1 DESCRIPTION
POE::Filter::IRCD provides a convenient way of parsing and creating IRC protocol
-lines.
+lines. It provides the parsing engine for L<POE::Component::Server::IRC> and L<POE::Component::IRC>.
+A standalone version exists as L<Parse::IRC>.
=head1 CONSTRUCTOR
@@ -207,9 +215,11 @@
=item new
-Creates a new POE::Filter::IRCD object. Takes two optional arguments: DEBUG which will print
-all lines received to STDERR; 'colonify', set to 1 to force the filter to always colonify the
-last param passed in a put(), default is 0. See below for more detail.
+Creates a new POE::Filter::IRCD object. Takes two optional arguments:
+
+ 'debug', which will print all lines received to STDERR;
+ 'colonify', set to 1 to force the filter to always colonify the last param passed in a put(),
+ default is 0. See below for more detail.
=back
@@ -259,6 +269,10 @@
$filter->put( [ $hashref ] );
+=item clone
+
+Makes a copy of the filter, and clears the copy's buffer.
+
=item debug
With a true or false argument, enables or disables debug output respectively. Without an argument the behaviour is to toggle the debug status.
@@ -281,5 +295,11 @@
L<POE::Filter::Stackable>
+L<POE::Component::Server::IRC>
+
+L<POE::Component::IRC>
+
+L<Parse::IRC>
+
=cut
More information about the Pkg-perl-cvs-commits
mailing list