Merge remote-tracking branch 'upstream/master'

bundle/syntastic/syntax_checkers/ruby/jruby.vim

@@ -19,17 +19,8 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_ruby_jruby_GetLocList() dict
-    if syntastic#util#isRunningWindows()
-        let exe = self.getExecEscaped()
-        let args = '-T1'
-    else
-        let exe = 'RUBYOPT= ' . self.getExecEscaped()
-        let args = ''
-    endif
-
     let makeprg = self.makeprgBuild({
-        \ 'exe': exe,
-        \ 'args': args,
+        \ 'args': (syntastic#util#isRunningWindows() ? '-T1' : ''),
         \ 'args_after': '-W1 -c' })
 
     let errorformat =
@@ -41,9 +32,12 @@ function! SyntaxCheckers_ruby_jruby_GetLocList() dict
         \ '%W%f:%l: %m,'.
         \ '%-C%.%#'
 
+    let env = syntastic#util#isRunningWindows() ? {} : { 'RUBYOPT': '' }
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'env': env })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({

bundle/syntastic/syntax_checkers/ruby/macruby.vim

@@ -18,9 +18,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_ruby_macruby_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe': 'RUBYOPT= ' . self.getExecEscaped(),
-        \ 'args_after': '-W1 -c' })
+    let makeprg = self.makeprgBuild({ 'args_after': '-W1 -c' })
 
     let errorformat =
         \ '%-GSyntax OK,'.
@@ -31,9 +29,12 @@ function! SyntaxCheckers_ruby_macruby_GetLocList() dict
         \ '%W%f:%l: %m,'.
         \ '%-C%.%#'
 
+    let env = { 'RUBYOPT': '' }
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'env': env })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({

bundle/syntastic/syntax_checkers/ruby/mri.vim

@@ -18,6 +18,13 @@ let g:loaded_syntastic_ruby_mri_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
+function! SyntaxCheckers_ruby_mri_IsAvailable() dict
+    if !exists('g:syntastic_ruby_mri_exec') && exists('g:syntastic_ruby_exec')
+        let g:syntastic_ruby_mri_exec = g:syntastic_ruby_exec
+    endif
+    return executable(self.getExec())
+endfunction
+
 function! SyntaxCheckers_ruby_mri_GetHighlightRegex(i)
     if stridx(a:i['text'], 'assigned but unused variable') >= 0
         let term = split(a:i['text'], ' - ')[1]
@@ -28,18 +35,7 @@ function! SyntaxCheckers_ruby_mri_GetHighlightRegex(i)
 endfunction
 
 function! SyntaxCheckers_ruby_mri_GetLocList() dict
-    if !exists('g:syntastic_ruby_exec')
-        let g:syntastic_ruby_exec = self.getExec()
-    endif
-
-    let exe = syntastic#util#shexpand(g:syntastic_ruby_exec)
-    if !syntastic#util#isRunningWindows()
-        let exe = 'RUBYOPT= ' . exe
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'exe': exe,
-        \ 'args_after': '-w -T1 -c' })
+    let makeprg = self.makeprgBuild({ 'args_after': '-w -T1 -c' })
 
     "this is a hack to filter out a repeated useless warning in rspec files
     "containing lines like
@@ -48,7 +44,7 @@ function! SyntaxCheckers_ruby_mri_GetLocList() dict
     "
     "Which always generate the warning below. Note that ruby >= 1.9.3 includes
     "the word "possibly" in the warning
-    let errorformat = '%-G%.%#warning: %\(possibly %\)%\?useless use of == in void context,'
+    let errorformat = '%-G%\m%.%#warning: %\%%(possibly %\)%\?useless use of == in void context,'
 
     " filter out lines starting with ...
     " long lines are truncated and wrapped in ... %p then returns the wrong
@@ -64,9 +60,12 @@ function! SyntaxCheckers_ruby_mri_GetLocList() dict
         \ '%W%f:%l: %m,'.
         \ '%-C%.%#'
 
+    let env = syntastic#util#isRunningWindows() ? {} : { 'RUBYOPT': '' }
+
     return SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
+        \ 'errorformat': errorformat,
+        \ 'env': env })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({

bundle/syntastic/syntax_checkers/ruby/rubylint.vim

@@ -20,7 +20,11 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_ruby_rubylint_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args': 'analyze --presenter=syntastic' })
+    if !exists('s:rubylint_new')
+        let s:rubylint_new = syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
+            \ self.getExecEscaped() . ' --version'), [2])
+    endif
+    let makeprg = self.makeprgBuild({ 'args': (s:rubylint_new ? '' : 'analyze ') . '--presenter=syntastic' })
 
     let errorformat = '%f:%t:%l:%c: %m'