diff -Nru libutf8-all-perl-0.010/Build.PL libutf8-all-perl-0.011/Build.PL --- libutf8-all-perl-0.010/Build.PL 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/Build.PL 2013-08-03 14:12:21.000000000 +0000 @@ -8,15 +8,7 @@ my %module_build_args = ( "build_requires" => { - "File::Find" => 0, - "File::Temp" => 0, - "Module::Build" => "0.3601", - "PerlIO" => 0, - "Test::Fatal" => 0, - "Test::More" => "0.96", - "Test::Warn" => 0, - "autodie" => 0, - "version" => "0.77" + "Module::Build" => "0.3601" }, "configure_requires" => { "Dist::CheckConflicts" => "0.02", @@ -28,7 +20,7 @@ "Mike Doherty " ], "dist_name" => "utf8-all", - "dist_version" => "0.010", + "dist_version" => "0.011", "license" => "perl", "module_name" => "utf8::all", "recommends" => {}, @@ -37,6 +29,7 @@ "Dist::CheckConflicts" => "0.02", "Encode" => 0, "Import::Into" => 0, + "Symbol" => 0, "charnames" => 0, "feature" => 0, "open" => 0, @@ -46,10 +39,32 @@ "utf8" => 0, "warnings" => 0 }, - "script_files" => [] + "script_files" => [], + "test_requires" => { + "Capture::Tiny" => 0, + "PerlIO" => 0, + "Test::Fatal" => 0, + "Test::More" => "0.96", + "Test::Warn" => 0, + "autodie" => 0, + "version" => "0.77" + } ); +unless ( eval { Module::Build->VERSION(0.4004) } ) { + my $tr = delete $module_build_args{test_requires}; + my $br = $module_build_args{build_requires}; + for my $mod ( keys %$tr ) { + if ( exists $br->{$mod} ) { + $br->{$mod} = $tr->{$mod} if $tr->{$mod} > $br->{$mod}; + } + else { + $br->{$mod} = $tr->{$mod}; + } + } +} + my $build = Module::Build->new(%module_build_args); $build->create_build_script; @@ -76,6 +91,8 @@ EOF } + return if $ENV{AUTOMATED_TESTING} || $ENV{NONINTERACTIVE_TESTING}; + # More or less copied from Module::Build return if $ENV{PERL_MM_USE_DEFAULT}; return unless -t STDIN && ( -t STDOUT || !( -f STDOUT || -c STDOUT ) ); diff -Nru libutf8-all-perl-0.010/Changes libutf8-all-perl-0.011/Changes --- libutf8-all-perl-0.010/Changes 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/Changes 2013-08-03 14:12:21.000000000 +0000 @@ -1,5 +1,9 @@ Revision history for Perl module utf8-all +0.011 2013-08-03 + * Only decode readdir entries if utf8::all is in effect [leont] + * Support direct dirhandles in readdir [leont] + 0.010 2013-02-02 * Don't depend on localizable error strings diff -Nru libutf8-all-perl-0.010/META.json libutf8-all-perl-0.011/META.json --- libutf8-all-perl-0.010/META.json 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/META.json 2013-08-03 14:12:21.000000000 +0000 @@ -5,7 +5,7 @@ "Mike Doherty " ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 4.300030, CPAN::Meta::Converter version 2.120921", + "generated_by" : "Dist::Zilla version 4.300035, CPAN::Meta::Converter version 2.131560", "license" : [ "perl_5" ], @@ -34,18 +34,26 @@ } }, "develop" : { + "conflicts" : { + "autodie" : "2.11" + }, "requires" : { "Pod::Coverage::TrustPod" : "0", + "Test::CPAN::Changes" : "0.19", "Test::CPAN::Meta" : "0", "Test::Pod" : "1.41", "Test::Pod::Coverage" : "1.08" } }, "runtime" : { + "conflicts" : { + "autodie" : "2.11" + }, "requires" : { "Dist::CheckConflicts" : "0.02", "Encode" : "0", "Import::Into" : "0", + "Symbol" : "0", "charnames" : "0", "feature" : "0", "open" : "0", @@ -58,8 +66,7 @@ }, "test" : { "requires" : { - "File::Find" : "0", - "File::Temp" : "0", + "Capture::Tiny" : "0", "PerlIO" : "0", "Test::Fatal" : "0", "Test::More" : "0.96", @@ -81,8 +88,8 @@ "web" : "https://github.com/doherty/utf8-all" } }, - "version" : "0.010", - "x_conflicts" : { + "version" : "0.011", + "x_breaks" : { "autodie" : "2.11" } } diff -Nru libutf8-all-perl-0.010/META.yml libutf8-all-perl-0.011/META.yml --- libutf8-all-perl-0.010/META.yml 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/META.yml 2013-08-03 14:12:21.000000000 +0000 @@ -4,8 +4,7 @@ - 'Michael Schwern ' - 'Mike Doherty ' build_requires: - File::Find: 0 - File::Temp: 0 + Capture::Tiny: 0 Module::Build: 0.3601 PerlIO: 0 Test::Fatal: 0 @@ -16,8 +15,10 @@ configure_requires: Dist::CheckConflicts: 0.02 Module::Build: 0.3601 +conflicts: + autodie: 2.11 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.300030, CPAN::Meta::Converter version 2.120921' +generated_by: 'Dist::Zilla version 4.300035, CPAN::Meta::Converter version 2.131560' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -32,6 +33,7 @@ Dist::CheckConflicts: 0.02 Encode: 0 Import::Into: 0 + Symbol: 0 charnames: 0 feature: 0 open: 0 @@ -44,6 +46,6 @@ bugtracker: https://github.com/doherty/utf8-all/issues homepage: http://metacpan.org/release/utf8-all/ repository: git://github.com/doherty/utf8-all.git -version: 0.010 -x_conflicts: +version: 0.011 +x_breaks: autodie: 2.11 diff -Nru libutf8-all-perl-0.010/Makefile.PL libutf8-all-perl-0.011/Makefile.PL --- libutf8-all-perl-0.010/Makefile.PL 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/Makefile.PL 2013-08-03 14:12:21.000000000 +0000 @@ -13,15 +13,7 @@ "ABSTRACT" => "turn on Unicode - all of it", "AUTHOR" => "Michael Schwern , Mike Doherty ", "BUILD_REQUIRES" => { - "File::Find" => 0, - "File::Temp" => 0, - "Module::Build" => "0.3601", - "PerlIO" => 0, - "Test::Fatal" => 0, - "Test::More" => "0.96", - "Test::Warn" => 0, - "autodie" => 0, - "version" => "0.77" + "Module::Build" => "0.3601" }, "CONFIGURE_REQUIRES" => { "Dist::CheckConflicts" => "0.02", @@ -35,6 +27,7 @@ "Dist::CheckConflicts" => "0.02", "Encode" => 0, "Import::Into" => 0, + "Symbol" => 0, "charnames" => 0, "feature" => 0, "open" => 0, @@ -43,13 +36,35 @@ "utf8" => 0, "warnings" => 0 }, - "VERSION" => "0.010", + "TEST_REQUIRES" => { + "Capture::Tiny" => 0, + "PerlIO" => 0, + "Test::Fatal" => 0, + "Test::More" => "0.96", + "Test::Warn" => 0, + "autodie" => 0, + "version" => "0.77" + }, + "VERSION" => "0.011", "test" => { "TESTS" => "t/*.t" } ); +unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) { + my $tr = delete $WriteMakefileArgs{TEST_REQUIRES}; + my $br = $WriteMakefileArgs{BUILD_REQUIRES}; + for my $mod ( keys %$tr ) { + if ( exists $br->{$mod} ) { + $br->{$mod} = $tr->{$mod} if $tr->{$mod} > $br->{$mod}; + } + else { + $br->{$mod} = $tr->{$mod}; + } + } +} + unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) { my $br = delete $WriteMakefileArgs{BUILD_REQUIRES}; my $pp = $WriteMakefileArgs{PREREQ_PM}; @@ -93,6 +108,8 @@ EOF } + return if $ENV{AUTOMATED_TESTING} || $ENV{NONINTERACTIVE_TESTING}; + # More or less copied from Module::Build return if $ENV{PERL_MM_USE_DEFAULT}; return unless -t STDIN && ( -t STDOUT || !( -f STDOUT || -c STDOUT ) ); diff -Nru libutf8-all-perl-0.010/README libutf8-all-perl-0.011/README --- libutf8-all-perl-0.010/README 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/README 2013-08-03 14:12:21.000000000 +0000 @@ -2,7 +2,7 @@ utf8::all - turn on Unicode - all of it VERSION - version 0.010 + version 0.011 SYNOPSIS use utf8::all; # Turn on UTF-8. All of it. diff -Nru libutf8-all-perl-0.010/README.mkdn libutf8-all-perl-0.011/README.mkdn --- libutf8-all-perl-0.010/README.mkdn 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/README.mkdn 2013-08-03 14:12:21.000000000 +0000 @@ -4,7 +4,7 @@ # VERSION -version 0.010 +version 0.011 # SYNOPSIS diff -Nru libutf8-all-perl-0.010/debian/changelog libutf8-all-perl-0.011/debian/changelog --- libutf8-all-perl-0.010/debian/changelog 2013-02-18 18:21:35.000000000 +0000 +++ libutf8-all-perl-0.011/debian/changelog 2013-09-13 13:28:36.000000000 +0000 @@ -1,3 +1,10 @@ +libutf8-all-perl (0.011-1) unstable; urgency=low + + * New upstream release. + * Update build and runtime dependencies. + + -- gregor herrmann Fri, 13 Sep 2013 15:28:28 +0200 + libutf8-all-perl (0.010-1) unstable; urgency=low [ Salvatore Bonaccorso ] diff -Nru libutf8-all-perl-0.010/debian/control libutf8-all-perl-0.011/debian/control --- libutf8-all-perl-0.010/debian/control 2013-02-18 18:21:35.000000000 +0000 +++ libutf8-all-perl-0.011/debian/control 2013-09-13 13:28:36.000000000 +0000 @@ -4,14 +4,16 @@ Section: perl Priority: optional Build-Depends: debhelper (>= 8), - perl (>= 5.11.4) | libmodule-build-perl -Build-Depends-Indep: libautodie-perl (>= 2.12) | perl (>= 5.17.2), + perl (>= 5.11.4) | libmodule-build-perl (>= 0.360100) +Build-Depends-Indep: libcapture-tiny-perl, + libcpan-changes-perl, libdist-checkconflicts-perl, libimport-into-perl, libtest-fatal-perl, libtest-script-perl, libtest-warn-perl, - perl (>= 5.13.4) | libtest-simple-perl (>= 0.96) + perl (>= 5.13.4) | libtest-simple-perl (>= 0.96), + perl (>= 5.17.2) | libautodie-perl (>= 2.12) Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libutf8-all-perl.git Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libutf8-all-perl.git @@ -21,8 +23,9 @@ Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, - libautodie-perl (>= 2.12) | perl (>= 5.17.2), - libimport-into-perl + libimport-into-perl, + perl (>= 5.17.2) | libautodie-perl (>= 2.12) +Breaks: libautodie-perl (<< 2.12~) Description: Perl pragma to turn on UTF-8 everywhere The utf8 pragma allows you to write Perl source code encoded in UTF-8. That means UTF-8 strings, variable names, and regular expressions. utf8::all goes diff -Nru libutf8-all-perl-0.010/lib/utf8/all/Conflicts.pm libutf8-all-perl-0.011/lib/utf8/all/Conflicts.pm --- libutf8-all-perl-0.010/lib/utf8/all/Conflicts.pm 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/lib/utf8/all/Conflicts.pm 2013-08-03 14:12:21.000000000 +0000 @@ -9,19 +9,64 @@ -conflicts => { 'autodie' => '2.11', }, - -also => [ qw( - Dist::CheckConflicts - Encode - Import::Into - charnames - feature - open - parent - strict - utf8 - warnings - ) ], ; 1; + +# ABSTRACT: Provide information on conflicts for utf8::all + +__END__ + +=pod + +=encoding utf-8 + +=head1 NAME + +utf8::all::Conflicts - Provide information on conflicts for utf8::all + +=head1 VERSION + +version 0.011 + +=head1 AVAILABILITY + +The project homepage is L. + +The latest version of this module is available from the Comprehensive Perl +Archive Network (CPAN). Visit L to find a CPAN +site near you, or see L. + +=head1 SOURCE + +The development version is on github at L +and may be cloned from L + +=head1 BUGS AND LIMITATIONS + +You can make new bug reports, and view existing ones, through the +web interface at L. + +=head1 AUTHORS + +=over 4 + +=item * + +Michael Schwern + +=item * + +Mike Doherty + +=back + +=head1 COPYRIGHT AND LICENSE + +This software is copyright (c) 2009 by Michael Schwern . + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +=cut diff -Nru libutf8-all-perl-0.010/lib/utf8/all.pm libutf8-all-perl-0.011/lib/utf8/all.pm --- libutf8-all-perl-0.010/lib/utf8/all.pm 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/lib/utf8/all.pm 2013-08-03 14:12:21.000000000 +0000 @@ -3,11 +3,12 @@ use warnings; use 5.010; # state # ABSTRACT: turn on Unicode - all of it -our $VERSION = '0.010'; # VERSION +our $VERSION = '0.011'; # VERSION use Import::Into; use parent qw(Encode charnames utf8 open warnings feature); +use Symbol qw/qualify_to_ref/; sub import { my $target = caller; @@ -38,15 +39,18 @@ } sub _utf8_readdir(*) { ## no critic (Subroutines::ProhibitSubroutinePrototypes) - my $handle = shift; + my $pre_handle = shift; + my $handle = ref($pre_handle) ? $pre_handle : qualify_to_ref($pre_handle, caller); + my $hints = (caller 0)[10]; if (wantarray) { my @all_files = CORE::readdir($handle); + return @all_files if not $hints->{'utf8::all'}; $_ = Encode::decode('UTF-8', $_) for @all_files; return @all_files; } else { my $next_file = CORE::readdir($handle); - $next_file = Encode::decode('UTF-8', $next_file); + $next_file = Encode::decode('UTF-8', $next_file) if $hints->{'utf8::all'}; return $next_file; } } @@ -66,7 +70,7 @@ =head1 VERSION -version 0.010 +version 0.011 =head1 SYNOPSIS diff -Nru libutf8-all-perl-0.010/t/00-compile.t libutf8-all-perl-0.011/t/00-compile.t --- libutf8-all-perl-0.010/t/00-compile.t 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/t/00-compile.t 2013-08-03 14:12:21.000000000 +0000 @@ -1,73 +1,39 @@ -#!perl - use strict; use warnings; -use Test::More; +# This test was generated via Dist::Zilla::Plugin::Test::Compile 2.011 + +use Test::More 0.88; -use File::Find; -use File::Temp qw{ tempdir }; +use Capture::Tiny qw{ capture }; -my @modules; -find( - sub { - return if $File::Find::name !~ /\.pm\z/; - my $found = $File::Find::name; - $found =~ s{^lib/}{}; - $found =~ s{[/\\]}{::}g; - $found =~ s/\.pm$//; - # nothing to skip - push @modules, $found; - }, - 'lib', +my @module_files = qw( +lib/utf8/all.pm ); -sub _find_scripts { - my $dir = shift @_; +my @scripts = qw( + +); - my @found_scripts = (); - find( - sub { - return unless -f; - my $found = $File::Find::name; - # nothing to skip - open my $FH, '<', $_ or do { - note( "Unable to open $found in ( $! ), skipping" ); - return; - }; - my $shebang = <$FH>; - return unless $shebang =~ /^#!.*?\bperl\b\s*$/; - push @found_scripts, $found; - }, - $dir, - ); +# no fake home requested - return @found_scripts; +my @warnings; +for my $lib (@module_files) +{ + my ($stdout, $stderr, $exit) = capture { + system($^X, '-Mblib', '-e', qq{require qq[$lib]}); + }; + is($?, 0, "$lib loaded ok"); + warn $stderr if $stderr; + push @warnings, $stderr if $stderr; } -my @scripts; -do { push @scripts, _find_scripts($_) if -d $_ } - for qw{ bin script scripts }; +is(scalar(@warnings), 0, 'no warnings found') if $ENV{AUTHOR_TESTING}; -my $plan = scalar(@modules) + scalar(@scripts); -$plan ? (plan tests => $plan) : (plan skip_all => "no tests to run"); -{ - # fake home for cpan-testers - # no fake requested ## local $ENV{HOME} = tempdir( CLEANUP => 1 ); - like( qx{ $^X -Ilib -e "require $_; print '$_ ok'" }, qr/^\s*$_ ok/s, "$_ loaded ok" ) - for sort @modules; - SKIP: { - eval "use Test::Script 1.05; 1;"; - skip "Test::Script needed to test script compilation", scalar(@scripts) if $@; - foreach my $file ( @scripts ) { - my $script = $file; - $script =~ s!.*/!!; - script_compiles( $file, "$script script compiles" ); - } - } -} + +done_testing; diff -Nru libutf8-all-perl-0.010/t/readdir.t libutf8-all-perl-0.011/t/readdir.t --- libutf8-all-perl-0.010/t/readdir.t 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/t/readdir.t 2013-08-03 14:12:21.000000000 +0000 @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::More 0.96 tests => 2; +use Test::More 0.96 tests => 3; use Encode qw/decode FB_CROAK/; subtest utf8 => sub { @@ -38,3 +38,22 @@ is $utf8 => decode('UTF-8', $core, FB_CROAK) or diag "$utf8 : $core"; closedir $dh; }; + +subtest package_var => sub { + plan tests => 3; + opendir DH, 'corpus' + or die "Couldn't open directory 'corpus'"; + + my @files = sort grep { $_ ne '.' and $_ ne '..' } eval { readdir DH; }; + my @utf8_files; + { + rewinddir DH; + use utf8::all; + @utf8_files = sort grep { $_ ne '.' and $_ ne '..' } readdir DH; + } + closedir DH; + + is_deeply \@utf8_files, [sort "\x{307f}\x{304b}\x{3061}\x{3083}\x{3093}", "testfile"]; + is $files[0] => $utf8_files[0]; + is decode('UTF-8', $files[1], FB_CROAK) => $utf8_files[1]; +}; diff -Nru libutf8-all-perl-0.010/xt/release/cpan-changes.t libutf8-all-perl-0.011/xt/release/cpan-changes.t --- libutf8-all-perl-0.010/xt/release/cpan-changes.t 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/xt/release/cpan-changes.t 2013-08-03 14:12:21.000000000 +0000 @@ -1,7 +1,11 @@ #!perl -use Test::More; -eval 'use Test::CPAN::Changes'; -plan skip_all => 'Test::CPAN::Changes required for this test' if $@; -changes_file_ok('Changes'); +use strict; +use warnings; + +use Test::More 0.96 tests => 2; +use_ok('Test::CPAN::Changes'); +subtest 'changes_ok' => sub { + changes_file_ok('Changes'); +}; done_testing(); diff -Nru libutf8-all-perl-0.010/xt/release/minimum-version.t libutf8-all-perl-0.011/xt/release/minimum-version.t --- libutf8-all-perl-0.010/xt/release/minimum-version.t 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/xt/release/minimum-version.t 2013-08-03 14:12:21.000000000 +0000 @@ -5,4 +5,4 @@ eval "use Test::MinimumVersion"; plan skip_all => "Test::MinimumVersion required for testing minimum versions" if $@; -all_minimum_version_from_metayml_ok(); +all_minimum_version_ok( qq{5.10.1} ); diff -Nru libutf8-all-perl-0.010/xt/release/synopsis.t libutf8-all-perl-0.011/xt/release/synopsis.t --- libutf8-all-perl-0.010/xt/release/synopsis.t 2013-02-02 14:28:56.000000000 +0000 +++ libutf8-all-perl-0.011/xt/release/synopsis.t 2013-08-03 14:12:21.000000000 +0000 @@ -5,4 +5,4 @@ eval "use Test::Synopsis"; plan skip_all => "Test::Synopsis required for testing synopses" if $@; -all_synopsis_ok('lib'); +all_synopsis_ok();