Add a preliminary PostfixadminMv.

[mailshears.git] / bin / mailshears

diff --git a/bin/mailshears b/bin/mailshears
index f7b1963cc8bde0a49cfc388fa29d963cf8e3db55..f7d5afa5b10c75264e92f275f4bfeb24724bb74e 100755 (executable)
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -83,23 +83,15 @@ def make_header(plugin_name)
 end
 
 
-plugin_class = nil
-runner_class = nil
-dummy_runner_class = nil
+plugin_module = nil
 
 if mode == :rm then
-  plugin_class = RmPlugin
-  runner_class = RmRunner
-  dummy_runner_class = RmDummyRunner
+  plugin_module = RmPlugin
 elsif mode == :mv then
-  plugin_class = MvPlugin
-  runner_class = MvRunner
-  dummy_runner_class = MvDummyRunner
+  plugin_module = MvPlugin
 else
   # Safe, catch-all default
-  plugin_class = PrunePlugin
-  runner_class = PruneRunner
-  dummy_runner_class = PruneDummyRunner
+  plugin_module = PrunePlugin
 end
 
 
@@ -109,26 +101,13 @@ require 'stringio'
 output_buffer = StringIO.new()
 $stdout = output_buffer
 
-plugin_class.includers.each do |plugin_class_includer|
-  plugin = plugin_class_includer.new(cfg)
-
-  if cfg.i_mean_business then
-    runner = runner_class.new()
-  else
-    runner = dummy_runner_class.new()
-  end
-
-  # The splat passes the correct (we hope) number of arguments to the
-  # appropriate runner. The Rm(Dummy)Runner have splats on their
-  # *target arguments as well, to turn ARGV back into an array.
-  runner.run(plugin, *ARGV)
-end
+plugin_module.run(cfg, *ARGV)
 
 # Restore stdout, and print the header plus whatever the plugins
 # produced if they produced anything. If they didn't, we avoid
 # printing the header.
 $stdout = STDOUT
 if output_buffer.size > 0 then
-  puts make_header(plugin_class.to_s())
+  puts make_header(plugin_module.to_s())
   puts output_buffer.string()
 end