From a808a03dd481002feaeb2455c3473fe7f9beacd1 Mon Sep 17 00:00:00 2001 From: Stevan Little Date: Mon, 19 Sep 2011 12:57:51 -0400 Subject: [PATCH] Update CPAN-Meta to CPAN version 2.112621 [DELTA] 2.112621 2011-09-19 12:15:16 America/New_York [BUGFIX] - Spell BACKEND environment variables correctly this time [noticed by Stevan Little] 2.112620 2011-09-18 20:56:06 America/New_York [BUGFIX] - Protect tests against PERL_(YAML|JSON)_BACKEND settings that could cause tests to fail. (RT #69979) --- Porting/Maintainers.pl | 2 +- cpan/CPAN-Meta/Changes | 14 ++++++++++++++ cpan/CPAN-Meta/lib/CPAN/Meta.pm | 4 ++-- cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm | 4 ++-- cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm | 4 ++-- cpan/CPAN-Meta/lib/CPAN/Meta/History.pm | 4 ++-- cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm | 4 ++-- cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm | 4 ++-- cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm | 4 ++-- cpan/CPAN-Meta/t/converter-bad.t | 2 ++ cpan/CPAN-Meta/t/converter-fail.t | 2 ++ cpan/CPAN-Meta/t/converter.t | 2 ++ cpan/CPAN-Meta/t/load-bad.t | 2 ++ cpan/CPAN-Meta/t/meta-obj.t | 2 ++ cpan/CPAN-Meta/t/no-index.t | 2 ++ cpan/CPAN-Meta/t/prereqs-finalize.t | 2 ++ cpan/CPAN-Meta/t/prereqs-merge.t | 2 ++ cpan/CPAN-Meta/t/prereqs.t | 2 ++ cpan/CPAN-Meta/t/repository.t | 2 ++ cpan/CPAN-Meta/t/save-load.t | 2 ++ cpan/CPAN-Meta/t/validator.t | 2 ++ pod/perldelta.pod | 2 +- 22 files changed, 54 insertions(+), 16 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 08967b6..094332b 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -496,7 +496,7 @@ use File::Glob qw(:case); 'CPAN::Meta' => { 'MAINTAINER' => 'dagolden', - 'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.112600.tar.gz', + 'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.112621.tar.gz', 'FILES' => q[cpan/CPAN-Meta], 'EXCLUDED' => [ qr/^xt/, diff --git a/cpan/CPAN-Meta/Changes b/cpan/CPAN-Meta/Changes index 5ae721e..873d41a 100644 --- a/cpan/CPAN-Meta/Changes +++ b/cpan/CPAN-Meta/Changes @@ -1,5 +1,19 @@ Revision history for CPAN-Meta +2.112621 2011-09-19 12:15:16 America/New_York + + [BUGFIX] + + - Spell BACKEND environment variables correctly this time + [noticed by Stevan Little] + +2.112620 2011-09-18 20:56:06 America/New_York + + [BUGFIX] + + - Protect tests against PERL_(YAML|JSON)_BACKEND settings that could + cause tests to fail. (RT #69979) + 2.112600 2011-09-17 12:21:09 America/New_York [DOCUMENTATION] diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta.pm b/cpan/CPAN-Meta/lib/CPAN/Meta.pm index 493fba8..cfb1b25 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta; -our $VERSION = '2.112600'; # VERSION +our $VERSION = '2.112621'; # VERSION use Carp qw(carp croak); @@ -346,7 +346,7 @@ CPAN::Meta - the distribution metadata for a CPAN dist =head1 VERSION -version 2.112600 +version 2.112621 =head1 SYNOPSIS diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm index 5a3fad4..e468720 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Converter; -our $VERSION = '2.112600'; # VERSION +our $VERSION = '2.112621'; # VERSION use CPAN::Meta::Validator; @@ -1260,7 +1260,7 @@ CPAN::Meta::Converter - Convert CPAN distribution metadata structures =head1 VERSION -version 2.112600 +version 2.112621 =head1 SYNOPSIS diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm index 72f32b3..4002b74 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Feature; -our $VERSION = '2.112600'; # VERSION +our $VERSION = '2.112621'; # VERSION use CPAN::Meta::Prereqs; @@ -42,7 +42,7 @@ CPAN::Meta::Feature - an optional feature provided by a CPAN distribution =head1 VERSION -version 2.112600 +version 2.112621 =head1 DESCRIPTION diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm index df3524c..1f2e9ae 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm @@ -3,7 +3,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::History; -our $VERSION = '2.112600'; # VERSION +our $VERSION = '2.112621'; # VERSION 1; @@ -20,7 +20,7 @@ CPAN::Meta::History - history of CPAN Meta Spec changes =head1 VERSION -version 2.112600 +version 2.112621 =head1 DESCRIPTION diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm index 5e025d7..04c5cf7 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Prereqs; -our $VERSION = '2.112600'; # VERSION +our $VERSION = '2.112621'; # VERSION use Carp qw(confess); @@ -149,7 +149,7 @@ CPAN::Meta::Prereqs - a set of distribution prerequisites by phase and type =head1 VERSION -version 2.112600 +version 2.112621 =head1 DESCRIPTION diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm index 393088e..09bfc23 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm @@ -3,7 +3,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Spec; -our $VERSION = '2.112600'; # VERSION +our $VERSION = '2.112621'; # VERSION 1; @@ -20,7 +20,7 @@ CPAN::Meta::Spec - specification for CPAN distribution metadata =head1 VERSION -version 2.112600 +version 2.112621 =head1 SYNOPSIS diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm index 81ec895..c3d6906 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Validator; -our $VERSION = '2.112600'; # VERSION +our $VERSION = '2.112621'; # VERSION #--------------------------------------------------------------------------# @@ -838,7 +838,7 @@ CPAN::Meta::Validator - validate CPAN distribution metadata structures =head1 VERSION -version 2.112600 +version 2.112621 =head1 SYNOPSIS diff --git a/cpan/CPAN-Meta/t/converter-bad.t b/cpan/CPAN-Meta/t/converter-bad.t index 1225e42..fdfea25 100644 --- a/cpan/CPAN-Meta/t/converter-bad.t +++ b/cpan/CPAN-Meta/t/converter-bad.t @@ -9,6 +9,8 @@ use File::Spec; use IO::Dir; use Parse::CPAN::Meta 1.4400; +delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults + my $data_dir = IO::Dir->new( 't/data-bad' ); my @files = sort grep { /^\w/ } $data_dir->read; diff --git a/cpan/CPAN-Meta/t/converter-fail.t b/cpan/CPAN-Meta/t/converter-fail.t index 3a82f2d..065b3d7 100644 --- a/cpan/CPAN-Meta/t/converter-fail.t +++ b/cpan/CPAN-Meta/t/converter-fail.t @@ -9,6 +9,8 @@ use File::Spec; use IO::Dir; use Parse::CPAN::Meta 1.4400; +delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults + my $data_dir = IO::Dir->new( 't/data-fail' ); my @files = sort grep { /^\w/ } $data_dir->read; diff --git a/cpan/CPAN-Meta/t/converter.t b/cpan/CPAN-Meta/t/converter.t index 372fd55..ede8d03 100644 --- a/cpan/CPAN-Meta/t/converter.t +++ b/cpan/CPAN-Meta/t/converter.t @@ -11,6 +11,8 @@ use IO::Dir; use Parse::CPAN::Meta 1.4400; use version; +delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults + # mock file object package File::StringObject; diff --git a/cpan/CPAN-Meta/t/load-bad.t b/cpan/CPAN-Meta/t/load-bad.t index d18b65c..22a6510 100644 --- a/cpan/CPAN-Meta/t/load-bad.t +++ b/cpan/CPAN-Meta/t/load-bad.t @@ -8,6 +8,8 @@ use IO::Dir; sub _slurp { do { local(@ARGV,$/)=shift(@_); <> } } +delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults + my $data_dir = IO::Dir->new( 't/data-bad' ); my @files = sort grep { /^\w/ } $data_dir->read; diff --git a/cpan/CPAN-Meta/t/meta-obj.t b/cpan/CPAN-Meta/t/meta-obj.t index 522f67d..bb39c46 100644 --- a/cpan/CPAN-Meta/t/meta-obj.t +++ b/cpan/CPAN-Meta/t/meta-obj.t @@ -6,6 +6,8 @@ use CPAN::Meta; use Scalar::Util qw(blessed); +delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults + my $distmeta = { name => 'Module-Build', abstract => 'Build and install Perl modules', diff --git a/cpan/CPAN-Meta/t/no-index.t b/cpan/CPAN-Meta/t/no-index.t index 4f8df45..b151680 100644 --- a/cpan/CPAN-Meta/t/no-index.t +++ b/cpan/CPAN-Meta/t/no-index.t @@ -4,6 +4,8 @@ use Test::More 0.88; use CPAN::Meta; +delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults + my %distmeta = ( name => 'Module-Billed', abstract => 'inscrutable', diff --git a/cpan/CPAN-Meta/t/prereqs-finalize.t b/cpan/CPAN-Meta/t/prereqs-finalize.t index 040e3f3..e974f99 100644 --- a/cpan/CPAN-Meta/t/prereqs-finalize.t +++ b/cpan/CPAN-Meta/t/prereqs-finalize.t @@ -4,6 +4,8 @@ use Test::More 0.88; use CPAN::Meta::Prereqs; +delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults + sub dies_ok (&@) { my ($code, $qr, $comment) = @_; diff --git a/cpan/CPAN-Meta/t/prereqs-merge.t b/cpan/CPAN-Meta/t/prereqs-merge.t index 63e267e..37bca7d 100644 --- a/cpan/CPAN-Meta/t/prereqs-merge.t +++ b/cpan/CPAN-Meta/t/prereqs-merge.t @@ -4,6 +4,8 @@ use Test::More 0.88; use CPAN::Meta::Prereqs; +delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults + my $prereq_struct_1 = { runtime => { requires => { diff --git a/cpan/CPAN-Meta/t/prereqs.t b/cpan/CPAN-Meta/t/prereqs.t index a24f272..1ffacb5 100644 --- a/cpan/CPAN-Meta/t/prereqs.t +++ b/cpan/CPAN-Meta/t/prereqs.t @@ -4,6 +4,8 @@ use Test::More 0.88; use CPAN::Meta::Prereqs; +delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults + my $prereq_struct = { runtime => { requires => { diff --git a/cpan/CPAN-Meta/t/repository.t b/cpan/CPAN-Meta/t/repository.t index b8800d9..8bb1da7c 100644 --- a/cpan/CPAN-Meta/t/repository.t +++ b/cpan/CPAN-Meta/t/repository.t @@ -4,6 +4,8 @@ use Test::More 0.88; use CPAN::Meta; +delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults + # 1.4 repository upgrade { my $label = "(version 1.4) old repository winds up in 'url'"; diff --git a/cpan/CPAN-Meta/t/save-load.t b/cpan/CPAN-Meta/t/save-load.t index 73cac57..79650b1 100644 --- a/cpan/CPAN-Meta/t/save-load.t +++ b/cpan/CPAN-Meta/t/save-load.t @@ -6,6 +6,8 @@ use CPAN::Meta; use File::Temp 0.20 (); use Parse::CPAN::Meta 1.4400; +delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults + my $distmeta = { name => 'Module-Build', abstract => 'Build and install Perl modules', diff --git a/cpan/CPAN-Meta/t/validator.t b/cpan/CPAN-Meta/t/validator.t index e76fcc2..847f768 100644 --- a/cpan/CPAN-Meta/t/validator.t +++ b/cpan/CPAN-Meta/t/validator.t @@ -8,6 +8,8 @@ use File::Spec; use IO::Dir; use Parse::CPAN::Meta 1.4400; +delete $ENV{$_} for qw/PERL_JSON_BACKEND PERL_YAML_BACKEND/; # use defaults + { my $data_dir = IO::Dir->new( 't/data' ); my @files = sort grep { /^\w/ } $data_dir->read; diff --git a/pod/perldelta.pod b/pod/perldelta.pod index c95b8dd..2ab0e49 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -178,7 +178,7 @@ It now correctly deparses C<$#{/}> and C. =item * -L has been upgraded from version 2.112150 to version 2.112600. +L has been upgraded from version 2.112150 to version 2.112621. =item * -- 1.8.3.1