admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

style: improve Rubocop error handling.

Browse Source 
- Check if the JSON is definitely invalid (< 2 characters)
- Output the arguments that were passed to Rubocop
This commit is contained in:
Mike McQuaid 2017-03-08 09:26:07 +00:00
parent 9105acab6b
commit fe59fde8f8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/cmd/style.rb
View File

@ -70,10 +70,14 @@ module Homebrew
!$?.success? !$?.success?
when :json when :json
json = Utils.popen_read_text("rubocop", "--format", "json", *args) json = Utils.popen_read_text("rubocop", "--format", "json", *args)
# exit status of 1 just means violations were found; other numbers mean execution errors # exit status of 1 just means violations were found; other numbers mean
# execution errors.
# exitstatus can also be nil if RuboCop process crashes, e.g. due to # exitstatus can also be nil if RuboCop process crashes, e.g. due to
# native extension problems # native extension problems.
raise "Error while running RuboCop" if $?.exitstatus.nil? || $?.exitstatus > 1 # JSON needs to be at least 2 characters.
if $?.exitstatus.nil? || $?.exitstatus > 1 || json.to_s.length < 2
raise "Error running `rubocop --format json #{args.join " "}`"
end
RubocopResults.new(JSON.parse(json)) RubocopResults.new(JSON.parse(json))
else else
raise "Invalid output_type for check_style_impl: #{output_type}" raise "Invalid output_type for check_style_impl: #{output_type}"