diff -Nru libdata-dumper-compact-perl-0.004001/Changes libdata-dumper-compact-perl-0.005002/Changes --- libdata-dumper-compact-perl-0.004001/Changes 2019-09-15 18:26:41.000000000 +0000 +++ libdata-dumper-compact-perl-0.005002/Changes 2020-06-07 00:22:06.000000000 +0000 @@ -1,5 +1,14 @@ Revision history for Data-Dumper-Compact +0.005002 - 2020-06-07 + - Fix JSON::Dumper::Compact + +0.005001 - 2020-05-25 + - Fixup to use Mu::Tiny everywhere and require working version of Mu::Tiny + +0.005000 - 2020-05-20 + - Switch to Mu::Tiny for a shallower dep tree + 0.004001 - 2019-09-15 - Regexp fixup to avoid a deprecation warning diff -Nru libdata-dumper-compact-perl-0.004001/debian/changelog libdata-dumper-compact-perl-0.005002/debian/changelog --- libdata-dumper-compact-perl-0.004001/debian/changelog 2019-09-15 21:39:51.000000000 +0000 +++ libdata-dumper-compact-perl-0.005002/debian/changelog 2020-06-13 14:33:04.000000000 +0000 @@ -1,3 +1,16 @@ +libdata-dumper-compact-perl (0.005002-1) unstable; urgency=medium + + * Team upload. + * Import upstream versions 0.005000, 0.005002. + * Update years of upstream copyright. + * Update (build) dependencies. + * Refresh spelling-fix.patch (offset). + * Declare compliance with Debian Policy 4.5.0. + * Set Rules-Requires-Root: no. + * Bump debhelper-compat to 13. + + -- gregor herrmann Sat, 13 Jun 2020 16:33:04 +0200 + libdata-dumper-compact-perl (0.004001-1) unstable; urgency=medium * Team upload. diff -Nru libdata-dumper-compact-perl-0.004001/debian/control libdata-dumper-compact-perl-0.005002/debian/control --- libdata-dumper-compact-perl-0.004001/debian/control 2019-09-15 21:39:51.000000000 +0000 +++ libdata-dumper-compact-perl-0.005002/debian/control 2020-06-13 14:33:04.000000000 +0000 @@ -4,23 +4,26 @@ Section: perl Testsuite: autopkgtest-pkg-perl Priority: optional -Build-Depends: debhelper-compat (= 12) -Build-Depends-Indep: libmu-perl , +Build-Depends: debhelper-compat (= 13) +Build-Depends-Indep: libclass-method-modifiers-perl , libjson-maybexs-perl , - libnamespace-clean-perl , + libmu-tiny-perl , + libstrictures-perl , perl -Standards-Version: 4.4.0 +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libdata-dumper-compact-perl Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libdata-dumper-compact-perl.git Homepage: https://metacpan.org/release/Data-Dumper-Compact +Rules-Requires-Root: no Package: libdata-dumper-compact-perl Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, + libclass-method-modifiers-perl, libjson-maybexs-perl, - libmu-perl, - libnamespace-clean-perl + libmu-tiny-perl, + libstrictures-perl Description: vertically compact width-limited data formatter Data::Dumper::Compact provides a replacement of the Dumper() function that produces a more compact output. diff -Nru libdata-dumper-compact-perl-0.004001/debian/copyright libdata-dumper-compact-perl-0.005002/debian/copyright --- libdata-dumper-compact-perl-0.004001/debian/copyright 2019-09-15 21:39:51.000000000 +0000 +++ libdata-dumper-compact-perl-0.005002/debian/copyright 2020-06-13 14:33:04.000000000 +0000 @@ -4,7 +4,7 @@ Source: https://metacpan.org/release/Data-Dumper-Compact Files: * -Copyright: 2019, Matt S Trout +Copyright: 2020, Matt S Trout License: Artistic or GPL-1+ Files: debian/* diff -Nru libdata-dumper-compact-perl-0.004001/debian/patches/spelling-fix.patch libdata-dumper-compact-perl-0.005002/debian/patches/spelling-fix.patch --- libdata-dumper-compact-perl-0.004001/debian/patches/spelling-fix.patch 2019-09-15 21:39:51.000000000 +0000 +++ libdata-dumper-compact-perl-0.005002/debian/patches/spelling-fix.patch 2020-06-13 14:33:04.000000000 +0000 @@ -1,7 +1,9 @@ Description: This patch fixes the spelling errors. -Author: Utkarsh Gupta +Bug: https://github.com/shadow-dot-cat/Data-Dumper-Compact/issues/3 Forwarded: https://github.com/shadow-dot-cat/Data-Dumper-Compact/issues/3 -Last-Update: 2019-06-11 +Author: Utkarsh Gupta +Reviewed-by: gregor herrmann +Last-Update: 2020-06-10 --- a/README +++ b/README @@ -16,7 +18,7 @@ --- a/lib/Data/Dumper/Compact.pm +++ b/lib/Data/Dumper/Compact.pm -@@ -1032,7 +1032,7 @@ +@@ -1030,7 +1030,7 @@ =head2 Single entry formatting Where possible, a single entry will be cuddled such that the opening @@ -27,7 +29,7 @@ --- a/lib/Devel/DDCWarn.pm +++ b/lib/Devel/DDCWarn.pm -@@ -214,7 +214,7 @@ +@@ -224,7 +224,7 @@ Note that this primarily being a debugging and/or scripting oriented tool, if something initialises us again later, this will reset the (single) global @@ -38,7 +40,7 @@ fledged global so you are absolutely allowed to C it: --- a/lib/JSON/Dumper/Compact.pm +++ b/lib/JSON/Dumper/Compact.pm -@@ -67,7 +67,7 @@ +@@ -68,7 +68,7 @@ =head1 DESCRIPTION JSON::Dumper::Compact is a subclass of L that turns diff -Nru libdata-dumper-compact-perl-0.004001/lib/Data/Dumper/Compact.pm libdata-dumper-compact-perl-0.005002/lib/Data/Dumper/Compact.pm --- libdata-dumper-compact-perl-0.004001/lib/Data/Dumper/Compact.pm 2019-09-15 18:25:26.000000000 +0000 +++ libdata-dumper-compact-perl-0.005002/lib/Data/Dumper/Compact.pm 2020-06-07 00:21:39.000000000 +0000 @@ -3,11 +3,9 @@ use List::Util qw(sum); use Scalar::Util qw(blessed reftype); use Data::Dumper (); -use Mu; -use strictures 2; -use namespace::clean; +use Mu::Tiny; -our $VERSION = '0.004001'; +our $VERSION = '0.005002'; $VERSION =~ tr/_//d; sub import { @@ -20,17 +18,17 @@ *{"${targ}::${ddc}"} = $cb; } -ro max_width => default => 78; +lazy max_width => sub { 78 }; -lazy width => sub { shift->max_width }, init_arg => undef; +lazy width => sub { shift->max_width }; lazy indent_width => sub { length($_[0]->indent_by) }; sub _next_width { $_[0]->width - $_[0]->indent_width } -ro indent_by => default => ' '; +lazy indent_by => sub { ' ' }; -ro transforms => default => sub { [] }; +lazy transforms => sub { [] }; sub add_transform { push(@{$_[0]->transforms}, $_[1]); $_[0] } @@ -206,7 +204,7 @@ my @plain = grep !/\s/, map $_->[1], grep $_->[0] eq 'string', @$payload; if (@plain == @$payload) { my $try = 'qw('.join(' ', @plain).')'; - return $try if $self->{oneline} or length($try) <= $self->{width}; + return $try if $self->{oneline} or length($try) <= $self->width; } return $self->_format_arraylike('(', ')', $payload); } @@ -241,7 +239,7 @@ }; if (!grep /\n/, @oneline) { my $try = join(' ', $l, @oneline, $r); - return $try if $self->{oneline} or length $try <= $self->{width}; + return $try if $self->{oneline} or length $try <= $self->width; } local $self->{width} = $self->_next_width; if (@$payload == 1) { @@ -264,7 +262,7 @@ my @bits; $oneline[-1] .= ','; # going into multiline mode, *now* we add the comma foreach my $idx (0..$#$payload) { - my $spare = $self->{width} - sum((scalar @bits)+1, map length($_), @bits); + my $spare = $self->width - sum((scalar @bits)+1, map length($_), @bits); my $f = $oneline[$idx]; if ($f !~ /\n/) { # single line entry, add to the bits for the current line if it'll fit @@ -332,7 +330,7 @@ ), '}'); }; return $oneline if $self->{oneline}; - return $oneline if $oneline !~ /\n/ and length($oneline) <= $self->{width}; + return $oneline if $oneline !~ /\n/ and length($oneline) <= $self->width; my $width = local $self->{width} = $self->_next_width; my @f = map { my $s = $k{$_}.' '.$self->_format(my $p = $hash->{$_}); diff -Nru libdata-dumper-compact-perl-0.004001/lib/Devel/DDCWarn.pm libdata-dumper-compact-perl-0.005002/lib/Devel/DDCWarn.pm --- libdata-dumper-compact-perl-0.004001/lib/Devel/DDCWarn.pm 2019-09-15 18:25:26.000000000 +0000 +++ libdata-dumper-compact-perl-0.005002/lib/Devel/DDCWarn.pm 2020-06-07 00:21:39.000000000 +0000 @@ -4,7 +4,7 @@ use Data::Dumper::Compact; use base qw(Exporter); -our $VERSION = '0.004001'; +our $VERSION = '0.005002'; $VERSION =~ tr/_//d; our @EXPORT = map +($_, $_.'T'), qw(Df Dto Dwarn Derr); @@ -58,11 +58,21 @@ sub Dwarn { Dto($W, @_) } sub DwarnT { DtoT($W, @_) } +sub Dwarn1 { + return () unless @_; + my $one = shift; + wantarray ? (Dwarn($one), @_) : Dwarn($one) +} my $E = sub { print STDERR $_[0] }; sub Derr { Dto($E, @_) } sub DerrT { DtoT($E, @_) } +sub Derr1 { + return () unless @_; + my $one = shift; + wantarray ? (Derr($one), @_) : Derr($one) +} 1; diff -Nru libdata-dumper-compact-perl-0.004001/lib/JSON/Dumper/Compact.pm libdata-dumper-compact-perl-0.005002/lib/JSON/Dumper/Compact.pm --- libdata-dumper-compact-perl-0.004001/lib/JSON/Dumper/Compact.pm 2019-09-15 18:25:26.000000000 +0000 +++ libdata-dumper-compact-perl-0.005002/lib/JSON/Dumper/Compact.pm 2020-06-07 00:21:39.000000000 +0000 @@ -1,11 +1,10 @@ package JSON::Dumper::Compact; use JSON::MaybeXS; -use Mu; -use strictures 2; -use namespace::clean; +use Mu::Tiny; +use Class::Method::Modifiers; -our $VERSION = '0.004001'; +our $VERSION = '0.005002'; $VERSION =~ tr/_//d; extends 'Data::Dumper::Compact'; @@ -17,7 +16,9 @@ ->filter_json_single_key_object(__bless__ => sub { bless($_[0][1], $_[0][0]); }); -}, handles => { _json_decode => 'decode' }; +}; + +sub _json_decode { shift->json_obj->decode(@_) } sub _build_dumper { my $j = shift->json_obj; sub { $j->encode($_[0]) } } diff -Nru libdata-dumper-compact-perl-0.004001/LICENSE libdata-dumper-compact-perl-0.005002/LICENSE --- libdata-dumper-compact-perl-0.004001/LICENSE 2019-09-15 18:26:52.000000000 +0000 +++ libdata-dumper-compact-perl-0.005002/LICENSE 2020-06-07 00:22:14.000000000 +0000 @@ -7,7 +7,7 @@ --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2019 by mst - Matt S Trout (cpan:MSTROUT) . +This software is Copyright (c) 2020 by mst - Matt S Trout (cpan:MSTROUT) . This is free software, licensed under: @@ -267,7 +267,7 @@ --- The Artistic License 1.0 --- -This software is Copyright (c) 2019 by mst - Matt S Trout (cpan:MSTROUT) . +This software is Copyright (c) 2020 by mst - Matt S Trout (cpan:MSTROUT) . This is free software, licensed under: diff -Nru libdata-dumper-compact-perl-0.004001/Makefile.PL libdata-dumper-compact-perl-0.005002/Makefile.PL --- libdata-dumper-compact-perl-0.004001/Makefile.PL 2019-05-09 01:44:17.000000000 +0000 +++ libdata-dumper-compact-perl-0.005002/Makefile.PL 2020-06-07 00:21:13.000000000 +0000 @@ -18,8 +18,8 @@ }, runtime => { requires => { - Mu => 0, - 'namespace::clean' => 0, + 'Mu::Tiny' => '0.000002', + 'Class::Method::Modifiers' => 0, }, }, develop => { diff -Nru libdata-dumper-compact-perl-0.004001/META.json libdata-dumper-compact-perl-0.005002/META.json --- libdata-dumper-compact-perl-0.004001/META.json 2019-09-15 18:26:52.000000000 +0000 +++ libdata-dumper-compact-perl-0.005002/META.json 2020-06-07 00:22:13.000000000 +0000 @@ -33,8 +33,8 @@ }, "runtime" : { "requires" : { - "Mu" : "0", - "namespace::clean" : "0" + "Class::Method::Modifiers" : "0", + "Mu::Tiny" : "0.000002" } }, "test" : { @@ -58,7 +58,7 @@ "web" : "https://github.com/shadow-dot-cat/Data-Dumper-Compact" } }, - "version" : "0.004001", + "version" : "0.005002", "x_authority" : "cpan:MSTROUT", "x_breaks" : {}, "x_serialization_backend" : "JSON::PP version 2.27300" diff -Nru libdata-dumper-compact-perl-0.004001/META.yml libdata-dumper-compact-perl-0.005002/META.yml --- libdata-dumper-compact-perl-0.004001/META.yml 2019-09-15 18:26:51.000000000 +0000 +++ libdata-dumper-compact-perl-0.005002/META.yml 2020-06-07 00:22:13.000000000 +0000 @@ -18,13 +18,13 @@ - t - xt requires: - Mu: '0' - namespace::clean: '0' + Class::Method::Modifiers: '0' + Mu::Tiny: '0.000002' resources: bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=Data-Dumper-Compact license: http://dev.perl.org/licenses/ repository: https://github.com/shadow-dot-cat/Data-Dumper-Compact.git -version: '0.004001' +version: '0.005002' x_authority: cpan:MSTROUT x_breaks: {} x_serialization_backend: 'CPAN::Meta::YAML version 0.012'