lib/backup/cli.rb in backup-3.6.0 vs lib/backup/cli.rb in backup-3.7.0

- old
+ new

@@ -2,10 +2,12 @@ ## # Build the Backup Command Line Interface using Thor module Backup class CLI < Thor + class Error < Backup::Error; end + class FatalError < Backup::FatalError; end ## # [Perform] # # The only required option is the --trigger [-t]. @@ -140,18 +142,18 @@ triggers = options[:trigger].split(',').map(&:strip) models = triggers.map {|trigger| Model.find_by_trigger(trigger) }.flatten.uniq - raise Errors::CLIError, "No Models found for trigger(s) " + + raise Error, "No Models found for trigger(s) " + "'#{ triggers.join(',') }'." if models.empty? # Finalize Logger and begin real-time logging. Logger.start! rescue Exception => err - Logger.error Errors::CLIError.wrap(err) + Logger.error Error.wrap(err) # Logger configuration will be ignored # and messages will be output to the console only. Logger.abort! exit(3) end @@ -164,20 +166,20 @@ when 1 warnings = true when 2 errors = true unless models.empty? - Logger.info Errors::ModelError.new(<<-EOS) + Logger.info Error.new(<<-EOS) Backup will now continue... The following triggers will now be processed: (#{ models.map {|m| m.trigger }.join(', ') }) EOS end when 3 fatal = true unless models.empty? - Logger.error Errors::ModelFatalError.new(<<-EOS) + Logger.error FatalError.new(<<-EOS) Backup will now exit. The following triggers will not be processed: (#{ models.map {|m| m.trigger }.join(', ') }) EOS end @@ -225,10 +227,10 @@ def check begin Config.update(options) Config.load_config! rescue Exception => err - Logger.error Errors::CLIError.wrap(err) + Logger.error Error.wrap(err) end if Logger.has_warnings? || Logger.has_errors? Logger.error 'Configuration Check Failed.' exit_code = 1