From 9df008d63655d1fb897692386ada7b3c936835bd Mon Sep 17 00:00:00 2001 From: Laust Rud Jacobsen Date: Wed, 4 Nov 2015 22:09:53 +0100 Subject: [PATCH] Rubocop: fail preferred over raise --- .rubocop_todo.yml | 11 ----------- app/controllers/notices_controller.rb | 2 +- app/interactors/problem_merge.rb | 2 +- app/models/problem.rb | 2 +- lib/airbrake_api/v3/notice_parser.rb | 2 +- lib/hoptoad.rb | 4 ++-- 6 files changed, 6 insertions(+), 17 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 74909e9..034e371 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -242,17 +242,6 @@ Style/Semicolon: - 'app/decorators/issue_tracker_type_decorator.rb' - 'app/models/notice_fingerprinter.rb' -# Offense count: 6 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -Style/SignalException: - Exclude: - - 'app/controllers/notices_controller.rb' - - 'app/interactors/problem_merge.rb' - - 'app/models/problem.rb' - - 'lib/airbrake_api/v3/notice_parser.rb' - - 'lib/hoptoad.rb' - # Offense count: 1 # Configuration parameters: Methods. Style/SingleLineBlockParams: diff --git a/app/controllers/notices_controller.rb b/app/controllers/notices_controller.rb index 2057ada..0b79a0d 100644 --- a/app/controllers/notices_controller.rb +++ b/app/controllers/notices_controller.rb @@ -39,7 +39,7 @@ private return @notice_params if @notice_params @notice_params = params[:data] || request.raw_post if @notice_params.blank? - raise ParamsError.new('Need a data params in GET or raw post data') + fail ParamsError.new('Need a data params in GET or raw post data') end @notice_params end diff --git a/app/interactors/problem_merge.rb b/app/interactors/problem_merge.rb index 75ba63a..33d9e20 100644 --- a/app/interactors/problem_merge.rb +++ b/app/interactors/problem_merge.rb @@ -5,7 +5,7 @@ class ProblemMerge problems = problems.flatten.uniq @merged_problem = problems[0] @child_problems = problems[1..-1] - raise ArgumentError.new("need almost 2 uniq different problems") if @child_problems.empty? + fail ArgumentError.new("need almost 2 uniq different problems") if @child_problems.empty? end attr_reader :merged_problem, :child_problems diff --git a/app/models/problem.rb b/app/models/problem.rb index 325cff2..cb212cd 100644 --- a/app/models/problem.rb +++ b/app/models/problem.rb @@ -219,7 +219,7 @@ class Problem when "last_notice_at" then order_by(["last_notice_at", order]) when "last_deploy_at" then order_by(["last_deploy_at", order]) when "count" then order_by(["notices_count", order]) - else raise("\"#{sort}\" is not a recognized sort") + else fail("\"#{sort}\" is not a recognized sort") end end diff --git a/lib/airbrake_api/v3/notice_parser.rb b/lib/airbrake_api/v3/notice_parser.rb index a65767f..5eae5ac 100644 --- a/lib/airbrake_api/v3/notice_parser.rb +++ b/lib/airbrake_api/v3/notice_parser.rb @@ -27,7 +27,7 @@ module AirbrakeApi private def error - raise AirbrakeApi::ParamsError unless params.key?('errors') && params['errors'].any? + fail AirbrakeApi::ParamsError unless params.key?('errors') && params['errors'].any? @error ||= params['errors'].first end diff --git a/lib/hoptoad.rb b/lib/hoptoad.rb index 0d23716..98da58f 100644 --- a/lib/hoptoad.rb +++ b/lib/hoptoad.rb @@ -9,7 +9,7 @@ module Hoptoad class << self def parse_xml!(xml) - parsed = ActiveSupport::XmlMini.backend.parse(xml)['notice'] || raise(ApiVersionError) + parsed = ActiveSupport::XmlMini.backend.parse(xml)['notice'] || fail(ApiVersionError) processor = get_version_processor(parsed['version']) processor.process_notice(parsed) end @@ -17,7 +17,7 @@ module Hoptoad private def get_version_processor(version) case version when /2\.[01234]/ then Hoptoad::V2 - else; raise ApiVersionError + else; fail ApiVersionError end end end -- libgit2 0.21.2