Fix typo in mv_plugin.

Rename the 'rm' plugin classes with an 'Rm' suffix.

diff --git a/lib/mv/mv_plugin.rb b/lib/mv/mv_plugin.rb
index c5647f2c92a6ecee0915fa5ab96504c3f04e615e..76fad8395cf6454666d3caf1b3ed3e7401dce0cb 100644 (file)
--- a/lib/mv/mv_plugin.rb
+++ b/lib/mv/mv_plugin.rb
@@ -3,7 +3,7 @@ module MvPlugin
   # Plugins for moving (renaming) accounts.
   #
 
-  def mv_domain(from. to)
+  def mv_domain(from, to)
     # Rename the given domain.
     raise NotImplementedError
   end

diff --git a/lib/mv/plugins/dovecot_mailstore.rb b/lib/mv/plugins/dovecot_mailstore.rb
index f0824528b438c3ab7cf9f823ce7dc13209ea3741..4ce1437f8fa474da5a9d77b798e6a8620a7d2fea 100644 (file)
--- a/lib/mv/plugins/dovecot_mailstore.rb
+++ b/lib/mv/plugins/dovecot_mailstore.rb
@@ -67,7 +67,8 @@ class DovecotMailstoreMv < Mailstore
     # Return the filesystem path of this account's mailbox.
     # Only works if the account exists!
     if not account.include?('@')
-      raise InvalidAccountError.new("#{account}: Accounts must contain an '@' symbol.")
+      msg = "#{account}: Accounts must contain an '@' symbol."
+      raise InvalidAccountError.new(msg)
     end
 
     account_parts = account.split('@')

diff --git a/lib/rm/plugins/agendav.rb b/lib/rm/plugins/agendav.rb
index 7a594425816bcb894778cd42434fe7be5041db23..bb34295614a0fdfa47936021ecfc4a54a25b3b26 100644 (file)
--- a/lib/rm/plugins/agendav.rb
+++ b/lib/rm/plugins/agendav.rb
@@ -3,7 +3,7 @@ require 'pg'
 require 'common/plugin'
 require 'rm/rm_plugin'
 
-class AgendavDb
+class AgendavRm
 
   include Plugin
   include RmPlugin

diff --git a/lib/rm/plugins/davical.rb b/lib/rm/plugins/davical.rb
index b8c8203eb28fc5596c238e9752ef62858e4f6011..5ca8bf131137be28b53b9a4f62c9afa456666500 100644 (file)
--- a/lib/rm/plugins/davical.rb
+++ b/lib/rm/plugins/davical.rb
@@ -3,7 +3,7 @@ require 'pg'
 require 'common/plugin'
 require 'rm/rm_plugin'
 
-class DavicalDb
+class DavicalRm
   #
   # DAViCal only supports Postgres, so even if we ever are
   # database-agnostic, this plugin can't be.

diff --git a/lib/rm/plugins/dovecot_mailstore.rb b/lib/rm/plugins/dovecot_mailstore.rb
index 7c2f02166fe26d5dc4c89da748547149e1685e6b..048319f3c20010232bf4ce90f1bdcab35741b22d 100644 (file)
--- a/lib/rm/plugins/dovecot_mailstore.rb
+++ b/lib/rm/plugins/dovecot_mailstore.rb
@@ -6,7 +6,7 @@ require 'common/mailstore'
 require 'common/plugin'
 require 'rm/rm_plugin'
 
-class DovecotMailstore < Mailstore
+class DovecotMailstoreRm < Mailstore
 
   include Plugin
   include RmPlugin

diff --git a/lib/rm/plugins/roundcube_db.rb b/lib/rm/plugins/roundcube_db.rb
index e8165d1225f270629b857de08c87637b3ea8881b..f2621df8cffeee6c4384b9deb134e799ba64b77d 100644 (file)
--- a/lib/rm/plugins/roundcube_db.rb
+++ b/lib/rm/plugins/roundcube_db.rb
@@ -3,7 +3,7 @@ require 'pg'
 require 'common/plugin'
 require 'rm/rm_plugin'
 
-class RoundcubeDb
+class RoundcubeDbRm
 
   include Plugin
   include RmPlugin