r55564 - in /trunk/libdata-dump-streamer-perl: Changes META.yml debian/changelog debian/control debian/copyright debian/rules debian/source/ debian/source/format lib/Data/Dump/Streamer.pm t/madness.t t/test_helper.pl
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Tue Apr 6 21:21:04 UTC 2010
Author: jawnsy-guest
Date: Tue Apr 6 21:20:56 2010
New Revision: 55564
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=55564
Log:
* New upstream release
* Standards-Version 3.8.4 (drop perl version dep)
* Add myself to Uploaders and Copyright
* Rewrite control description
* Use new short debhelper rules format
* Update copyright to new DEP5 format
Added:
trunk/libdata-dump-streamer-perl/debian/source/
trunk/libdata-dump-streamer-perl/debian/source/format
Modified:
trunk/libdata-dump-streamer-perl/Changes
trunk/libdata-dump-streamer-perl/META.yml
trunk/libdata-dump-streamer-perl/debian/changelog
trunk/libdata-dump-streamer-perl/debian/control
trunk/libdata-dump-streamer-perl/debian/copyright
trunk/libdata-dump-streamer-perl/debian/rules
trunk/libdata-dump-streamer-perl/lib/Data/Dump/Streamer.pm
trunk/libdata-dump-streamer-perl/t/madness.t
trunk/libdata-dump-streamer-perl/t/test_helper.pl
Modified: trunk/libdata-dump-streamer-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-dump-streamer-perl/Changes?rev=55564&op=diff
==============================================================================
--- trunk/libdata-dump-streamer-perl/Changes (original)
+++ trunk/libdata-dump-streamer-perl/Changes Tue Apr 6 21:20:56 2010
@@ -1,3 +1,21 @@
+2.13 (2010-04-05)
+
+No really, *actually* removed re.pm debugging code
+
+2.12 (2010-04-05)
+
+Removed re.pm debugging code (which also broke compat w/ perl-5.8
+
+2.11 (2010-04-04)
+
+perl-5.12.0 blesses file handles into IO::File, not IO::Handle
+
+2.10 (2010-04-04)
+
+Perl-5.12.0 has:
+ - qr// as a native
+ - $! isn't auto-filled with 'Bad file descriptor' as often
+
2.09 (2009-03-24)
Hashkeys ending in newline were incorrectly quoted. Sorry Ambrus.
Modified: trunk/libdata-dump-streamer-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-dump-streamer-perl/META.yml?rev=55564&op=diff
==============================================================================
--- trunk/libdata-dump-streamer-perl/META.yml (original)
+++ trunk/libdata-dump-streamer-perl/META.yml Tue Apr 6 21:20:56 2010
@@ -1,9 +1,11 @@
--- #YAML:1.0
name: Data-Dump-Streamer
-version: 2.09
+version: 2.13
abstract: Accurately serialize a data structure as Perl code.
license: ~
-generated_by: ExtUtils::MakeMaker version 6.36
+author:
+ - Yves Orton (demerphq)
+generated_by: ExtUtils::MakeMaker version 6.42
distribution_type: module
requires:
B::Deparse: 0
@@ -12,7 +14,5 @@
Text::Abbrev: 0
Text::Balanced: 0
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.2.html
- version: 1.2
-author:
- - Yves Orton (demerphq)
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
+ version: 1.3
Modified: trunk/libdata-dump-streamer-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-dump-streamer-perl/debian/changelog?rev=55564&op=diff
==============================================================================
--- trunk/libdata-dump-streamer-perl/debian/changelog (original)
+++ trunk/libdata-dump-streamer-perl/debian/changelog Tue Apr 6 21:20:56 2010
@@ -1,6 +1,13 @@
-libdata-dump-streamer-perl (2.09-2) UNRELEASED; urgency=low
+libdata-dump-streamer-perl (2.13-1) UNRELEASED; urgency=low
+ [ Jonathan Yu ]
+ * New upstream release
+ * Standards-Version 3.8.4 (drop perl version dep)
+ * Add myself to Uploaders and Copyright
* Removed Alexis Sukrieh from Uploaders (Closes: #536130)
+ * Rewrite control description
+ * Use new short debhelper rules format
+ * Update copyright to new DEP5 format
[ Nathan Handler ]
* debian/watch: Update to ignore development releases.
@@ -12,7 +19,7 @@
* debian/control: remove unversioned (build) dependency on perl-
modules.
- -- Ryan Niebur <ryan at debian.org> Fri, 25 Sep 2009 00:24:22 -0700
+ -- Jonathan Yu <jawnsy at cpan.org> Tue, 06 Apr 2010 17:54:48 -0400
libdata-dump-streamer-perl (2.09-1) unstable; urgency=low
Modified: trunk/libdata-dump-streamer-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-dump-streamer-perl/debian/control?rev=55564&op=diff
==============================================================================
--- trunk/libdata-dump-streamer-perl/debian/control (original)
+++ trunk/libdata-dump-streamer-perl/debian/control Tue Apr 6 21:20:56 2010
@@ -1,14 +1,14 @@
Source: libdata-dump-streamer-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7), perl (>= 5.8.8-7), libb-utils-perl,
- libpadwalker-perl (>= 1.0), libcompress-zlib-perl, libmime-tools-perl,
+Build-Depends: debhelper (>= 7), perl, libb-utils-perl,
+ libpadwalker-perl, libcompress-zlib-perl, libmime-tools-perl,
libalgorithm-diff-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Damyan Ivanov <dmn at debian.org>, Gunnar Wolf <gwolf at debian.org>,
Russ Allbery <rra at debian.org>, Niko Tyni <ntyni at debian.org>,
- Ryan Niebur <ryan at debian.org>
-Standards-Version: 3.8.1
+ Ryan Niebur <ryan at debian.org>, Jonathan Yu <jawnsy at cpan.org>
+Standards-Version: 3.8.4
Homepage: http://search.cpan.org/dist/Data-Dump-Streamer/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdata-dump-streamer-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libdata-dump-streamer-perl/
@@ -16,22 +16,11 @@
Package: libdata-dump-streamer-perl
Architecture: any
Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, libb-utils-perl
-Recommends: libpadwalker-perl (>= 1.0)
-Description: Perl module for serializing a data structure as Perl code
- Given a list of scalars or reference variables, writes out
- their contents in perl syntax. The references can also be
- objects. The contents of each variable is output using the least
- number of Perl statements as convenient, usually only one.
- Self-referential structures, closures, and objects are output
- correctly.
- .
- The return value can be evaled to get back an identical copy of the
- original reference structure. In some cases this may require the use
- of utility subs that Data::Dump::Streamer will optionally export.
- .
- This module is very similar in concept to the core module
- Data::Dumper, with the major differences being that this module is
- designed to output to a stream instead of constructing its output in
- memory (trading speed for memory), and that the traversal over the
- data structure is effectively breadth first versus the depth first
- traversal done by the others.
+Recommends: libpadwalker-perl
+Description: module for serializing a data structure as Perl code
+ Data::Dump::Streamer is a Perl module that serializes scalars, objects or
+ reference variables and provides their contents in Perl syntax. Special data
+ structures including closures, self-referential structures and objects are
+ output correctly. This module is very similar in concept to the core module
+ Data::Dumper, except this module is designed to output to a stream instead
+ of constructing its output in memory (trading speed for memory).
Modified: trunk/libdata-dump-streamer-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-dump-streamer-perl/debian/copyright?rev=55564&op=diff
==============================================================================
--- trunk/libdata-dump-streamer-perl/debian/copyright (original)
+++ trunk/libdata-dump-streamer-perl/debian/copyright Tue Apr 6 21:20:56 2010
@@ -1,32 +1,34 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Yves Orton (demerphq)
-Upstream-Source: http://search.cpan.org/dist/Data-Dump-Streamer/
-Upstream-Name: Data-Dump-Streamer
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
+Maintainer: Joshua ben Jore <jjore at cpan.org>
+Source: http://search.cpan.org/dist/Data-Dump-Streamer/
+Name: Data-Dump-Streamer
-Copyright: 2003-2005, Yves Orton
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2003-2005, Yves Orton <yves at cpan.org>
+License: Artistic or GPL-1+
Files: debian/*
-Copyright: 2007, 2009, Gunnar Wolf <gwolf at debian.org>
+Copyright: 2009-2010, Jonathan Yu <jawnsy at cpan.org>
+ 2009, Ryan Niebur <ryan at debian.org>
+ 2007-2009, Gunnar Wolf <gwolf at debian.org>
+ 2008, Niko Tyni <ntyni at debian.org>
2007, Alexis Sukrieh <sukria at debian.org>
2007, Damyan Ivanov <dmn at debian.org>
2007, Russ Allbery <rra at debian.org>
- 2008, Niko Tyni <ntyni at debian.org>
- 2009, Ryan Niebur <ryan at debian.org>
-License: Artistic | GPL-1+
+License: Artistic or 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 GNU/Linux 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 GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
+
Modified: trunk/libdata-dump-streamer-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-dump-streamer-perl/debian/rules?rev=55564&op=diff
==============================================================================
--- trunk/libdata-dump-streamer-perl/debian/rules (original)
+++ trunk/libdata-dump-streamer-perl/debian/rules Tue Apr 6 21:20:56 2010
@@ -1,23 +1,4 @@
#!/usr/bin/make -f
-build: build-stamp
-build-stamp:
- dh build
- touch $@
-
-clean:
+%:
dh $@
-
-install: install-stamp
-install-stamp: build-stamp
- dh install
- touch $@
-
-binary-arch: install
- dh $@
-
-binary-indep:
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
Added: trunk/libdata-dump-streamer-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-dump-streamer-perl/debian/source/format?rev=55564&op=file
==============================================================================
--- trunk/libdata-dump-streamer-perl/debian/source/format (added)
+++ trunk/libdata-dump-streamer-perl/debian/source/format Tue Apr 6 21:20:56 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: trunk/libdata-dump-streamer-perl/lib/Data/Dump/Streamer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-dump-streamer-perl/lib/Data/Dump/Streamer.pm?rev=55564&op=diff
==============================================================================
--- trunk/libdata-dump-streamer-perl/lib/Data/Dump/Streamer.pm (original)
+++ trunk/libdata-dump-streamer-perl/lib/Data/Dump/Streamer.pm Tue Apr 6 21:20:56 2010
@@ -35,7 +35,7 @@
BEGIN {
#$Id: Streamer.pm 40 2007-12-22 00:37:55Z demerphq $#
- $VERSION ='2.09';
+ $VERSION ='2.13';
$XS_VERSION='2.07';
$VERSION = eval $VERSION; # used for beta stuff.
@ISA = qw(Exporter DynaLoader);
@@ -2921,6 +2921,9 @@
$self->_dump_format($item,$name,$indent);
} elsif ($type eq 'IO') {
$self->{fh}->print("*{Symbol::gensym()}{IO}");
+ } elsif ($type eq 'ORANGE' || $type eq 'Regexp' || $type eq 'REGEXP') {
+ my ($pat,$mod)=regex($item);
+ $self->_dump_qr($pat,$mod);
} else {
Carp::confess "_dump_rv() can't handle '$type' objects yet\n :-(\n";
}
Modified: trunk/libdata-dump-streamer-perl/t/madness.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-dump-streamer-perl/t/madness.t?rev=55564&op=diff
==============================================================================
--- trunk/libdata-dump-streamer-perl/t/madness.t (original)
+++ trunk/libdata-dump-streamer-perl/t/madness.t Tue Apr 6 21:20:56 2010
@@ -210,6 +210,7 @@
EXPECT
}
{
+ undef $!;
format STDOUT =
@<<<<<< @││││││ @>>>>>>
"left", "middle", "right"
@@ -221,7 +222,7 @@
NV => 3.14159265358979,
PV => "string",
PV8 => "ab\ncd\x{20ac}\t",
- PVM => $!,
+ PVM => "$!",
RV => \$.,
AR => [ 1..2 ],
HR => { key => "value" },
@@ -232,7 +233,46 @@
OBJ => bless qr/("[^"]+")/,"Zorp",
);
- same( $dump= $o->Data(\%hash)->Out, <<'EXPECT', "", $o);
+ # Dumping differences per perl version:
+ # 5.12.0+:
+ #
+ # IO handles are now blessed into IO::File, I guess?
+ #
+ if ( $] >= 5.012_000 ) {
+ same( $dump= $o->Data(\%hash)->Out, <<'EXPECT', "", $o);
+$HASH1 = {
+ AR => [
+ 1,
+ 2
+ ],
+ CR => sub {
+ use warnings;
+ use strict 'refs';
+ 'code';
+ },
+ FMT => \do{ local *F; my $F=<<'_EOF_FORMAT_'; $F=~s/^\s+# //mg; eval $F; die $F.$@ if $@; *F{FORMAT};
+ # format F =
+ # @<<<<<< @││││││ @>>>>>>
+ # 'left', 'middle', 'right'
+ # .
+_EOF_FORMAT_
+ },
+ GLB => *::STDERR,
+ HR => { key => 'value' },
+ IO => bless( *{Symbol::gensym()}{IO}, 'IO::File' ),
+ IV => 1,
+ NV => 3.14159265358979,
+ OBJ => bless( qr/("[^"]+")/, 'Zorp' ),
+ PV => 'string',
+ PV8 => "ab\ncd\x{20ac}\t",
+ PVM => '',
+ RV => \do { my $v = undef },
+ UND => undef
+ };
+EXPECT
+ }
+ else {
+ same( $dump= $o->Data(\%hash)->Out, <<'EXPECT', "", $o);
$HASH1 = {
AR => [
1,
@@ -258,12 +298,12 @@
OBJ => bless( qr/("[^"]+")/, 'Zorp' ),
PV => 'string',
PV8 => "ab\ncd\x{20ac}\t",
- PVM => 'Bad file descriptor',
+ PVM => '',
RV => \do { my $v = undef },
UND => undef
};
EXPECT
-
+ }
}
__END__
Modified: trunk/libdata-dump-streamer-perl/t/test_helper.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-dump-streamer-perl/t/test_helper.pl?rev=55564&op=diff
==============================================================================
--- trunk/libdata-dump-streamer-perl/t/test_helper.pl (original)
+++ trunk/libdata-dump-streamer-perl/t/test_helper.pl Tue Apr 6 21:20:56 2010
@@ -78,6 +78,30 @@
sub capture { \@_ }
+sub _similar {
+ my ( $str1, $str2, $name, $obj ) = @_;
+
+ s/\s+$//gm for $str1, $str2;
+ s/\r\n/\n/g for $str1, $str2;
+ s/\(0x[0-9a-xA-X]+\)/(0xdeadbeef)/g for $str1, $str2;
+ my @vars = $str2 =~ m/^(?:my\s*)?(\$\w+)\s*=/gm;
+
+ #warn "@vars";
+ my $text = "\n" . $str1;
+ my $pat = "\n" . $str2;
+
+ unless ( like( $text, $pat ) ) {
+ if ( $] >= 5.012 ) {
+ eval qq{
+ use re qw( Debug EXECUTE );
+ \$text =~ \$pat;
+ 1;
+ }
+ or die $@;
+ }
+ $obj->diag;
+ }
+}
sub _same {
my ( $str1, $str2, $name, $obj ) = @_;
@@ -166,6 +190,69 @@
$_[$_-1]=$x[$_-1] for 1.. at _;
}
wantarray ? @x : $x[0]
+}
+
+sub similar {
+ goto &_similar unless ref( $_[1] );
+ my $name = shift;
+ my $obj = shift;
+ my ($expect,$result) = normalize(shift, scalar $obj->Data(@_)->Out());
+
+ my $main_pass = like( "\n$result", "\n$expect" );
+ if ( ! $main_pass ) {
+ $obj->diag;
+ }
+
+ my @declare=grep { /^[\$\@\%]/ } @{$obj->{declare}};
+
+ my @dump =map { /^[\@\%\&]/ ? "\\$_" : $_ } @{$obj->{out_names}};
+ my $dumpvars=join ( ",", @dump );
+
+ print $result,"\n" if $name=~/Test/;
+
+ my ($dumper,$error) = _dumper(\@_);
+ if ($error) {
+ diag( "$name\n$error" ) if $ENV{TEST_VERBOSE};
+ }
+ if ($dumper) {
+
+ my $result2_eval = $result . "\n" . 'scalar( $obj->Data(' . $dumpvars . ")->Out())\n";
+ my $dd_result_eval =
+ $result . "\nscalar(Data::Dumper->new("
+ . 'sub{\@_}->(' . $dumpvars . ")"
+ . ")->Purity(1)->Sortkeys(1)->Quotekeys(1)->"
+ . "Useperl(1)->Dump())\n";
+ unless ( $obj->Declare ) {
+ $dd_result_eval = "my(" . join ( ",", @declare ) . ");\n" . $dd_result_eval;
+ $result2_eval = "my(" . join ( ",", @declare ) . ");\n" . $result2_eval;
+ }
+ foreach my $test ( [ "Data::Dumper", $dd_result_eval, $dumper ],
+ [ "Data::Dump::Streamer", $result2_eval, $result ] ) {
+ my ( $test_name, $eval, $orig ) = @$test;
+
+ my ($warned,$res);
+ {
+ local $SIG{__WARN__}=sub { my $err=join ('', at _); $warned.=$err unless $err=~/^Subroutine|Encountered/};
+ $res = eval $eval;
+ if ($warned) { print "Eval $test_name produced warnings:$warned\n$eval" };
+ }
+ normalize($res);
+ my $fail = 0;
+ if ($@) {
+ print join "\n", "Failed $test_name eval()", $eval, $@, "";
+ $fail = 1;
+ } elsif ( $res ne $orig ) {
+ print "Failed $test_name second time\n";
+ eval { print string_diff( $orig, $res, "Orig", "Result" ) };
+ print "Orig:\n$orig\nResult:\n$res\nEval:\n$eval\n";
+ $fail = 1;
+ }
+ $obj->diag if $fail;
+ return fail($name) if $fail;
+ }
+ #print join "\n",$result,$result2,$dumper,$dd_result,"";
+ }
+ ok( $main_pass, $name )
}
sub same {
@@ -474,4 +561,4 @@
-1;
+1;
More information about the Pkg-perl-cvs-commits
mailing list