Hello community,
here is the log from the commit of package perl-CPAN-Meta for openSUSE:Factory
checked in at 2015-06-15 17:46:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-CPAN-Meta (Old)
and /work/SRC/openSUSE:Factory/.perl-CPAN-Meta.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-CPAN-Meta"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-CPAN-Meta/perl-CPAN-Meta.changes
2015-04-25 21:16:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-CPAN-Meta.new/perl-CPAN-Meta.changes
2015-06-15 17:46:52.000000000 +0200
@@ -1,0 +2,41 @@
+Sun Jun 14 07:58:43 UTC 2015 - co...@suse.com
+
+- updated to 2.150005
+ see /usr/share/doc/packages/perl-CPAN-Meta/Changes
+
+ 2.150005 2015-06-09 19:08:44-06:00 America/Denver
+
+ [TESTING]
+
+ - Changed some test data from UTF-8 to ASCII
+
+ 2.150004 2015-05-19 11:25:53-04:00 America/New_York (TRIAL RELEASE)
+
+ [DOCUMENTED]
+
+ - Noted explicitly that historical META spec files are licensed under
+ the same terms as Perl
+
+ [TESTING]
+
+ - Added test for 'x_deprecated' field in "provides"
+
+ [META]
+
+ - declared extra developer prereq
+
+ 2.150003 2015-04-21 19:41:15-04:00 America/New_York (TRIAL RELEASE)
+
+ [CHANGED]
+
+ - Serialized CPAN::Meta objects now include a x_serialization_backend
+ entry
+
+ 2.150002 2015-04-19 01:00:10+02:00 Europe/Berlin (TRIAL RELEASE)
+
+ [CHANGED]
+
+ - Metadata merging now does deep hash merging as long as keys
+ don't conflict
+
+-------------------------------------------------------------------
Old:
----
CPAN-Meta-2.150001.tar.gz
New:
----
CPAN-Meta-2.150005.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-CPAN-Meta.spec ++++++
--- /var/tmp/diff_new_pack.TAKNOk/_old 2015-06-15 17:46:53.000000000 +0200
+++ /var/tmp/diff_new_pack.TAKNOk/_new 2015-06-15 17:46:53.000000000 +0200
@@ -17,7 +17,7 @@
Name: perl-CPAN-Meta
-Version: 2.150001
+Version: 2.150005
Release: 0
%define cpan_name CPAN-Meta
Summary: The Distribution Metadata for a Cpan Dist
@@ -30,14 +30,14 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
-BuildRequires: perl(CPAN::Meta::Requirements) >= 2.121
+BuildRequires: perl(CPAN::Meta::Requirements) >= 2.121000
BuildRequires: perl(CPAN::Meta::YAML) >= 0.008
BuildRequires: perl(File::Temp) >= 0.20
BuildRequires: perl(JSON::PP) >= 2.27200
BuildRequires: perl(Parse::CPAN::Meta) >= 1.4414
BuildRequires: perl(Test::More) >= 0.88
BuildRequires: perl(version) >= 0.88
-Requires: perl(CPAN::Meta::Requirements) >= 2.121
+Requires: perl(CPAN::Meta::Requirements) >= 2.121000
Requires: perl(CPAN::Meta::YAML) >= 0.008
Requires: perl(JSON::PP) >= 2.27200
Requires: perl(Parse::CPAN::Meta) >= 1.4414
++++++ CPAN-Meta-2.150001.tar.gz -> CPAN-Meta-2.150005.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/Changes
new/CPAN-Meta-2.150005/Changes
--- old/CPAN-Meta-2.150001/Changes 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/Changes 2015-06-10 03:08:59.000000000 +0200
@@ -1,5 +1,40 @@
Revision history for CPAN-Meta
+2.150005 2015-06-09 19:08:44-06:00 America/Denver
+
+ [TESTING]
+
+ - Changed some test data from UTF-8 to ASCII
+
+2.150004 2015-05-19 11:25:53-04:00 America/New_York (TRIAL RELEASE)
+
+ [DOCUMENTED]
+
+ - Noted explicitly that historical META spec files are licensed under
+ the same terms as Perl
+
+ [TESTING]
+
+ - Added test for 'x_deprecated' field in "provides"
+
+ [META]
+
+ - declared extra developer prereq
+
+2.150003 2015-04-21 19:41:15-04:00 America/New_York (TRIAL RELEASE)
+
+ [CHANGED]
+
+ - Serialized CPAN::Meta objects now include a x_serialization_backend
+ entry
+
+2.150002 2015-04-19 01:00:10+02:00 Europe/Berlin (TRIAL RELEASE)
+
+ [CHANGED]
+
+ - Metadata merging now does deep hash merging as long as keys
+ don't conflict
+
2.150001 2015-03-09 14:41:39-04:00 America/New_York
[DOCUMENTED]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/MANIFEST
new/CPAN-Meta-2.150005/MANIFEST
--- old/CPAN-Meta-2.150001/MANIFEST 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/MANIFEST 2015-06-10 03:08:59.000000000 +0200
@@ -1,4 +1,4 @@
-# This file was automatically generated by Dist::Zilla::Plugin::Manifest
v5.032.
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest
v5.037.
CONTRIBUTING.mkdn
Changes
LICENSE
@@ -69,6 +69,7 @@
t/data-test/META-2.json
t/data-test/META-2.meta
t/data-test/gpl-1_4.yml
+t/data-test/preserve-release-status.yml
t/data-test/provides-version-missing.json
t/data-test/resources.yml
t/data-test/restricted-2.json
@@ -77,6 +78,7 @@
t/data-test/version-not-normal.json
t/data-test/version-ranges-1_4.yml
t/data-test/version-ranges-2.json
+t/data-test/x_deprecated-META.json
t/data-valid/1122575719-META.yml
t/data-valid/1206545041-META.yml
t/data-valid/1985684504-META.yml
@@ -84,6 +86,7 @@
t/data-valid/META-1_0.yml
t/data-valid/META-1_1.yml
t/data-valid/scalar-meta-spec.yml
+t/data-valid/x_deprecated-META.yml
t/load-bad.t
t/merge.t
t/meta-obj.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/META.json
new/CPAN-Meta-2.150005/META.json
--- old/CPAN-Meta-2.150001/META.json 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/META.json 2015-06-10 03:08:59.000000000 +0200
@@ -5,7 +5,7 @@
"Ricardo Signes <r...@cpan.org>"
],
"dynamic_config" : 0,
- "generated_by" : "Dist::Zilla version 5.032, CPAN::Meta::Converter version
2.143240",
+ "generated_by" : "Dist::Zilla version 5.037, CPAN::Meta::Converter version
2.150001",
"license" : [
"perl_5"
],
@@ -34,10 +34,12 @@
}
},
"develop" : {
+ "recommends" : {
+ "Perl::Critic::Policy::Lax::ProhibitStringyEval::ExceptForRequire"
: "0"
+ },
"requires" : {
"Dist::Zilla" : "5",
"Dist::Zilla::Plugin::Encoding" : "0",
- "Dist::Zilla::Plugin::MakeMaker" : "0",
"Dist::Zilla::Plugin::MakeMaker::Highlander" : "0.003",
"Dist::Zilla::Plugin::OnlyCorePrereqs" : "0.014",
"Dist::Zilla::Plugin::Prereqs" : "0",
@@ -91,35 +93,35 @@
"provides" : {
"CPAN::Meta" : {
"file" : "lib/CPAN/Meta.pm",
- "version" : "2.150001"
+ "version" : "2.150005"
},
"CPAN::Meta::Converter" : {
"file" : "lib/CPAN/Meta/Converter.pm",
- "version" : "2.150001"
+ "version" : "2.150005"
},
"CPAN::Meta::Feature" : {
"file" : "lib/CPAN/Meta/Feature.pm",
- "version" : "2.150001"
+ "version" : "2.150005"
},
"CPAN::Meta::History" : {
"file" : "lib/CPAN/Meta/History.pm",
- "version" : "2.150001"
+ "version" : "2.150005"
},
"CPAN::Meta::Merge" : {
"file" : "lib/CPAN/Meta/Merge.pm",
- "version" : "2.150001"
+ "version" : "2.150005"
},
"CPAN::Meta::Prereqs" : {
"file" : "lib/CPAN/Meta/Prereqs.pm",
- "version" : "2.150001"
+ "version" : "2.150005"
},
"CPAN::Meta::Spec" : {
"file" : "lib/CPAN/Meta/Spec.pm",
- "version" : "2.150001"
+ "version" : "2.150005"
},
"CPAN::Meta::Validator" : {
"file" : "lib/CPAN/Meta/Validator.pm",
- "version" : "2.150001"
+ "version" : "2.150005"
}
},
"release_status" : "stable",
@@ -134,7 +136,7 @@
"web" : "https://github.com/Perl-Toolchain-Gang/CPAN-Meta";
}
},
- "version" : "2.150001",
+ "version" : "2.150005",
"x_authority" : "cpan:DAGOLDEN",
"x_contributors" : [
"Ansgar Burchardt <ans...@cpan.org>",
@@ -157,9 +159,11 @@
"Michael G. Schwern <mschw...@cpan.org>",
"mohawk2 <moha...@users.noreply.github.com>",
"moznion <mozn...@gmail.com>",
+ "Niko Tyni <nt...@debian.org>",
"Olaf Alders <o...@wundersolutions.com>",
- "Olivier Mengue <dol...@cpan.org>",
- "Randy Sims <ran...@thepierianspring.org>"
+ "Olivier Mengué <dol...@cpan.org>",
+ "Randy Sims <ran...@thepierianspring.org>",
+ "Tomohiro Hosaka <boku...@bokut.in>"
]
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/META.yml
new/CPAN-Meta-2.150005/META.yml
--- old/CPAN-Meta-2.150001/META.yml 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/META.yml 2015-06-10 03:08:59.000000000 +0200
@@ -18,7 +18,7 @@
ExtUtils::MakeMaker: '6.17'
perl: '5.006'
dynamic_config: 0
-generated_by: 'Dist::Zilla version 5.032, CPAN::Meta::Converter version
2.143240'
+generated_by: 'Dist::Zilla version 5.037, CPAN::Meta::Converter version
2.150001'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -36,28 +36,28 @@
provides:
CPAN::Meta:
file: lib/CPAN/Meta.pm
- version: '2.150001'
+ version: '2.150005'
CPAN::Meta::Converter:
file: lib/CPAN/Meta/Converter.pm
- version: '2.150001'
+ version: '2.150005'
CPAN::Meta::Feature:
file: lib/CPAN/Meta/Feature.pm
- version: '2.150001'
+ version: '2.150005'
CPAN::Meta::History:
file: lib/CPAN/Meta/History.pm
- version: '2.150001'
+ version: '2.150005'
CPAN::Meta::Merge:
file: lib/CPAN/Meta/Merge.pm
- version: '2.150001'
+ version: '2.150005'
CPAN::Meta::Prereqs:
file: lib/CPAN/Meta/Prereqs.pm
- version: '2.150001'
+ version: '2.150005'
CPAN::Meta::Spec:
file: lib/CPAN/Meta/Spec.pm
- version: '2.150001'
+ version: '2.150005'
CPAN::Meta::Validator:
file: lib/CPAN/Meta/Validator.pm
- version: '2.150001'
+ version: '2.150005'
requires:
CPAN::Meta::Requirements: '2.121'
CPAN::Meta::YAML: '0.008'
@@ -73,7 +73,7 @@
bugtracker: https://github.com/Perl-Toolchain-Gang/CPAN-Meta/issues
homepage: https://github.com/Perl-Toolchain-Gang/CPAN-Meta
repository: https://github.com/Perl-Toolchain-Gang/CPAN-Meta.git
-version: '2.150001'
+version: '2.150005'
x_authority: cpan:DAGOLDEN
x_contributors:
- 'Ansgar Burchardt <ans...@cpan.org>'
@@ -96,6 +96,8 @@
- 'Michael G. Schwern <mschw...@cpan.org>'
- 'mohawk2 <moha...@users.noreply.github.com>'
- 'moznion <mozn...@gmail.com>'
+ - 'Niko Tyni <nt...@debian.org>'
- 'Olaf Alders <o...@wundersolutions.com>'
- - 'Olivier Mengue <dol...@cpan.org>'
+ - 'Olivier Mengué <dol...@cpan.org>'
- 'Randy Sims <ran...@thepierianspring.org>'
+ - 'Tomohiro Hosaka <boku...@bokut.in>'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/Makefile.PL
new/CPAN-Meta-2.150005/Makefile.PL
--- old/CPAN-Meta-2.150001/Makefile.PL 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/Makefile.PL 2015-06-10 03:08:59.000000000 +0200
@@ -1,4 +1,4 @@
-# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker
v5.032.
+# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker
v5.037.
use strict;
use warnings;
@@ -39,7 +39,7 @@
"overload" => 0,
"utf8" => 0
},
- "VERSION" => "2.150001",
+ "VERSION" => "2.150005",
"test" => {
"TESTS" => "t/*.t"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/README
new/CPAN-Meta-2.150005/README
--- old/CPAN-Meta-2.150001/README 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/README 2015-06-10 03:08:59.000000000 +0200
@@ -2,7 +2,7 @@
CPAN::Meta - the distribution metadata for a CPAN dist
VERSION
- version 2.150001
+ version 2.150005
SYNOPSIS
use v5.10;
@@ -198,6 +198,10 @@
YAML. In both cases, the same rules are followed as in the "save()"
method for choosing a serialization backend.
+ The serialized structure will include a "x_serialization_backend" entry
+ giving the package and version used to serialize. Any existing key in
+ the given $meta object will be clobbered.
+
STRING DATA
The following methods return a single value, which is the value for the
corresponding entry in the distmeta structure. Values should be either
@@ -328,12 +332,16 @@
* moznion <mozn...@gmail.com>
+ * Niko Tyni <nt...@debian.org>
+
* Olaf Alders <o...@wundersolutions.com>
- * Olivier Mengue <dol...@cpan.org>
+ * Olivier Mengué <dol...@cpan.org>
* Randy Sims <ran...@thepierianspring.org>
+ * Tomohiro Hosaka <boku...@bokut.in>
+
COPYRIGHT AND LICENSE
This software is copyright (c) 2010 by David Golden and Ricardo Signes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/cpanfile
new/CPAN-Meta-2.150005/cpanfile
--- old/CPAN-Meta-2.150001/cpanfile 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/cpanfile 2015-06-10 03:08:59.000000000 +0200
@@ -34,7 +34,6 @@
on 'develop' => sub {
requires "Dist::Zilla" => "5";
requires "Dist::Zilla::Plugin::Encoding" => "0";
- requires "Dist::Zilla::Plugin::MakeMaker" => "0";
requires "Dist::Zilla::Plugin::MakeMaker::Highlander" => "0.003";
requires "Dist::Zilla::Plugin::OnlyCorePrereqs" => "0.014";
requires "Dist::Zilla::Plugin::Prereqs" => "0";
@@ -52,3 +51,7 @@
requires "Test::Spelling" => "0.12";
requires "Test::Version" => "1";
};
+
+on 'develop' => sub {
+ recommends
"Perl::Critic::Policy::Lax::ProhibitStringyEval::ExceptForRequire" => "0";
+};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/dist.ini
new/CPAN-Meta-2.150005/dist.ini
--- old/CPAN-Meta-2.150001/dist.ini 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/dist.ini 2015-06-10 03:08:59.000000000 +0200
@@ -12,7 +12,6 @@
[@DAGOLDEN]
:version = 0.070
--remove = MakeMaker
-remove = PodWeaver
authority = cpan:DAGOLDEN
no_minimum_perl = 1
@@ -21,6 +20,7 @@
AutoVersion.major = 2
GithubMeta.user = Perl-Toolchain-Gang
MetaNoIndex.directory[] = history
+MakeMaker.eumm_version = 6.17 ; as shipped with 5.8.1
stopwords = apache
stopwords = bsd
stopwords = dir
@@ -42,9 +42,6 @@
replacer = replace_with_comment
post_code_replacer = replace_with_nothing
-; as shipped with 5.8.1
-[MakeMaker]
-eumm_version = 6.17
; repeat these from Parse::CPAN::Meta to ensure we don't wind up
; with P::C::M installed but the backends not installed (as seen in
@@ -57,6 +54,9 @@
CPAN::Meta::YAML = 0.008
version = 0.88
+[Prereqs / DevelopRecommends]
+Perl::Critic::Policy::Lax::ProhibitStringyEval::ExceptForRequire = 0
+
[OnlyCorePrereqs]
:version = 0.014
check_dual_life_versions = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/lib/CPAN/Meta/Converter.pm
new/CPAN-Meta-2.150005/lib/CPAN/Meta/Converter.pm
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta/Converter.pm 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta/Converter.pm 2015-06-10
03:08:59.000000000 +0200
@@ -3,7 +3,7 @@
use warnings;
package CPAN::Meta::Converter;
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
#pod =head1 SYNOPSIS
#pod
@@ -388,6 +388,8 @@
sub _bad_version_hook {
my ($v) = @_;
+ $v =~ s{^\s*}{};
+ $v =~ s{\s*$}{};
$v =~ s{[a-z]+$}{}; # strip trailing alphabetics
my $vobj = eval { version->new($v) };
return defined($vobj) ? $vobj : version->new(0); # or give up
@@ -803,7 +805,7 @@
# CHANGED TO MANDATORY
'dynamic_config' => \&_keep_or_one,
# ADDED MANDATORY
- 'release_status' => \&_release_status_from_version,
+ 'release_status' => \&_release_status,
# PRIOR OPTIONAL
'keywords' => \&_keep,
'no_index' => \&_no_index_directory,
@@ -1497,7 +1499,7 @@
=head1 VERSION
-version 2.150001
+version 2.150005
=head1 SYNOPSIS
@@ -1634,4 +1636,4 @@
__END__
-# vim: ts=2 sts=2 sw=2 et:
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/lib/CPAN/Meta/Feature.pm
new/CPAN-Meta-2.150005/lib/CPAN/Meta/Feature.pm
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta/Feature.pm 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta/Feature.pm 2015-06-10
03:08:59.000000000 +0200
@@ -3,7 +3,7 @@
use warnings;
package CPAN::Meta::Feature;
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
use CPAN::Meta::Prereqs;
@@ -67,8 +67,6 @@
# ABSTRACT: an optional feature provided by a CPAN distribution
-__END__
-
=pod
=encoding UTF-8
@@ -79,7 +77,7 @@
=head1 VERSION
-version 2.150001
+version 2.150005
=head1 DESCRIPTION
@@ -144,3 +142,8 @@
the same terms as the Perl 5 programming language system itself.
=cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/CPAN-Meta-2.150001/lib/CPAN/Meta/History/Meta_1_0.pod
new/CPAN-Meta-2.150005/lib/CPAN/Meta/History/Meta_1_0.pod
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta/History/Meta_1_0.pod 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta/History/Meta_1_0.pod 2015-06-10
03:08:59.000000000 +0200
@@ -7,7 +7,8 @@
=head1 PREFACE
This is a historical copy of the version 1.0 specification for F<META.yml>
-files, copyright by Ken Williams.
+files, copyright by Ken Williams and licensed under the same terms as Perl
+itself.
Modifications from the original:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/CPAN-Meta-2.150001/lib/CPAN/Meta/History/Meta_1_1.pod
new/CPAN-Meta-2.150005/lib/CPAN/Meta/History/Meta_1_1.pod
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta/History/Meta_1_1.pod 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta/History/Meta_1_1.pod 2015-06-10
03:08:59.000000000 +0200
@@ -7,7 +7,8 @@
=head1 PREFACE
This is a historical copy of the version 1.1 specification for F<META.yml>
-files, copyright by Ken Williams.
+files, copyright by Ken Williams and licensed under the same terms as Perl
+itself.
Modifications from the original:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/CPAN-Meta-2.150001/lib/CPAN/Meta/History/Meta_1_2.pod
new/CPAN-Meta-2.150005/lib/CPAN/Meta/History/Meta_1_2.pod
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta/History/Meta_1_2.pod 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta/History/Meta_1_2.pod 2015-06-10
03:08:59.000000000 +0200
@@ -7,7 +7,8 @@
=head1 PREFACE
This is a historical copy of the version 1.2 specification for F<META.yml>
-files, copyright by Ken Williams.
+files, copyright by Ken Williams and licensed under the same terms as Perl
+itself.
Modifications from the original:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/CPAN-Meta-2.150001/lib/CPAN/Meta/History/Meta_1_3.pod
new/CPAN-Meta-2.150005/lib/CPAN/Meta/History/Meta_1_3.pod
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta/History/Meta_1_3.pod 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta/History/Meta_1_3.pod 2015-06-10
03:08:59.000000000 +0200
@@ -7,7 +7,8 @@
=head1 PREFACE
This is a historical copy of the version 1.3 specification for F<META.yml>
-files, copyright by Ken Williams.
+files, copyright by Ken Williams and licensed under the same terms as Perl
+itself.
Modifications from the original:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/CPAN-Meta-2.150001/lib/CPAN/Meta/History/Meta_1_4.pod
new/CPAN-Meta-2.150005/lib/CPAN/Meta/History/Meta_1_4.pod
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta/History/Meta_1_4.pod 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta/History/Meta_1_4.pod 2015-06-10
03:08:59.000000000 +0200
@@ -7,7 +7,8 @@
=head1 PREFACE
This is a historical copy of the version 1.4 specification for F<META.yml>
-files, copyright by Ken Williams.
+files, copyright by Ken Williams and licensed under the same terms as Perl
+itself.
Modifications from the original:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/lib/CPAN/Meta/History.pm
new/CPAN-Meta-2.150005/lib/CPAN/Meta/History.pm
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta/History.pm 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta/History.pm 2015-06-10
03:08:59.000000000 +0200
@@ -4,7 +4,7 @@
use warnings;
package CPAN::Meta::History;
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
1;
@@ -22,7 +22,7 @@
=head1 VERSION
-version 2.150001
+version 2.150005
=head1 DESCRIPTION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/lib/CPAN/Meta/Merge.pm
new/CPAN-Meta-2.150005/lib/CPAN/Meta/Merge.pm
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta/Merge.pm 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta/Merge.pm 2015-06-10
03:08:59.000000000 +0200
@@ -3,15 +3,24 @@
package CPAN::Meta::Merge;
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
use Carp qw/croak/;
use Scalar::Util qw/blessed/;
use CPAN::Meta::Converter 2.141170;
+sub _is_identical {
+ my ($left, $right) = @_;
+ return
+ (not defined $left and not defined $right)
+ # if either of these are references, we compare the serialized value
+ || (defined $left and defined $right and $left eq $right);
+}
+
sub _identical {
my ($left, $right, $path) = @_;
- croak sprintf "Can't merge attribute %s: '%s' does not equal '%s'",
join('.', @{$path}), $left, $right unless $left eq $right;
+ croak sprintf "Can't merge attribute %s: '%s' does not equal '%s'",
join('.', @{$path}), $left, $right
+ unless _is_identical($left, $right);
return $left;
}
@@ -50,6 +59,13 @@
if (not exists $left->{$key}) {
$left->{$key} = $right->{$key};
}
+ # identical strings or references are merged identically
+ elsif (_is_identical($left->{$key}, $right->{$key})) {
+ 1; # do nothing - keep left
+ }
+ elsif (ref $left->{$key} eq 'HASH' and ref $right->{$key} eq 'HASH') {
+ $left->{$key} = _uniq_map($left->{$key}, $right->{$key}, [ @{$path},
$key ]);
+ }
else {
croak 'Duplication of element ' . join '.', @{$path}, $key;
}
@@ -219,6 +235,9 @@
# ABSTRACT: Merging CPAN Meta fragments
+
+# vim: ts=2 sts=2 sw=2 et :
+
__END__
=pod
@@ -231,7 +250,7 @@
=head1 VERSION
-version 2.150001
+version 2.150005
=head1 SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/lib/CPAN/Meta/Prereqs.pm
new/CPAN-Meta-2.150005/lib/CPAN/Meta/Prereqs.pm
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta/Prereqs.pm 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta/Prereqs.pm 2015-06-10
03:08:59.000000000 +0200
@@ -3,7 +3,7 @@
use warnings;
package CPAN::Meta::Prereqs;
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
#pod =head1 DESCRIPTION
#pod
@@ -163,7 +163,7 @@
#pod
#pod my $new_reqs = $prereqs->merged_requirements( \@phases, \@types );
#pod my $new_reqs = $prereqs->merged_requirements( \@phases );
-#pod my $new_reqs = $preerqs->merged_requirements();
+#pod my $new_reqs = $prereqs->merged_requirements();
#pod
#pod This method joins together all requirements across a number of phases
#pod and types into a new L<CPAN::Meta::Requirements> object. If arguments
@@ -275,8 +275,6 @@
# ABSTRACT: a set of distribution prerequisites by phase and type
-__END__
-
=pod
=encoding UTF-8
@@ -287,7 +285,7 @@
=head1 VERSION
-version 2.150001
+version 2.150005
=head1 DESCRIPTION
@@ -353,7 +351,7 @@
my $new_reqs = $prereqs->merged_requirements( \@phases, \@types );
my $new_reqs = $prereqs->merged_requirements( \@phases );
- my $new_reqs = $preerqs->merged_requirements();
+ my $new_reqs = $prereqs->merged_requirements();
This method joins together all requirements across a number of phases
and types into a new L<CPAN::Meta::Requirements> object. If arguments
@@ -417,3 +415,8 @@
the same terms as the Perl 5 programming language system itself.
=cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/lib/CPAN/Meta/Spec.pm
new/CPAN-Meta-2.150005/lib/CPAN/Meta/Spec.pm
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta/Spec.pm 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta/Spec.pm 2015-06-10
03:08:59.000000000 +0200
@@ -8,7 +8,7 @@
use warnings;
package CPAN::Meta::Spec;
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
1;
@@ -29,7 +29,7 @@
=head1 VERSION
-version 2.150001
+version 2.150005
=head1 SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/lib/CPAN/Meta/Validator.pm
new/CPAN-Meta-2.150005/lib/CPAN/Meta/Validator.pm
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta/Validator.pm 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta/Validator.pm 2015-06-10
03:08:59.000000000 +0200
@@ -3,7 +3,7 @@
use warnings;
package CPAN::Meta::Validator;
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
#pod =head1 SYNOPSIS
#pod
@@ -986,8 +986,6 @@
# ABSTRACT: validate CPAN distribution metadata structures
-__END__
-
=pod
=encoding UTF-8
@@ -998,7 +996,7 @@
=head1 VERSION
-version 2.150001
+version 2.150005
=head1 SYNOPSIS
@@ -1205,3 +1203,8 @@
the same terms as the Perl 5 programming language system itself.
=cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/lib/CPAN/Meta.pm
new/CPAN-Meta-2.150005/lib/CPAN/Meta.pm
--- old/CPAN-Meta-2.150001/lib/CPAN/Meta.pm 2015-03-09 19:41:54.000000000
+0100
+++ new/CPAN-Meta-2.150005/lib/CPAN/Meta.pm 2015-06-10 03:08:59.000000000
+0200
@@ -3,7 +3,7 @@
use warnings;
package CPAN::Meta;
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
#pod =head1 SYNOPSIS
#pod
@@ -591,6 +591,10 @@
#pod both cases, the same rules are followed as in the C<save()> method for
choosing
#pod a serialization backend.
#pod
+#pod The serialized structure will include a C<x_serialization_backend> entry
giving
+#pod the package and version used to serialize. Any existing key in the given
+#pod C<$meta> object will be clobbered.
+#pod
#pod =cut
sub as_string {
@@ -610,10 +614,14 @@
my ($data, $backend);
if ( $version ge '2' ) {
$backend = Parse::CPAN::Meta->json_backend();
+ local $struct->{x_serialization_backend} = sprintf '%s version %s',
+ $backend, $backend->VERSION;
$data = $backend->new->pretty->canonical->encode($struct);
}
else {
$backend = Parse::CPAN::Meta->yaml_backend();
+ local $struct->{x_serialization_backend} = sprintf '%s version %s',
+ $backend, $backend->VERSION;
$data = eval { no strict 'refs'; &{"$backend\::Dump"}($struct) };
if ( $@ ) {
croak $backend->can('errstr') ? $backend->errstr : $@
@@ -632,8 +640,6 @@
# ABSTRACT: the distribution metadata for a CPAN dist
-__END__
-
=pod
=encoding UTF-8
@@ -644,7 +650,7 @@
=head1 VERSION
-version 2.150001
+version 2.150005
=head1 SYNOPSIS
@@ -859,6 +865,10 @@
both cases, the same rules are followed as in the C<save()> method for choosing
a serialization backend.
+The serialized structure will include a C<x_serialization_backend> entry giving
+the package and version used to serialize. Any existing key in the given
+C<$meta> object will be clobbered.
+
=head1 STRING DATA
The following methods return a single value, which is the value for the
@@ -1025,7 +1035,7 @@
=head1 CONTRIBUTORS
-=for stopwords Ansgar Burchardt Avar Arnfjord Bjarmason Christopher J. Madsen
Chuck Adams Cory G Watson Damyan Ivanov Eric Wilhelm Graham Knop Gregor Hermann
Karen Etheridge Kenichi Ishigaki Ken Williams Lars Dieckow Leon Timmermans
majensen Mark Fowler Matt S Trout Michael G. Schwern mohawk2 moznion Olaf
Alders Olivier Mengue Randy Sims
+=for stopwords Ansgar Burchardt Avar Arnfjord Bjarmason Christopher J. Madsen
Chuck Adams Cory G Watson Damyan Ivanov Eric Wilhelm Graham Knop Gregor Hermann
Karen Etheridge Kenichi Ishigaki Ken Williams Lars Dieckow Leon Timmermans
majensen Mark Fowler Matt S Trout Michael G. Schwern mohawk2 moznion Niko Tyni
Olaf Alders Olivier Mengué Randy Sims Tomohiro Hosaka
=over 4
@@ -1111,16 +1121,24 @@
=item *
+Niko Tyni <nt...@debian.org>
+
+=item *
+
Olaf Alders <o...@wundersolutions.com>
=item *
-Olivier Mengue <dol...@cpan.org>
+Olivier Mengué <dol...@cpan.org>
=item *
Randy Sims <ran...@thepierianspring.org>
+=item *
+
+Tomohiro Hosaka <boku...@bokut.in>
+
=back
=head1 COPYRIGHT AND LICENSE
@@ -1131,3 +1149,8 @@
the same terms as the Perl 5 programming language system itself.
=cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/00-report-prereqs.dd
new/CPAN-Meta-2.150005/t/00-report-prereqs.dd
--- old/CPAN-Meta-2.150001/t/00-report-prereqs.dd 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/t/00-report-prereqs.dd 2015-06-10
03:08:59.000000000 +0200
@@ -6,10 +6,12 @@
}
},
'develop' => {
+ 'recommends' => {
+
'Perl::Critic::Policy::Lax::ProhibitStringyEval::ExceptForRequire' => '0'
+ },
'requires' => {
'Dist::Zilla' => '5',
'Dist::Zilla::Plugin::Encoding' => '0',
- 'Dist::Zilla::Plugin::MakeMaker' => '0',
'Dist::Zilla::Plugin::MakeMaker::Highlander' => '0.003',
'Dist::Zilla::Plugin::OnlyCorePrereqs'
=> '0.014',
'Dist::Zilla::Plugin::Prereqs' => '0',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/00-report-prereqs.t
new/CPAN-Meta-2.150005/t/00-report-prereqs.t
--- old/CPAN-Meta-2.150001/t/00-report-prereqs.t 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/t/00-report-prereqs.t 2015-06-10
03:08:59.000000000 +0200
@@ -3,7 +3,7 @@
use strict;
use warnings;
-# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.020
+# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.021
use Test::More tests => 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/converter-bad.t
new/CPAN-Meta-2.150005/t/converter-bad.t
--- old/CPAN-Meta-2.150001/t/converter-bad.t 2015-03-09 19:41:54.000000000
+0100
+++ new/CPAN-Meta-2.150005/t/converter-bad.t 2015-06-10 03:08:59.000000000
+0200
@@ -73,4 +73,4 @@
}
done_testing;
-
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/converter-fail.t
new/CPAN-Meta-2.150005/t/converter-fail.t
--- old/CPAN-Meta-2.150001/t/converter-fail.t 2015-03-09 19:41:54.000000000
+0100
+++ new/CPAN-Meta-2.150005/t/converter-fail.t 2015-06-10 03:08:59.000000000
+0200
@@ -38,4 +38,4 @@
}
done_testing;
-
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/converter-fragments.t
new/CPAN-Meta-2.150005/t/converter-fragments.t
--- old/CPAN-Meta-2.150001/t/converter-fragments.t 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/t/converter-fragments.t 2015-06-10
03:08:59.000000000 +0200
@@ -151,8 +151,8 @@
my $got = $cmc->upgrade_fragment;
my $exp = $c->{expect};
is_deeply( $got, $exp, $c->{label} )
- or diag "GOT:\n" . explain($got) . "\nEXPECTED:\n" . explain($exp);
+ or diag "GOT:\n", explain($got), "EXPECTED:\n", explain($exp);
}
done_testing;
-# vim: ts=4 sts=4 sw=4 et:
+# vim: ts=8 sts=4 sw=4 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/converter.t
new/CPAN-Meta-2.150005/t/converter.t
--- old/CPAN-Meta-2.150001/t/converter.t 2015-03-09 19:41:54.000000000
+0100
+++ new/CPAN-Meta-2.150005/t/converter.t 2015-06-10 03:08:59.000000000
+0200
@@ -34,6 +34,7 @@
#use Data::Dumper;
for my $f ( reverse sort @files ) {
+ note '';
my $path = File::Spec->catfile('t','data-test',$f);
my $original = Parse::CPAN::Meta->load_file( $path );
ok( $original, "loaded $f" );
@@ -294,4 +295,15 @@
);
}
+# specific test for preserving release_status on upconversion
+{
+ my $path =
File::Spec->catfile('t','data-test','preserve-release-status.yml');
+ my $original = Parse::CPAN::Meta->load_file( $path );
+ ok( $original, "loaded META-2.json" );
+ my $cmc = CPAN::Meta::Converter->new( $original );
+ my $cleaned_up = $cmc->convert( version => "2" );
+ is( $cleaned_up->{release_status}, 'unstable', "release_status preserved" );
+}
+
done_testing;
+# vim: ts=2 sts=2 sw=2 et:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/CPAN-Meta-2.150001/t/data-test/preserve-release-status.yml
new/CPAN-Meta-2.150005/t/data-test/preserve-release-status.yml
--- old/CPAN-Meta-2.150001/t/data-test/preserve-release-status.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/CPAN-Meta-2.150005/t/data-test/preserve-release-status.yml
2015-06-10 03:08:59.000000000 +0200
@@ -0,0 +1,13 @@
+# http://module-build.sourceforge.net/META-spec.html
+#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
+name: Template-DBI
+version: 2.64
+version_from: lib/Template/Plugin/DBI.pm
+installdirs: site
+license: perl
+requires:
+ DBI: 1
+ Template: 2.15
+distribution_type: module
+generated_by: ExtUtils::MakeMaker version 6.17
+release_status: unstable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/CPAN-Meta-2.150001/t/data-test/x_deprecated-META.json
new/CPAN-Meta-2.150005/t/data-test/x_deprecated-META.json
--- old/CPAN-Meta-2.150001/t/data-test/x_deprecated-META.json 1970-01-01
01:00:00.000000000 +0100
+++ new/CPAN-Meta-2.150005/t/data-test/x_deprecated-META.json 2015-06-10
03:08:59.000000000 +0200
@@ -0,0 +1,148 @@
+{
+ "abstract" : "Author tests making sure correct line endings are used",
+ "author" : [
+ "Florian Ragwitz <r...@debian.org>",
+ "Caleb Cushing <xenoterrac...@gmail.com>",
+ "Karen Etheridge <et...@cpan.org>"
+ ],
+ "dynamic_config" : 0,
+ "generated_by" : "Dist::Zilla version 5.035, CPAN::Meta::Converter version
2.150002",
+ "keywords" : [
+ "plugin",
+ "test",
+ "testing",
+ "author",
+ "development",
+ "whitespace",
+ "newline",
+ "linefeed",
+ "formatting"
+ ],
+ "license" : [
+ "perl_5"
+ ],
+ "meta-spec" : {
+ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";,
+ "version" : 2
+ },
+ "name" : "Dist-Zilla-Plugin-Test-EOL",
+ "no_index" : {
+ "directory" : [
+ "t",
+ "xt"
+ ]
+ },
+ "prereqs" : {
+ "configure" : {
+ "requires" : {
+ "Module::Build::Tiny" : "0.039",
+ "perl" : "5.006"
+ }
+ },
+ "develop" : {
+ "recommends" : {
+ "Dist::Zilla::PluginBundle::Author::ETHER" : "0.092"
+ },
+ "requires" : {
+ "Dist::Zilla" : "5"
+ }
+ },
+ "runtime" : {
+ "requires" : {
+ "Data::Section" : "0.004",
+ "Dist::Zilla::File::InMemory" : "0",
+ "Dist::Zilla::Role::FileFinderUser" : "0",
+ "Dist::Zilla::Role::FileGatherer" : "0",
+ "Dist::Zilla::Role::FileMunger" : "0",
+ "Dist::Zilla::Role::PrereqSource" : "0",
+ "Dist::Zilla::Role::TextTemplate" : "0",
+ "Moose" : "0",
+ "Moose::Util::TypeConstraints" : "0",
+ "Path::Tiny" : "0",
+ "Sub::Exporter::ForMethods" : "0",
+ "namespace::autoclean" : "0",
+ "perl" : "5.006",
+ "strict" : "0",
+ "warnings" : "0"
+ }
+ },
+ "build" : {
+ "requires" : {
+ "Build::Requires": "1.1",
+ "Test::More" : "0"
+ }
+ },
+ "test" : {
+ "recommends" : {
+ "CPAN::Meta" : "2.120900"
+ },
+ "requires" : {
+ "Test::More" : "0.88",
+ "Test::Requires" : "1.2"
+ }
+ }
+ },
+ "provides" : {
+ "Dist::Zilla::Plugin::EOLTests" : {
+ "file" : "lib/Dist/Zilla/Plugin/EOLTests.pm",
+ "version" : "0.18",
+ "x_deprecated" : 1
+ },
+ "Dist::Zilla::Plugin::Test::EOL" : {
+ "file" : "lib/Dist/Zilla/Plugin/Test/EOL.pm",
+ "version" : "0.18"
+ }
+ },
+ "release_status" : "stable",
+ "resources" : {
+ "bugtracker" : {
+ "mailto" : "bug-dist-zilla-plugin-test-...@rt.cpan.org",
+ "web" :
"https://rt.cpan.org/Public/Dist/Display.html?Name=Dist-Zilla-Plugin-Test-EOL";
+ },
+ "homepage" :
"https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-EOL";,
+ "repository" : {
+ "type" : "git",
+ "url" :
"https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-EOL.git";,
+ "web" : "https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-EOL";
+ },
+ "x_IRC" : "irc://irc.perl.org/#distzilla",
+ "x_MailingList" : "http://dzil.org/#mailing-list";
+ },
+ "version" : "0.18",
+ "x_Dist_Zilla" : {
+ "perl" : {
+ "version" : "5.021010"
+ },
+ "plugins" : [
+ {
+ "class" : "Dist::Zilla::Plugin::Bootstrap::lib",
+ "config" : {
+ "Dist::Zilla::Role::Bootstrap" : {
+ "try_built" : null
+ }
+ },
+ "name" : "Bootstrap::lib",
+ "version" : "1.001000"
+ },
+ {
+ "class" : "Dist::Zilla::Plugin::VerifyPhases",
+ "name" : "@Author::ETHER/PHASE VERIFICATION",
+ "version" : "0.010"
+ }
+ ],
+ "zilla" : {
+ "class" : "Dist::Zilla::Dist::Builder",
+ "config" : {
+ "is_trial" : ""
+ },
+ "version" : "5.035"
+ }
+ },
+ "x_authority" : "cpan:FLORA",
+ "x_authority_from_module" : "Dist::Zilla::Plugin::Test::EOL",
+ "x_contributors" : [
+ "Olivier Mengue <dol...@cpan.org>",
+ "Shlomi Fish <shlo...@shlomifish.org>"
+ ],
+ "x_permissions_from_module" : "Dist::Zilla::Plugin::Test::EOL"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/CPAN-Meta-2.150001/t/data-valid/x_deprecated-META.yml
new/CPAN-Meta-2.150005/t/data-valid/x_deprecated-META.yml
--- old/CPAN-Meta-2.150001/t/data-valid/x_deprecated-META.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/CPAN-Meta-2.150005/t/data-valid/x_deprecated-META.yml 2015-06-10
03:08:59.000000000 +0200
@@ -0,0 +1,91 @@
+---
+abstract: 'Author tests making sure correct line endings are used'
+author:
+ - 'Florian Ragwitz <r...@debian.org>'
+ - 'Caleb Cushing <xenoterrac...@gmail.com>'
+ - 'Karen Etheridge <et...@cpan.org>'
+build_requires:
+ Build::Requires: '1.1'
+ Test::More: '0.88'
+ Test::Requires: '1.2'
+configure_requires:
+ Module::Build::Tiny: '0.039'
+ perl: '5.006'
+dynamic_config: 0
+generated_by: 'Dist::Zilla version 5.035, CPAN::Meta::Converter version
2.150002'
+keywords:
+ - plugin
+ - test
+ - testing
+ - author
+ - development
+ - whitespace
+ - newline
+ - linefeed
+ - formatting
+license: perl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: '1.4'
+name: Dist-Zilla-Plugin-Test-EOL
+no_index:
+ directory:
+ - t
+ - xt
+provides:
+ Dist::Zilla::Plugin::EOLTests:
+ file: lib/Dist/Zilla/Plugin/EOLTests.pm
+ version: '0.18'
+ x_deprecated: 1
+ Dist::Zilla::Plugin::Test::EOL:
+ file: lib/Dist/Zilla/Plugin/Test/EOL.pm
+ version: '0.18'
+requires:
+ Data::Section: '0.004'
+ Dist::Zilla::File::InMemory: '0'
+ Dist::Zilla::Role::FileFinderUser: '0'
+ Dist::Zilla::Role::FileGatherer: '0'
+ Dist::Zilla::Role::FileMunger: '0'
+ Dist::Zilla::Role::PrereqSource: '0'
+ Dist::Zilla::Role::TextTemplate: '0'
+ Moose: '0'
+ Moose::Util::TypeConstraints: '0'
+ Path::Tiny: '0'
+ Sub::Exporter::ForMethods: '0'
+ namespace::autoclean: '0'
+ perl: '5.006'
+ strict: '0'
+ warnings: '0'
+resources:
+ IRC: irc://irc.perl.org/#distzilla
+ MailingList: http://dzil.org/#mailing-list
+ bugtracker:
https://rt.cpan.org/Public/Dist/Display.html?Name=Dist-Zilla-Plugin-Test-EOL
+ homepage: https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-EOL
+ repository: https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-EOL.git
+version: '0.18'
+x_Dist_Zilla:
+ perl:
+ version: '5.021010'
+ plugins:
+ -
+ class: Dist::Zilla::Plugin::Bootstrap::lib
+ config:
+ Dist::Zilla::Role::Bootstrap:
+ try_built: ~
+ name: Bootstrap::lib
+ version: '1.001000'
+ -
+ class: Dist::Zilla::Plugin::VerifyPhases
+ name: '@Author::ETHER/PHASE VERIFICATION'
+ version: '0.010'
+ zilla:
+ class: Dist::Zilla::Dist::Builder
+ config:
+ is_trial: ''
+ version: '5.035'
+x_authority: cpan:FLORA
+x_authority_from_module: Dist::Zilla::Plugin::Test::EOL
+x_contributors:
+ - 'Olivier Mengue <dol...@cpan.org>'
+ - 'Shlomi Fish <shlo...@shlomifish.org>'
+x_permissions_from_module: Dist::Zilla::Plugin::Test::EOL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/load-bad.t
new/CPAN-Meta-2.150005/t/load-bad.t
--- old/CPAN-Meta-2.150001/t/load-bad.t 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/t/load-bad.t 2015-06-10 03:08:59.000000000 +0200
@@ -15,13 +15,11 @@
for my $f ( sort @files ) {
my $path = File::Spec->catfile('t','data-fixable',$f);
- my $meta = eval { CPAN::Meta->load_file( $path ) };
- ok( defined $meta, "load_file('$f')" ) or diag $@;
+ ok( eval { CPAN::Meta->load_file( $path ) }, "load_file('$f')" ) or diag $@;
my $string = _slurp($path);
my $method = $path =~ /\.json/ ? "load_json_string" : "load_yaml_string";
- my $meta2 = eval { CPAN::Meta->$method( $string, { fix_errors => 1 } ) };
- ok( defined $meta2, "$method(slurp('$f'))" ) or diag $@;
+ ok( eval { CPAN::Meta->$method( $string, { fix_errors => 1 } ) },
"$method(slurp('$f'))" ) or diag $@;
}
done_testing;
-
+# vim: ts=2 sts=2 sw=2 et:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/merge.t
new/CPAN-Meta-2.150005/t/merge.t
--- old/CPAN-Meta-2.150001/t/merge.t 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/t/merge.t 2015-06-10 03:08:59.000000000 +0200
@@ -1,5 +1,3 @@
-#! perl
-
use strict;
use warnings;
@@ -14,6 +12,7 @@
license => [ 'perl_5' ],
resources => {
license => [ 'http://dev.perl.org/licenses/' ],
+ bugtracker => { web =>
'https://rt.cpan.org/Dist/Display.html?Foo-Bar' },
},
prereqs => {
runtime => {
@@ -70,6 +69,7 @@
license => [ 'perl_5', 'bsd' ],
resources => {
license => [ 'http://dev.perl.org/licenses/',
'http://opensource.org/licenses/bsd-license.php' ],
+ bugtracker => { web =>
'https://rt.cpan.org/Dist/Display.html?Foo-Bar' },
},
prereqs => {
runtime => {
@@ -100,6 +100,34 @@
version => 2,
},
);
+my %provides_merge_expected = (
+ abstract => 'This is a test',
+ author => ['A.U. Thor'],
+ generated_by => 'Myself',
+ license => [ 'perl_5' ],
+ resources => {
+ license => [ 'http://dev.perl.org/licenses/' ],
+ bugtracker => { web =>
'https://rt.cpan.org/Dist/Display.html?Foo-Bar' },
+ },
+ prereqs => {
+ runtime => {
+ requires => {
+ Foo => '0',
+ },
+ },
+ },
+ dynamic_config => 0,
+ provides => {
+ Baz => {
+ file => 'lib/Baz.pm',
+ version => '0.001', # same as %base, but for
this extra key
+ },
+ },
+ 'meta-spec' => {
+ url => "http://search.cpan.org/perldoc?CPAN::Meta::Spec";,
+ version => 2,
+ },
+);
my $merger = CPAN::Meta::Merge->new(default_version => '2');
@@ -108,13 +136,34 @@
is_deeply($first_result, \%first_expected, 'First result is as expected');
is_deeply($merger->merge(\%base, { abstract => 'This is a test' }), \%base,
'Can merge in identical abstract');
-my $failure = eval { $merger->merge(\%base, { abstract => 'And now for
something else' }) };
-is($failure, undef, 'Trying to merge different author gives an exception');
+is(
+ eval { $merger->merge(\%base, { abstract => 'And now for something else'
}) },
+ undef,
+ 'Trying to merge different author gives an exception',
+);
like $@, qr/^Can't merge attribute abstract/, 'Exception looks right';
-my $failure2 = eval { $merger->merge(\%base, { provides => { Baz => { file =>
'Baz.pm' } } }) };
-is($failure2, undef, 'Trying to merge different author gives an exception');
-like $@, qr/^Duplication of element provides\.Baz /, 'Exception looks right';
+is(
+ eval { $merger->merge(\%base, { resources => { bugtracker => { web =>
'http://foo.com' } } } ) },
+ undef,
+ 'Trying to merge a different bugtracker URL gives an exception',
+);
+like $@, qr/^Duplication of element resources\.bugtracker\.web /, 'Exception
looks right';
+
+is(
+ eval { $merger->merge(\%base, { provides => { Baz => { file => 'Baz.pm' }
} }) },
+ undef,
+ 'Trying to merge different provides.$module.file gives an exception',
+);
+like $@, qr/^Duplication of element provides\.Baz\.file /, 'Exception looks
right';
+
+my $provides_result = $merger->merge(\%base, { provides => { Baz => { file =>
'lib/Baz.pm', version => '0.001' } } });
+is_deeply(
+ $provides_result,
+ \%provides_merge_expected,
+ 'Trying to merge a new key for provides.$module is permitted; identical
values are preserved',
+);
+
# issue 67
@base{qw/name version release_status/} = qw/Foo-Bar 0.01 testing/;
@@ -122,3 +171,4 @@
ok my $first_result_obj = $merger->merge($base_obj, \%first), 'merging
CPAN::Meta objects succeeds';
done_testing();
+# vim: ts=4 sts=4 sw=4 tw=78 noet :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/meta-obj.t
new/CPAN-Meta-2.150005/t/meta-obj.t
--- old/CPAN-Meta-2.150001/t/meta-obj.t 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/t/meta-obj.t 2015-06-10 03:08:59.000000000 +0200
@@ -240,3 +240,4 @@
$chk_feature->( $meta->feature('domination') );
done_testing;
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/no-index.t
new/CPAN-Meta-2.150005/t/no-index.t
--- old/CPAN-Meta-2.150001/t/no-index.t 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/t/no-index.t 2015-06-10 03:08:59.000000000 +0200
@@ -86,3 +86,4 @@
}
done_testing;
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/optional_feature-merge.t
new/CPAN-Meta-2.150005/t/optional_feature-merge.t
--- old/CPAN-Meta-2.150001/t/optional_feature-merge.t 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/t/optional_feature-merge.t 2015-06-10
03:08:59.000000000 +0200
@@ -1,6 +1,5 @@
use strict;
use warnings;
-# vim: set ts=4 sw=4 noet nolist :
use Test::More;
use CPAN::Meta;
@@ -92,8 +91,7 @@
}
};
-my $result = eval { $merger->merge($meta1, $fragment3) };
-is($result, undef, 'Trying to merge optional_features with same feature name
and different descriptions gives an exception');
+is( eval { $merger->merge($meta1, $fragment3) }, undef, 'Trying to merge
optional_features with same feature name and different descriptions gives an
exception');
like $@, qr/^Cannot merge two optional_features named 'FeatureName' with
different 'description' values/, 'Exception looks right';
my $fragment4 = {
@@ -106,8 +104,7 @@
}
};
-$result = eval { $merger->merge($meta1, $fragment4) };
-is($result, undef, 'Trying to merge optional_features with same feature name
and differences in other keys gives an exception');
+is( eval { $merger->merge($meta1, $fragment4) }, undef, 'Trying to merge
optional_features with same feature name and differences in other keys gives an
exception');
like $@, qr/^Cannot merge two optional_features named 'FeatureName' with
different 'x_default' values/, 'Exception looks right';
my $fragment5 = {
@@ -140,3 +137,4 @@
);
done_testing;
+# vim: ts=4 sts=4 sw=4 noet :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/prereqs-finalize.t
new/CPAN-Meta-2.150005/t/prereqs-finalize.t
--- old/CPAN-Meta-2.150001/t/prereqs-finalize.t 2015-03-09 19:41:54.000000000
+0100
+++ new/CPAN-Meta-2.150005/t/prereqs-finalize.t 2015-06-10 03:08:59.000000000
+0200
@@ -9,9 +9,7 @@
sub dies_ok (&@) {
my ($code, $qr, $comment) = @_;
- my $lived = eval { $code->(); 1 };
-
- if ($lived) {
+ if (eval { $code->(); 1 }) {
fail("$comment: did not die");
} else {
like($@, $qr, $comment);
@@ -91,3 +89,4 @@
pass('...and we can add stuff to it');
done_testing;
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/prereqs-merge.t
new/CPAN-Meta-2.150005/t/prereqs-merge.t
--- old/CPAN-Meta-2.150001/t/prereqs-merge.t 2015-03-09 19:41:54.000000000
+0100
+++ new/CPAN-Meta-2.150005/t/prereqs-merge.t 2015-06-10 03:08:59.000000000
+0200
@@ -104,3 +104,4 @@
);
done_testing;
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/prereqs.t
new/CPAN-Meta-2.150005/t/prereqs.t
--- old/CPAN-Meta-2.150001/t/prereqs.t 2015-03-09 19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/t/prereqs.t 2015-06-10 03:08:59.000000000 +0200
@@ -161,4 +161,4 @@
}
done_testing;
-
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/repository.t
new/CPAN-Meta-2.150005/t/repository.t
--- old/CPAN-Meta-2.150001/t/repository.t 2015-03-09 19:41:54.000000000
+0100
+++ new/CPAN-Meta-2.150005/t/repository.t 2015-06-10 03:08:59.000000000
+0200
@@ -225,3 +225,4 @@
);
}
done_testing;
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/save-load.t
new/CPAN-Meta-2.150005/t/save-load.t
--- old/CPAN-Meta-2.150001/t/save-load.t 2015-03-09 19:41:54.000000000
+0100
+++ new/CPAN-Meta-2.150005/t/save-load.t 2015-06-10 03:08:59.000000000
+0200
@@ -83,6 +83,16 @@
ok( my $loaded = Parse::CPAN::Meta->load_file($metafile), 'load saved file' );
is($loaded->{name}, 'Module-Build', 'name correct');
+like(
+ $loaded->{x_serialization_backend},
+ qr/\AJSON::PP version [0-9]/,
+ "x_serialization_backend",
+);
+
+ok(
+ ! exists $meta->{x_serialization_backend},
+ "we didn't leak x_serialization_backend up into the saved struct",
+);
ok( $loaded = Parse::CPAN::Meta->load_file('t/data-test/META-1_4.yml'), 'load
META-1.4' );
is($loaded->{name}, 'Module-Build', 'name correct');
@@ -98,6 +108,17 @@
is( $loaded->{name}, 'Module-Build', 'name correct');
is( $loaded->{requires}{perl}, "5.006", 'prereq correct' );
+like(
+ $loaded->{x_serialization_backend},
+ qr/\ACPAN::Meta::YAML version [0-9]/,
+ "x_serialization_backend",
+);
+
+ok(
+ ! exists $meta->{x_serialization_backend},
+ "we didn't leak x_serialization_backend up into the saved struct",
+);
+
# file without suffix
ok( $loaded = CPAN::Meta->load_file('t/data-test/META-2.meta'), 'load_file
META-2.meta' );
@@ -106,3 +127,4 @@
ok( $loaded = CPAN::Meta->load_string($string), 'load META-2.meta from string'
);
done_testing;
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/t/validator.t
new/CPAN-Meta-2.150005/t/validator.t
--- old/CPAN-Meta-2.150001/t/validator.t 2015-03-09 19:41:54.000000000
+0100
+++ new/CPAN-Meta-2.150005/t/validator.t 2015-06-10 03:08:59.000000000
+0200
@@ -36,8 +36,9 @@
my $meta = Parse::CPAN::Meta->load_file( File::Spec->catfile($f) );
my $cmv = CPAN::Meta::Validator->new({%$meta});
ok( ! $cmv->is_valid, "$f shouldn't validate" );
+ note 'validation error: ', $_ foreach $cmv->errors;
}
}
done_testing;
-
+# vim: ts=2 sts=2 sw=2 et :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/xt/author/00-compile.t
new/CPAN-Meta-2.150005/xt/author/00-compile.t
--- old/CPAN-Meta-2.150001/xt/author/00-compile.t 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/xt/author/00-compile.t 2015-06-10
03:08:59.000000000 +0200
@@ -2,11 +2,11 @@
use strict;
use warnings;
-# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.051
+# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.053
use Test::More;
-plan tests => 8 + ($ENV{AUTHOR_TESTING} ? 1 : 0);
+plan tests => 9;
my @module_files = (
'CPAN/Meta.pm',
@@ -46,6 +46,9 @@
waitpid($pid, 0);
is($?, 0, "$lib loaded ok");
+ shift @_warnings if @_warnings and $_warnings[0] =~ /^Using .*\bblib/
+ and not eval { blib->VERSION('1.01') };
+
if (@_warnings)
{
warn @_warnings;
@@ -56,6 +59,6 @@
is(scalar(@warnings), 0, 'no warnings found')
- or diag 'got warnings: ', ( Test::More->can('explain') ?
Test::More::explain(\@warnings) : join("\n", '', @warnings) ) if
$ENV{AUTHOR_TESTING};
+ or diag 'got warnings: ', ( Test::More->can('explain') ?
Test::More::explain(\@warnings) : join("\n", '', @warnings) );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/xt/author/pod-spell.t
new/CPAN-Meta-2.150005/xt/author/pod-spell.t
--- old/CPAN-Meta-2.150001/xt/author/pod-spell.t 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/xt/author/pod-spell.t 2015-06-10
03:08:59.000000000 +0200
@@ -2,7 +2,7 @@
use warnings;
use Test::More;
-# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.006008
+# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.006009
use Test::Spelling 0.12;
use Pod::Wordlist;
@@ -87,15 +87,21 @@
mschwern
mohawk2
moznion
+Niko
+Tyni
+ntyni
Olaf
Alders
olaf
Olivier
-Mengue
+Mengué
dolmen
Randy
Sims
randys
+Tomohiro
+Hosaka
+bokutin
lib
CPAN
Meta
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-2.150001/xt/release/test-version.t
new/CPAN-Meta-2.150005/xt/release/test-version.t
--- old/CPAN-Meta-2.150001/xt/release/test-version.t 2015-03-09
19:41:54.000000000 +0100
+++ new/CPAN-Meta-2.150005/xt/release/test-version.t 2015-06-10
03:08:59.000000000 +0200
@@ -2,14 +2,15 @@
use warnings;
use Test::More;
-# generated by Dist::Zilla::Plugin::Test::Version 0.003001
+# generated by Dist::Zilla::Plugin::Test::Version 1.02
use Test::Version;
-my @imports = ( 'version_all_ok' );
+my @imports = qw( version_all_ok );
my $params = {
- is_strict => 0,
- has_version => 1,
+ is_strict => 0,
+ has_version => 1,
+
};
push @imports, $params
