From: Michael Orlitzky Date: Thu, 29 Aug 2013 16:21:37 +0000 (-0400) Subject: Fix typo in mv_plugin. X-Git-Tag: 0.0.1~89 X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=616d9c0f3260f4d8e9bf26140fa6032c3eabca8b;p=mailshears.git 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 c5647f2..76fad83 100644 --- 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 f082452..4ce1437 100644 --- 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 7a59442..bb34295 100644 --- 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 b8c8203..5ca8bf1 100644 --- 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 7c2f021..048319f 100644 --- 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 e8165d1..f2621df 100644 --- 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