testowl 0.0.3 → 0.0.4

data/lib/testowl/rspec_runner.rb

@@ -2,20 +2,16 @@ module Testowl
   class RspecRunner
 
     def run(files)
-      results = `rspec -c #{files.join(" ")}`
-      lines = results.split("\n")
+      results = runDirectly(files)
+      lines = results.output.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
-        if fail_count > 0
-          puts results
-        end
         return test_count, fail_count, timing
       else
-        $stderr.print results
         if exception_message
           raise exception_message
         else
@@ -24,5 +20,11 @@ module Testowl
       end
     end
       
+    def runDirectly(files)
+      results = TestOwl::Teeio.new
+      results.run "rspec -c #{files.join(" ")}"
+      results.output
+    end
+
   end
 end

data/lib/testowl/test_unit_runner.rb

@@ -11,12 +11,11 @@ module Testowl
   class TestUnitRunner
 
     def run(files)
-      results = nil
-      begin
-        results = runDrb(files)
+      results = begin
+        runDrb(files)
       rescue
         puts "Drb not available. Running tests directly instead."
-        results = runDirectly(files)
+        runDirectly(files)
       end
       puts "Done"
       lines = results.split("\n")
@@ -26,15 +25,11 @@ module Testowl
         file_count, test_count, fail_count = counts.split(',').map(&:to_i)
         timing = lines.detect{|line| line =~ /Finished\sin/}
         timing = timing.sub(/Finished\sin/, '').strip if timing
-        if fail_count > 0
-          puts results
-        end
         return test_count, fail_count, timing
       else
         if exception_message
           raise exception_message
         else
-          $stderr.print results
           raise "Problem interpreting result. Please check the terminal output."
         end
       end
@@ -43,14 +38,17 @@ module Testowl
     def runDrb(files)
       DRb.start_service("druby://127.0.0.1:0") # this allows Ruby to do some magical stuff so you can pass an output stream over DRb.
       test_server = DRbObject.new_with_uri("druby://127.0.0.1:8988")
-      results = StringIO.new
-      test_server.run(files, $stderr, results)
-      results.string
+      results = TestOwl::Teeio.new
+      test_server.run(files, results, results)
+      results.output
     end
 
     def runDirectly(files)
-      `ruby #{files.join(' ')}`
+      results = TestOwl::Teeio.new
+      results.run "ruby #{files.join(' ')}"
+      results.output
     end
 
   end
+
 end

data/lib/testowl/version.rb

@@ -1,3 +1,3 @@
 module Testowl
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/testowl.rb

@@ -1,6 +1,8 @@
+require 'tempfile'
 require 'testowl/growl'
 require 'testowl/monitor'
 require 'testowl/rspec_runner'
+require 'testowl/teeio'
 require 'testowl/test_unit_runner'
 require 'testowl/tester'
 require 'testowl/version'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testowl
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Bill Horsman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 -07:00
+date: 2011-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency