Hello community,
here is the log from the commit of package perl-CPAN-Meta-Check for
openSUSE:Factory checked in at 2013-12-06 13:51:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-CPAN-Meta-Check (Old)
and /work/SRC/openSUSE:Factory/.perl-CPAN-Meta-Check.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-CPAN-Meta-Check"
Changes:
--------
---
/work/SRC/openSUSE:Factory/perl-CPAN-Meta-Check/perl-CPAN-Meta-Check.changes
2013-08-07 20:53:10.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.perl-CPAN-Meta-Check.new/perl-CPAN-Meta-Check.changes
2013-12-06 14:42:40.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Nov 25 07:38:18 UTC 2013 - [email protected]
+
+- updated to 0.008
+ Switch to using merged_requirements
+ Test Env instead of Carp for version overshoot [#89591]
+ Document $incdirs in the right function
+
+-------------------------------------------------------------------
Old:
----
CPAN-Meta-Check-0.007.tar.gz
New:
----
CPAN-Meta-Check-0.008.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-CPAN-Meta-Check.spec ++++++
--- /var/tmp/diff_new_pack.LOpXEI/_old 2013-12-06 14:42:41.000000000 +0100
+++ /var/tmp/diff_new_pack.LOpXEI/_new 2013-12-06 14:42:41.000000000 +0100
@@ -17,7 +17,7 @@
Name: perl-CPAN-Meta-Check
-Version: 0.007
+Version: 0.008
Release: 0
%define cpan_name CPAN-Meta-Check
Summary: Verify requirements in a CPAN::Meta object
@@ -30,13 +30,14 @@
BuildRequires: perl
BuildRequires: perl-macros
BuildRequires: perl(CPAN::Meta) >= 2.120920
-BuildRequires: perl(CPAN::Meta::Requirements) >= 2.120920
+BuildRequires: perl(CPAN::Meta::Prereqs) >= 2.132830
+BuildRequires: perl(CPAN::Meta::Requirements) >= 2.121
BuildRequires: perl(Module::Metadata)
BuildRequires: perl(Test::Deep)
BuildRequires: perl(Test::More) >= 0.88
#BuildRequires: perl(CPAN::Meta::Check)
-Requires: perl(CPAN::Meta) >= 2.120920
-Requires: perl(CPAN::Meta::Requirements) >= 2.120920
+Requires: perl(CPAN::Meta::Prereqs) >= 2.132830
+Requires: perl(CPAN::Meta::Requirements) >= 2.121
Requires: perl(Module::Metadata)
%{perl_requires}
++++++ CPAN-Meta-Check-0.007.tar.gz -> CPAN-Meta-Check-0.008.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-Check-0.007/Changes
new/CPAN-Meta-Check-0.008/Changes
--- old/CPAN-Meta-Check-0.007/Changes 2013-07-31 14:38:18.000000000 +0200
+++ new/CPAN-Meta-Check-0.008/Changes 2013-10-17 16:45:21.000000000 +0200
@@ -1,5 +1,10 @@
Revision history for CPAN-Meta-Check
+0.008 2013-10-17 16:44:57 Europe/Amsterdam
+ Switch to using merged_requirements
+ Test Env instead of Carp for version overshoot [#89591]
+ Document $incdirs in the right function
+
0.007 2013-07-31 14:37:58 Europe/Amsterdam
Swap conflicts test, as underscore versions broke it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-Check-0.007/META.json
new/CPAN-Meta-Check-0.008/META.json
--- old/CPAN-Meta-Check-0.007/META.json 2013-07-31 14:38:18.000000000 +0200
+++ new/CPAN-Meta-Check-0.008/META.json 2013-10-17 16:45:21.000000000 +0200
@@ -4,7 +4,7 @@
"Leon Timmermans <[email protected]>"
],
"dynamic_config" : 0,
- "generated_by" : "Dist::Zilla version 4.300035, CPAN::Meta::Converter
version 2.120921",
+ "generated_by" : "Dist::Zilla version 4.300039, CPAN::Meta::Converter
version 2.132830",
"license" : [
"perl_5"
],
@@ -28,8 +28,8 @@
},
"runtime" : {
"requires" : {
- "CPAN::Meta" : "2.120920",
- "CPAN::Meta::Requirements" : "2.120920",
+ "CPAN::Meta::Prereqs" : "2.132830",
+ "CPAN::Meta::Requirements" : "2.121",
"Exporter" : "5.57",
"Module::Metadata" : "0",
"perl" : "5.006",
@@ -40,13 +40,21 @@
"test" : {
"requires" : {
"CPAN::Meta" : "2.120920",
- "File::Find" : "0",
- "File::Temp" : "0",
+ "Env" : "0",
+ "File::Spec" : "0",
+ "IO::Handle" : "0",
+ "IPC::Open3" : "0",
"Test::Deep" : "0",
"Test::More" : "0.88"
}
}
},
+ "provides" : {
+ "CPAN::Meta::Check" : {
+ "file" : "lib/CPAN/Meta/Check.pm",
+ "version" : "0.008"
+ }
+ },
"release_status" : "stable",
"resources" : {
"bugtracker" : {
@@ -59,6 +67,6 @@
"web" : "https://github.com/Leont/cpan-meta-check";
}
},
- "version" : "0.007"
+ "version" : "0.008"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-Check-0.007/META.yml
new/CPAN-Meta-Check-0.008/META.yml
--- old/CPAN-Meta-Check-0.007/META.yml 2013-07-31 14:38:18.000000000 +0200
+++ new/CPAN-Meta-Check-0.008/META.yml 2013-10-17 16:45:21.000000000 +0200
@@ -4,22 +4,28 @@
- 'Leon Timmermans <[email protected]>'
build_requires:
CPAN::Meta: 2.120920
- File::Find: 0
- File::Temp: 0
+ Env: 0
+ File::Spec: 0
+ IO::Handle: 0
+ IPC::Open3: 0
Test::Deep: 0
Test::More: 0.88
configure_requires:
ExtUtils::MakeMaker: 6.30
dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.300035, CPAN::Meta::Converter version
2.120921'
+generated_by: 'Dist::Zilla version 4.300039, CPAN::Meta::Converter version
2.132830'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
name: CPAN-Meta-Check
+provides:
+ CPAN::Meta::Check:
+ file: lib/CPAN/Meta/Check.pm
+ version: 0.008
requires:
- CPAN::Meta: 2.120920
- CPAN::Meta::Requirements: 2.120920
+ CPAN::Meta::Prereqs: 2.132830
+ CPAN::Meta::Requirements: 2.121
Exporter: 5.57
Module::Metadata: 0
perl: 5.006
@@ -28,4 +34,4 @@
resources:
bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=CPAN-Meta-Check
repository: git://github.com/Leont/cpan-meta-check.git
-version: 0.007
+version: 0.008
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-Check-0.007/Makefile.PL
new/CPAN-Meta-Check-0.008/Makefile.PL
--- old/CPAN-Meta-Check-0.007/Makefile.PL 2013-07-31 14:38:18.000000000
+0200
+++ new/CPAN-Meta-Check-0.008/Makefile.PL 2013-10-17 16:45:21.000000000
+0200
@@ -20,8 +20,8 @@
"LICENSE" => "perl",
"NAME" => "CPAN::Meta::Check",
"PREREQ_PM" => {
- "CPAN::Meta" => "2.120920",
- "CPAN::Meta::Requirements" => "2.120920",
+ "CPAN::Meta::Prereqs" => "2.132830",
+ "CPAN::Meta::Requirements" => "2.121",
"Exporter" => "5.57",
"Module::Metadata" => 0,
"strict" => 0,
@@ -29,12 +29,14 @@
},
"TEST_REQUIRES" => {
"CPAN::Meta" => "2.120920",
- "File::Find" => 0,
- "File::Temp" => 0,
+ "Env" => 0,
+ "File::Spec" => 0,
+ "IO::Handle" => 0,
+ "IPC::Open3" => 0,
"Test::Deep" => 0,
"Test::More" => "0.88"
},
- "VERSION" => "0.007",
+ "VERSION" => "0.008",
"test" => {
"TESTS" => "t/*.t"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-Check-0.007/README
new/CPAN-Meta-Check-0.008/README
--- old/CPAN-Meta-Check-0.007/README 2013-07-31 14:38:18.000000000 +0200
+++ new/CPAN-Meta-Check-0.008/README 2013-10-17 16:45:21.000000000 +0200
@@ -1,7 +1,7 @@
This archive contains the distribution CPAN-Meta-Check,
-version 0.007:
+version 0.008:
Verify requirements in a CPAN::Meta object
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-Check-0.007/dist.ini
new/CPAN-Meta-Check-0.008/dist.ini
--- old/CPAN-Meta-Check-0.007/dist.ini 2013-07-31 14:38:18.000000000 +0200
+++ new/CPAN-Meta-Check-0.008/dist.ini 2013-10-17 16:45:21.000000000 +0200
@@ -4,7 +4,8 @@
copyright_holder = Leon Timmermans
copyright_year = 2012
-[@LEONT::PP]
+[@LEONT]
+install_tool = eumm
[Prereqs]
-CPAN::Meta = 2.120920
-;should be a conflict with lower versions, but whatever
+CPAN::Meta::Requirements = 2.121
+CPAN::Meta::Prereqs = 2.132830
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-Check-0.007/lib/CPAN/Meta/Check.pm
new/CPAN-Meta-Check-0.008/lib/CPAN/Meta/Check.pm
--- old/CPAN-Meta-Check-0.007/lib/CPAN/Meta/Check.pm 2013-07-31
14:38:18.000000000 +0200
+++ new/CPAN-Meta-Check-0.008/lib/CPAN/Meta/Check.pm 2013-10-17
16:45:21.000000000 +0200
@@ -1,6 +1,6 @@
package CPAN::Meta::Check;
{
- $CPAN::Meta::Check::VERSION = '0.007';
+ $CPAN::Meta::Check::VERSION = '0.008';
}
use strict;
use warnings;
@@ -39,16 +39,7 @@
sub requirements_for {
my ($meta, $phases, $type) = @_;
my $prereqs = ref($meta) eq 'CPAN::Meta' ? $meta->effective_prereqs :
$meta;
- if (!ref $phases) {
- return $prereqs->requirements_for($phases, $type);
- }
- else {
- my $ret = CPAN::Meta::Requirements->new;
- for my $phase (@{ $phases }) {
-
$ret->add_requirements($prereqs->requirements_for($phase, $type));
- }
- return $ret;
- }
+ return $prereqs->merged_requirements(ref($phases) ? $phases : [ $phases
], [ $type ]);
}
sub check_requirements {
@@ -90,7 +81,7 @@
=head1 VERSION
-version 0.007
+version 0.008
=head1 SYNOPSIS
@@ -102,17 +93,19 @@
=head1 FUNCTIONS
-=head2 check_requirements($reqs, $type)
+=head2 check_requirements($reqs, $type, $incdirs)
-This function checks if all dependencies in C<$reqs> (a
L<CPAN::Meta::Requirements|CPAN::Meta::Requirements> object) are met, taking
into account that 'conflicts' dependencies have to be checked in reverse. It
returns a hash with the modules as keys and any problems as values; the value
for a successfully found module will be undef.
+This function checks if all dependencies in C<$reqs> (a
L<CPAN::Meta::Requirements|CPAN::Meta::Requirements> object) are met, taking
into account that 'conflicts' dependencies have to be checked in reverse. It
returns a hash with the modules as keys and any problems as values; the value
for a successfully found module will be undef. Modules are searched for in
C<@$incdirs>, defaulting to C<@INC>.
=head2 verify_dependencies($meta, $phases, $types, $incdirs)
-Check all requirements in C<$meta> for phases C<$phases> and types C<$types>.
Modules are searched for in C<@$incdirs>, defaulting to C<@INC>.
+Check all requirements in C<$meta> for phases C<$phases> and types C<$types>.
Modules are searched for in C<@$incdirs>, defaulting to C<@INC>. C<$meta>
should be a L<CPAN::Meta::Prereqs> or L<CPAN::Meta> object.
+
+=head2 requirements_for($meta, $phases, $types)
-=head2 requirements_for($meta, $phases, $types, incdirs)
+B<< This function is deprecated and may be removed at some point in the
future, please use CPAN::Meta::Prereqs->merged_requirements instead. >>
-This function returns a unified
L<CPAN::Meta::Requirements|CPAN::Meta::Requirements> object for all C<$type>
requirements for C<$phases>. $phases may be either one (scalar) value or an
arrayref of valid values as defined by the L<CPAN::Meta spec|CPAN::Meta::Spec>.
C<$type> must be a relationship as defined by the same spec. Modules are
searched for in C<@$incdirs>, defaulting to C<@INC>.
+This function returns a unified
L<CPAN::Meta::Requirements|CPAN::Meta::Requirements> object for all C<$type>
requirements for C<$phases>. C<$phases> may be either one (scalar) value or an
arrayref of valid values as defined by the L<CPAN::Meta spec|CPAN::Meta::Spec>.
C<$type> must be a relationship as defined by the same spec. C<$meta> should be
a L<CPAN::Meta::Prereqs> or L<CPAN::Meta> object.
=head1 SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-Check-0.007/t/00-compile.t
new/CPAN-Meta-Check-0.008/t/00-compile.t
--- old/CPAN-Meta-Check-0.007/t/00-compile.t 2013-07-31 14:38:18.000000000
+0200
+++ new/CPAN-Meta-Check-0.008/t/00-compile.t 2013-10-17 16:45:21.000000000
+0200
@@ -1,74 +1,48 @@
-#!perl
-
use strict;
use warnings;
-use Test::More;
+# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.036
+use Test::More tests => 1 + ($ENV{AUTHOR_TESTING} ? 1 : 0);
-use File::Find;
-use File::Temp qw{ tempdir };
-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 = (
+ 'CPAN/Meta/Check.pm'
);
-sub _find_scripts {
- my $dir = shift @_;
- 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,
- );
- return @found_scripts;
-}
+# no fake home requested
-my @scripts;
-do { push @scripts, _find_scripts($_) if -d $_ }
- for qw{ bin script scripts };
+my $inc_switch = q[-Mblib];
-my $plan = scalar(@modules) + scalar(@scripts);
-$plan ? (plan tests => $plan) : (plan skip_all => "no tests to run");
+use File::Spec;
+use IPC::Open3;
+use IO::Handle;
+my @warnings;
+for my $lib (@module_files)
{
- # fake home for cpan-testers
- # no fake requested ## local $ENV{HOME} = tempdir( CLEANUP => 1 );
+ # see L<perlfaq8/How can I capture STDERR from an external command?>
+ open my $stdin, '<', File::Spec->devnull or die "can't open devnull: $!";
+ my $stderr = IO::Handle->new;
+
+ my $pid = open3($stdin, '>&STDERR', $stderr, $^X, $inc_switch, '-e',
"require q[$lib]");
+ binmode $stderr, ':crlf' if $^O eq 'MSWin32';
+ my @_warnings = <$stderr>;
+ waitpid($pid, 0);
+ is($?, 0, "$lib loaded ok");
+
+ if (@_warnings)
+ {
+ warn @_warnings;
+ push @warnings, @_warnings;
+ }
+}
- 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" );
- }
- }
-}
+is(scalar(@warnings), 0, 'no warnings found') if $ENV{AUTHOR_TESTING};
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CPAN-Meta-Check-0.007/t/10-basics.t
new/CPAN-Meta-Check-0.008/t/10-basics.t
--- old/CPAN-Meta-Check-0.007/t/10-basics.t 2013-07-31 14:38:18.000000000
+0200
+++ new/CPAN-Meta-Check-0.008/t/10-basics.t 2013-10-17 16:45:21.000000000
+0200
@@ -8,6 +8,8 @@
use CPAN::Meta 2.120920;
use CPAN::Meta::Check qw/check_requirements verify_dependencies/;
+use Env ();
+
my %prereq_struct = (
runtime => {
requires => {
@@ -19,7 +21,7 @@
recommends => {
'Pod::Text' => 0,
'This::Should::Be::NonExistent' => 1,
- Carp => 99999,
+ Env => 99999,
},
conflicts => {
'CPAN::Meta' => '<= 100.0',
# check should fail
@@ -43,9 +45,9 @@
cmp_deeply(check_requirements($pre_req, 'requires'), { map { ( $_ => undef ) }
qw/Config File::Spec IO::File perl/ }, 'Requirements are satisfied ');
my $pre_rec = $meta->effective_prereqs->requirements_for('runtime',
'recommends');
-cmp_deeply([ sort +$pre_rec->required_modules ], [ qw/Carp Pod::Text
This::Should::Be::NonExistent/ ], 'The right recommendations are present');
+cmp_deeply([ sort +$pre_rec->required_modules ], [ qw/Env Pod::Text
This::Should::Be::NonExistent/ ], 'The right recommendations are present');
cmp_deeply(check_requirements($pre_rec, 'recommends'), {
- Carp => "Installed version ($Carp::VERSION) of Carp is not in
range '99999'",
+ Env => "Installed version ($Env::VERSION) of Env is not in
range '99999'",
'Pod::Text' => undef,
'This::Should::Be::NonExistent' => 'Module
\'This::Should::Be::NonExistent\' is not installed',
}, 'Recommendations give the right errors');
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
