r52771 - in /trunk/libdata-peek-perl: ChangeLog META.yml Makefile.PL Peek.pm Peek.xs README debian/changelog debian/control debian/copyright t/10_DDumper.t

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Mon Feb 15 04:05:08 UTC 2010


Author: jawnsy-guest
Date: Mon Feb 15 04:04:10 2010
New Revision: 52771

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=52771
Log:
* New upstream release
* Standards-Version 3.8.4 (no changes)
* Rewrite control short description
* Update copyright to new DEP5 format
* Update years of copyright

Modified:
    trunk/libdata-peek-perl/ChangeLog
    trunk/libdata-peek-perl/META.yml
    trunk/libdata-peek-perl/Makefile.PL
    trunk/libdata-peek-perl/Peek.pm
    trunk/libdata-peek-perl/Peek.xs
    trunk/libdata-peek-perl/README
    trunk/libdata-peek-perl/debian/changelog
    trunk/libdata-peek-perl/debian/control
    trunk/libdata-peek-perl/debian/copyright
    trunk/libdata-peek-perl/t/10_DDumper.t

Modified: trunk/libdata-peek-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-peek-perl/ChangeLog?rev=52771&op=diff
==============================================================================
--- trunk/libdata-peek-perl/ChangeLog (original)
+++ trunk/libdata-peek-perl/ChangeLog Mon Feb 15 04:04:10 2010
@@ -1,3 +1,10 @@
+2010-02-14 0.30 - H.Merijn Brand   <h.m.brand at xs4all.nl>
+
+    * Use $Data::Dumper::Quotekeys = 0; instead of removing the quotes myself
+    * Put first hash element after opening lonely brace
+    * Upped copyright to 2010
+    * Use warn () instead of print STDERR
+
 2009-11-09 0.29 - H.Merijn Brand   <h.m.brand at xs4all.nl>
 
     * Use skip instead of skip_all for builds that have no DPeek ()

Modified: trunk/libdata-peek-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-peek-perl/META.yml?rev=52771&op=diff
==============================================================================
--- trunk/libdata-peek-perl/META.yml (original)
+++ trunk/libdata-peek-perl/META.yml Mon Feb 15 04:04:10 2010
@@ -1,6 +1,6 @@
 --- #YAML:1.1
 name:                    Data::Peek
-version:                 0.29
+version:                 0.30
 abstract:                Modified and extended debugging facilities
 license:                 perl
 author:              
@@ -10,7 +10,7 @@
 provides:
     Data::Peek:
         file:            Peek.pm
-        version:         0.29
+        version:         0.30
 requires:     
     perl:                5.006
     DynaLoader:          0

Modified: trunk/libdata-peek-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-peek-perl/Makefile.PL?rev=52771&op=diff
==============================================================================
--- trunk/libdata-peek-perl/Makefile.PL (original)
+++ trunk/libdata-peek-perl/Makefile.PL Mon Feb 15 04:04:10 2010
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright PROCURA B.V. (c) 2008-2009 H.Merijn Brand
+# Copyright PROCURA B.V. (c) 2008-2010 H.Merijn Brand
 
 require 5.006; # <- also see postamble at the bottom for META.yml
 use strict;
@@ -131,7 +131,7 @@
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2008-2009 H.Merijn Brand
+Copyright (C) 2008-2010 H.Merijn Brand
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

Modified: trunk/libdata-peek-perl/Peek.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-peek-perl/Peek.pm?rev=52771&op=diff
==============================================================================
--- trunk/libdata-peek-perl/Peek.pm (original)
+++ trunk/libdata-peek-perl/Peek.pm Mon Feb 15 04:04:10 2010
@@ -6,7 +6,7 @@
 use DynaLoader ();
 
 use vars qw( $VERSION @ISA @EXPORT @EXPORT_OK );
-$VERSION   = "0.29";
+$VERSION   = "0.30";
 @ISA       = qw( DynaLoader Exporter );
 @EXPORT    = qw( DDumper DDsort DPeek DDisplay DDump DDual DGrow );
 @EXPORT_OK = qw( triplevar );
