Changeset 19223

Timestamp:

09/12/08 16:32:18 (5 years ago)

Author:

lopnor

Message:

lang/perl/App-Hachero: DisableDynamicPlugin?

Location:

lang/perl/App-Hachero/trunk

Files:

• Makefile.PL (modified) (1 diff)
• lib/App/Hachero.pm (modified) (3 diffs)
• t/app/01_plugin_path.t (modified) (2 diffs)
• t/data/plugin/test_foo.pm (modified) (1 diff)

lang/perl/App-Hachero/trunk/Makefile.PL

@@ -27 +27 @@
 build_requires 'Test::Base';
 
+install_script 'hachero.pl';
+
 tests 't/*.t t/*/*.t t/*/*/*.t';
 

lang/perl/App-Hachero/trunk/lib/App/Hachero.pm

@@ -10 +10 @@
 use Module::Collect;
 
-__PACKAGE__->load_components(qw/Plaggerize Autocall::InjectMethod/);
-__PACKAGE__->mk_accessors(qw/currentline currentlog currentinfo result work_path packages_from_plugin_path/);
+__PACKAGE__->load_components(qw/DisableDynamicPlugin Plaggerize Autocall::InjectMethod/);
+__PACKAGE__->mk_accessors(qw/currentline currentlog currentinfo result work_path/);
 
+my $packages_from_plugin_path;
 my $context;
 sub context { $context }
@@ -18 +19 @@
 sub new {
     my $class = shift;
+    my $args = $_[0];
+    my $config = $class->setup_config( $args->{config} );
+
+    my @plugins;
+    my $plugin_list = $config->{global}->{pluginloader}->{plugin_list};
+    for my $plugin (@{ $config->{$plugin_list} }) {
+        push @plugins, { module => $plugin->{module}, config => $plugin };
+    }
+
+    if (my $path = $config->{global}{plugin_path}) {
+        my $collect = Module::Collect->new(
+            path => $path,
+            pattern => '*.pm',
+            prefix => 'App::Hachero::Plugin',
+        );
+        $packages_from_plugin_path = $collect->modules;
+    }
+
+    $class->load_plugins(@plugins);
 
     my $self = $class->SUPER::new(@_);
@@ -61 +81 @@
 }
 
-sub setup_plugins {
-    my ($self, @args) = @_;
-
-    $self->packages_from_plugin_path([]);
-
-    if (my $path = $self->conf->{global}{plugin_path}) {
-        my $collect = Module::Collect->new(
-            path => $path,
-            pattern => '*.pm',
-            prefix => 'App::Hachero::Plugin',
-        );
-        my $packages = $collect->modules;
-
-        $self->packages_from_plugin_path($packages);
-    }
-    $self->NEXT( setup_plugins => @args );
-}
-
 sub class_component_load_plugin_resolver {
     my ($self, $package) = @_;
     $package = "App::Hachero::Plugin::$package";
-    for my $pkg (@{ $self->packages_from_plugin_path }) {
+    for my $pkg (@{ $packages_from_plugin_path }) {
         return $pkg if $pkg->{package} eq $package;
     }

lang/perl/App-Hachero/trunk/t/app/01_plugin_path.t

@@ -1 +1 @@
 use strict;
 use warnings;
-use Test::More tests => 1;
+use Test::More tests => 2;
 use File::Spec;
 use App::Hachero;
@@ -21 +21 @@
 
 ok $app;
+$app->run_hook('input');
+is $app->currentline, 'ok';

lang/perl/App-Hachero/trunk/t/data/plugin/test_foo.pm

@@ -4 +4 @@
 use base 'App::Hachero::Plugin::Base';
 
+sub input : Hook {
+    my ($self, $context) = @_;
+    $context->currentline('ok');
+}
+
 1;