Merge pull request #1850 from rrosenblum/ruby_linters

Update all Ruby linters to work consistently with bundler

4 files changed, 24 insertions, 24 deletions

diff --git a/ale_linters/ruby/brakeman.vim b/ale_linters/ruby/brakeman.vim
index 85cfc184..122e0b5b 100644
--- a/ale_linters/ruby/brakeman.vim
+++ b/ale_linters/ruby/brakeman.vim
@@ -1,8 +1,9 @@
 " Author: Eddie Lebow https://github.com/elebow
 " Description: Brakeman, a static analyzer for Rails security
 
-let g:ale_ruby_brakeman_options =
-\   get(g:, 'ale_ruby_brakeman_options', '')
+call ale#Set('ruby_brakeman_options', '')
+call ale#Set('ruby_brakeman_executable', 'brakeman')
+call ale#Set('ruby_brakeman_options', '')
 
 function! ale_linters#ruby#brakeman#Handle(buffer, lines) abort
     let l:output = []
@@ -33,14 +34,17 @@ function! ale_linters#ruby#brakeman#GetCommand(buffer) abort
         return ''
     endif
 
-    return 'brakeman -f json -q '
+    let l:executable = ale#Var(a:buffer, 'ruby_brakeman_executable')
+
+    return ale#handlers#ruby#EscapeExecutable(l:executable, 'brakeman')
+    \    . ' -f json -q '
     \    . ale#Var(a:buffer, 'ruby_brakeman_options')
     \    . ' -p ' . ale#Escape(l:rails_root)
 endfunction
 
 call ale#linter#Define('ruby', {
 \    'name': 'brakeman',
-\    'executable': 'brakeman',
+\    'executable_callback': ale#VarFunc('ruby_brakeman_executable'),
 \    'command_callback': 'ale_linters#ruby#brakeman#GetCommand',
 \    'callback': 'ale_linters#ruby#brakeman#Handle',
 \    'lint_file': 1,
diff --git a/ale_linters/ruby/rails_best_practices.vim b/ale_linters/ruby/rails_best_practices.vim
index 4ba1f3fe..20cadca8 100644
--- a/ale_linters/ruby/rails_best_practices.vim
+++ b/ale_linters/ruby/rails_best_practices.vim
@@ -22,26 +22,18 @@ function! ale_linters#ruby#rails_best_practices#Handle(buffer, lines) abort
     return l:output
 endfunction
 
-function! ale_linters#ruby#rails_best_practices#GetExecutable(buffer) abort
-    return ale#Var(a:buffer, 'ruby_rails_best_practices_executable')
-endfunction
-
 function! ale_linters#ruby#rails_best_practices#GetCommand(buffer) abort
-    let l:executable = ale_linters#ruby#rails_best_practices#GetExecutable(a:buffer)
-    let l:exec_args = l:executable =~? 'bundle$'
-    \   ? ' exec rails_best_practices'
-    \   : ''
-
     let l:rails_root = ale#ruby#FindRailsRoot(a:buffer)
 
     if l:rails_root is? ''
         return ''
     endif
 
+    let l:executable = ale#Var(a:buffer, 'ruby_rails_best_practices_executable')
     let l:output_file = ale#Has('win32') ? '%t ' : '/dev/stdout '
     let l:cat_file = ale#Has('win32') ? '; type %t' : ''
 
-    return ale#Escape(l:executable) . l:exec_args
+    return ale#handlers#ruby#EscapeExecutable(l:executable, 'rails_best_practices')
     \    . ' --silent -f json --output-file ' . l:output_file
     \    . ale#Var(a:buffer, 'ruby_rails_best_practices_options')
     \    . ale#Escape(l:rails_root)
@@ -50,7 +42,7 @@ endfunction
 
 call ale#linter#Define('ruby', {
 \    'name': 'rails_best_practices',
