Add runtime module {,un}loading

10 files changed, 65 insertions, 50 deletions

diff --git a/Plugin/Admin.pm b/Plugin/Admin.pm
index ff64d83..23f8635 100644
--- a/Plugin/Admin.pm
+++ b/Plugin/Admin.pm
@@ -4,34 +4,42 @@ use strict;
 use warnings;
 
 use IdaliusConfig qw/assert_scalar assert_list/;
+use Plugin qw/load_plugin unload_plugin/;
 
 my $config;
+my $root_config;
 
 sub configure {
 	my $self = shift;
 	my $cmdref = shift;
 	shift; # run_command
 	$config = shift;
+	$root_config = shift;
 
 	IdaliusConfig::assert_list($config, $self, "admins");
 	IdaliusConfig::assert_scalar($config, $self, "must_id");
 	IdaliusConfig::assert_scalar($config, $self, "quit_msg");
 
-	$cmdref->("say", sub { $self->say(@_); } );
-	$cmdref->("action", sub { $self->do_action(@_); } );
+	$cmdref->($self, "say", sub { $self->say(@_); } );
+	$cmdref->($self, "action", sub { $self->do_action(@_); } );
 
-	$cmdref->("nick", sub { $self->nick(@_); } );
-	$cmdref->("join", sub { $self->join_channel(@_); } );
-	$cmdref->("part", sub { $self->part(@_); } );
-	$cmdref->("mode", sub { $self->mode(@_); } );
-	$cmdref->("kick", sub { $self->kick(@_); } );
-	$cmdref->("topic", sub { $self->topic(@_); } );
-	$cmdref->("reconnect", sub { $self->reconnect(@_); } );
+	$cmdref->($self, "nick", sub { $self->nick(@_); } );
+	$cmdref->($self, "join", sub { $self->join_channel(@_); } );
+	$cmdref->($self, "part", sub { $self->part(@_); } );
+	$cmdref->($self, "mode", sub { $self->mode(@_); } );
+	$cmdref->($self, "kick", sub { $self->kick(@_); } );
+	$cmdref->($self, "topic", sub { $self->topic(@_); } );
+	$cmdref->($self, "reconnect", sub { $self->reconnect(@_); } );
 
-	$cmdref->("ignore", sub { $self->ignore(@_); } );
-	$cmdref->("don't ignore", sub { $self->do_not_ignore(@_); } );
-	$cmdref->("who are you ignoring?", sub { $self->dump_ignore(@_); } );
-	$cmdref->("exit", sub { $self->exit(@_); } );
+	$cmdref->($self, "ignore", sub { $self->ignore(@_); } );
+	$cmdref->($self, "don't ignore", sub { $self->do_not_ignore(@_); } );
+	$cmdref->($self, "who are you ignoring?", sub { $self->dump_ignore(@_); } );
+
+	$cmdref->($self, "exit", sub { $self->exit(@_); } );
+
+	$cmdref->($self, "plugins", sub { $self->dump_plugins(@_); } );
+	$cmdref->($self, "load", sub { $self->load_plugin(@_); } );
+	$cmdref->($self, "unload", sub { $self->unload_plugin(@_); } );
 
 	return $self;
 }
@@ -198,4 +206,35 @@ sub exit {
 	exit;
 }
 
+sub dump_plugins {
+	my ($self, $irc, $logger, $who, $where, $ided, $rest, @arguments) = @_;
+	return "Active plugins: " . join ", ", @{$root_config->{plugins}};
+}
+
+sub unload_plugin {
+	my ($self, $irc, $logger, $who, $where, $ided, $rest, @arguments) = @_;
+
+	return unless is_admin($logger, $who, $ided);
+	return "Syntax: unload <plugin>" unless @arguments == 1;
+
+	my $module = $arguments[0];
+
+	my $error = Plugin::unload_plugin($logger, $root_config, $module);
+	return $error if $error;
+	return "$module unloaded";
+}
+
+sub load_plugin {
+	my ($self, $irc, $logger, $who, $where, $ided, $rest, @arguments) = @_;
+
+	return unless is_admin($logger, $who, $ided);
+	return "Syntax: load <plugin>" unless @arguments == 1;
+
+	my $module = $arguments[0];
+
+	my $error = Plugin::load_plugin($logger, $root_config, $module);
+	return $error if $error;
+	return "$module loaded";
+}
+
 1;
diff --git a/Plugin/DevNull.pm b/Plugin/DevNull.pm
index b1087f1..038929a 100644
--- a/Plugin/DevNull.pm
+++ b/Plugin/DevNull.pm
@@ -10,8 +10,8 @@ sub configure {
 	my $cmdref = shift;
 	$run_command = shift;
 
-	$cmdref->("hush", sub { $self->hush(@_); } );
-	$cmdref->("devnull", sub { $self->hush(@_); } );
+	$cmdref->($self, "hush", sub { $self->hush(@_); } );
+	$cmdref->($self, "devnull", sub { $self->hush(@_); } );
 
 	return $self;
 }
