New 'path' generation

tpope · tpope · commit 7ff47b7a44ce · 2011-08-22T02:09:08.000-04:00
The 'path' is now simply Ruby's load path, prefixed with the global 'path' if it was set to a default value. Notably, this means the current working directory is only included if Ruby itself included it (true on 1.8, but not 1.9). Closes vim-ruby#32.
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
@@ -71,21 +71,24 @@ setlocal commentstring=#\ %s
 if !exists("s:ruby_path")
   if exists("g:ruby_path")
     let s:ruby_path = g:ruby_path
-  elseif has("ruby") && has("win32")
-    ruby VIM::command( 'let s:ruby_path = "%s"' % $:.join(%q{,}) )
-    let s:ruby_path = '.,' . substitute(s:ruby_path, '\%(^\|,\)\.\%(,\|$\)', ',,', '')
-  elseif executable("ruby")
-    let s:code = "print $:.join(%q{,})"
-    if &shellxquote == "'"
-      let s:ruby_path = system('ruby -e "' . s:code . '"')
+  else
+    if has("ruby") && has("win32")
+      ruby VIM::command( 'let s:ruby_path = "%s"' % $:.join(%q{,}) )
+      let s:ruby_path = substitute(s:ruby_path, '\%(^\|,\)\.\%(,\|$\)', ',,', '')
+    elseif executable("ruby")
+      let s:code = "print $:.join(%q{,})"
+      if &shellxquote == "'"
+        let s:ruby_path = system('ruby -e "' . s:code . '"')
+      else
+        let s:ruby_path = system("ruby -e '" . s:code . "'")
+      endif
+      let s:ruby_path = substitute(s:ruby_path, '\%(^\|,\)\.\%(,\|$\)', ',,', '')
     else
-      let s:ruby_path = system("ruby -e '" . s:code . "'")
+      let s:ruby_path = substitute($RUBYLIB,':',',','g')
+    endif
+    if &g:path !~# '\v^\.%(,/%(usr|emx)/include)=,,$'
+      let s:ruby_path = substitute(&g:path,',,$',',','') . ',' . s:ruby_path
     endif
-    let s:ruby_path = '.,' . substitute(s:ruby_path, '\%(^\|,\)\.\%(,\|$\)', ',,', '')
-  else
-    " If we can't call ruby to get its path, just default to using the
-    " current directory and the directory of the current file.
-    let s:ruby_path = ".,,"
   endif
 endif
 