-\    'executable_callback': 'ale_linters#ruby#rails_best_practices#GetExecutable',
+\    'executable_callback': ale#VarFunc('ruby_rails_best_practices_executable'),
 \    'command_callback': 'ale_linters#ruby#rails_best_practices#GetCommand',
 \    'callback': 'ale_linters#ruby#rails_best_practices#Handle',
 \    'lint_file': 1,
diff --git a/ale_linters/ruby/reek.vim b/ale_linters/ruby/reek.vim
index aa5d8d70..eefc4ecf 100644
--- a/ale_linters/ruby/reek.vim
+++ b/ale_linters/ruby/reek.vim
@@ -3,6 +3,8 @@
 
 call ale#Set('ruby_reek_show_context', 0)
 call ale#Set('ruby_reek_show_wiki_link', 0)
+call ale#Set('ruby_reek_options', '')
+call ale#Set('ruby_reek_executable', 'reek')
 
 function! ale_linters#ruby#reek#VersionCheck(buffer) abort
     " If we have previously stored the version number in a cache, then
@@ -12,18 +14,23 @@ function! ale_linters#ruby#reek#VersionCheck(buffer) abort
         return ''
     endif
 
-    return 'reek --version'
+    let l:executable = ale#Var(a:buffer, 'ruby_reek_executable')
+
+    return ale#handlers#ruby#EscapeExecutable(l:executable, 'reek')
+    \   . ' --version'
 endfunction
 
 function! ale_linters#ruby#reek#GetCommand(buffer, version_output) abort
     let l:version = ale#semver#GetVersion('reek', a:version_output)
+    let l:executable = ale#Var(a:buffer, 'ruby_reek_executable')
 
     " Tell reek what the filename is if the version of reek is new enough.
     let l:display_name_args = ale#semver#GTE(l:version, [5, 0, 0])
     \   ? ' --stdin-filename %s'
     \   : ''
 
-    return 'reek -f json --no-progress --no-color'
+    return ale#handlers#ruby#EscapeExecutable(l:executable, 'reek')
+    \   . ' -f json --no-progress --no-color'
     \   . l:display_name_args
 endfunction
 
@@ -62,7 +69,7 @@ endfunction
 
 call ale#linter#Define('ruby', {
 \   'name': 'reek',
-\   'executable': 'reek',
+\   'executable_callback': ale#VarFunc('ruby_reek_executable'),
 \   'command_chain': [
 \       {'callback': 'ale_linters#ruby#reek#VersionCheck'},
 \       {'callback': 'ale_linters#ruby#reek#GetCommand'},
diff --git a/ale_linters/ruby/rubocop.vim b/ale_linters/ruby/rubocop.vim
index 777f457a..58d73407 100644
--- a/ale_linters/ruby/rubocop.vim
+++ b/ale_linters/ruby/rubocop.vim
@@ -2,12 +2,9 @@
 " Description: RuboCop, a code style analyzer for Ruby files
 
 function! ale_linters#ruby#rubocop#GetCommand(buffer) abort
-    let l:executable = ale#handlers#rubocop#GetExecutable(a:buffer)
-    let l:exec_args = l:executable =~? 'bundle$'
-    \   ? ' exec rubocop'
-    \   : ''
+    let l:executable = ale#Var(a:buffer, 'ruby_rubocop_executable')
 
-    return ale#Escape(l:executable) . l:exec_args
+    return ale#handlers#ruby#EscapeExecutable(l:executable, 'rubocop')
     \   . ' --format json --force-exclusion '
     \   . ale#Var(a:buffer, 'ruby_rubocop_options')
     \   . ' --stdin ' . ale#Escape(expand('#' . a:buffer . ':p'))
@@ -55,7 +52,7 @@ endfunction
 
 call ale#linter#Define('ruby', {
 \   'name': 'rubocop',
-\   'executable_callback': 'ale#handlers#rubocop#GetExecutable',
+\   'executable_callback': ale#VarFunc('ruby_rubocop_executable'),
 \   'command_callback': 'ale_linters#ruby#rubocop#GetCommand',
 \   'callback': 'ale_linters#ruby#rubocop#Handle',
 \})