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

cd to HOMEBREW_LIBRARY is not needed anymore for RuboCop.

Browse Source
This commit is contained in:
Markus Reiter 2016-09-28 22:47:14 +02:00
parent 5800f2f084
commit 18a9945ad8
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,26 +56,25 @@ module Homebrew
args << "--config" << HOMEBREW_LIBRARY_PATH/".rubocop.yml" args << "--config" << HOMEBREW_LIBRARY_PATH/".rubocop.yml"
args += [HOMEBREW_LIBRARY_PATH] args += [HOMEBREW_LIBRARY_PATH]
else else
args << "--config" << HOMEBREW_LIBRARY/"Taps/.rubocop.yml" args << "--config" << Tap::TAP_DIRECTORY/".rubocop.yml"
args << "--format" << "simple"
args += files args += files
end end
HOMEBREW_LIBRARY.cd do case output_type
case output_type when :print
when :print args << "--display-cop-names" if ARGV.include? "--display-cop-names"
args << "--display-cop-names" if ARGV.include? "--display-cop-names" system "rubocop", *args
system "rubocop", "--format", "simple", *args !$?.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
raise "Error while running RuboCop" if $?.exitstatus.nil? || $?.exitstatus > 1 RubocopResults.new(Utils::JSON.load(json))
RubocopResults.new(Utils::JSON.load(json)) else
else raise "Invalid output_type for check_style_impl: #{output_type}"
raise "Invalid output_type for check_style_impl: #{output_type}"
end
end end
end end