X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=bin%2Fmailshears;h=215bd6ba1f7bf046a71f0df9bbfaa7b34f384101;hp=f7b1963cc8bde0a49cfc388fa29d963cf8e3db55;hb=e7c89a22bd64fe2f1023b87728315b97cac715b8;hpb=72696d3f6e95ef773af9727e9c3459b9038b0fc2

diff --git a/bin/mailshears b/bin/mailshears
index f7b1963..215bd6b 100755
--- 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,13 +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)
+plugin_module.includers.each do |plugin_module_includer|
+  plugin = plugin_module_includer.new(cfg)
 
   if cfg.i_mean_business then
-    runner = runner_class.new()
+    runner = plugin.runner().new()
   else
-    runner = dummy_runner_class.new()
+    runner = plugin.dummy_runner().new()
   end
 
   # The splat passes the correct (we hope) number of arguments to the
@@ -129,6 +121,6 @@ end
 # 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