Changeset 765

Timestamp:

05/17/06 18:19:18

Author:

miyagawa

Message:

• Plagger->bootstrap now takes scalar ref containing YAML data, or hash reference of config
  
• Plugins are not 'require'd if the module is in memory already
  
• Added test suite for Subscription::ConfigINI
  

Files:

• trunk/plagger/lib/Plagger.pm (modified) (3 diffs)
• trunk/plagger/t/plugins (added)
• trunk/plagger/t/plugins/Subscription-ConfigINI (added)
• trunk/plagger/t/plugins/Subscription-ConfigINI/config.ini (added)
• trunk/plagger/t/plugins/Subscription-ConfigINI/subscription.t (added)

trunk/plagger/lib/Plagger.pm

@@ -41 +41 @@
-    if (-e $opt{config} && -r _) {
-        $config = YAML::LoadFile($opt{config});
-        $self->load_include($config);
-        $self->{conf} = $config->{global};
-        $self->{conf}->{log} ||= { level => 'debug' };
-        $self->{config_path} = $opt{config};
+    } elsif (ref($opt{config}) && ref($opt{config}) eq 'SCALAR') {
+        $config = YAML::Load(${$opt{config}});
+    } elsif (ref($opt{config}) && ref($opt{config}) eq 'HASH') {
+        $config = $opt{config};
-    } else {
-        croak "Plagger->bootstrap: $opt{config}: $!";
-    }
+
+    $self->load_include($config);
+    $self->{conf} = $config->{global};
+    $self->{conf}->{log} ||= { level => 'debug' };
-
-    local *Plagger::context = sub { $self };
@@ -65 +70 @@
-sub rewrite_config {
-    my $self = shift;
+
+    unless ($self->{config_path}) {
+        $self->log(warn => "config is not loaded from file. Ignoring rewrite tasks.");
+        return;
+    }
-
-    open my $fh, $self->{config_path} or $self->error("$self->{config_path}: $!");
@@ -234 +244 @@
-    $module = "Plagger::Plugin::$module";
-
-my $path = $self->plugins_path->{$module}
-eval { require $path } or die $@
+$module->isa('Plagger::Plugin')
+$self->log(debug => "$module is loaded elsewhere ... maybe .t script?")
-    } else {
-
+
+
+
+
+
-    }
-