[Jifty-commit] r685 - in jifty/trunk: lib/Jifty/Web t

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Mon Mar 13 14:37:44 2006
New Revision: 685

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/Makefile.PL
   jifty/trunk/lib/Jifty/Web/PageRegion.pm
   jifty/trunk/t/01-dependencies.t

Log:
 r8492 at zoq-fot-pik:  chmrr | 2006-03-13 14:37:35 -0500
  * Axe out modules in Makefile.PL that are in core
  * Document ->exit on PageRegions


Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Mon Mar 13 14:37:44 2006
@@ -5,15 +5,11 @@
 requires(perl => '5.8.3'); 
 requires('Apache::Session');
 requires('App::CLI' => 0.03 ); # App::CLI::Command::Help App::CLI::Command
-requires('CGI');                   # CGI::Fast
-requires('CGI::Cookie');
 requires('Cache::Cache'); #Cache::FileCache
 requires('Calendar::Simple');
-requires('Carp');
 requires('Class::Accessor');
 requires('Class::Container');
 requires('Clone');
-requires('Cwd');
 requires('DBD::SQLite');
 requires('Data::Page');
 requires('Digest::MD5');
@@ -23,14 +19,7 @@
 requires('Email::Simple');
 requires('Email::Simple::Creator');
 requires('Encode');
-requires('Exporter');
-requires('File::Basename');
-requires('File::Copy');
-requires('File::Find');
 requires('File::ShareDir');
-requires('File::Spec');
-requires('FindBin');
-requires('Getopt::Long');
 requires('HTML::Entities');
 requires('HTML::Mason' => 1.3101);           # HTML::Mason::Exceptions HTML::Mason::FakeApache HTML::Mason::MethodMaker HTML::Mason::Request HTML::Mason::Utils
 requires('HTML::Mason::Plugin');
@@ -43,13 +32,12 @@
 requires('Locale::Maketext::Simple');
 requires('Log::Log4perl');
 requires('LWP::UserAgent');
-requires('Math::BigInt');
+requires('Module::CoreList');
 requires('Module::Install::Admin' => '0.50');
 requires('Module::Pluggable' => '2.95');
 requires('Module::Refresh');
 requires('Params::Validate');
 requires('Pod::Simple'); #Pod::Simple::Text
-requires('Pod::Usage');
 requires('Scalar::Util');
 requires('String::Koremutake');
 requires('Test::Base' => 0.44);            # Test::Base::Filter
@@ -61,7 +49,6 @@
 requires('Time::HiRes');
 requires('Time::ParseDate');
 requires('UNIVERSAL::require');
-requires('UNIVERSAL');
 requires('URI');
 requires('WWW::Mechanize' => 1.12);
 requires('XML::Writer');

Modified: jifty/trunk/lib/Jifty/Web/PageRegion.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/PageRegion.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/PageRegion.pm	Mon Mar 13 14:37:44 2006
@@ -207,6 +207,10 @@
 
 =head2 exit 
 
+Exits the page region, if it is the most recent one.  Normally, you
+won't need to call this by hand; however, if you are calling L</enter>
+by hand, you will need to call the corresponding C<exit>.
+
 =cut
 
 sub exit {

Modified: jifty/trunk/t/01-dependencies.t
==============================================================================
--- jifty/trunk/t/01-dependencies.t	(original)
+++ jifty/trunk/t/01-dependencies.t	Mon Mar 13 14:37:44 2006
@@ -12,6 +12,7 @@
 
 use Test::More qw(no_plan);
 use File::Find;
+use Module::CoreList;
 
 my %used;
 find( \&wanted, qw/ lib bin t /);
@@ -44,10 +45,17 @@
 }
 
 for (sort keys %used) {
-    next if /^(Jifty|BTDT|Jifty::DBI|TestApp|inc|t)/ or lc $_ eq $_;
+    my $first_in = Module::CoreList->first_release($_);
+    next if defined $first_in and $first_in <= 5.006;
+    next if /^(Jifty|BTDT|Jifty::DBI|TestApp|inc|t)/;
     ok(delete $required{$_}, "$_ in Makefile.PL");
     delete $used{$_};
 }
 
+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;
+}
+
 1;