[SCM] libcpan-meta-check-perl Debian packaging branch, master, updated. debian/0.004-1-39-g7d96c48

[Leon Timmermans]

The following commit has been merged in the master branch:
commit 0df7970bbd5b88be9cf2c2c56af3f7e3c1fcbdee
Author: Leon Timmermans <fawaka at gmail.com>
Date:   Sun Apr 1 11:51:21 2012 +0200

    Upgrade to using CPAN::Meta::Requirements

diff --git a/lib/CPAN/Meta/Check.pm b/lib/CPAN/Meta/Check.pm
index 2f10516..99731b6 100644
--- a/lib/CPAN/Meta/Check.pm
+++ b/lib/CPAN/Meta/Check.pm
@@ -7,9 +7,8 @@ our @EXPORT = qw//;
 our @EXPORT_OK = qw/check_requirements requirements_for verify_dependencies/;
 our %EXPORT_TAGS = (all => [ @EXPORT, @EXPORT_OK ] );
 
-use CPAN::Meta;
+use CPAN::Meta::Requirements 2.120920;
 use Module::Metadata;
-use Version::Requirements;
 
 sub _check_dep {
 	my ($reqs, $module) = @_;
@@ -19,8 +18,8 @@ sub _check_dep {
 		return "Module '$module' is not installed" if not defined $metadata;
 		eval { $metadata->version };
 	};
-	return "Missing version info for module '$module'" if $reqs->as_string_hash->{$module} and not $version;
-	return sprintf 'Installed version (%s) of %s is not in range \'%s\'', $version, $module, $reqs->as_string_hash->{$module} if not $reqs->accepts_module($module, $version || 0);
+	return "Missing version info for module '$module'" if $reqs->requirements_for_module($module) and not $version;
+	return sprintf 'Installed version (%s) of %s is not in range \'%s\'', $version, $module, $reqs->requirements_for_module($module) if not $reqs->accepts_module($module, $version || 0);
 	return;
 }
 
@@ -30,7 +29,7 @@ sub _check_conflict {
 	return if not defined $metadata;
 	my $version = eval { $metadata->version };
 	return "Missing version info for module '$module'" if not $version;
-	return sprintf 'Installed version (%s) of %s is in range \'%s\'', $version, $module, $reqs->as_string_hash->{$module} if $reqs->accepts_module($module, $version);
+	return sprintf 'Installed version (%s) of %s is in range \'%s\'', $version, $module, $$reqs->requirements_for_module($module) if $reqs->accepts_module($module, $version);
 	return;
 }
 
@@ -40,7 +39,7 @@ sub requirements_for {
 		return $meta->effective_prereqs->requirements_for($phases, $type);
 	}
 	else {
-		my $ret = Version::Requirements->new;
+		my $ret = CPAN::Meta::Requirements->new;
 		for my $phase (@{ $phases }) {
 			$ret->add_requirements($meta->effective_prereqs->requirements_for($phase, $type));
 		}
@@ -88,13 +87,13 @@ This module verifies if modules are
 
 =func check_requirements($reqs, $type)
 
-This function checks if all dependencies in C<$reqs> (a L<Version::Requirements|Version::Requirements> object) are met, taking into account that 'conflicts' dependencies have to be checked in reverse. It returns a hash with the modules as values and any problems as keys, the value for a succesfully 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 values and any problems as keys, the value for a succesfully found module will be undef.
 
-=func verify_requirements($meta, $phases, $types)
+=func verify_dependencies($meta, $phases, $types)
 
 Check all requirements in C<$meta> for phases C<$phases> and types C<$types>.
 
 =func requirements_for($meta, $phases, $types)
 
-This function returns a unified L<Version::Requirements|Version::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 a relationship as defined by the same spec.
+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 a relationship as defined by the same spec.
 

-- 
libcpan-meta-check-perl Debian packaging