testowl 0.0.7 → 0.0.8

data/lib/testowl/growl.rb

@@ -3,7 +3,7 @@ module Testowl
 
     Growlnotify = "growlnotify"
 
-    def self.grr(title, message, status, files, suffix)
+    def self.grr(title, message, seconds, status, files, suffix)
       project = File.expand_path(".").split("/").last
       growlnotify = `which #{Growlnotify}`.chomp
       if growlnotify == ''
@@ -14,9 +14,12 @@ module Testowl
           @warning_done = true
         end
       else
+        message_lines = [message.gsub("'", "`")]
+        message_lines << sprintf("(%0.1f seconds)", seconds) if seconds
+        message_lines << "#{files.map{|file| file.sub(/^spec\/[^\/]*\//, '').sub(/_test.rb$/, '')}.join("\n")}\n#{suffix}"
         options = []
         options << "-n Watchr"
-        options << "--message '#{message.gsub("'", "`")}\n\n#{files.map{|file| file.sub(/^spec\/[^\/]*\//, '').sub(/_test.rb$/, '')}.join("\n")}\n#{suffix}'"
+        options << "--message '#{message_lines.join("\n\n")}'"
         options << "--sticky" if status == :error
         options << "--image '#{image_path(status)}'"
         options << "--identifier #{Digest::MD5.hexdigest files.join}" # (used for coalescing)

data/lib/testowl/monitor.rb

@@ -8,10 +8,12 @@ module Testowl
         @runner = RspecRunner.new
         @test_dir = "spec"
         @test_suffix = "spec"
+        puts "TestOwl #{VERSION} has detected RSpec"
       elsif File.exist?("test/test_helper.rb")
         @runner = TestUnitRunner.new
         @test_dir = "test"
         @test_suffix = "test"
+        puts "TestOwl #{VERSION} has detected Test Unit"
       else
         raise "Can't find either spec_helper.rb or test_helper.rb and this owl is confused."
       end
@@ -34,7 +36,7 @@ module Testowl
         puts "Detected change in #{match[0]}"
         run_controller(match[1], "triggered by #{match[0]}")
       end
-      puts "Monitoring files..."
+      puts "Waiting for code changes..."
       Watchr::Controller.new(script, Watchr.handler.new).run
     end
 

data/lib/testowl/rspec_runner.rb

@@ -3,20 +3,15 @@ module Testowl
 
     def run(files)
       results = runDirectly(files)
-      lines = results.split("\n")
-      exception_message = lines.detect{|line| line =~ /^Exception encountered/ }
-      counts = lines.detect{|line| line =~ /(\d+)\sexamples?,\s(\d+)\sfailures?/ }
-      if counts
-        test_count, fail_count = counts.split(',').map(&:to_i)
-        timing = lines.detect{|line| line =~ /Finished\sin/}
-        timing = timing.sub(/Finished\sin/, '').strip if timing
+      count_match = /(\d+)\sexamples?,\s(\d+)\sfailures?/.match(results)
+      timing_match = /Finished\sin\s([0-9\.]*)\sseconds/.match(results)
+      if count_match && timing_match
+        test_count = count_match[1].to_i
+        fail_count = count_match[2].to_i
+        timing = timing_match[1].to_f
         return test_count, fail_count, timing
       else
-        if exception_message
-          raise exception_message
-        else
-          raise "Problem interpreting result. Please check the terminal output."
-        end
+        raise "Problem interpreting result. Please check the terminal output."
       end
     end
       

data/lib/testowl/test_unit_runner.rb

@@ -18,21 +18,17 @@ module Testowl
         runDirectly(files)
       end
       puts "Done"
-      lines = results.split("\n")
-      exception_message = lines.detect{|line| line =~ /^Exception encountered/ }
-      counts = lines.detect{|line| line =~ /(\d+)\sassertions?,\s(\d+)\sfailures?,\s(\d+)\serrors?/ }
-      if counts
-        file_count, test_count, fail_count, error_count = counts.split(',').map(&:to_i)
-        fail_count += error_count # let's lump errors and failures together
-        timing = lines.detect{|line| line =~ /Finished\sin/}
-        timing = timing.sub(/Finished\sin/, '').strip if timing
+      count_match = /(\d+)\sassertions?,\s(\d+)\sfailures?,\s(\d+)\serrors?/.match(results)
+      timing_match = /Finished\sin\s([0-9\.]*)\sseconds/.match(results)
+      puts count_match
+      puts timing_match
+      if count_match && timing_match
+        test_count = count_match[1].to_i
+        fail_count = count_match[2].to_i + count_match[3].to_i # let's lump errors and failures together
+        timing = timing_match[1].to_f
         return test_count, fail_count, timing
       else
-        if exception_message
-          raise exception_message
-        else
-          raise "Problem interpreting result. Please check the terminal output."
-        end
+        raise "Problem interpreting result. Please check the terminal output."
       end
     end
 

data/lib/testowl/tester.rb

@@ -14,6 +14,7 @@ module Testowl
     def run
       test_count = 0
       fail_count = 0
+      seconds = 0
       files_run = []
       begin
         @files_list.each do |files|
@@ -21,20 +22,21 @@ module Testowl
           files_run += files
           test_count += result[0]
           fail_count += result[1]
+          seconds += result[2]
           break if fail_count > 0
         end
         if test_count == 0
-          Growl.grr "Empty Test", "No tests run", :error, files_run, @reason
+          Growl.grr "Empty Test", "No tests run", seconds, :error, files_run, @reason
           return false
         elsif fail_count > 0
-          Growl.grr "Fail", "#{fail_count} out of #{test_count} test#{'s' if test_count > 1} failed :(", :failed, files_run, @reason
+          Growl.grr "Fail", "#{fail_count} out of #{test_count} test#{'s' if test_count > 1} failed :(", seconds, :failed, files_run, @reason
           return false
         else
-          Growl.grr "Pass", "All #{test_count} example#{'s' if test_count > 1} passed :)", :success, files_run, @reason
+          Growl.grr "Pass", "All #{test_count} example#{'s' if test_count > 1} passed :)", seconds, :success, files_run, @reason
           return true
         end
       rescue => exc
-        Growl.grr "Exception", exc.message, :error, files_run, @reason
+        Growl.grr "Exception", exc.message, nil, :error, files_run, @reason
       end
     end
 

data/lib/testowl/version.rb

@@ -1,3 +1,3 @@
 module Testowl
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testowl
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Bill Horsman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 -07:00
+date: 2011-06-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency