Skip to content

Commit e2b6691

Browse files
author
Max Maischein
committed
Update CPAN::Meta::YAML to 0.019
1 parent 3be0722 commit e2b6691

File tree

12 files changed

+149
-67
lines changed

12 files changed

+149
-67
lines changed

‎MANIFEST

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -642,56 +642,58 @@ cpan/CPAN-Meta-Requirements/t/from-hash.t
642642
cpan/CPAN-Meta-Requirements/t/merge.t
643643
cpan/CPAN-Meta-Requirements/t/strings.t
644644
cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm CPAN-Meta-YAML files
645-
cpan/CPAN-Meta-YAML/t/01_api.t
645+
cpan/CPAN-Meta-YAML/t/01_api.t Test file related to CPAN::Meta::YAML
646646
cpan/CPAN-Meta-YAML/t/01_compile.t CPAN-Meta-YAML files
647-
cpan/CPAN-Meta-YAML/t/10_read.t
648-
cpan/CPAN-Meta-YAML/t/11_read_string.t
649-
cpan/CPAN-Meta-YAML/t/12_write.t
650-
cpan/CPAN-Meta-YAML/t/13_write_string.t
647+
cpan/CPAN-Meta-YAML/t/10_read.t Test file related to CPAN::Meta::YAML
648+
cpan/CPAN-Meta-YAML/t/11_read_string.t Test file related to CPAN::Meta::YAML
649+
cpan/CPAN-Meta-YAML/t/12_write.t Test file related to CPAN::Meta::YAML
650+
cpan/CPAN-Meta-YAML/t/13_write_string.t Test file related to CPAN::Meta::YAML
651651
cpan/CPAN-Meta-YAML/t/20_subclass.t CPAN-Meta-YAML files
652-
cpan/CPAN-Meta-YAML/t/21_yamlpm_compat.t
653-
cpan/CPAN-Meta-YAML/t/30_yaml_spec_tml.t
654-
cpan/CPAN-Meta-YAML/t/31_local_tml.t
655-
cpan/CPAN-Meta-YAML/t/32_world_tml.t
656-
cpan/CPAN-Meta-YAML/t/86_fail.t
657-
cpan/CPAN-Meta-YAML/t/data/ascii.yml
658-
cpan/CPAN-Meta-YAML/t/data/latin1.yml
652+
cpan/CPAN-Meta-YAML/t/21_yamlpm_compat.t Test file related to CPAN::Meta::YAML
653+
cpan/CPAN-Meta-YAML/t/30_yaml_spec_tml.t Test file related to CPAN::Meta::YAML
654+
cpan/CPAN-Meta-YAML/t/31_local_tml.t Test file related to CPAN::Meta::YAML
655+
cpan/CPAN-Meta-YAML/t/32_world_tml.t Test file related to CPAN::Meta::YAML
656+
cpan/CPAN-Meta-YAML/t/86_fail.t Test file related to CPAN::Meta::YAML
657+
cpan/CPAN-Meta-YAML/t/data/ascii.yml CPAN::Meta::YAML
658+
cpan/CPAN-Meta-YAML/t/data/latin1.yml CPAN::Meta::YAML
659659
cpan/CPAN-Meta-YAML/t/data/multibyte.yml CPAN-Meta-YAML files
660660
cpan/CPAN-Meta-YAML/t/data/utf_16_le_bom.yml CPAN-Meta-YAML files
661-
cpan/CPAN-Meta-YAML/t/data/utf_8_bom.yml
662-
cpan/CPAN-Meta-YAML/t/lib/SubtestCompat.pm
663-
cpan/CPAN-Meta-YAML/t/lib/TestBridge.pm
664-
cpan/CPAN-Meta-YAML/t/lib/TestML/Tiny.pm
665-
cpan/CPAN-Meta-YAML/t/lib/TestUtils.pm
666-
cpan/CPAN-Meta-YAML/t/README.md
667-
cpan/CPAN-Meta-YAML/t/tml
668-
cpan/CPAN-Meta-YAML/t/tml-local/dump-error/circular.tml
669-
cpan/CPAN-Meta-YAML/t/tml-local/load-error/document.tml
670-
cpan/CPAN-Meta-YAML/t/tml-local/load-error/scalar.tml
671-
cpan/CPAN-Meta-YAML/t/tml-local/load-error/tag.tml
672-
cpan/CPAN-Meta-YAML/t/tml-local/load-warning/document.tml
673-
cpan/CPAN-Meta-YAML/t/tml-local/perl-to-yaml/quoting.tml
674-
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/collection.tml
675-
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/comment.tml
676-
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/document.tml
677-
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/mapping.tml
678-
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/quoting.tml
679-
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/scalar.tml
680-
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/sequence.tml
681-
cpan/CPAN-Meta-YAML/t/tml-spec/basic-data.tml
682-
cpan/CPAN-Meta-YAML/t/tml-spec/unicode.tml
683-
cpan/CPAN-Meta-YAML/t/tml-world/Acme-Time-Baby.tml
684-
cpan/CPAN-Meta-YAML/t/tml-world/Data-Swap.tml
685-
cpan/CPAN-Meta-YAML/t/tml-world/Games-Nintendo-Wii-Mii.tml
686-
cpan/CPAN-Meta-YAML/t/tml-world/HTML-WebDAO.tml
687-
cpan/CPAN-Meta-YAML/t/tml-world/ITS-SIN-FIDS-Content-XML.tml
688-
cpan/CPAN-Meta-YAML/t/tml-world/Plagger.tml
689-
cpan/CPAN-Meta-YAML/t/tml-world/Spreadsheet-Read.tml
690-
cpan/CPAN-Meta-YAML/t/tml-world/Template-Provider-Unicode-Japanese.tml
691-
cpan/CPAN-Meta-YAML/t/tml-world/toolbar.tml
692-
cpan/CPAN-Meta-YAML/t/tml-world/Vanilla-Perl.tml
693-
cpan/CPAN-Meta-YAML/t/tml-world/YAML-Tiny-META.tml
694-
cpan/CPAN-Meta-YAML/t/tml-world/yaml_org.tml
661+
cpan/CPAN-Meta-YAML/t/data/utf_8_bom.yml CPAN::Meta::YAML
662+
cpan/CPAN-Meta-YAML/t/lib/SubtestCompat.pm Module related to CPAN::Meta::YAML
663+
cpan/CPAN-Meta-YAML/t/lib/TestBridge.pm Module related to CPAN::Meta::YAML
664+
cpan/CPAN-Meta-YAML/t/lib/TestML/Tiny.pm Module related to CPAN::Meta::YAML
665+
cpan/CPAN-Meta-YAML/t/lib/TestUtils.pm Module related to CPAN::Meta::YAML
666+
cpan/CPAN-Meta-YAML/t/README.md CPAN::Meta::YAML
667+
cpan/CPAN-Meta-YAML/t/tml CPAN::Meta::YAML
668+
cpan/CPAN-Meta-YAML/t/tml-local/dump-error/circular.tml Test file related to CPAN::Meta::YAML
669+
cpan/CPAN-Meta-YAML/t/tml-local/load-error/document.tml Test file related to CPAN::Meta::YAML
670+
cpan/CPAN-Meta-YAML/t/tml-local/load-error/scalar.tml Test file related to CPAN::Meta::YAML
671+
cpan/CPAN-Meta-YAML/t/tml-local/load-error/tag.tml Test file related to CPAN::Meta::YAML
672+
cpan/CPAN-Meta-YAML/t/tml-local/load-warning/document.tml Test file related to CPAN::Meta::YAML
673+
cpan/CPAN-Meta-YAML/t/tml-local/perl-to-yaml/quoting.tml Test file related to CPAN::Meta::YAML
674+
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/collection.tml Test file related to CPAN::Meta::YAML
675+
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/comment.tml Test file related to CPAN::Meta::YAML
676+
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/document.tml Test file related to CPAN::Meta::YAML
677+
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/mapping.tml Test file related to CPAN::Meta::YAML
678+
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/quoting.tml Test file related to CPAN::Meta::YAML
679+
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/scalar.tml Test file related to CPAN::Meta::YAML
680+
cpan/CPAN-Meta-YAML/t/tml-local/yaml-roundtrip/sequence.tml Test file related to CPAN::Meta::YAML
681+
cpan/CPAN-Meta-YAML/t/tml-spec/basic-data.tml Test file related to CPAN::Meta::YAML
682+
cpan/CPAN-Meta-YAML/t/tml-spec/multiline.tml CPAN-Meta-YAML
683+
cpan/CPAN-Meta-YAML/t/tml-spec/unicode.tml Test file related to CPAN::Meta::YAML
684+
cpan/CPAN-Meta-YAML/t/tml-world/Acme-Time-Baby.tml Test file related to CPAN::Meta::YAML
685+
cpan/CPAN-Meta-YAML/t/tml-world/Data-Swap.tml Test file related to CPAN::Meta::YAML
686+
cpan/CPAN-Meta-YAML/t/tml-world/Games-Nintendo-Wii-Mii.tml Test file related to CPAN::Meta::YAML
687+
cpan/CPAN-Meta-YAML/t/tml-world/HTML-WebDAO.tml Test file related to CPAN::Meta::YAML
688+
cpan/CPAN-Meta-YAML/t/tml-world/ITS-SIN-FIDS-Content-XML.tml Test file related to CPAN::Meta::YAML
689+
cpan/CPAN-Meta-YAML/t/tml-world/Plagger.tml Test file related to CPAN::Meta::YAML
690+
cpan/CPAN-Meta-YAML/t/tml-world/Spreadsheet-Read.tml Test file related to CPAN::Meta::YAML
691+
cpan/CPAN-Meta-YAML/t/tml-world/Template-Provider-Unicode-Japanese.tml Test file related to CPAN::Meta::YAML
692+
cpan/CPAN-Meta-YAML/t/tml-world/toolbar.tml Test file related to CPAN::Meta::YAML
693+
cpan/CPAN-Meta-YAML/t/tml-world/Vanilla-Perl.tml Test file related to CPAN::Meta::YAML
694+
cpan/CPAN-Meta-YAML/t/tml-world/YAML-Tiny-META.tml Test file related to CPAN::Meta::YAML
695+
cpan/CPAN-Meta-YAML/t/tml-world/yaml_org.tml Test file related to CPAN::Meta::YAML
696+
cpan/CPAN-Meta-YAML/weaver.ini CPAN-Meta-YAML
695697
cpan/DB_File/config.in Part of Berkeley DB configuration
696698
cpan/DB_File/DB_File.pm Berkeley DB extension Perl module
697699
cpan/DB_File/DB_File.xs Berkeley DB extension external subroutines

‎META.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,4 @@ resources:
106106
license: https://dev.perl.org/licenses/
107107
repository: https://github.com/Perl/perl5
108108
version: '5.041007'
109-
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
109+
x_serialization_backend: 'CPAN::Meta::YAML version 0.019'

‎Porting/Maintainers.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,8 @@ package Maintainers;
329329
},
330330

331331
'CPAN::Meta::YAML' => {
332-
'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-YAML-0.018.tar.gz',
332+
'DISTRIBUTION' => 'ETHER/CPAN-Meta-YAML-0.019.tar.gz',
333+
'SYNCINFO' => 'corion on Mon Dec 16 09:12:25 2024',
333334
'FILES' => q[cpan/CPAN-Meta-YAML],
334335
'EXCLUDED' => [
335336
't/00-report-prereqs.t',

‎cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use 5.008001; # sane UTF-8 support
22
use strict;
33
use warnings;
4-
package CPAN::Meta::YAML; # git description: v1.68-2-gcc5324e
4+
package CPAN::Meta::YAML; # git description: v1.74-6-g56f1f15
55
# XXX-INGY is 5.8.1 too old/broken for utf8?
66
# XXX-XDG Lancaster consensus was that it was sufficient until
77
# proven otherwise
8-
$CPAN::Meta::YAML::VERSION = '0.018';
8+
$CPAN::Meta::YAML::VERSION = '0.019';
99
; # original $VERSION removed by Doppelgaenger
1010

1111
#####################################################################
@@ -138,7 +138,10 @@ my %UNESCAPES = (
138138
# These 3 values have special meaning when unquoted and using the
139139
# default YAML schema. They need quotes if they are strings.
140140
my %QUOTE = map { $_ => 1 } qw{
141-
null true false
141+
null Null NULL
142+
y Y yes Yes YES n N no No NO
143+
true True TRUE false False FALSE
144+
on On ON off Off OFF
142145
};
143146

144147
# The commented out form is simpler, but overloaded the Perl regex
@@ -373,7 +376,7 @@ sub _load_scalar {
373376
while ( @$lines ) {
374377
$lines->[0] =~ /^(\s*)/;
375378
last unless length($1) >= $indent->[-1];
376-
push @multiline, substr(shift(@$lines), length($1));
379+
push @multiline, substr(shift(@$lines), $indent->[-1]);
377380
}
378381

379382
my $j = (substr($string, 0, 1) eq '>') ? ' ' : "\n";
@@ -569,10 +572,8 @@ sub _dump_file {
569572
if ( _can_flock() ) {
570573
# Open without truncation (truncate comes after lock)
571574
my $flags = Fcntl::O_WRONLY()|Fcntl::O_CREAT();
572-
sysopen( $fh, $file, $flags );
573-
unless ( $fh ) {
574-
$self->_error("Failed to open file '$file' for writing: $!");
575-
}
575+
sysopen( $fh, $file, $flags )
576+
or $self->_error("Failed to open file '$file' for writing: $!");
576577

577578
# Use no translation and strict UTF-8
578579
binmode( $fh, ":raw:encoding(UTF-8)");
@@ -878,7 +879,7 @@ CPAN::Meta::YAML - Read and write a subset of YAML for CPAN Meta files
878879
879880
=head1 VERSION
880881
881-
version 0.018
882+
version 0.019
882883
883884
=head1 SYNOPSIS
884885
@@ -934,6 +935,12 @@ David Golden <dagolden@cpan.org>
934935
935936
=back
936937
938+
=head1 CONTRIBUTOR
939+
940+
=for stopwords Karen Etheridge
941+
942+
Karen Etheridge <ether@cpan.org>
943+
937944
=head1 COPYRIGHT AND LICENSE
938945
939946
This software is copyright (c) 2010 by Adam Kennedy.

‎cpan/CPAN-Meta-YAML/t/01_api.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ subtest "default exports" => sub {
2222

2323
subtest "all exports" => sub {
2424
package main::all_exports;
25-
use Test::More;
25+
use Test::More 0.88;
2626
use CPAN::Meta::YAML qw/Load Dump LoadFile DumpFile freeze thaw/;
2727
ok( defined(&Load), 'Found exported Load function' );
2828
ok( defined(&Dump), 'Found exported Dump function' );

‎cpan/CPAN-Meta-YAML/t/01_compile.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ BEGIN {
1111
use Test::More 0.88;
1212

1313
# Check their perl version
14-
ok( $] ge '5.008001', "Your perl is new enough" );
14+
ok( "$]" >= 5.008001, "Your perl is new enough" );
1515

1616
# Does the module load
1717
require_ok( 'CPAN::Meta::YAML' );

‎cpan/CPAN-Meta-YAML/t/30_yaml_spec_tml.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ diag 'using JSON backend: ' . $JSON . ' ' . $JSON->VERSION
1616
# Each spec test will need a different bridge and arguments:
1717
my @spec_tests = (
1818
['t/tml-spec/basic-data.tml', 'test_yaml_json', $JSON],
19+
['t/tml-spec/multiline.tml', 'test_yaml_json', $JSON],
1920
# This test is currently failing massively. We use LAST to only run what is
2021
# covered so far.
2122
['t/tml-spec/unicode.tml', 'test_code_point'], # uses JSON::PP

‎cpan/CPAN-Meta-YAML/t/lib/SubtestCompat.pm

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,18 @@ unless ( Test::More->can("subtest") ) {
6262
};
6363
push @EXPORT, 'subtest';
6464
}
65+
elsif ( !eval { Test::More->VERSION(0.95_01) } ) {
66+
my $subtest = \&Test::Builder::subtest;
67+
no warnings 'redefine';
68+
*Test::Builder::subtest = sub {
69+
my ($self, $name, $subtests, @args) = @_;
70+
my $sub = sub {
71+
$subtests->(@_);
72+
$self->done_testing
73+
unless $self->{Have_Plan} || $self->{No_Plan} || $self->{Skip_All};
74+
};
75+
return $self->$subtest($name, $sub, @args);
76+
};
77+
}
6578

6679
1;

‎cpan/CPAN-Meta-YAML/t/lib/TestBridge.pm

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,12 @@ package TestBridge;
33
use strict;
44
use warnings;
55
use lib 't/lib';
6+
use open ':std', ':encoding(UTF-8)'; # force stdin, stdout, stderr into utf8
67
use Test::More 0.88;
78
use SubtestCompat;
89
use TestUtils;
910
use TestML::Tiny;
1011

11-
BEGIN {
12-
$| = 1;
13-
binmode(Test::More->builder->$_, ":utf8")
14-
for qw/output failure_output todo_output/;
15-
}
16-
1712
use CPAN::Meta::YAML;
1813

1914
use Exporter ();
@@ -352,11 +347,13 @@ sub test_code_point {
352347
my $data = { chr($code) => chr($code) };
353348
my $dump = CPAN::Meta::YAML::Dump($data);
354349
$dump =~ s/^---\n//;
355-
is $dump, $yaml, "Dump key and value of code point char $code";
350+
ok($dump eq $yaml or "'$dump'" eq $yaml,
351+
"Dump key and value of code point char $code");
356352

357353
my $yny = CPAN::Meta::YAML::Dump(CPAN::Meta::YAML::Load($yaml));
358354
$yny =~ s/^---\n//;
359-
is $yny, $yaml, "YAML for code point $code YNY roundtrips";
355+
ok($yny eq $yaml or "'$yny'" eq $yaml,
356+
"YAML for code point $code YNY roundtrips");
360357

361358
my $nyn = CPAN::Meta::YAML::Load(CPAN::Meta::YAML::Dump($data));
362359
cmp_deeply( $nyn, $data, "YAML for code point $code NYN roundtrips" );

‎cpan/CPAN-Meta-YAML/t/tml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ __END__
8585
8686
=head1 NAME
8787
88+
=for stopwords tml
89+
8890
t/tml - run .tml files matching a pattern
8991
9092
=head1 SYNOPSIS

0 commit comments

Comments
 (0)