[Jifty-commit] r4607 - in jifty/trunk: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Mon Dec  3 16:33:35 2007
New Revision: 4607

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Everything.pm
   jifty/trunk/lib/Jifty/Script.pm

Log:
 r25354 at zoq-fot-pik:  chmrr | 2007-12-03 16:32:25 -0500
  * Delay things which call Jifty::Util::require; Jifty::Util is often
    in *mid-require* when Jifty::Everything is loaded, thus causing
    calls to Jifty::Util::require to silently fail.
 


Modified: jifty/trunk/lib/Jifty/Everything.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Everything.pm	(original)
+++ jifty/trunk/lib/Jifty/Everything.pm	Mon Dec  3 16:33:35 2007
@@ -89,9 +89,14 @@
 #Jifty::Module::Pluggable->import(search_path => ['Jifty::Web::Form::Field'], require     => 1, except      => qr/\.#/);
 #__PACKAGE__->plugins;
 
-# load commands defined in Jifty/Plugin/*/Command/*.pm
-Jifty::Module::Pluggable->import(search_path => ['Jifty::Plugin'], file_regex => qr{/Command/[^/]+}, require => 1);
-__PACKAGE__->plugins;
+# Set up to load commands defined in Jifty/Plugin/*/Command/*.pm
+# we do the actual load in Jifty::Script
+Jifty::Module::Pluggable->import(
+    search_path => ['Jifty::Plugin'],
+    file_regex  => qr{/Command/[^/]+},
+    require     => 1,
+    sub_name    => "plugin_commands"
+);
 
 =head1 SEE ALSO
 

Modified: jifty/trunk/lib/Jifty/Script.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script.pm	(original)
+++ jifty/trunk/lib/Jifty/Script.pm	Mon Dec  3 16:33:35 2007
@@ -2,6 +2,9 @@
 use App::CLI;
 use base qw/App::CLI App::CLI::Command/;
 
+use Jifty::Everything;
+Jifty::Everything->plugin_commands;
+
 =head1 NAME
 
 Jifty::Script - Base class for all bin/jifty commands