X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=bin%2Fmailshears;h=f7d5afa5b10c75264e92f275f4bfeb24724bb74e;hp=1398a8f06ab67d7cb5aac84d1bf2aa2d074953ce;hb=c2737d4d972df30725e417bed0940fc8df8e88bd;hpb=6f2bc0181c6bb900e37d04ea722beec54486b87e;ds=sidebyside

diff --git a/bin/mailshears b/bin/mailshears
index 1398a8f..f7d5afa 100755
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -83,15 +83,15 @@ def make_header(plugin_name)
 end
 
 
-plugin_class = nil
+plugin_module = nil
 
 if mode == :rm then
-  plugin_class = RmPlugin
+  plugin_module = RmPlugin
 elsif mode == :mv then
-  plugin_class = MvPlugin
+  plugin_module = MvPlugin
 else
   # Safe, catch-all default
-  plugin_class = PrunePlugin
+  plugin_module = PrunePlugin
 end
 
 
@@ -101,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 = plugin.runner().new()
-  else
-    runner = plugin.dummy_runner().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