Made the plugin more robust against output done from within the rspec tests:

sebastiangeiger · sebastiangeiger · commit 0629ea891d96 · 2011-09-27T11:17:41.000-07:00
- The formatter wraps progress indicators in "&lt;progress&gt;&lt;/progress&gt;" tags
	- The Vim script extracts those indicators from the tags and clears the tags at the end
diff --git a/plugin/sweet-vim-rspec.vim b/plugin/sweet-vim-rspec.vim
@@ -139,7 +139,7 @@ function! s:PollingSystemCall(systemcall)
   let pid = system(a:systemcall . " > " . output_file . " & echo $!") " the echo $! returns the process id
   let running = 1
   while running 
-    let progress =  system("cat " . output_file . " | head -1")
+    let progress =  s:ExtractProgressIndicators(system("cat " . output_file))
     let old_length = progress_length
     let progress_length = strlen(progress)
     let new_output = strpart(progress, old_length, progress_length - old_length)
@@ -148,11 +148,34 @@ function! s:PollingSystemCall(systemcall)
     sleep 100m
   endwhile
   echohl Special | echon " √Done" | echohl Normal
-  let result = readfile(output_file)[1:] " Omitting the first line, since it contains the progress indicators
+  let result = s:FilterProgressIndicatorWrappers(readfile(output_file))
   call delete(output_file)
   return result
 endfunction
 
+" The formatter wraps every .,F or * in a <progress></progress> tag pair.
+" That way potential output that is done by the RSpec test itself can be
+" ignored
+function! s:ExtractProgressIndicators(string)
+  let result = ""
+  let start = 0
+  while start != -1
+    let start = match(a:string, '\c<progress>\zs\(.\{1,1}\)\ze<\/progress>', start)  
+    if start != -1
+      let result .= strpart(a:string, start, 1)
+    endif
+  endwhile
+  return result
+endfunction
+
+function! s:FilterProgressIndicatorWrappers(list)
+  let result = []
+  for line in a:list 
+    call add(result, substitute(line, '<\/\?progress>', "", "g"))
+  endfor
+  return result
+endfunction
+
 function! s:ColoredOutput(string)
   let i = 0
   while i < len(a:string)
diff --git a/plugin/sweet_vim_rspec2_formatter.rb b/plugin/sweet_vim_rspec2_formatter.rb
@@ -8,6 +8,10 @@ class SweetVimRspecFormatter < BaseTextFormatter
         @@passes = []
         @@pending = []
 
+        def my_print(string)
+          output.print "<progress>#{string}</progress>"
+        end
+
         def example_failed(example)
           data = ""
           data << "+-+ "
@@ -23,7 +27,7 @@ def example_failed(example)
           data << exception.backtrace.join("\n")
           data << "\n-+-\n" * 2
           @@failures << data
-          output.print "F"
+          my_print "F"
         end
 
         def example_pending(example)
@@ -35,23 +39,23 @@ def example_pending(example)
           data << example.location + ": in `#{example.description}'"
           data << "\n\n-+-\n"
           @@pending << data
-          output.print "*"
+          my_print "*"
         end
 
         def example_passed(example)
           if ENV['SWEET_VIM_RSPEC_SHOW_PASSING'] == 'true'
             @@passes << "[PASS] #{example.full_description}\n"
           end
-          output.print "."
+          my_print "."
         end
 
         def dump_failures
-          output.puts @@failures.join("")
+          my_print @@failures.join("")
         end
 
         def dump_pending
-          output.puts 
-          output.puts @@pending.join("")
+          my_print "\n"
+          my_print @@pending.join("")
         end
  
         def message msg; end
