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

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Wed Aug 23 19:24:55 EDT 2006


Author: bartb
Date: Wed Aug 23 19:24:50 2006
New Revision: 1848

Modified:
   jifty/trunk/Makefile.PL
   jifty/trunk/t/01-dependencies.t

Log:
Moved some modules to feature sections in Makefile.PL, updated 01-dependencies.t to recognise recommends sections as well as requires

Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Wed Aug 23 19:24:50 2006
@@ -14,7 +14,7 @@
 requires('Crypt::Rijndael');
 requires('Compress::Zlib');
 requires('CSS::Squish' => 0.05 );
-requires('DBD::SQLite' => 1.11 );
+#requires('DBD::SQLite' => 1.11 );
 requires('Data::Page');
 requires('DateTime');
 requires('Date::Manip');
@@ -52,21 +52,21 @@
 requires('Module::Refresh' => '0.09');
 requires('Module::ScanDeps');
 requires('Object::Declare' => '0.13');
-requires('PAR::Dist::FromCPAN');
+#requires('PAR::Dist::FromCPAN');
 requires('Params::Validate');
 requires('PerlIO::gzip');
 requires('Pod::Simple'); #Pod::Simple::Text
 requires('Scalar::Defer' => '0.06');
 requires('String::Koremutake');
-requires('Test::Base' => 0.44);            # Test::Base::Filter
-requires('Test::HTTP::Server::Simple' => '0.02');
-requires('Test::HTML::Lint');
-requires('Test::More' => 0.62);
-requires('Test::Pod::Coverage');
-requires('Test::WWW::Mechanize' => 1.04);
+#requires('Test::Base' => 0.44);            # Test::Base::Filter
+#requires('Test::HTTP::Server::Simple' => '0.02');
+#requires('Test::HTML::Lint');
+#requires('Test::More' => 0.62);
+#requires('Test::Pod::Coverage');
+#requires('Test::WWW::Mechanize' => 1.04);
 requires('UNIVERSAL::require');
 requires('URI');
-requires('WWW::Mechanize' => 1.12);
+#requires('WWW::Mechanize' => 1.12);
 requires('XML::Writer');
 requires('XML::Simple');
 requires('XML::XPath');
@@ -82,6 +82,29 @@
     requires('JSON' => 0.01) unless can_use('JSON::Syck' => 0.14);
 }
 
+features(
+    'Development of a jifty application' => [
+        -default => 1,
+        recommends('DBD::SQLite' => 1.11 ),
+        recommends('Test::Base' => 0.44 ),            # Test::Base::Filter
+        recommends('Test::HTTP::Server::Simple' => '0.02' ),
+        recommends('Test::HTML::Lint'),
+        recommends('Test::More' => 0.62 ),
+        recommends('Test::Pod::Coverage'),
+        recommends('Test::WWW::Mechanize' => 1.04 ),
+        recommends('WWW::Mechanize' => 1.12 ),
+    ],
+    'Development of the jifty framework' => [
+        -default => 0,
+        recommends('DBD::SQLite'),
+    ],
+    'Experimental features' => [
+        -default => 0,
+        recommends('PAR::Dist::FromCPAN'),
+    ],
+);
+
+
 no_index directory => 't';
 no_index package => 'DB';
 no_index package => 'inc';

Modified: jifty/trunk/t/01-dependencies.t
==============================================================================
--- jifty/trunk/t/01-dependencies.t	(original)
+++ jifty/trunk/t/01-dependencies.t	Wed Aug 23 19:24:50 2006
@@ -46,10 +46,10 @@
     ok(open(MAKEFILE,"Makefile.PL"), "Opened Makefile");
     my $data = <MAKEFILE>;
     close(FILE);
-    while ($data =~ /^\s*?requires\('([\w:]+)'(?:\s*=>\s*['"]?([\d\.]+)['"]?)?.*?(?:#(.*))?$/gm) {
-        $required{$1} = $2;
-        if (defined $3 and length $3) {
-            $required{$_} = undef for split ' ', $3;
+    while ($data =~ /^\s*?(requires|recommends)\('([\w:]+)'(?:\s*=>\s*['"]?([\d\.]+)['"]?)?.*?(?:#(.*))?$/gm) {
+        $required{$2} = $3;
+        if (defined $4 and length $4) {
+            $required{$_} = undef for split ' ', $4;
         }
     }
 }


More information about the Jifty-commit mailing list