[Jifty-commit] r869 - in jifty/trunk: t

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Tue Apr 18 02:18:01 2006
New Revision: 869

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/Makefile.PL
   jifty/trunk/t/01-dependencies.t

Log:
 r12397 at zoq-fot-pik:  chmrr | 2006-04-18 02:17:21 -0400
  * Better dependency checking
  * Remove modules in 5.8.3 core from Makefile.PL


Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Tue Apr 18 02:18:01 2006
@@ -14,13 +14,11 @@
 requires('DBD::SQLite');
 requires('Data::Page');
 requires('Date::Manip');
-requires('Digest::MD5');
 requires('Email::Folder');
 requires('Email::LocalDelivery');
 requires('Email::Send' => '1.99_01'); # Email::Send::Jifty::Test
 requires('Email::Simple');
 requires('Email::Simple::Creator');
-requires('Encode');
 requires('File::Find::Rule');
 requires('File::MMagic');
 requires('File::ShareDir');
@@ -45,7 +43,6 @@
 requires('Module::Refresh' => '0.09');
 requires('Params::Validate');
 requires('Pod::Simple'); #Pod::Simple::Text
-requires('Scalar::Util');
 requires('String::Koremutake');
 requires('Test::Base' => 0.44);            # Test::Base::Filter
 requires('Test::HTML::Lint');
@@ -53,7 +50,6 @@
 requires('Test::More' => 0.62);
 requires('Test::Pod::Coverage');
 requires('Test::WWW::Mechanize');
-requires('Time::HiRes');
 requires('UNIVERSAL::require');
 requires('URI');
 requires('WWW::Mechanize' => 1.12);

Modified: jifty/trunk/t/01-dependencies.t
==============================================================================
--- jifty/trunk/t/01-dependencies.t	(original)
+++ jifty/trunk/t/01-dependencies.t	Tue Apr 18 02:18:01 2006
@@ -19,13 +19,13 @@
 
 sub wanted {
     return unless -f $_;
-    return if $File::Find::dir =~ m!/inc(/|$)!;
+    return if $File::Find::name =~ /\.pod$/;
     local $/;
     open(FILE, $_) or return;
     my $data = <FILE>;
     close(FILE);
-    $used{$1}++ while $data =~ /^use\s+([\w:]+)/gm;
-    while ($data =~ m|^use base qw/([\w\s:]+)/|gm) {
+    $used{$1}++ while $data =~ /^\s*use\s+([\w:]+)/gm;
+    while ($data =~ m|^\s*use base qw.([\w\s:]+)|gm) {
         $used{$_}++ for split ' ', $1;
     }
 }
@@ -36,10 +36,10 @@
     ok(open(MAKEFILE,"Makefile.PL"), "Opened Makefile");
     my $data = <MAKEFILE>;
     close(FILE);
-    while ($data =~ /^\s*?requires\('([\w:]+)'.*?(?:#(.*))?$/gm) {
-        $required{$1}++;
-        if (defined $2 and length $2) {
-            $required{$_}++ for split ' ', $2;
+    while ($data =~ /^\s*?requires\('([\w:]+)'(?:\s*=>\s*['"]?([\d\.]+)['"]?)?.*?(?:#(.*))?$/gm) {
+        $required{$1} = $2;
+        if (defined $3 and length $3) {
+            $required{$_} = undef for split ' ', $3;
         }
     }
 }
@@ -47,14 +47,15 @@
 for (sort keys %used) {
     my $first_in = Module::CoreList->first_release($_);
     next if defined $first_in and $first_in <= 5.00803;
-    next if /^(Jifty|BTDT|Jifty::DBI|TestApp|inc|t)/;
-    ok(delete $required{$_}, "$_ in Makefile.PL");
+    next if /^(Jifty|Jifty::DBI|inc|t|TestApp|Application)(::|$)/;
+    ok(exists $required{$_}, "$_ in Makefile.PL");
     delete $used{$_};
+    delete $required{$_};
 }
 
-for (keys %required) {
-    my $first_in = Module::CoreList->first_release($_);
-    fail("Required module $_ is already in core") if defined $first_in and $first_in <= 5.006;
+for (sort keys %required) {
+    my $first_in = Module::CoreList->first_release($_, $required{$_});
+    fail("Required module $_ is already in core") if defined $first_in and $first_in <= 5.00803;
 }
 
 1;