Factor out plugin running into the Plugin module (along with the includers() handling).

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

diff --git a/lib/rm/rm_runner.rb b/lib/rm/rm_runner.rb
index 114aabc355ad1c215f0b95e3cf1f20a2a626ea4d..b953898061691cf70f049dd5217579980351c31c 100644 (file)
--- a/lib/rm/rm_runner.rb
+++ b/lib/rm/rm_runner.rb
@@ -5,17 +5,17 @@ class RmRunner
 
   def run(plugin, *targets)
     targets.each do |target|
-      # Why think too hard? An account has an @, a domain doesn't.
+      # Why think too hard? An user has an @, a domain doesn't.
       if target.include?('@') then
         begin
-          account_description = plugin.describe_account(target)
-          plugin.delete_account(target)
-          report(plugin, "Removed account: #{target} (#{account_description})")
+          user_description = plugin.describe_user(target)
+          plugin.delete_user(target)
+          report(plugin, "Removed user: #{target} (#{user_description})")
 
-        rescue NonexistentAccountError => e
-          report(plugin, "Account not found: #{e.to_s}")
+        rescue NonexistentUserError => e
+          report(plugin, "User not found: #{e.to_s}")
         rescue StandardError => e
-          report(plugin, "There was an error removing the account: #{e.to_s}")
+          report(plugin, "There was an error removing the user: #{e.to_s}")
           Kernel.exit(ExitCodes::DATABASE_ERROR)
         end
       else
@@ -24,9 +24,9 @@ class RmRunner
           plugin.delete_domain(target)
           report(plugin, "Removed domain: #{target} (#{domain_description})")
 
-        rescue NonexistentAccountError => e
+        rescue NonexistentUserError => e
           # Can happen in the usernames.each... block.
-          report(plugin, "Account not found: #{e.to_s}")
+          report(plugin, "User not found: #{e.to_s}")
         rescue NonexistentDomainError => e
           report(plugin, "Domain not found: #{e.to_s}")
         rescue StandardError => e