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

diff --git a/bin/mailshears b/bin/mailshears
index f7b1963..4d69f8f 100755
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -1,17 +1,7 @@
-#!/usr/bin/ruby -wKU
+#!/usr/bin/ruby -wU
 #
 # mailshears, to prune unused mail directories.
 #
-# Mail users for virtual hosts are stored in SQL, and managed by
-# Postfixadmin. However, the physical directories are handled by
-# Postfix/Dovecot and are left untouched by Postfixadmin. This is good
-# for security, but comes at a cost: Postfixadmin can't remove a
-# user's mail directory when his or her account is deleted.
-#
-# This program compares the list of filesystem users with the ones
-# in the database. It outputs any users that exist in the
-# filesystem, but not the database.
-#
 
 # Define a usage string using the program name.
 exe = File.basename($PROGRAM_NAME)
@@ -83,23 +73,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 +91,19 @@ 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()
+begin
+  plugin_module.run(cfg, *ARGV)
+ensure
+  # Now restore stdout, and print the header plus whatever the plugins
+  # produced if they produced anything. If they didn't produce any
+  # output, then we avoid printing the header.
+  #
+  # This gets wrapped in an "ensure" block because otherwise, if
+  # plugin_module.run() crashes, the traceback will get stored in
+  # output_buffer and never get printed.
+  $stdout = STDOUT
+  if output_buffer.size > 0 then
+    puts make_header(plugin_module.to_s())
+    puts output_buffer.string()
   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
-
-# 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 output_buffer.string()
 end