Hello community, here is the log from the commit of package perl-strictures for openSUSE:Factory checked in at 2015-02-10 20:22:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-strictures (Old) and /work/SRC/openSUSE:Factory/.perl-strictures.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-strictures" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-strictures/perl-strictures.changes 2014-09-17 17:26:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-strictures.new/perl-strictures.changes 2015-02-10 20:22:52.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Feb 7 07:21:44 UTC 2015 - coolo@suse.com + +- updated to 1.005006 + - fix extra checks triggering on paths starting with t, xt, lib, or blib, + rather than only triggering on those directories. + - avoid stat checks for VCS directories until we are in an appropriately + named file + - various cleanups in test files + +------------------------------------------------------------------- Old: ---- strictures-1.005005.tar.gz New: ---- strictures-1.005006.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-strictures.spec ++++++ --- /var/tmp/diff_new_pack.8cW6RB/_old 2015-02-10 20:22:52.000000000 +0100 +++ /var/tmp/diff_new_pack.8cW6RB/_new 2015-02-10 20:22:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-strictures # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: perl-strictures -Version: 1.005005 +Version: 1.005006 Release: 0 %define cpan_name strictures Summary: Turn on strict and make all warnings fatal @@ -81,7 +81,6 @@ %prep %setup -q -n %{cpan_name}-%{version} -find . -type f -print0 | xargs -0 chmod 644 %build %{__perl} Makefile.PL INSTALLDIRS=vendor ++++++ strictures-1.005005.tar.gz -> strictures-1.005006.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/Changes new/strictures-1.005006/Changes --- old/strictures-1.005005/Changes 2014-08-16 03:16:45.000000000 +0200 +++ new/strictures-1.005006/Changes 2015-01-30 14:01:25.000000000 +0100 @@ -1,5 +1,12 @@ Release history for strictures +1.005006 - 2015-01-30 + - fix extra checks triggering on paths starting with t, xt, lib, or blib, + rather than only triggering on those directories. + - avoid stat checks for VCS directories until we are in an appropriately + named file + - various cleanups in test files + 1.005005 - 2014-08-16 - include minimum perl version in metadata diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/MANIFEST new/strictures-1.005006/MANIFEST --- old/strictures-1.005005/MANIFEST 2014-08-16 03:16:54.000000000 +0200 +++ new/strictures-1.005006/MANIFEST 2015-01-30 14:01:44.000000000 +0100 @@ -1,18 +1,10 @@ Changes lib/strictures.pm -maint/bump-version -maint/Makefile.include maint/Makefile.PL.include Makefile.PL MANIFEST This list of files t/crash.t -t/dep_constellations/broken/bareword/filehandles.pm -t/dep_constellations/broken/indirect.pm -t/dep_constellations/broken/multidimensional.pm -t/smells-of-vcs/.exists -t/smells-of-vcs/lib/one.pm -t/smells-of-vcs/other/one.pl -t/smells-of-vcs/t/one.faket +t/extras.t t/strictures.t xt/pod.t META.yml Module YAML meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/META.json new/strictures-1.005006/META.json --- old/strictures-1.005005/META.json 2014-08-16 03:16:54.000000000 +0200 +++ new/strictures-1.005006/META.json 2015-01-30 14:01:44.000000000 +0100 @@ -4,7 +4,7 @@ "mst - Matt S. Trout (cpan:MSTROUT) <mst@shadowcat.co.uk>" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141520", + "generated_by" : "ExtUtils::MakeMaker version 7.04, CPAN::Meta::Converter version 2.142690", "license" : [ "perl_5" ], @@ -28,6 +28,9 @@ }, "develop" : { "requires" : { + "Pod::Coverage::CountParents" : "0", + "Test::Pod" : "0", + "Test::Pod::Coverage" : "0", "bareword::filehandles" : "0", "indirect" : "0", "multidimensional" : "0" @@ -64,5 +67,5 @@ "web" : "http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git" } }, - "version" : "1.005005" + "version" : "1.005006" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/META.yml new/strictures-1.005006/META.yml --- old/strictures-1.005005/META.yml 2014-08-16 03:16:54.000000000 +0200 +++ new/strictures-1.005006/META.yml 2015-01-30 14:01:44.000000000 +0100 @@ -6,7 +6,7 @@ Test::More: '0' configure_requires: {} dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141520' +generated_by: 'ExtUtils::MakeMaker version 7.04, CPAN::Meta::Converter version 2.142690' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -26,4 +26,4 @@ bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=strictures license: http://dev.perl.org/licenses/ repository: git://git.shadowcat.co.uk/p5sagit/strictures.git -version: '1.005005' +version: '1.005006' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/Makefile.PL new/strictures-1.005006/Makefile.PL --- old/strictures-1.005005/Makefile.PL 2014-08-12 09:50:11.000000000 +0200 +++ new/strictures-1.005006/Makefile.PL 2015-01-30 13:08:27.000000000 +0100 @@ -31,6 +31,9 @@ }, }, develop => { requires => { + 'Test::Pod' => 0, + 'Test::Pod::Coverage' => 0, + 'Pod::Coverage::CountParents' => 0, %extra_prereqs, } }, }, @@ -56,7 +59,6 @@ PREREQ_PM => { ($] >= 5.008004 && $have_compiler ? %extra_prereqs : () ) }, - realclean => { FILES => [ 'Distar/', 'MANIFEST*' ] }, ); sub parse_args { @@ -71,7 +73,7 @@ return $tmp->{ARGS} || {}; } -############################################################################## +## BOILERPLATE ############################################################### require ExtUtils::MakeMaker; (do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml'; @@ -82,8 +84,10 @@ ($MM_ARGS{NAME} = $META{name}) =~ s/-/::/g; ($MM_ARGS{VERSION_FROM} = "lib/$MM_ARGS{NAME}.pm") =~ s{::}{/}g; -$MM_ARGS{LICENSE} = $META{license} - if $eumm_version >= 6.30; +$META{license} = [ $META{license} ] + if $META{license} && !ref $META{license}; +$MM_ARGS{LICENSE} = $META{license}[0] + if $META{license} && $eumm_version >= 6.30; $MM_ARGS{NO_MYMETA} = 1 if $mymeta_broken; $MM_ARGS{META_ADD} = { 'meta-spec' => { version => 2 }, %META } @@ -110,3 +114,4 @@ if $eumm_version < 6.51_03; ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS); +## END BOILERPLATE ########################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/README new/strictures-1.005006/README --- old/strictures-1.005005/README 2014-08-16 03:16:54.000000000 +0200 +++ new/strictures-1.005006/README 2015-01-30 14:01:44.000000000 +0100 @@ -11,7 +11,7 @@ except when called from a file which matches: - (caller)[1] =~ /^(?:t|xt|lib|blib)/ + (caller)[1] =~ /^(?:t|xt|lib|blib)[\\\/]/ and when either ".git", ".svn", or ".hg" is present in the current directory (with the intention of only forcing extra tests on the author diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/lib/strictures.pm new/strictures-1.005006/lib/strictures.pm --- old/strictures-1.005005/lib/strictures.pm 2014-08-16 03:16:14.000000000 +0200 +++ new/strictures-1.005006/lib/strictures.pm 2015-01-30 13:58:20.000000000 +0100 @@ -7,7 +7,8 @@ *_PERL_LT_5_8_4 = ($] < 5.008004) ? sub(){1} : sub(){0}; } -our $VERSION = '1.005005'; +our $VERSION = '1.005006'; +$VERSION = eval $VERSION; sub VERSION { my ($class, $version) = @_; @@ -24,9 +25,7 @@ our $extra_load_states; -our $Smells_Like_VCS = (-e '.git' || -e '.svn' || -e '.hg' - || (-e '../../dist.ini' - && (-e '../../.git' || -e '../../.svn' || -e '../../.hg' ))); +our $Smells_Like_VCS; sub import { strict->import; @@ -40,8 +39,13 @@ } $ENV{PERL_STRICTURES_EXTRA}; } elsif (! _PERL_LT_5_8_4) { - !!((caller)[1] =~ /^(?:t|xt|lib|blib)/ - and $Smells_Like_VCS) + (caller)[1] =~ /^(?:t|xt|lib|blib)[\\\/]/ + and defined $Smells_Like_VCS ? $Smells_Like_VCS + : ( $Smells_Like_VCS = !!( + -e '.git' || -e '.svn' || -e '.hg' + || (-e '../../dist.ini' + && (-e '../../.git' || -e '../../.svn' || -e '../../.hg' )) + )) } }; if ($extra_tests) { @@ -104,7 +108,7 @@ except when called from a file which matches: - (caller)[1] =~ /^(?:t|xt|lib|blib)/ + (caller)[1] =~ /^(?:t|xt|lib|blib)[\\\/]/ and when either C<.git>, C<.svn>, or C<.hg> is present in the current directory (with the intention of only forcing extra tests on the author side) -- or when C<.git>, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/maint/Makefile.include new/strictures-1.005006/maint/Makefile.include --- old/strictures-1.005005/maint/Makefile.include 2013-09-18 08:11:53.000000000 +0200 +++ new/strictures-1.005006/maint/Makefile.include 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -bump: - maint/bump-version - rm Makefile -bumpminor: - maint/bump-version minor - rm Makefile -bumpmajor: - maint/bump-version major - rm Makefile -upload: $(DISTVNAME).tar$(SUFFIX) - cpan-upload $< diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/maint/bump-version new/strictures-1.005006/maint/bump-version --- old/strictures-1.005005/maint/bump-version 2014-08-16 03:15:28.000000000 +0200 +++ new/strictures-1.005006/maint/bump-version 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -#!/usr/bin/env perl - -use 5.010; -use strict; -use warnings FATAL => 'all'; -use autodie; - -chomp(my $LATEST = qx(grep '^[0-9]' Changes | head -1 | awk '{print \$1}')); - -my @parts = map { m/(\d{1,3})/g } split /\./, $LATEST; -push @parts, 0, 0; - -my $OLD_DECIMAL = sprintf('%i.%03i%03i', @parts[0..2]); - -my %bump_part = (major => 0, minor => 1, bugfix => 2); - -my $bump_this = - $bump_part{$ARGV[0]||'bugfix'} - // die "no idea which part to bump - $ARGV[0] means nothing to me"; - -my @new_parts = @parts; - -$new_parts[$bump_this]++; - -my $NEW_DECIMAL = sprintf('%i.%03i%03i', @new_parts[0..2]); - -my @PM_FILES = ( 'lib/strictures.pm' ); - -foreach my $filename (@PM_FILES) { - warn "Bumping $OLD_DECIMAL -> $NEW_DECIMAL in $filename\n"; - - my $file = do { local (@ARGV, $/) = ($filename); <> }; - - $file =~ s/(?<=\$VERSION = ')${\quotemeta $OLD_DECIMAL}/${NEW_DECIMAL}/; - - open my $out, '>', $filename; - - print $out $file; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/t/extras.t new/strictures-1.005006/t/extras.t --- old/strictures-1.005005/t/extras.t 1970-01-01 01:00:00.000000000 +0100 +++ new/strictures-1.005006/t/extras.t 2015-01-30 13:56:02.000000000 +0100 @@ -0,0 +1,123 @@ +BEGIN { delete $ENV{PERL_STRICTURES_EXTRA} } +use strict; +use warnings; +use Test::More $] >= 5.008_004 ? qw(no_plan) + : (skip_all => 'Extra tests disabled on perls <= 5.008003'); + +use File::Temp; + +my $tempdir = File::Temp::tempdir(CLEANUP => 1, TMPDIR => 1); +chdir $tempdir; + +my %extras; +BEGIN { + %extras = map { $_ => 1 } qw( + indirect.pm + multidimensional.pm + bareword/filehandles.pm + ); + $INC{$_} = __FILE__ + for keys %extras; +} + +use strictures (); + +my $indirect = 0; +sub indirect::unimport { + $indirect++; +}; + +{ + local $strictures::Smells_Like_VCS = undef; + eval qq{ +#line 1 "t/nogit.t" +use strictures; +1; +} or die "$@"; + ok defined $strictures::Smells_Like_VCS, 'VCS dir has been checked'; + ok !$strictures::Smells_Like_VCS, 'VCS dir not detected with no .git'; +} + +mkdir '.git'; + +{ + local $strictures::Smells_Like_VCS = undef; + eval qq{ +#line 1 "t/withgit.t" +use strictures; +1; +} or die "$@"; + ok defined $strictures::Smells_Like_VCS, 'VCS dir has been checked'; + ok $strictures::Smells_Like_VCS, 'VCS dir detected with .git'; +} + +$strictures::Smells_Like_VCS = 1; + +for my $check ( + ["file.pl" => 0], + ["test.pl" => 0], + ["library.pm" => 0], + ["t/test.t" => 1], + ["xt/test.t" => 1], + ["t/one.faket" => 1], + ["lib/module.pm" => 1], + ["other/one.pl" => 0], + ["other/t/test.t" => 0], + ["blib/module.pm" => 1], +) { + my ($file, $want) = @$check; + $indirect = 0; + eval qq{ +#line 1 "$file" +use strictures; +1; + } or die "$@"; + my $not = $want ? '' : ' not'; + is $indirect, $want, + "file named $file does$not get extras"; +} + +{ + local $ENV{PERL_STRICTURES_EXTRA} = 1; + local $strictures::extra_load_states = undef; + local @INC = (sub { + die "Can't locate $_[1] in \@INC (...).\n" + if $extras{$_[1]}; + }, @INC); + local %INC = %INC; + delete $INC{$_} + for keys %extras; + + { + open my $fh, '>', \(my $str = ''); + { + local *STDERR = $fh; + eval qq{ +#line 1 "t/load_fail.t" +use strictures; +1; + } or die "$@"; + } + + strictures->import; + like( + $str, + qr/Missing were:\n\n indirect multidimensional bareword::filehandles/, + "failure to load all three extra deps is reported" + ); + } + + { + open my $fh, '>', \(my $str = ''); + { + local *STDERR = $fh; + eval qq{ +#line 1 "t/load_fail.t" +use strictures; +1; + } or die "$@"; + } + + is $str, '', "extra dep load failure is not reported a second time"; + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/t/smells-of-vcs/lib/one.pm new/strictures-1.005006/t/smells-of-vcs/lib/one.pm --- old/strictures-1.005005/t/smells-of-vcs/lib/one.pm 2013-11-15 07:38:08.000000000 +0100 +++ new/strictures-1.005006/t/smells-of-vcs/lib/one.pm 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -package one; - -use strictures 1; - -new Foo 1, 2, 3; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/t/smells-of-vcs/other/one.pl new/strictures-1.005006/t/smells-of-vcs/other/one.pl --- old/strictures-1.005005/t/smells-of-vcs/other/one.pl 2013-11-15 07:38:08.000000000 +0100 +++ new/strictures-1.005006/t/smells-of-vcs/other/one.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -use strictures 1; - -new Foo 1, 2, 3; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/t/smells-of-vcs/t/one.faket new/strictures-1.005006/t/smells-of-vcs/t/one.faket --- old/strictures-1.005005/t/smells-of-vcs/t/one.faket 2013-11-15 07:38:08.000000000 +0100 +++ new/strictures-1.005006/t/smells-of-vcs/t/one.faket 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -use strictures 1; - -new Foo 1, 2, 3; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/t/strictures.t new/strictures-1.005006/t/strictures.t --- old/strictures-1.005005/t/strictures.t 2014-08-04 11:40:39.000000000 +0200 +++ new/strictures-1.005006/t/strictures.t 2015-01-30 13:56:02.000000000 +0100 @@ -1,10 +1,5 @@ BEGIN { delete $ENV{PERL_STRICTURES_EXTRA} } -# -e is sufficient here. --e 't/smells-of-vcs/.git' - or mkdir('t/smells-of-vcs/.git') - or die "Couldn't create fake .git: $!"; - use Test::More qw(no_plan); our (@us, @expect); @@ -38,54 +33,4 @@ eval { $v = strictures->VERSION; 1 } or diag $@; is $v, $strictures::VERSION, '->VERSION returns version correctly'; -SKIP: { - skip 'Extra tests disabled on perls <= 5.008003', 1 - if $] < 5.008004; - skip 'Not got all the modules to do this', 1 - unless eval { - require indirect; - require multidimensional; - require bareword::filehandles; - 1; - }; - sub Foo::new { 1 } - chdir("t/smells-of-vcs"); - local $strictures::Smells_Like_VCS = 1; - foreach my $file (qw(lib/one.pm t/one.faket)) { - ok(!eval { require $file; 1 }, "Failed to load ${file}"); - like($@, qr{Indirect call of method}, "Failed due to indirect.pm, ok"); - } - ok(eval { require "other/one.pl"; 1 }, "Loaded other/one.pl ok"); - chdir("../.."); -} - ok(!eval q{use strictures 2; 1; }, "Can't use strictures 2 (this is version 1)"); - -SKIP: { - skip 'Extra tests disabled on perls <= 5.008003', 1 - if $] < 5.008004; - local $ENV{PERL_STRICTURES_EXTRA} = 1; - local $strictures::extra_load_states = undef; - local @INC = ("t/dep_constellations/broken", @INC); - local %INC = %INC; - delete $INC{$_} - for qw( indirect.pm multidimensional.pm bareword/filehandles.pm ); - - { - open my $fh, '>', \my $str; - local *STDERR = $fh; - strictures->import; - like( - $str, - qr/Missing were:\n\n indirect multidimensional bareword::filehandles/, - "failure to load all three extra deps is reported" - ); - } - - { - open my $fh, '>', \my $str; - local *STDERR = $fh; - strictures->import; - ok( !$str, "extra dep load failure is not reported a second time" ); - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005005/xt/pod.t new/strictures-1.005006/xt/pod.t --- old/strictures-1.005005/xt/pod.t 2014-06-01 07:30:31.000000000 +0200 +++ new/strictures-1.005006/xt/pod.t 2015-01-30 13:08:08.000000000 +0100 @@ -4,12 +4,9 @@ use strict; use warnings FATAL => 'all'; -# the all_ things attempt to plan, which we didn't want, so stop them -# from doing that -no warnings 'redefine'; -local *Test::Builder::plan = sub { }; - -all_pod_files_ok; -all_pod_coverage_ok({ coverage_class => 'Pod::Coverage::CountParents' }); +pod_file_ok($_) + for all_pod_files; +pod_coverage_ok($_, { coverage_class => 'Pod::Coverage::CountParents' }) + for all_modules; done_testing; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org