testowl 0.0.2 → 0.0.3

data/lib/testowl/growl.rb

@@ -20,7 +20,7 @@ module Testowl
         options << "--sticky" if status == :error
         options << "--image '#{image_path(status)}'"
         options << "--identifier #{Digest::MD5.hexdigest files.join}" # (used for coalescing)
-        title = "RSpec #{title} (#{project})"
+        title = "TestOwl #{title} (#{project})"
         system %(#{growlnotify} #{options.join(' ')} '#{title}' &)
         puts message
       end

data/lib/testowl/monitor.rb

@@ -22,37 +22,28 @@ module Testowl
       # Watch the scripts themselves
       script.watch("#{test_dir}/.*/*_#{test_suffix}\.rb") do |match|
         puts "Detected change in #{match[0]}"
-        fire [match[0]], "has been updated"
+        run_test(match[0])
       end
       # Watch models
       script.watch("app/models/(.*)\.rb") do |match|
         puts "Detected change in #{match[0]}"
-        tests = []
-        model = match[1]
-        tests += tests_for_model(model)
-        fire tests, "triggered by #{match[0]}"
+        run_model(match[1], "triggered by #{match[0]}")
       end
       puts "Monitoring files..."
       Watchr::Controller.new(script, Watchr.handler.new).run
     end
 
-    def fire(files, reason)
-      return if files.nil? || files.size == 0
-      # We don't want to do no performance testing
-      files = files.map{|file| file =~ /^test\/performance\// ? nil : file }.compact
-      puts "Running #{files.join(", ")}"
-      begin
-        test_count, fail_count, timing = @runner.run(files)
-        if test_count == 0
-          Growl.grr "Empty Test", "No tests run", :error, files, reason
-        elsif fail_count > 0
-          Growl.grr "Fail", "#{fail_count} out of #{test_count} test#{'s' if test_count > 1} failed in #{timing} :(", :failed, files, reason
-        else
-          Growl.grr "Pass", "All #{test_count} example#{'s' if test_count > 1} passed in #{timing} :)", :success, files, reason
-        end
-      rescue => exc
-        Growl.grr "Exception", exc.message, :error, files, reason
-      end
+    def run_test(file)
+      tester = Tester.new(@runner, "has been updated")
+      tester.add file
+      tester.run
+    end
+
+    def run_model(model_name, reason)
+      tester = Tester.new(@runner, reason)
+      tester.add Dir["#{test_dir}/**/#{model_name}_#{test_suffix}.rb"]
+      tester.add Dir["#{test_dir}/**/#{model_name.pluralize}_controller_#{test_suffix}.rb"]
+      tester.run
     end
 
     def tests_for_model(model)

data/lib/testowl/rspec_runner.rb

@@ -19,7 +19,7 @@ module Testowl
         if exception_message
           raise exception_message
         else
-          raise "Problem interpreting output"
+          raise "Problem interpreting result. Please check the terminal output."
         end
       end
     end

data/lib/testowl/test_unit_runner.rb

@@ -35,7 +35,7 @@ module Testowl
           raise exception_message
         else
           $stderr.print results
-          raise "Problem interpreting output"
+          raise "Problem interpreting result. Please check the terminal output."
         end
       end
     end

data/lib/testowl/tester.rb

@@ -0,0 +1,42 @@
+module Testowl
+  class Tester
+
+    def initialize(runner, reason)
+      @runner = runner
+      @reason = reason
+      @files_list = []
+    end
+
+    def add(files)
+      @files_list << [files].flatten
+    end
+
+    def run
+      test_count = 0
+      fail_count = 0
+      files_run = []
+      begin
+        @files_list.each do |files|
+          result = @runner.run(files)
+          files_run += files
+          test_count += result[0]
+          fail_count += result[1]
+          break if fail_count > 0
+        end
+        if test_count == 0
+          Growl.grr "Empty Test", "No tests run", :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
+          return false
+        else
+          Growl.grr "Pass", "All #{test_count} example#{'s' if test_count > 1} passed :)", :success, files_run, @reason
+          return true
+        end
+      rescue => exc
+        Growl.grr "Exception", exc.message, :error, files_run, @reason
+      end
+    end
+
+  end
+end

data/lib/testowl/version.rb

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

data/lib/testowl.rb

@@ -2,6 +2,7 @@ require 'testowl/growl'
 require 'testowl/monitor'
 require 'testowl/rspec_runner'
 require 'testowl/test_unit_runner'
+require 'testowl/tester'
 require 'testowl/version'
 require 'watchr'
 require 'digest'

data/testowl.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Bill Horsman"]
   s.email       = ["bill@logicalcobwebs.com"]
-  s.homepage    = ""
-  s.summary     = %q{TestUnit, Watchr and Growl Integration for Continuous Testing}
-  s.description = %q{TestUnit, Watchr and Growl Integration for Continuous Testing}
+  s.homepage    = "https://github.com/billhorsman/testowl"
+  s.summary     = %q{TestUnit/RSpec, Watchr and Growl Integration for Continuous Testing}
+  s.description = %q{TestUnit/RSpec, Watchr and Growl Integration for Continuous Testing}
 
   s.add_runtime_dependency "watchr"
   s.add_runtime_dependency "rails"
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "lib/testowl/monitor.rb",
     "lib/testowl/rspec_runner.rb",
     "lib/testowl/test_unit_runner.rb",
+    "lib/testowl/tester.rb",
     "lib/testowl/version.rb",
     "testowl.gemspec"
   ]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testowl
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Bill Horsman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 -07:00
+date: 2011-06-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   requirement: *id002
   name: rails
-description: TestUnit, Watchr and Growl Integration for Continuous Testing
+description: TestUnit/RSpec, Watchr and Growl Integration for Continuous Testing
 email: 
 - bill@logicalcobwebs.com
 executables: 
@@ -69,10 +69,11 @@ files:
 - lib/testowl/monitor.rb
 - lib/testowl/rspec_runner.rb
 - lib/testowl/test_unit_runner.rb
+- lib/testowl/tester.rb
 - lib/testowl/version.rb
 - testowl.gemspec
 has_rdoc: true
-homepage: ""
+homepage: https://github.com/billhorsman/testowl
 licenses: []
 
 post_install_message: 
@@ -104,6 +105,6 @@ rubyforge_project:
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: TestUnit, Watchr and Growl Integration for Continuous Testing
+summary: TestUnit/RSpec, Watchr and Growl Integration for Continuous Testing
 test_files: []