X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fprune%2Fprune_runner.rb;h=a9e2282857fc3be027a14d0410ae75436c25f934;hp=acc8828ba11be426a0c0ad90b1fe991c25f7154a;hb=df4e02ebf6a4e28a58abcb298a4442a245ad0b15;hpb=365d681f1ef45bd3f5f2c9dded07108bdd75a1ff

diff --git a/lib/prune/prune_runner.rb b/lib/prune/prune_runner.rb
index acc8828..a9e2282 100644
--- a/lib/prune/prune_runner.rb
+++ b/lib/prune/prune_runner.rb
@@ -1,36 +1,34 @@
 require 'common/runner'
-
-# This is always needed, regardless of which plugin is running.
 require 'prune/plugins/postfixadmin'
+require 'rm/rm_runner'
 
+# Perform the pruning of users/domains using {PrunePlugin}s.
+#
 class PruneRunner
   include Runner
 
-  def run(plugin)
+  # Run *plugin* to prune leftover users and directories.
+  #
+  # @param cfg [Configuration] configuration options passed to
+  # {PostfixadminPrune}.
+  #
+  # @param plugin [Class] plugin class that will perform the pruning.
+  #
+  def run(cfg, plugin)
     # We don't want to check the PostfixAdmin database against itself.
     return if plugin.class == PostfixadminPrune
 
-    cfg = Configuration.new()
     pfa = PostfixadminPrune.new(cfg)
 
     db_users = pfa.list_users()
     db_domains = pfa.list_domains()
 
-    leftover_users = plugin.get_leftover_accounts(db_users)
-    leftover_domains = plugin.get_leftover_domains(db_domains)
-
-    leftover_users.each do |user|
-      user_description = plugin.describe_account(user)
-      plugin.delete_account(user)
-      report(plugin, "Removed user: #{user} (#{user_description})")
-    end
-
-    leftover_domains.each do |domain|
-      domain_description = plugin.describe_domain(domain)
-      plugin.delete_domain(domain)
-      report(plugin, "Removed domain: #{domain} (#{domain_description})")
-    end
+    leftovers  = plugin.get_leftover_users(db_users)
+    leftovers += plugin.get_leftover_domains(db_domains)
 
+    # We're counting on our PrunePlugin also being an RmPlugin here.
+    rm_runner = RmRunner.new()
+    rm_runner.run(cfg, plugin, *leftovers)
   end
 
 end