Fix variable names in the prune tests.

[mailshears.git] / lib / prune / prune_runner.rb

diff --git a/lib/prune/prune_runner.rb b/lib/prune/prune_runner.rb
index acc8828ba11be426a0c0ad90b1fe991c25f7154a..8ae8ad218bcbc402e167509dca190ab62cbec5fb 100644 (file)
--- a/lib/prune/prune_runner.rb
+++ b/lib/prune/prune_runner.rb
@@ -1,7 +1,6 @@
 require 'common/runner'
-
-# This is always needed, regardless of which plugin is running.
 require 'prune/plugins/postfixadmin'
+require 'rm/rm_runner'
 
 class PruneRunner
   include Runner
@@ -16,21 +15,11 @@ class PruneRunner
     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)
 
+    rm_runner = RmRunner.new()
+    rm_runner.run(plugin, *leftovers)
   end
 
 end