Overhaul everything to get consistent error reports.

[mailshears.git] / lib / rm / rm_dummy_runner.rb

diff --git a/lib/rm/rm_dummy_runner.rb b/lib/rm/rm_dummy_runner.rb
index c79e0467984198e903eef70ae296fae91dc17c60..2ab25e80a3e402f5ba3c21214b30a768d6c2cd2c 100644 (file)
--- a/lib/rm/rm_dummy_runner.rb
+++ b/lib/rm/rm_dummy_runner.rb
@@ -1,16 +1,24 @@
+require 'common/runner'
+
 class RmDummyRunner
   include Runner
 
-  def run(plugin, targets)
+  def run(plugin, *targets)
     targets.each do |target|
-      if target.include?('@') then
-        puts "Would remove account: #{target}"
-      else
-        puts "Would remove domain: #{target}"
+      target_description = plugin.describe(target)
+      msg =  "Would remove #{target.class.to_s().downcase()} #{target}"
+
+      # Only append the extra description if it's useful.
+      if not target_description.nil? and
+         not target_description.empty? and
+         not target_description == target.to_s() then
+        msg += " (#{target_description})"
       end
+      msg += '.'
+
+      report(plugin, msg)
     end
 
-    # TODO: remove from postfixadmin as well.
   end
 
 end