diff --git a/Plugin/Echo.pm b/Plugin/Echo.pm
index ba66c48..f5225fe 100644
--- a/Plugin/Echo.pm
+++ b/Plugin/Echo.pm
@@ -7,7 +7,7 @@ sub configure {
 	my $self = shift;
 	my $cmdref = shift;
 
-	$cmdref->("echo", sub { $self->echo(@_); } );
+	$cmdref->($self, "echo", sub { $self->echo(@_); } );
 
 	return $self;
 }
diff --git a/Plugin/Introspect.pm b/Plugin/Introspect.pm
deleted file mode 100644
index 05f338a..0000000
--- a/Plugin/Introspect.pm
+++ /dev/null
@@ -1,24 +0,0 @@
-package Plugin::Introspect;
-
-use strict;
-use warnings;
-
-my $root_config;
-
-sub configure {
-	my $self = shift;
-	my $cmdref = shift;
-	shift; # run_command
-	shift; # module config
-	$root_config = shift;
-
-	$cmdref->("plugins", sub { $self->dump_plugins(@_); } );
-
-	return $self;
-}
-
-sub dump_plugins {
-	my ($self, $irc, $logger, $who, $where, $ided, $rest, @arguments) = @_;
-	return "Plugins: " . join ", ", $root_config->{plugins};
-}
-1;
diff --git a/Plugin/Map.pm b/Plugin/Map.pm
index 42856eb..a0f61ba 100644
--- a/Plugin/Map.pm
+++ b/Plugin/Map.pm
@@ -12,7 +12,7 @@ sub configure {
 	my $cmdref = shift;
 	$run_command = shift;
 
-	$cmdref->("map", sub { $self->map(@_); } );
+	$cmdref->($self, "map", sub { $self->map(@_); } );
 
 	return $self;
 }
diff --git a/Plugin/Ping.pm b/Plugin/Ping.pm
index 602469b..2cf46d5 100644
--- a/Plugin/Ping.pm
+++ b/Plugin/Ping.pm
@@ -7,7 +7,7 @@ sub configure {
 	my $self = shift;
 	my $cmdref = shift;
 
-	$cmdref->("ping", sub { $self->ping(@_); } );
+	$cmdref->($self, "ping", sub { $self->ping(@_); } );
 
 	return $self;
 }
diff --git a/Plugin/Random.pm b/Plugin/Random.pm
index cea65fb..c6ed304 100644
--- a/Plugin/Random.pm
+++ b/Plugin/Random.pm
@@ -9,8 +9,8 @@ sub configure {
 	my $self = shift;
 	my $cmdref = shift;
 
-	$cmdref->("shuffle", sub { $self->shuffle(@_); } );
-	$cmdref->("choose", sub { $self->choose(@_); } );
+	$cmdref->($self, "shuffle", sub { $self->shuffle(@_); } );
+	$cmdref->($self, "choose", sub { $self->choose(@_); } );
 
 	return $self;
 }
diff --git a/Plugin/Source.pm b/Plugin/Source.pm
index 6b93979..8719305 100644
--- a/Plugin/Source.pm
+++ b/Plugin/Source.pm
@@ -7,7 +7,7 @@ sub configure {
 	my $self = shift;
 	my $cmdref = shift;
 	my @source_commands = ("guts", "help", "source");
-	$cmdref->($_, sub { $self->source(@_); }) for @source_commands;
+	$cmdref->($self, $_, sub { $self->source(@_); }) for @source_commands;
 	return $self;
 }
 
diff --git a/Plugin/Thanks.pm b/Plugin/Thanks.pm
index 01c52ac..0ccf319 100644
--- a/Plugin/Thanks.pm
+++ b/Plugin/Thanks.pm
@@ -7,10 +7,10 @@ sub configure {
 	my $self = shift;
 	my $cmdref = shift;
 
-	$cmdref->("thanks", sub { $self->thanks(@_); } );
-	$cmdref->("thanks.", sub { $self->thanks(@_); } );
-	$cmdref->("thanks!", sub { $self->thanks(@_); } );
-	$cmdref->("thanks?", sub { $self->thanks(@_); } );
+	$cmdref->($self, "thanks", sub { $self->thanks(@_); } );
+	$cmdref->($self, "thanks.", sub { $self->thanks(@_); } );
+	$cmdref->($self, "thanks!", sub { $self->thanks(@_); } );
+	$cmdref->($self, "thanks?", sub { $self->thanks(@_); } );
 
 	return $self;
 }
diff --git a/Plugin/Timezone.pm b/Plugin/Timezone.pm
index 5e649b1..a8a8fcc 100644
--- a/Plugin/Timezone.pm
+++ b/Plugin/Timezone.pm
@@ -16,7 +16,7 @@ sub configure {
 
 	IdaliusConfig::assert_dict($config, $self, "timezone");
 
-	$cmdref->("time", sub { $self->time(@_); } );
+	$cmdref->($self, "time", sub { $self->time(@_); } );
 
 	return $self;
 }