diff -Nru libstring-rewriteprefix-perl-0.005/Changes libstring-rewriteprefix-perl-0.006/Changes --- libstring-rewriteprefix-perl-0.005/Changes 2009-11-30 20:51:07.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/Changes 2010-10-25 19:36:40.000000000 +0000 @@ -1,5 +1,10 @@ Revision history for String-RewritePrefix +0.006 2010-10-25 15:36:37 America/New_York + give explicit Sub::Exporter requirement + + do not warn if a coderef prefix generator returns undef + 0.005 2009-11-30 export "rewrite" with Sub::Exporter prefix new_rewriter with a _; it was always private diff -Nru libstring-rewriteprefix-perl-0.005/debian/changelog libstring-rewriteprefix-perl-0.006/debian/changelog --- libstring-rewriteprefix-perl-0.005/debian/changelog 2010-10-29 14:36:47.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/debian/changelog 2010-10-28 20:40:33.000000000 +0000 @@ -1,3 +1,14 @@ +libstring-rewriteprefix-perl (0.006-1) unstable; urgency=low + + * New upstream release. + * debian/copyright: Formatting changes; refer to "Debian systems" instead of + "Debian GNU/Linux systems"; refer to /usr/share/common-licenses/GPL-1. + * Use source format 3.0 (quilt). + * Bump Standards-Version to 3.9.1. + * Add myself to Uploaders. + + -- Ansgar Burchardt Thu, 28 Oct 2010 22:40:32 +0200 + libstring-rewriteprefix-perl (0.005-1) unstable; urgency=low [ Brian Cassidy ] diff -Nru libstring-rewriteprefix-perl-0.005/debian/control libstring-rewriteprefix-perl-0.006/debian/control --- libstring-rewriteprefix-perl-0.005/debian/control 2010-10-29 14:36:47.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/debian/control 2010-10-28 20:33:41.000000000 +0000 @@ -5,8 +5,8 @@ Build-Depends-Indep: perl, libsub-exporter-perl Maintainer: Debian Perl Group Uploaders: Krzysztof Krzyżaniak (eloy) , - Brian Cassidy -Standards-Version: 3.8.3 + Brian Cassidy , Ansgar Burchardt +Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libstring-rewriteprefix-perl/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libstring-rewriteprefix-perl/ Homepage: http://search.cpan.org/dist/String-RewritePrefix/ diff -Nru libstring-rewriteprefix-perl-0.005/debian/copyright libstring-rewriteprefix-perl-0.006/debian/copyright --- libstring-rewriteprefix-perl-0.005/debian/copyright 2010-10-29 14:36:47.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/debian/copyright 2010-10-28 20:30:18.000000000 +0000 @@ -1,29 +1,30 @@ -Format-Specification: - http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196 -Upstream-Maintainer: Ricardo SIGNES -Upstream-Source: http://search.cpan.org/dist/String-RewritePrefix/ -Upstream-Name: String-RewritePrefix +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Maintainer: Ricardo SIGNES +Source: http://search.cpan.org/dist/String-RewritePrefix/ +Name: String-RewritePrefix Files: * -Copyright: 2008, by Ricardo SIGNES. -License-Alias: Perl -License: Artistic | GPL-1+ +Copyright: 2010, by Ricardo SIGNES. +License: Artistic or GPL-1+ Files: debian/* -Copyright: 2009, Krzysztof Krzyżaniak (eloy) +Copyright: + 2009, Krzysztof Krzyżaniak (eloy) 2009, Brian Cassidy License: Artistic | GPL-1+ License: Artistic - This program is free software; you can redistribute it and/or modify - it under the terms of the Artistic License, which comes with Perl. - On Debian GNU/Linux systems, the complete text of the Artistic License - can be found in `/usr/share/common-licenses/Artistic' + This program is free software; you can redistribute it and/or modify + it under the terms of the Artistic License, which comes with Perl. + . + On Debian systems, the complete text of the Artistic License can be + found in `/usr/share/common-licenses/Artistic' License: GPL-1+ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 1, or (at your option) - any later version. - On Debian GNU/Linux systems, the complete text of the GNU General - Public License can be found in `/usr/share/common-licenses/GPL' + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + . + On Debian systems, the complete text of version 1 of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-1'. diff -Nru libstring-rewriteprefix-perl-0.005/debian/source/format libstring-rewriteprefix-perl-0.006/debian/source/format --- libstring-rewriteprefix-perl-0.005/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/debian/source/format 2010-10-29 14:36:47.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru libstring-rewriteprefix-perl-0.005/dist.ini libstring-rewriteprefix-perl-0.006/dist.ini --- libstring-rewriteprefix-perl-0.005/dist.ini 1970-01-01 00:00:00.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/dist.ini 2010-10-25 19:36:40.000000000 +0000 @@ -0,0 +1,6 @@ +name = String-RewritePrefix +author = Ricardo Signes +license = Perl_5 +copyright_holder = Ricardo Signes + +[@RJBS] diff -Nru libstring-rewriteprefix-perl-0.005/INSTALL libstring-rewriteprefix-perl-0.006/INSTALL --- libstring-rewriteprefix-perl-0.005/INSTALL 2008-11-21 21:46:15.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/INSTALL 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -# Copyright (c) 2008 by Ricardo SIGNES. All rights reserved. -# Licensed under terms of Perl itself (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License was distributed with this file or you may obtain a -# copy of the License from http://dev.perl.org/licenses/ - -INSTALLATION - -This distribution may be installed via one of the following -methods: - - -1. If Build.PL exists and Module::Build is installed: - - perl Build.PL - perl Build - perl Build test - perl Build install - -2. If Makefile.PL exists: - - perl Makefile.PL - make - make test - make install - -If you are on a Windows machine you should use -'nmake' or 'dmake' rather than 'make'. diff -Nru libstring-rewriteprefix-perl-0.005/lib/String/RewritePrefix.pm libstring-rewriteprefix-perl-0.006/lib/String/RewritePrefix.pm --- libstring-rewriteprefix-perl-0.005/lib/String/RewritePrefix.pm 2009-11-30 20:50:22.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/lib/String/RewritePrefix.pm 2010-10-25 19:36:40.000000000 +0000 @@ -1,61 +1,17 @@ use strict; use warnings; package String::RewritePrefix; +BEGIN { + $String::RewritePrefix::VERSION = '0.006'; +} use Carp (); +# ABSTRACT: rewrite strings based on a set of known prefixes -use Sub::Exporter -setup => { +# 0.972 allows \'method_name' form -- rjbs, 2010-10-25 +use Sub::Exporter 0.972 -setup => { exports => [ rewrite => \'_new_rewriter' ], }; -=head1 NAME - -String::RewritePrefix - rewrite strings based on a set of known prefixes - -=head1 VERSION - -version 0.005 - -=head1 SYNOPSIS - - use String::RewritePrefix; - my @to_load = String::RewritePrefix->rewrite( - { '' => 'MyApp::', '+' => '' }, - qw(Plugin Mixin Addon +Corporate::Thinger), - ); - - # now you have: - qw(MyApp::Plugin MyApp::Mixin MyApp::Addon Corporate::Thinger) - -You can also import a rewrite routine: - - use String::RewritePrefix rewrite => { - -as => 'rewrite_dt_prefix', - prefixes => { '' => 'MyApp::', '+' => '' }, - }; - - my @to_load = rewrite_dt_prefix( qw(Plugin Mixin Addon +Corporate::Thinger)); - - # now you have: - qw(MyApp::Plugin MyApp::Mixin MyApp::Addon Corporate::Thinger) - -=cut - -our $VERSION = '0.005'; - -=head1 METHODS - -=head2 rewrite - - String::RewritePrefix->rewrite(\%prefix, @strings); - -This rewrites all the given strings using the rules in C<%prefix>. Its keys -are known prefixes for which its values will be substituted. This is performed -in longest-first order, and only one prefix will be rewritten. - -If the prefix value is a coderef, it will be executed with the remaining string -as its only argument. The return value will be used as the prefix. - -=cut sub rewrite { my ($self, $arg, @rest) = @_; @@ -85,7 +41,8 @@ if (index($str, $rewrites[$i]) == 0) { if (ref $rewrites[$i+1]) { my $rest = substr $str, length($rewrites[$i]); - push @result, $rewrites[$i+1]->($rest) . $rest; + my $str = $rewrites[ $i+1 ]->($rest); + push @result, (defined $str ? $str : '') . $rest; } else { push @result, $rewrites[$i+1] . substr $str, length($rewrites[$i]); } @@ -100,17 +57,65 @@ }; } +1; + +__END__ +=pod + +=head1 NAME + +String::RewritePrefix - rewrite strings based on a set of known prefixes + +=head1 VERSION + +version 0.006 + +=head1 SYNOPSIS + + use String::RewritePrefix; + my @to_load = String::RewritePrefix->rewrite( + { '' => 'MyApp::', '+' => '' }, + qw(Plugin Mixin Addon +Corporate::Thinger), + ); + + # now you have: + qw(MyApp::Plugin MyApp::Mixin MyApp::Addon Corporate::Thinger) + +You can also import a rewrite routine: + + use String::RewritePrefix rewrite => { + -as => 'rewrite_dt_prefix', + prefixes => { '' => 'MyApp::', '+' => '' }, + }; + + my @to_load = rewrite_dt_prefix( qw(Plugin Mixin Addon +Corporate::Thinger)); + + # now you have: + qw(MyApp::Plugin MyApp::Mixin MyApp::Addon Corporate::Thinger) + +=head1 METHODS + +=head2 rewrite + + String::RewritePrefix->rewrite(\%prefix, @strings); + +This rewrites all the given strings using the rules in C<%prefix>. Its keys +are known prefixes for which its values will be substituted. This is performed +in longest-first order, and only one prefix will be rewritten. + +If the prefix value is a coderef, it will be executed with the remaining string +as its only argument. The return value will be used as the prefix. + =head1 AUTHOR -Ricardo SIGNES +Ricardo Signes =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2008 by Ricardo SIGNES. +This software is copyright (c) 2010 by Ricardo Signes. This is free software; you can redistribute it and/or modify it under -the same terms as perl itself. +the same terms as the Perl 5 programming language system itself. =cut -1; diff -Nru libstring-rewriteprefix-perl-0.005/LICENSE libstring-rewriteprefix-perl-0.006/LICENSE --- libstring-rewriteprefix-perl-0.005/LICENSE 2008-11-21 21:46:15.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/LICENSE 2010-10-25 19:36:40.000000000 +0000 @@ -1,20 +1,22 @@ -License terms of Perl itself +This software is copyright (c) 2010 by Ricardo Signes. -This program is free software; you can redistribute it and/or modify -it under the terms of either: +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 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 - later version, or +Terms of the Perl programming language system itself - b) the "Artistic License" which comes with this Kit. +a) the GNU General Public License as published by the Free + Software Foundation; either version 1, or (at your option) any + later version, or +b) the "Artistic License" -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See either -the GNU General Public License or the Artistic License for more details. +--- The GNU General Public License, Version 1, February 1989 --- ---------------------------------------------------------------------------- +This software is Copyright (c) 2010 by Ricardo Signes. + +This is free software, licensed under: + + The GNU General Public License, Version 1, February 1989 GNU GENERAL PUBLIC LICENSE Version 1, February 1989 @@ -161,7 +163,7 @@ licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. - + 7. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to @@ -207,7 +209,72 @@ END OF TERMS AND CONDITIONS ---------------------------------------------------------------------------- + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to humanity, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + + To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively convey +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19xx name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the +appropriate parts of the General Public License. Of course, the +commands you use may be called something other than `show w' and `show +c'; they could even be mouse-clicks or menu items--whatever suits your +program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + program `Gnomovision' (a program to direct compilers to make passes + at assemblers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +That's all there is to it! + + +--- The Artistic License 1.0 --- + +This software is Copyright (c) 2010 by Ricardo Signes. + +This is free software, licensed under: + + The Artistic License 1.0 The Artistic License @@ -215,107 +282,96 @@ The intent of this document is to state the conditions under which a Package may be copied, such that the Copyright Holder maintains some semblance of -artistic control over the development of the package, while giving the users of the -package the right to use and distribute the Package in a more-or-less customary -fashion, plus the right to make reasonable modifications. +artistic control over the development of the package, while giving the users of +the package the right to use and distribute the Package in a more-or-less +customary fashion, plus the right to make reasonable modifications. Definitions: -- "Package" refers to the collection of files distributed by the Copyright - Holder, and derivatives of that collection of files created through textual - modification. -- "Standard Version" refers to such a Package if it has not been modified, - or has been modified in accordance with the wishes of the Copyright - Holder. -- "Copyright Holder" is whoever is named in the copyright or copyrights for - the package. -- "You" is you, if you're thinking about copying or distributing this Package. -- "Reasonable copying fee" is whatever you can justify on the basis of - media cost, duplication charges, time of people involved, and so on. (You - will not be required to justify it to the Copyright Holder, but only to the - computing community at large as a market that must bear the fee.) -- "Freely Available" means that no fee is charged for the item itself, though - there may be fees involved in handling the item. It also means that - recipients of the item may redistribute it under the same conditions they - received it. + - "Package" refers to the collection of files distributed by the Copyright + Holder, and derivatives of that collection of files created through + textual modification. + - "Standard Version" refers to such a Package if it has not been modified, + or has been modified in accordance with the wishes of the Copyright + Holder. + - "Copyright Holder" is whoever is named in the copyright or copyrights for + the package. + - "You" is you, if you're thinking about copying or distributing this Package. + - "Reasonable copying fee" is whatever you can justify on the basis of media + cost, duplication charges, time of people involved, and so on. (You will + not be required to justify it to the Copyright Holder, but only to the + computing community at large as a market that must bear the fee.) + - "Freely Available" means that no fee is charged for the item itself, though + there may be fees involved in handling the item. It also means that + recipients of the item may redistribute it under the same conditions they + received it. 1. You may make and give away verbatim copies of the source form of the -Standard Version of this Package without restriction, provided that you duplicate -all of the original copyright notices and associated disclaimers. +Standard Version of this Package without restriction, provided that you +duplicate all of the original copyright notices and associated disclaimers. -2. You may apply bug fixes, portability fixes and other modifications derived from -the Public Domain or from the Copyright Holder. A Package modified in such a -way shall still be considered the Standard Version. - -3. You may otherwise modify your copy of this Package in any way, provided -that you insert a prominent notice in each changed file stating how and when -you changed that file, and provided that you do at least ONE of the following: - - a) place your modifications in the Public Domain or otherwise - make them Freely Available, such as by posting said modifications - to Usenet or an equivalent medium, or placing the modifications on - a major archive site such as ftp.uu.net, or by allowing the - Copyright Holder to include your modifications in the Standard - Version of the Package. - - b) use the modified Package only within your corporation or - organization. - - c) rename any non-standard executables so the names do not - conflict with standard executables, which must also be provided, - and provide a separate manual page for each non-standard - executable that clearly documents how it differs from the Standard - Version. +2. You may apply bug fixes, portability fixes and other modifications derived +from the Public Domain or from the Copyright Holder. A Package modified in such +a way shall still be considered the Standard Version. + +3. You may otherwise modify your copy of this Package in any way, provided that +you insert a prominent notice in each changed file stating how and when you +changed that file, and provided that you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or an + equivalent medium, or placing the modifications on a major archive site + such as ftp.uu.net, or by allowing the Copyright Holder to include your + modifications in the Standard Version of the Package. + + b) use the modified Package only within your corporation or organization. + + c) rename any non-standard executables so the names do not conflict with + standard executables, which must also be provided, and provide a separate + manual page for each non-standard executable that clearly documents how it + differs from the Standard Version. - d) make other distribution arrangements with the Copyright Holder. + d) make other distribution arrangements with the Copyright Holder. 4. You may distribute the programs of this Package in object code or executable form, provided that you do at least ONE of the following: - a) distribute a Standard Version of the executables and library - files, together with instructions (in the manual page or equivalent) - on where to get the Standard Version. - - b) accompany the distribution with the machine-readable source of - the Package with your modifications. - - c) accompany any non-standard executables with their - corresponding Standard Version executables, giving the - non-standard executables non-standard names, and clearly - documenting the differences in manual pages (or equivalent), - together with instructions on where to get the Standard Version. - - d) make other distribution arrangements with the Copyright Holder. - -5. You may charge a reasonable copying fee for any distribution of this Package. -You may charge any fee you choose for support of this Package. You may not -charge a fee for this Package itself. However, you may distribute this Package in -aggregate with other (possibly commercial) programs as part of a larger -(possibly commercial) software distribution provided that you do not advertise -this Package as a product of your own. - -6. The scripts and library files supplied as input to or produced as output from -the programs of this Package do not automatically fall under the copyright of this -Package, but belong to whomever generated them, and may be sold + a) distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on where to + get the Standard Version. + + b) accompany the distribution with the machine-readable source of the Package + with your modifications. + + c) accompany any non-standard executables with their corresponding Standard + Version executables, giving the non-standard executables non-standard + names, and clearly documenting the differences in manual pages (or + equivalent), together with instructions on where to get the Standard + Version. + + d) make other distribution arrangements with the Copyright Holder. + +5. You may charge a reasonable copying fee for any distribution of this +Package. You may charge any fee you choose for support of this Package. You +may not charge a fee for this Package itself. However, you may distribute this +Package in aggregate with other (possibly commercial) programs as part of a +larger (possibly commercial) software distribution provided that you do not +advertise this Package as a product of your own. + +6. The scripts and library files supplied as input to or produced as output +from the programs of this Package do not automatically fall under the copyright +of this Package, but belong to whomever generated them, and may be sold commercially, and may be aggregated with this Package. 7. C or perl subroutines supplied by you and linked into this Package shall not be considered part of this Package. -8. Aggregation of this Package with a commercial distribution is always permitted -provided that the use of this Package is embedded; that is, when no overt attempt -is made to make this Package's interfaces visible to the end user of the -commercial distribution. Such use shall not be construed as a distribution of -this Package. - -9. The name of the Copyright Holder may not be used to endorse or promote +8. The name of the Copyright Holder may not be used to endorse or promote products derived from this software without specific prior written permission. -10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR -PURPOSE. +9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. The End - diff -Nru libstring-rewriteprefix-perl-0.005/Makefile.PL libstring-rewriteprefix-perl-0.006/Makefile.PL --- libstring-rewriteprefix-perl-0.005/Makefile.PL 2009-11-30 20:51:16.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/Makefile.PL 2010-10-25 19:36:40.000000000 +0000 @@ -1,20 +1,54 @@ + use strict; -use ExtUtils::MakeMaker; +use warnings; + + + +use ExtUtils::MakeMaker 6.31; -WriteMakefile( - NAME => 'String::RewritePrefix', - VERSION_FROM => 'lib/String/RewritePrefix.pm', - (eval { ExtUtils::MakeMaker->VERSION(6.21) } ? (LICENSE => 'perl') : ()), - PREREQ_PM => { - 'Test::More' => '0.47', - 'Sub::Exporter' => 0, + + +my %WriteMakefileArgs = ( + 'ABSTRACT' => 'rewrite strings based on a set of known prefixes', + 'AUTHOR' => 'Ricardo Signes ', + 'BUILD_REQUIRES' => { + 'Test::More' => '0.96' + }, + 'CONFIGURE_REQUIRES' => { + 'ExtUtils::MakeMaker' => '6.31' + }, + 'DISTNAME' => 'String-RewritePrefix', + 'EXE_FILES' => [], + 'LICENSE' => 'perl', + 'NAME' => 'String::RewritePrefix', + 'PREREQ_PM' => { + 'Carp' => '0', + 'Sub::Exporter' => '0.972' }, - (eval { ExtUtils::MakeMaker->VERSION(6.46) } - ? (META_MERGE => { - resources => { - Repository => 'http://github.com/rjbs/string-rewriteprefix' - } - }) - : () - ), + 'VERSION' => '0.006', + 'test' => { + 'TESTS' => 't/*.t' + } ); + + +unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) { + my $br = delete $WriteMakefileArgs{BUILD_REQUIRES}; + my $pp = $WriteMakefileArgs{PREREQ_PM}; + for my $mod ( keys %$br ) { + if ( exists $pp->{$mod} ) { + $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod}; + } + else { + $pp->{$mod} = $br->{$mod}; + } + } +} + +delete $WriteMakefileArgs{CONFIGURE_REQUIRES} + unless eval { ExtUtils::MakeMaker->VERSION(6.52) }; + +WriteMakefile(%WriteMakefileArgs); + + + diff -Nru libstring-rewriteprefix-perl-0.005/MANIFEST libstring-rewriteprefix-perl-0.006/MANIFEST --- libstring-rewriteprefix-perl-0.005/MANIFEST 2009-11-30 21:01:05.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/MANIFEST 2010-10-25 19:36:40.000000000 +0000 @@ -1,12 +1,11 @@ Changes -INSTALL -lib/String/RewritePrefix.pm LICENSE +MANIFEST +META.json +META.yml Makefile.PL -MANIFEST This list of files -MANIFEST.SKIP README +dist.ini +lib/String/RewritePrefix.pm t/basic.t -xt/pod-coverage.t -xt/pod-format.t -META.yml Module meta-data (added by MakeMaker) +t/release-pod-syntax.t diff -Nru libstring-rewriteprefix-perl-0.005/MANIFEST.SKIP libstring-rewriteprefix-perl-0.006/MANIFEST.SKIP --- libstring-rewriteprefix-perl-0.005/MANIFEST.SKIP 2009-02-20 23:03:55.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/MANIFEST.SKIP 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -# Copyright (c) 2008 by Ricardo SIGNES. All rights reserved. -# Licensed under terms of Perl itself (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License was distributed with this file or you may obtain a -# copy of the License from http://dev.perl.org/licenses/ - -# Version control files and dirs. -\bRCS\b -\bCVS\b -,v$ -.svn/ -^.git - -# Generated by Perl module toolchain -^MANIFEST\.(?!SKIP) -^Makefile$ -^blib/ -^blibdirs$ -^PM_to_blib$ -^MakeMaker-\d -^Build$ -^_build -^cover_db -^.*\.bat$ - -# Temp, old, vi and emacs files. -~$ -\.old$ -\#\.*\#$ -\.\#$ -\.swp$ -\.bak$ -^pod.*\.tmp$ - -^String-Rewrite* diff -Nru libstring-rewriteprefix-perl-0.005/META.json libstring-rewriteprefix-perl-0.006/META.json --- libstring-rewriteprefix-perl-0.005/META.json 1970-01-01 00:00:00.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/META.json 2010-10-25 19:36:40.000000000 +0000 @@ -0,0 +1,220 @@ +{ + "abstract" : "rewrite strings based on a set of known prefixes", + "author" : [ + "Ricardo Signes " + ], + "dynamic_config" : 0, + "generated_by" : "Dist::Zilla version 4.102342, CPAN::Meta::Converter version 2.102400", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "String-RewritePrefix", + "prereqs" : { + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.31" + } + }, + "runtime" : { + "requires" : { + "Carp" : 0, + "Sub::Exporter" : "0.972" + } + }, + "test" : { + "requires" : { + "Test::More" : "0.96" + } + } + }, + "release_status" : "stable", + "resources" : { + "repository" : { + "type" : "git", + "url" : "git://git.codesimply.com/String-RewritePrefix.git" + } + }, + "version" : "0.006", + "x_Dist_Zilla" : { + "plugins" : [ + { + "class" : "Dist::Zilla::Plugin::GatherDir", + "name" : "@RJBS/@Basic/GatherDir", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::PruneCruft", + "name" : "@RJBS/@Basic/PruneCruft", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::ManifestSkip", + "name" : "@RJBS/@Basic/ManifestSkip", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::MetaYAML", + "name" : "@RJBS/@Basic/MetaYAML", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::License", + "name" : "@RJBS/@Basic/License", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::Readme", + "name" : "@RJBS/@Basic/Readme", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::ExtraTests", + "name" : "@RJBS/@Basic/ExtraTests", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::ExecDir", + "name" : "@RJBS/@Basic/ExecDir", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::ShareDir", + "name" : "@RJBS/@Basic/ShareDir", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::MakeMaker", + "name" : "@RJBS/@Basic/MakeMaker", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::Manifest", + "name" : "@RJBS/@Basic/Manifest", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::TestRelease", + "name" : "@RJBS/@Basic/TestRelease", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::ConfirmRelease", + "name" : "@RJBS/@Basic/ConfirmRelease", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::UploadToCPAN", + "name" : "@RJBS/@Basic/UploadToCPAN", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::AutoPrereqs", + "name" : "@RJBS/AutoPrereqs", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::Git::NextVersion", + "name" : "@RJBS/Git::NextVersion", + "version" : "1.102810" + }, + { + "class" : "Dist::Zilla::Plugin::PkgVersion", + "name" : "@RJBS/PkgVersion", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::MetaConfig", + "name" : "@RJBS/MetaConfig", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::MetaJSON", + "name" : "@RJBS/MetaJSON", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::NextRelease", + "name" : "@RJBS/NextRelease", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::PodSyntaxTests", + "name" : "@RJBS/PodSyntaxTests", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::Repository", + "name" : "@RJBS/Repository", + "version" : "0.14" + }, + { + "class" : "Dist::Zilla::Plugin::Prereqs", + "config" : { + "Dist::Zilla::Plugin::Prereqs" : { + "phase" : "test", + "type" : "requires" + } + }, + "name" : "@RJBS/TestMoreWithSubtests", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::PodWeaver", + "name" : "@RJBS/PodWeaver", + "version" : "3.101641" + }, + { + "class" : "Dist::Zilla::Plugin::Git::Check", + "name" : "@RJBS/@Git/Check", + "version" : "1.102810" + }, + { + "class" : "Dist::Zilla::Plugin::Git::Commit", + "name" : "@RJBS/@Git/Commit", + "version" : "1.102810" + }, + { + "class" : "Dist::Zilla::Plugin::Git::Tag", + "name" : "@RJBS/@Git/Tag", + "version" : "1.102810" + }, + { + "class" : "Dist::Zilla::Plugin::Git::Push", + "name" : "@RJBS/@Git/Push", + "version" : "1.102810" + }, + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : ":InstallModules", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : ":TestFiles", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : ":ExecFiles", + "version" : "4.102342" + }, + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : ":ShareFiles", + "version" : "4.102342" + } + ], + "zilla" : { + "class" : "Dist::Zilla::Dist::Builder", + "config" : { + "is_trial" : 0 + }, + "version" : "4.102342" + } + } +} + diff -Nru libstring-rewriteprefix-perl-0.005/META.yml libstring-rewriteprefix-perl-0.006/META.yml --- libstring-rewriteprefix-perl-0.005/META.yml 2009-11-30 21:01:05.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/META.yml 2010-10-25 19:36:40.000000000 +0000 @@ -1,24 +1,160 @@ ---- #YAML:1.0 -name: String-RewritePrefix -version: 0.005 -abstract: ~ -author: [] -license: perl -distribution_type: module -configure_requires: - ExtUtils::MakeMaker: 0 +--- +abstract: 'rewrite strings based on a set of known prefixes' +author: + - 'Ricardo Signes ' build_requires: - ExtUtils::MakeMaker: 0 + Test::More: 0.96 +configure_requires: + ExtUtils::MakeMaker: 6.31 +dynamic_config: 0 +generated_by: 'Dist::Zilla version 4.102342, CPAN::Meta::Converter version 2.102400' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: String-RewritePrefix requires: - Sub::Exporter: 0 - Test::More: 0.47 + Carp: 0 + Sub::Exporter: 0.972 resources: - Repository: http://github.com/rjbs/string-rewriteprefix -no_index: - directory: - - t - - inc -generated_by: ExtUtils::MakeMaker version 6.55_02 -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + repository: git://git.codesimply.com/String-RewritePrefix.git +version: 0.006 +x_Dist_Zilla: + plugins: + - + class: Dist::Zilla::Plugin::GatherDir + name: '@RJBS/@Basic/GatherDir' + version: 4.102342 + - + class: Dist::Zilla::Plugin::PruneCruft + name: '@RJBS/@Basic/PruneCruft' + version: 4.102342 + - + class: Dist::Zilla::Plugin::ManifestSkip + name: '@RJBS/@Basic/ManifestSkip' + version: 4.102342 + - + class: Dist::Zilla::Plugin::MetaYAML + name: '@RJBS/@Basic/MetaYAML' + version: 4.102342 + - + class: Dist::Zilla::Plugin::License + name: '@RJBS/@Basic/License' + version: 4.102342 + - + class: Dist::Zilla::Plugin::Readme + name: '@RJBS/@Basic/Readme' + version: 4.102342 + - + class: Dist::Zilla::Plugin::ExtraTests + name: '@RJBS/@Basic/ExtraTests' + version: 4.102342 + - + class: Dist::Zilla::Plugin::ExecDir + name: '@RJBS/@Basic/ExecDir' + version: 4.102342 + - + class: Dist::Zilla::Plugin::ShareDir + name: '@RJBS/@Basic/ShareDir' + version: 4.102342 + - + class: Dist::Zilla::Plugin::MakeMaker + name: '@RJBS/@Basic/MakeMaker' + version: 4.102342 + - + class: Dist::Zilla::Plugin::Manifest + name: '@RJBS/@Basic/Manifest' + version: 4.102342 + - + class: Dist::Zilla::Plugin::TestRelease + name: '@RJBS/@Basic/TestRelease' + version: 4.102342 + - + class: Dist::Zilla::Plugin::ConfirmRelease + name: '@RJBS/@Basic/ConfirmRelease' + version: 4.102342 + - + class: Dist::Zilla::Plugin::UploadToCPAN + name: '@RJBS/@Basic/UploadToCPAN' + version: 4.102342 + - + class: Dist::Zilla::Plugin::AutoPrereqs + name: '@RJBS/AutoPrereqs' + version: 4.102342 + - + class: Dist::Zilla::Plugin::Git::NextVersion + name: '@RJBS/Git::NextVersion' + version: 1.102810 + - + class: Dist::Zilla::Plugin::PkgVersion + name: '@RJBS/PkgVersion' + version: 4.102342 + - + class: Dist::Zilla::Plugin::MetaConfig + name: '@RJBS/MetaConfig' + version: 4.102342 + - + class: Dist::Zilla::Plugin::MetaJSON + name: '@RJBS/MetaJSON' + version: 4.102342 + - + class: Dist::Zilla::Plugin::NextRelease + name: '@RJBS/NextRelease' + version: 4.102342 + - + class: Dist::Zilla::Plugin::PodSyntaxTests + name: '@RJBS/PodSyntaxTests' + version: 4.102342 + - + class: Dist::Zilla::Plugin::Repository + name: '@RJBS/Repository' + version: 0.14 + - + class: Dist::Zilla::Plugin::Prereqs + config: + Dist::Zilla::Plugin::Prereqs: + phase: test + type: requires + name: '@RJBS/TestMoreWithSubtests' + version: 4.102342 + - + class: Dist::Zilla::Plugin::PodWeaver + name: '@RJBS/PodWeaver' + version: 3.101641 + - + class: Dist::Zilla::Plugin::Git::Check + name: '@RJBS/@Git/Check' + version: 1.102810 + - + class: Dist::Zilla::Plugin::Git::Commit + name: '@RJBS/@Git/Commit' + version: 1.102810 + - + class: Dist::Zilla::Plugin::Git::Tag + name: '@RJBS/@Git/Tag' + version: 1.102810 + - + class: Dist::Zilla::Plugin::Git::Push + name: '@RJBS/@Git/Push' + version: 1.102810 + - + class: Dist::Zilla::Plugin::FinderCode + name: ':InstallModules' + version: 4.102342 + - + class: Dist::Zilla::Plugin::FinderCode + name: ':TestFiles' + version: 4.102342 + - + class: Dist::Zilla::Plugin::FinderCode + name: ':ExecFiles' + version: 4.102342 + - + class: Dist::Zilla::Plugin::FinderCode + name: ':ShareFiles' + version: 4.102342 + zilla: + class: Dist::Zilla::Dist::Builder + config: + is_trial: 0 + version: 4.102342 diff -Nru libstring-rewriteprefix-perl-0.005/README libstring-rewriteprefix-perl-0.006/README --- libstring-rewriteprefix-perl-0.005/README 2008-11-21 21:46:15.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/README 2010-10-25 19:36:40.000000000 +0000 @@ -1,5 +1,13 @@ -perl Makefile.PL -make -make test -sudo make install + +This archive contains the distribution String-RewritePrefix, +version 0.006: + + rewrite strings based on a set of known prefixes + +This software is copyright (c) 2010 by Ricardo Signes. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + + diff -Nru libstring-rewriteprefix-perl-0.005/t/basic.t libstring-rewriteprefix-perl-0.006/t/basic.t --- libstring-rewriteprefix-perl-0.005/t/basic.t 2009-11-30 20:43:22.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/t/basic.t 2010-10-25 19:36:40.000000000 +0000 @@ -11,6 +11,7 @@ '-' => 'Tet::', '@' => 'KaTet::', '+' => sub { $_[0] . '::Foo::' }, + '!' => sub { return undef }, }, }); @@ -20,11 +21,12 @@ Plinko -@Oops +Bar + !None )); is_deeply( \@results, - [ qw(Tet::Corporation KaTet::Roller Plinko Tet::@Oops Bar::Foo::Bar) ], + [ qw(Tet::Corporation KaTet::Roller Plinko Tet::@Oops Bar::Foo::Bar None) ], "rewrote prefices", ); diff -Nru libstring-rewriteprefix-perl-0.005/t/release-pod-syntax.t libstring-rewriteprefix-perl-0.006/t/release-pod-syntax.t --- libstring-rewriteprefix-perl-0.005/t/release-pod-syntax.t 1970-01-01 00:00:00.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/t/release-pod-syntax.t 2010-10-25 19:36:40.000000000 +0000 @@ -0,0 +1,15 @@ +#!perl + +BEGIN { + unless ($ENV{RELEASE_TESTING}) { + require Test::More; + Test::More::plan(skip_all => 'these tests are for release candidate testing'); + } +} + +use Test::More; + +eval "use Test::Pod 1.41"; +plan skip_all => "Test::Pod 1.41 required for testing POD" if $@; + +all_pod_files_ok(); diff -Nru libstring-rewriteprefix-perl-0.005/xt/pod-coverage.t libstring-rewriteprefix-perl-0.006/xt/pod-coverage.t --- libstring-rewriteprefix-perl-0.005/xt/pod-coverage.t 2008-11-21 21:46:15.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/xt/pod-coverage.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -# Copyright (c) 2008 by Ricardo SIGNES. All rights reserved. -# Licensed under terms of Perl itself (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License was distributed with this file or you may obtain a -# copy of the License from http://dev.perl.org/licenses/ - -use Test::More; - -my $min_tpc = 1.08; -eval "use Test::Pod::Coverage $min_tpc"; -plan skip_all => "Test::Pod::Coverage $min_tpc required for testing POD coverage" - if $@; - -my $min_pc = 0.17; -eval "use Pod::Coverage $min_pc"; -plan skip_all => "Pod::Coverage $min_pc required for testing POD coverage" - if $@; - -my @modules = all_modules('lib'); - -plan tests => scalar @modules; - -for my $mod ( @modules ) { - my $doc = "lib/$mod"; - $doc =~ s{::}{/}g; - $doc = -f "$doc\.pod" ? "$doc\.pod" : "$doc\.pm" ; - pod_coverage_ok( $mod, { pod_from => $doc } ); -} - diff -Nru libstring-rewriteprefix-perl-0.005/xt/pod-format.t libstring-rewriteprefix-perl-0.006/xt/pod-format.t --- libstring-rewriteprefix-perl-0.005/xt/pod-format.t 2008-11-21 21:46:15.000000000 +0000 +++ libstring-rewriteprefix-perl-0.006/xt/pod-format.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -# Copyright (c) 2008 by Ricardo SIGNES. All rights reserved. -# Licensed under terms of Perl itself (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License was distributed with this file or you may obtain a -# copy of the License from http://dev.perl.org/licenses/ - -use Test::More; - -my $min_tp = 1.22; -eval "use Test::Pod $min_tp"; -plan skip_all => "Test::Pod $min_tp required for testing POD" if $@; - -all_pod_files_ok();