diff -Nru libemail-simple-perl-2.214/Changes libemail-simple-perl-2.216/Changes --- libemail-simple-perl-2.214/Changes 2017-09-08 18:21:25.000000000 +0000 +++ libemail-simple-perl-2.216/Changes 2018-06-06 15:47:55.000000000 +0000 @@ -1,5 +1,11 @@ Revision history for Perl extension Email::Simple +2.216 2018-06-06 11:47:52-04:00 America/New_York + - no changes since v2.215 + +2.215 2018-05-04 16:21:28+10:00 Australia/Melbourne (TRIAL RELEASE) + - do not re-fold folded lines (Marc Bradshaw) + 2.214 2017-09-08 14:21:20-04:00 America/New_York - the method header_raw_prepend is now available on emails and headers diff -Nru libemail-simple-perl-2.214/debian/changelog libemail-simple-perl-2.216/debian/changelog --- libemail-simple-perl-2.214/debian/changelog 2017-10-25 08:46:39.000000000 +0000 +++ libemail-simple-perl-2.216/debian/changelog 2018-06-22 20:42:55.000000000 +0000 @@ -1,3 +1,19 @@ +libemail-simple-perl (2.216-1) unstable; urgency=medium + + [ Damyan Ivanov ] + * declare conformance with Policy 4.1.3 (no changes needed) + + [ Salvatore Bonaccorso ] + * Update Vcs-* headers for switch to salsa.debian.org + + [ gregor herrmann ] + * Import upstream version 2.216. + * Update years of packaging copyright. + * Declare compliance with Debian Policy 4.1.4. + * Bump debhelper compatibility level to 10. + + -- gregor herrmann Fri, 22 Jun 2018 22:42:55 +0200 + libemail-simple-perl (2.214-1) unstable; urgency=medium * Team upload diff -Nru libemail-simple-perl-2.214/debian/compat libemail-simple-perl-2.216/debian/compat --- libemail-simple-perl-2.214/debian/compat 2017-10-25 08:34:53.000000000 +0000 +++ libemail-simple-perl-2.216/debian/compat 2018-06-22 20:42:55.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru libemail-simple-perl-2.214/debian/control libemail-simple-perl-2.216/debian/control --- libemail-simple-perl-2.214/debian/control 2017-10-25 08:45:08.000000000 +0000 +++ libemail-simple-perl-2.216/debian/control 2018-06-22 20:42:55.000000000 +0000 @@ -6,12 +6,12 @@ Section: perl Testsuite: autopkgtest-pkg-perl Priority: optional -Build-Depends: debhelper (>= 9) +Build-Depends: debhelper (>= 10) Build-Depends-Indep: libemail-date-format-perl, perl -Standards-Version: 4.1.1 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libemail-simple-perl.git -Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libemail-simple-perl.git +Standards-Version: 4.1.4 +Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libemail-simple-perl +Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libemail-simple-perl.git Homepage: https://metacpan.org/release/Email-Simple Package: libemail-simple-perl diff -Nru libemail-simple-perl-2.214/debian/copyright libemail-simple-perl-2.216/debian/copyright --- libemail-simple-perl-2.214/debian/copyright 2017-10-25 08:34:53.000000000 +0000 +++ libemail-simple-perl-2.216/debian/copyright 2018-06-22 20:42:55.000000000 +0000 @@ -12,7 +12,7 @@ 2005, Paul Wise 2006, Krzysztof Krzyzaniak (eloy) 2006, Niko Tyni - 2006-2017, gregor herrmann + 2006-2018, gregor herrmann 2007, Jeremiah Foster 2008, Ansgar Burchardt 2008, Rene Mayorga diff -Nru libemail-simple-perl-2.214/lib/Email/Simple/Creator.pm libemail-simple-perl-2.216/lib/Email/Simple/Creator.pm --- libemail-simple-perl-2.214/lib/Email/Simple/Creator.pm 2017-09-08 18:21:25.000000000 +0000 +++ libemail-simple-perl-2.216/lib/Email/Simple/Creator.pm 2018-06-06 15:47:55.000000000 +0000 @@ -2,7 +2,7 @@ use warnings; package Email::Simple::Creator; # ABSTRACT: private helper for building Email::Simple objects -$Email::Simple::Creator::VERSION = '2.214'; +$Email::Simple::Creator::VERSION = '2.216'; sub _crlf { "\x0d\x0a"; } @@ -44,7 +44,7 @@ =head1 VERSION -version 2.214 +version 2.216 =head1 AUTHORS diff -Nru libemail-simple-perl-2.214/lib/Email/Simple/Header.pm libemail-simple-perl-2.216/lib/Email/Simple/Header.pm --- libemail-simple-perl-2.214/lib/Email/Simple/Header.pm 2017-09-08 18:21:25.000000000 +0000 +++ libemail-simple-perl-2.216/lib/Email/Simple/Header.pm 2018-06-06 15:47:55.000000000 +0000 @@ -2,7 +2,7 @@ use warnings; package Email::Simple::Header; # ABSTRACT: the header of an Email::Simple message -$Email::Simple::Header::VERSION = '2.214'; +$Email::Simple::Header::VERSION = '2.216'; use Carp (); require Email::Simple; @@ -315,18 +315,18 @@ sub crlf { $_[0]->{mycrlf} } # =method fold -# +# # my $folded = $header->fold($line, \%arg); -# +# # Given a header string, this method returns a folded version, if the string is # long enough to warrant folding. This method is used internally. -# +# # Valid arguments are: -# +# # at - fold lines to be no longer than this length, if possible # if given and false, never fold headers # indent - indent lines with this string -# + # =cut sub _fold { @@ -335,17 +335,30 @@ $arg->{at} = $self->_default_fold_at unless exists $arg->{at}; + $arg->{indent} = $self->_default_fold_indent unless exists $arg->{indent}; + + my $indent = $arg->{indent} || $self->_default_fold_indent; + + # We will not folder headers if... + # * the header has vertical whitespace + # * all vertical whitespace is followed by horizontal whitespace or END + if ($line =~ /\n/) { + if ($line =~ s/\n([^\s\t])/\n$indent$1/g) { + Carp::carp("bad space in header: newline followed by non-space: $line"); + } else { + $line .= $self->crlf unless $line =~ /\n$/; + return $line; + } + } + return $line . $self->crlf unless $arg->{at} and $arg->{at} > 0; my $limit = ($arg->{at} || $self->_default_fold_at) - 1; return $line . $self->crlf if length $line <= $limit; - $arg->{indent} = $self->_default_fold_indent unless exists $arg->{indent}; - - my $indent = $arg->{indent} || $self->_default_fold_indent; - return $self->__fold_objless($line, $limit, $indent, $self->crlf); + } sub __fold_objless { @@ -368,19 +381,19 @@ } # =method default_fold_at -# +# # This method (provided for subclassing) returns the default length at which to # try to fold header lines. The default default is 78. -# +# # =cut sub _default_fold_at { 78 } # =method default_fold_indent -# +# # This method (provided for subclassing) returns the default string used to # indent folded headers. The default default is a single space. -# +# # =cut sub _default_fold_indent { " " } @@ -399,7 +412,7 @@ =head1 VERSION -version 2.214 +version 2.216 =head1 SYNOPSIS diff -Nru libemail-simple-perl-2.214/lib/Email/Simple.pm libemail-simple-perl-2.216/lib/Email/Simple.pm --- libemail-simple-perl-2.214/lib/Email/Simple.pm 2017-09-08 18:21:25.000000000 +0000 +++ libemail-simple-perl-2.216/lib/Email/Simple.pm 2018-06-06 15:47:55.000000000 +0000 @@ -3,7 +3,7 @@ use warnings; package Email::Simple; # ABSTRACT: simple parsing of RFC2822 message format and headers -$Email::Simple::VERSION = '2.214'; +$Email::Simple::VERSION = '2.216'; use Carp (); use Email::Simple::Creator; @@ -39,9 +39,9 @@ #pod ], #pod body => '...', #pod ); -#pod +#pod #pod $email->header_set( 'X-Content-Container' => 'bottle/glass' ); -#pod +#pod #pod print $email->as_string; #pod #pod =head1 DESCRIPTION @@ -348,7 +348,7 @@ =head1 VERSION -version 2.214 +version 2.216 =head1 SYNOPSIS @@ -375,9 +375,9 @@ ], body => '...', ); - + $email->header_set( 'X-Content-Container' => 'bottle/glass' ); - + print $email->as_string; =head1 DESCRIPTION @@ -541,7 +541,7 @@ =head1 CONTRIBUTORS -=for stopwords Brian Cassidy Christian Walde Michael Stevens Pali Ricardo SIGNES Ronald F. Guilmette William Yardley +=for stopwords Brian Cassidy Christian Walde Marc Bradshaw Michael Stevens Pali Ricardo SIGNES Ronald F. Guilmette William Yardley =over 4 @@ -555,6 +555,10 @@ =item * +Marc Bradshaw + +=item * + Michael Stevens =item * diff -Nru libemail-simple-perl-2.214/Makefile.PL libemail-simple-perl-2.216/Makefile.PL --- libemail-simple-perl-2.214/Makefile.PL 2017-09-08 18:21:25.000000000 +0000 +++ libemail-simple-perl-2.216/Makefile.PL 2018-06-06 15:47:55.000000000 +0000 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.010. +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v7.000. use strict; use warnings; @@ -27,7 +27,7 @@ "File::Spec" => 0, "Test::More" => "0.96" }, - "VERSION" => "2.214", + "VERSION" => "2.216", "test" => { "TESTS" => "t/*.t" } diff -Nru libemail-simple-perl-2.214/MANIFEST libemail-simple-perl-2.216/MANIFEST --- libemail-simple-perl-2.214/MANIFEST 2017-09-08 18:21:25.000000000 +0000 +++ libemail-simple-perl-2.216/MANIFEST 2018-06-06 15:47:55.000000000 +0000 @@ -1,4 +1,4 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.010. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v7.000. Changes LICENSE MANIFEST diff -Nru libemail-simple-perl-2.214/META.json libemail-simple-perl-2.216/META.json --- libemail-simple-perl-2.214/META.json 2017-09-08 18:21:25.000000000 +0000 +++ libemail-simple-perl-2.216/META.json 2018-06-06 15:47:55.000000000 +0000 @@ -6,7 +6,7 @@ "Ricardo SIGNES" ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 6.010, CPAN::Meta::Converter version 2.150005", + "generated_by" : "Dist::Zilla version 7.000, CPAN::Meta::Converter version 2.150010", "license" : [ "perl_5" ], @@ -23,6 +23,7 @@ }, "develop" : { "requires" : { + "Encode" : "0", "Test::More" : "0", "Test::Pod" : "1.41" } @@ -59,10 +60,10 @@ "web" : "https://github.com/rjbs/Email-Simple" } }, - "version" : "2.214", + "version" : "2.216", "x_Dist_Zilla" : { "perl" : { - "version" : "5.024000" + "version" : "5.026001" }, "plugins" : [ { @@ -82,7 +83,7 @@ } }, "name" : "@RJBS/Git::GatherDir", - "version" : "2.042" + "version" : "2.043" }, { "class" : "Dist::Zilla::Plugin::CheckPrereqsIndexed", @@ -129,57 +130,57 @@ { "class" : "Dist::Zilla::Plugin::PruneCruft", "name" : "@RJBS/@Filter/PruneCruft", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::ManifestSkip", "name" : "@RJBS/@Filter/ManifestSkip", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::MetaYAML", "name" : "@RJBS/@Filter/MetaYAML", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::License", "name" : "@RJBS/@Filter/License", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::Readme", "name" : "@RJBS/@Filter/Readme", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::ExecDir", "name" : "@RJBS/@Filter/ExecDir", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::ShareDir", "name" : "@RJBS/@Filter/ShareDir", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::Manifest", "name" : "@RJBS/@Filter/Manifest", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::TestRelease", "name" : "@RJBS/@Filter/TestRelease", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::ConfirmRelease", "name" : "@RJBS/@Filter/ConfirmRelease", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::UploadToCPAN", "name" : "@RJBS/@Filter/UploadToCPAN", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::MakeMaker", @@ -189,12 +190,12 @@ } }, "name" : "@RJBS/MakeMaker", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::AutoPrereqs", "name" : "@RJBS/AutoPrereqs", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::Git::NextVersion", @@ -205,42 +206,42 @@ "version_regexp" : "(?^:^([0-9]+\\.[0-9]+)$)" }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.13.0", + "git_version" : "2.17.0", "repo_root" : "." } }, "name" : "@RJBS/Git::NextVersion", - "version" : "2.042" + "version" : "2.043" }, { "class" : "Dist::Zilla::Plugin::PkgVersion", "name" : "@RJBS/PkgVersion", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::MetaConfig", "name" : "@RJBS/MetaConfig", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::MetaJSON", "name" : "@RJBS/MetaJSON", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::NextRelease", "name" : "@RJBS/NextRelease", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::Test::ChangesHasContent", "name" : "@RJBS/Test::ChangesHasContent", - "version" : "0.010" + "version" : "0.011" }, { "class" : "Dist::Zilla::Plugin::PodSyntaxTests", "name" : "@RJBS/PodSyntaxTests", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::Test::ReportPrereqs", @@ -256,7 +257,7 @@ } }, "name" : "@RJBS/TestMoreWithSubtests", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::PodWeaver", @@ -369,7 +370,7 @@ } }, "name" : "@RJBS/PodWeaver", - "version" : "4.008" + "version" : "4.009" }, { "class" : "Dist::Zilla::Plugin::GithubMeta", @@ -391,12 +392,12 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.13.0", + "git_version" : "2.17.0", "repo_root" : "." } }, "name" : "@RJBS/@Git/Check", - "version" : "2.042" + "version" : "2.043" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", @@ -414,7 +415,7 @@ "changelog" : "Changes" }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.13.0", + "git_version" : "2.17.0", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -422,7 +423,7 @@ } }, "name" : "@RJBS/@Git/Commit", - "version" : "2.042" + "version" : "2.043" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", @@ -431,12 +432,12 @@ "branch" : null, "changelog" : "Changes", "signed" : 0, - "tag" : "2.214", + "tag" : "2.216", "tag_format" : "%v", "tag_message" : "v%v" }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.13.0", + "git_version" : "2.17.0", "repo_root" : "." }, "Dist::Zilla::Role::Git::StringFormatter" : { @@ -444,7 +445,7 @@ } }, "name" : "@RJBS/@Git/Tag", - "version" : "2.042" + "version" : "2.043" }, { "class" : "Dist::Zilla::Plugin::Git::Push", @@ -457,18 +458,18 @@ "remotes_must_exist" : 0 }, "Dist::Zilla::Role::Git::Repo" : { - "git_version" : "2.13.0", + "git_version" : "2.17.0", "repo_root" : "." } }, "name" : "@RJBS/@Git/Push", - "version" : "2.042" + "version" : "2.043" }, { "class" : "Dist::Zilla::Plugin::Git::Contributors", "config" : { "Dist::Zilla::Plugin::Git::Contributors" : { - "git_version" : "2.13.0", + "git_version" : "2.17.0", "include_authors" : 0, "include_releaser" : 1, "order_by" : "name", @@ -476,76 +477,78 @@ } }, "name" : "@RJBS/Git::Contributors", - "version" : "0.030" + "version" : "0.034" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":InstallModules", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":IncModules", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":TestFiles", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExtraTestFiles", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExecFiles", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":PerlExecFiles", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ShareFiles", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":MainModule", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":AllFiles", - "version" : "6.010" + "version" : "7.000" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":NoFiles", - "version" : "6.010" + "version" : "7.000" } ], "zilla" : { "class" : "Dist::Zilla::Dist::Builder", "config" : { - "is_trial" : "0" + "is_trial" : 0 }, - "version" : "6.010" + "version" : "7.000" } }, "x_contributors" : [ "Brian Cassidy ", "Christian Walde ", + "Marc Bradshaw ", "Michael Stevens ", "Pali ", "Ricardo SIGNES ", "Ronald F. Guilmette ", "William Yardley " ], - "x_serialization_backend" : "Cpanel::JSON::XS version 3.0237" + "x_generated_by_perl" : "v5.26.1", + "x_serialization_backend" : "Cpanel::JSON::XS version 4.02" } diff -Nru libemail-simple-perl-2.214/META.yml libemail-simple-perl-2.216/META.yml --- libemail-simple-perl-2.214/META.yml 2017-09-08 18:21:25.000000000 +0000 +++ libemail-simple-perl-2.216/META.yml 2018-06-06 15:47:55.000000000 +0000 @@ -11,7 +11,7 @@ configure_requires: ExtUtils::MakeMaker: '0' dynamic_config: 0 -generated_by: 'Dist::Zilla version 6.010, CPAN::Meta::Converter version 2.150005' +generated_by: 'Dist::Zilla version 7.000, CPAN::Meta::Converter version 2.150010' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -27,10 +27,10 @@ bugtracker: https://github.com/rjbs/Email-Simple/issues homepage: https://github.com/rjbs/Email-Simple repository: https://github.com/rjbs/Email-Simple.git -version: '2.214' +version: '2.216' x_Dist_Zilla: perl: - version: '5.024000' + version: '5.026001' plugins: - class: Dist::Zilla::Plugin::Git::GatherDir @@ -46,7 +46,7 @@ Dist::Zilla::Plugin::Git::GatherDir: include_untracked: 0 name: '@RJBS/Git::GatherDir' - version: '2.042' + version: '2.043' - class: Dist::Zilla::Plugin::CheckPrereqsIndexed name: '@RJBS/CheckPrereqsIndexed' @@ -83,58 +83,58 @@ - class: Dist::Zilla::Plugin::PruneCruft name: '@RJBS/@Filter/PruneCruft' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::ManifestSkip name: '@RJBS/@Filter/ManifestSkip' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::MetaYAML name: '@RJBS/@Filter/MetaYAML' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::License name: '@RJBS/@Filter/License' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::Readme name: '@RJBS/@Filter/Readme' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::ExecDir name: '@RJBS/@Filter/ExecDir' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::ShareDir name: '@RJBS/@Filter/ShareDir' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::Manifest name: '@RJBS/@Filter/Manifest' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::TestRelease name: '@RJBS/@Filter/TestRelease' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::ConfirmRelease name: '@RJBS/@Filter/ConfirmRelease' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::UploadToCPAN name: '@RJBS/@Filter/UploadToCPAN' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::MakeMaker config: Dist::Zilla::Role::TestRunner: default_jobs: 9 name: '@RJBS/MakeMaker' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::AutoPrereqs name: '@RJBS/AutoPrereqs' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::Git::NextVersion config: @@ -143,34 +143,34 @@ version_by_branch: 1 version_regexp: (?^:^([0-9]+\.[0-9]+)$) Dist::Zilla::Role::Git::Repo: - git_version: 2.13.0 + git_version: 2.17.0 repo_root: . name: '@RJBS/Git::NextVersion' - version: '2.042' + version: '2.043' - class: Dist::Zilla::Plugin::PkgVersion name: '@RJBS/PkgVersion' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::MetaConfig name: '@RJBS/MetaConfig' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::MetaJSON name: '@RJBS/MetaJSON' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::NextRelease name: '@RJBS/NextRelease' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::Test::ChangesHasContent name: '@RJBS/Test::ChangesHasContent' - version: '0.010' + version: '0.011' - class: Dist::Zilla::Plugin::PodSyntaxTests name: '@RJBS/PodSyntaxTests' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::Test::ReportPrereqs name: '@RJBS/Test::ReportPrereqs' @@ -182,7 +182,7 @@ phase: test type: requires name: '@RJBS/TestMoreWithSubtests' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::PodWeaver config: @@ -270,7 +270,7 @@ name: '@RJBS/List' version: '4.015' name: '@RJBS/PodWeaver' - version: '4.008' + version: '4.009' - class: Dist::Zilla::Plugin::GithubMeta name: '@RJBS/GithubMeta' @@ -287,10 +287,10 @@ allow_dirty_match: [] changelog: Changes Dist::Zilla::Role::Git::Repo: - git_version: 2.13.0 + git_version: 2.17.0 repo_root: . name: '@RJBS/@Git/Check' - version: '2.042' + version: '2.043' - class: Dist::Zilla::Plugin::Git::Commit config: @@ -304,12 +304,12 @@ allow_dirty_match: [] changelog: Changes Dist::Zilla::Role::Git::Repo: - git_version: 2.13.0 + git_version: 2.17.0 repo_root: . Dist::Zilla::Role::Git::StringFormatter: time_zone: local name: '@RJBS/@Git/Commit' - version: '2.042' + version: '2.043' - class: Dist::Zilla::Plugin::Git::Tag config: @@ -317,16 +317,16 @@ branch: ~ changelog: Changes signed: 0 - tag: '2.214' + tag: '2.216' tag_format: '%v' tag_message: v%v Dist::Zilla::Role::Git::Repo: - git_version: 2.13.0 + git_version: 2.17.0 repo_root: . Dist::Zilla::Role::Git::StringFormatter: time_zone: local name: '@RJBS/@Git/Tag' - version: '2.042' + version: '2.043' - class: Dist::Zilla::Plugin::Git::Push config: @@ -336,72 +336,74 @@ - 'github :' remotes_must_exist: 0 Dist::Zilla::Role::Git::Repo: - git_version: 2.13.0 + git_version: 2.17.0 repo_root: . name: '@RJBS/@Git/Push' - version: '2.042' + version: '2.043' - class: Dist::Zilla::Plugin::Git::Contributors config: Dist::Zilla::Plugin::Git::Contributors: - git_version: 2.13.0 + git_version: 2.17.0 include_authors: 0 include_releaser: 1 order_by: name paths: [] name: '@RJBS/Git::Contributors' - version: '0.030' + version: '0.034' - class: Dist::Zilla::Plugin::FinderCode name: ':InstallModules' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::FinderCode name: ':IncModules' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::FinderCode name: ':TestFiles' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::FinderCode name: ':ExtraTestFiles' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::FinderCode name: ':ExecFiles' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::FinderCode name: ':PerlExecFiles' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::FinderCode name: ':ShareFiles' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::FinderCode name: ':MainModule' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::FinderCode name: ':AllFiles' - version: '6.010' + version: '7.000' - class: Dist::Zilla::Plugin::FinderCode name: ':NoFiles' - version: '6.010' + version: '7.000' zilla: class: Dist::Zilla::Dist::Builder config: is_trial: '0' - version: '6.010' + version: '7.000' x_contributors: - 'Brian Cassidy ' - 'Christian Walde ' + - 'Marc Bradshaw ' - 'Michael Stevens ' - 'Pali ' - 'Ricardo SIGNES ' - 'Ronald F. Guilmette ' - 'William Yardley ' -x_serialization_backend: 'YAML::Tiny version 1.70' +x_generated_by_perl: v5.26.1 +x_serialization_backend: 'YAML::Tiny version 1.73' diff -Nru libemail-simple-perl-2.214/README libemail-simple-perl-2.216/README --- libemail-simple-perl-2.214/README 2017-09-08 18:21:25.000000000 +0000 +++ libemail-simple-perl-2.216/README 2018-06-06 15:47:55.000000000 +0000 @@ -1,7 +1,5 @@ - - This archive contains the distribution Email-Simple, -version 2.214: +version 2.216: simple parsing of RFC2822 message format and headers @@ -11,5 +9,4 @@ the same terms as the Perl 5 programming language system itself. -This README file was generated by Dist::Zilla::Plugin::Readme v6.010. - +This README file was generated by Dist::Zilla::Plugin::Readme v7.000. diff -Nru libemail-simple-perl-2.214/t/00-report-prereqs.dd libemail-simple-perl-2.216/t/00-report-prereqs.dd --- libemail-simple-perl-2.214/t/00-report-prereqs.dd 2017-09-08 18:21:25.000000000 +0000 +++ libemail-simple-perl-2.216/t/00-report-prereqs.dd 2018-06-06 15:47:55.000000000 +0000 @@ -6,6 +6,7 @@ }, 'develop' => { 'requires' => { + 'Encode' => '0', 'Test::More' => '0', 'Test::Pod' => '1.41' } diff -Nru libemail-simple-perl-2.214/t/folding.t libemail-simple-perl-2.216/t/folding.t --- libemail-simple-perl-2.214/t/folding.t 2017-09-08 18:21:25.000000000 +0000 +++ libemail-simple-perl-2.216/t/folding.t 2018-06-06 15:47:55.000000000 +0000 @@ -1,6 +1,6 @@ #!perl -w use strict; -use Test::More tests => 7; +use Test::More tests => 14; # This time, with folding! @@ -53,3 +53,44 @@ unlike($email_1->as_string, qr/\Q$subject/, "we fold the 50-A line"); } + +{ + my $to = 'to@example.com'; + my $from = 'from@example.com'; + + my $subject = 'A ' x 50; # Long enough to need to be folded + + my $email_1 = Email::Simple->create( + header => [ + To => $to, + From => $from, + Subject => $subject, # string specified in constructor does *not* get folded + ] + ); + + $email_1->header_raw_prepend( 'Test' ,"This is a test of folding an existing header which is just the right xx\r\n size to fold twice" ); + $email_1->header_raw_prepend( 'Test2' ,"This is a test of folding an existing header which is long enough to fold but should never fold because it is already folded\n manually." ); + $email_1->header_raw_prepend( 'Test3', "this\n line\n is\n very\n folded" ); + $email_1->header_raw_prepend( 'Test4', "Folded line with a crlf at the end\n" ); + $email_1->header_raw_prepend( 'Test5', 'foobar' ); + + unlike($email_1->as_string(), qr/xx\r?\n\s+\r?\n/, 'we do not have a blank fold line' ); + like( $email_1->as_string(), qr/This is a test of folding an existing header which is long enough to fold but should never fold because it is already folded\n manually./, 'do not refold if already folded long lines' ); + like( $email_1->as_string(), qr/this\n line\n is\n very\n folded/, 'do not refold if already folded short lines' ); + unlike($email_1->as_string(), qr/at the end\n\s+\n/, 'no double fold on line ending in newline' ); + + + { + my @warnings; + my $string = do { + local $SIG{__WARN__} = sub { push @warnings, $_[0] }; + $email_1->header_raw_prepend( 'Test6', "Invalid\nFolding" ); + $email_1->as_string; + }; + + is(@warnings, 1, "setting an invalidly-folded header emits a warning"); + like($warnings[0], qr/bad space/, "...and it's the right one"); + like($string, qr/Test6: Invalid\r?\n Folding\r?\n/, "header fixed"); + } +} + diff -Nru libemail-simple-perl-2.214/xt/release/changes_has_content.t libemail-simple-perl-2.216/xt/release/changes_has_content.t --- libemail-simple-perl-2.214/xt/release/changes_has_content.t 2017-09-08 18:21:25.000000000 +0000 +++ libemail-simple-perl-2.216/xt/release/changes_has_content.t 2018-06-06 15:47:55.000000000 +0000 @@ -1,11 +1,10 @@ -#!perl - use Test::More tests => 2; note 'Checking Changes'; my $changes_file = 'Changes'; -my $newver = '2.214'; +my $newver = '2.216'; my $trial_token = '-TRIAL'; +my $encoding = 'UTF-8'; SKIP: { ok(-e $changes_file, "$changes_file file exists") @@ -16,8 +15,6 @@ done_testing; -# _get_changes copied and adapted from Dist::Zilla::Plugin::Git::Commit -# by Jerome Quelin sub _get_changes { my $newver = shift; @@ -25,6 +22,10 @@ # parse changelog to find commit message open(my $fh, '<', $changes_file) or die "cannot open $changes_file: $!"; my $changelog = join('', <$fh>); + if ($encoding) { + require Encode; + $changelog = Encode::decode($encoding, $changelog, Encode::FB_CROAK()); + } close $fh; my @content =