@@ -68,16 +68,21 @@
 
 sub DDumper
 {
-    local $Data::Dumper::Sortkeys = $_sortkeys;
-    local $Data::Dumper::Indent   = 1;
+    local $Data::Dumper::Sortkeys  = $_sortkeys;
+    local $Data::Dumper::Indent    = 1;
+    local $Data::Dumper::Quotekeys = 0;
+    local $Data::Dumper::Deparse   = 1;
+    local $Data::Dumper::Terse     = 1;
+    local $Data::Dumper::Useqq     = 0;	# I want unicode visible
 
     my $s = Data::Dumper::Dumper @_;
-    $s =~ s!^(\s*)'([^']*)'\s*=>!sprintf "%s%-16s =>", $1, $2!gme;	# Align => '
-    $s =~ s!\bbless\s*\(\s*!bless (!gm and $s =~ s!\s+\)([;,])$!)$1!gm;
-    $s =~ s!^(?= *[]}](?:[;,]|$))!  !gm;
-    $s =~ s!^(\s+)!$1$1!gm;
-
-    defined wantarray or print STDERR $s;
+    $s =~ s/^(\s*)(.*?)\s*=>/sprintf "%s%-16s =>", $1, $2/gme;	# Align =>
+    $s =~ s/\bbless\s*\(\s*/bless (/gm and $s =~ s/\s+\)([;,])$/)$1/gm;
+    $s =~ s/^(?= *[]}](?:[;,]|$))/  /gm;
+    $s =~ s/^(\s*[{[]) *\n *(?=\S)(?![{[])/$1   /gm;
+    $s =~ s/^(\s+)/$1$1/gm;
+
+    defined wantarray or warn $s;
     return $s;
     } # DDumper
 
@@ -158,7 +163,7 @@
 
     defined wantarray and return $dump;
 
-    print STDERR $dump;
+    warn $dump;
     } # DDump
 
 "Indent";
@@ -220,14 +225,13 @@
   * arrows for hashes are aligned at 16 (longer keys don't align)
   * closing braces and brackets are now correctly aligned
 
-In void context, C<DDumper ()> prints to STDERR.
+In void context, C<DDumper ()> warn ()'s.
 
 Example
 
   print DDumper { ape => 1, foo => "egg", bar => [ 2, "baz", undef ]};
 
-  $VAR1 = {
-      ape              => 1,
+  {   ape              => 1,
       bar              => [
           2,
           'baz',
@@ -251,15 +255,13 @@
 These can also be passed to import:
 
   $ perl -MDP=VNR -we'DDumper { foo => 1, bar => 2, zap => 3, gum => 13 }'
-  $VAR1 = {
-      gum              => 13,
+  {   gum              => 13,
       zap              => 3,
       bar              => 2,
       foo              => 1
       };
   $ perl -MDP=V   -we'DDumper { foo => 1, bar => 2, zap => 3, gum => 13 }'
-  $VAR1 = {
-      foo              => 1,
+  {   foo              => 1,
       gum              => 13,
       bar              => 2,
       zap              => 3
@@ -394,8 +396,7 @@
   my %h = DDump "abc\x{0a}de\x{20ac}fg";
   print DDumper \%h;
 
-  $VAR1 = {
-      CUR              => '11',
+  {   CUR              => '11',
       FLAGS            => {
           PADBUSY          => 1,
           PADMY            => 1,
@@ -416,8 +417,7 @@
       }, 1;
   print DDumper \%h;
 
-  $VAR1 = {
-      FLAGS            => {
+  {   FLAGS            => {
           PADBUSY          => 1,
           PADMY            => 1,
           ROK              => 1
@@ -570,7 +570,7 @@
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2008-2009 H.Merijn Brand
+Copyright (C) 2008-2010 H.Merijn Brand
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.

Modified: trunk/libdata-peek-perl/Peek.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-peek-perl/Peek.xs?rev=52771&op=diff
==============================================================================
--- trunk/libdata-peek-perl/Peek.xs (original)
+++ trunk/libdata-peek-perl/Peek.xs Mon Feb 15 04:04:10 2010
@@ -1,4 +1,4 @@
-/*  Copyright (c) 2008-2009 H.Merijn Brand.  All rights reserved.
+/*  Copyright (c) 2008-2010 H.Merijn Brand.  All rights reserved.
  *  This program is free software; you can redistribute it and/or
  *  modify it under the same terms as Perl itself.
  */
@@ -58,7 +58,7 @@
 void _Dump_Dual (pTHX_ SV *sv, SV *pv, SV *iv, SV *nv, SV *rv)
 {
 #ifndef NO_SV_PEEK
-    (void)fprintf (stderr, "%s\n  PV: %s\n  IV: %s\n  NV: %s\n  RV: %s\n",
+    warn ("%s\n  PV: %s\n  IV: %s\n  NV: %s\n  RV: %s\n",
 	sv_peek (sv), sv_peek (pv), sv_peek (iv), sv_peek (nv), sv_peek (rv));
 #endif
     } /* _Dump_Dual */
@@ -71,7 +71,7 @@
   PPCODE:
     I32 gimme = GIMME_V;
     ST (0) = _DPeek (aTHX_ items, ST (0));
-    if (gimme == G_VOID) (void)fprintf (stderr, "%s\n", SvPVX (ST (0)));
+    if (gimme == G_VOID) warn ("%s\n", SvPVX (ST (0)));
     XSRETURN (1);
     /* XS DPeek */
 

Modified: trunk/libdata-peek-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-peek-perl/README?rev=52771&op=diff
==============================================================================
--- trunk/libdata-peek-perl/README (original)
+++ trunk/libdata-peek-perl/README Mon Feb 15 04:04:10 2010
@@ -57,7 +57,7 @@
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2008-2009 H.Merijn Brand.  All rights reserved.
+Copyright (c) 2008-2010 H.Merijn Brand.  All rights reserved.
 
 This program is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.

Modified: trunk/libdata-peek-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-peek-perl/debian/changelog?rev=52771&op=diff
==============================================================================
--- trunk/libdata-peek-perl/debian/changelog (original)
+++ trunk/libdata-peek-perl/debian/changelog Mon Feb 15 04:04:10 2010
@@ -1,3 +1,13 @@
+libdata-peek-perl (0.30-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Standards-Version 3.8.4 (no changes)
+  * Rewrite control short description
+  * Update copyright to new DEP5 format
+  * Update years of copyright
+
+ -- Jonathan Yu <jawnsy at cpan.org>  Sun, 14 Feb 2010 23:22:44 -0500
+
 libdata-peek-perl (0.29-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libdata-peek-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-peek-perl/debian/control?rev=52771&op=diff
==============================================================================
--- trunk/libdata-peek-perl/debian/control (original)
+++ trunk/libdata-peek-perl/debian/control Mon Feb 15 04:04:10 2010
@@ -6,7 +6,7 @@
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jeremiah C. Foster <jeremiah at jeremiahfoster.com>,
  Jonathan Yu <jawnsy at cpan.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://search.cpan.org/dist/Data-Peek/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdata-peek-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libdata-peek-perl/
@@ -14,7 +14,7 @@
 Package: libdata-peek-perl
 Architecture: any
 Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Description: Perl module providing low-level manipulation of Perl data
+Description: module providing low-level manipulation of Perl data
  Data::Peek is a module that allows for low-level manipulation of Perl data
  structures, particularly for displaying the internal representation of given
  Perl variables.

Modified: trunk/libdata-peek-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-peek-perl/debian/copyright?rev=52771&op=diff
==============================================================================
--- trunk/libdata-peek-perl/debian/copyright (original)
+++ trunk/libdata-peek-perl/debian/copyright Mon Feb 15 04:04:10 2010
@@ -1,36 +1,35 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: H.Merijn Brand <h.m.brand at xs4all.nl>
-Upstream-Source: http://search.cpan.org/dist/Data-Peek/
-Upstream-Name: Data-Peek
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: H.Merijn Brand <h.m.brand at xs4all.nl>
+Source: http://search.cpan.org/dist/Data-Peek/
+Name: Data-Peek
 
 Files: *
-Copyright: 2008-2009, H.Merijn Brand <h.m.brand at xs4all.nl>
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2008-2010, H.Merijn Brand <h.m.brand at xs4all.nl>
+License: Artistic or GPL-1+
 
 Files: ppport.h
 Copyright: 2004-2009, Marcus Holland-Moritz <mhx-cpan at gmx.net>
  2001, Paul Marquess <pmqs at cpan.org> (Version 2.x)
  1999, Kenneth Albanowski <kjahds at kjahds.com> (Version 1.x)
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: debian/*
-Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
+Copyright: 2009-2010, Jonathan Yu <jawnsy at cpan.org>
  2009, Jeremiah C. Foster <jeremiah at jeremiahfoster.com>
-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-peek-perl/t/10_DDumper.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdata-peek-perl/t/10_DDumper.t?rev=52771&op=diff
==============================================================================
--- trunk/libdata-peek-perl/t/10_DDumper.t (original)
+++ trunk/libdata-peek-perl/t/10_DDumper.t Mon Feb 15 04:04:10 2010
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 56;
+use Test::More tests => 55;
 use Test::NoWarnings;
 
 BEGIN {
@@ -27,11 +27,11 @@
 	eval "\$var = $v";
 	ok ($dump = DDumper ($var),	"DDumper ($v)");
 	$dump =~ s/\A\$VAR1 = //;
-	$dump =~ s/;\n\Z//;
+	$dump =~ s/;?\n\Z//;
 	}
     if ($re) {
 	like ($dump, qr{$exp}ms,	".. content $re");
-	$1 and print STDERR "# '$1' (", length ($1), ")\n";
+	$1 and diag "# '$1' (", length ($1), ")\n";
 	}
     else {
 	is   ($dump,    $exp,		".. content");
@@ -54,18 +54,17 @@
 (0, 1)				1
 \(0, 1)				\1
 --	Structures
-[0, 1]				^\[\n					line 1
-				^    0,\n				line 2
-				^    1\n				line 3
-				^    ]\Z				line 4
-[0,1,2]				\A\[\n\s+0,\n\s+1,\n\s+2\n\s+]\Z	line splitting
+[0, 1]				^\[   0,\n				line 1
+				^    1\n				line 2
+				^    ]\Z				line 3
+[0,1,2]				\A\[\s+0,\n\s+1,\n\s+2\n\s+]\Z		line splitting
 --	Indentation
-[0]				\A\[\n    0\n    ]\Z			single indent
+[0]				\A\[   0\n    ]\Z			single indent
 [[0],{foo=>1}]			^\[\n					outer list
-				^ {4}\[\n {8}0\n {8}],\n {4}		inner list
-				^ {4}\{\n {8}foo {14}=> 1\n {8}}\n	inner hash
+				^ {4}\[   0\n {8}],\n {4}		inner list
+				^ {4}\{   foo {14}=> 1\n {8}}\n		inner hash
 				^ {4}]\Z				outer list end
-[[0],{foo=>1}]			\A\[\n {4}\[\n {8}0\n {8}],\n {4}\{\n {8}foo {14}=> 1\n {8}}\n {4}]\Z	full struct
+[[0],{foo=>1}]			\A\[\n {4}\[   0\n {8}],\n {4}\{   foo {14}=> 1\n {8}}\n {4}]\Z	full struct
 --	Sorting
 S:1:{ab=>1,bc=>2,cd=>3,de=>13}	ab.*bc.*cd.*de	default sort
 S:R:{ab=>1,bc=>2,cd=>3,de=>13}	de.*cd.*bc.*ab	reverse sort




More information about the Pkg-perl-cvs-commits mailing list