testowl 0.0.9 → 0.1.0

data/bin/testowl

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'testowl'
+require 'optparse'
 require 'active_support/inflector'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib') unless $LOAD_PATH.include?(File.dirname(__FILE__) + '/../lib')
@@ -8,7 +9,19 @@ CONFIG = File.dirname(__FILE__) + '/../lib/testowl/config.rb'
 
 
 begin
-  success = Testowl::Monitor.new.run
+  options = {}
+  OptionParser.new do|opts|
+    opts.banner = "Usage: testowl [options]"
+    options[:just_tests] = false
+    opts.on('-j', '--just-tests', "Just run tests, no heuristics") do |v|
+      options[:just_tests] = v
+    end
+    opts.on( '-h', '--help', 'Display this screen' ) do
+     puts opts
+     exit
+   end
+  end.parse!
+  success = Testowl::Monitor.new(options).run
   Kernel.exit 1 unless success
 rescue SystemExit => e
   Kernel.exit(e.status)

data/lib/testowl/growl.rb

@@ -3,7 +3,7 @@ module Testowl
 
     Growlnotify = "growlnotify"
 
-    def self.grr(title, message, seconds, status, files, suffix)
+    def self.grr(title, message, seconds, status, files, suffix, identifier)
       project = File.expand_path(".").split("/").last
       growlnotify = `which #{Growlnotify}`.chomp
       if growlnotify == ''
@@ -17,12 +17,12 @@ module Testowl
         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}"
+        message_lines << identifier
         options = []
         options << "-n Watchr"
         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)
+        options << "--identifier #{identifier}" # (used for coalescing)
         title = "TestOwl #{title} (#{project})"
         system %(#{growlnotify} #{options.join(' ')} '#{title}' &)
         puts message

data/lib/testowl/monitor.rb

@@ -3,7 +3,8 @@ module Testowl
 
     attr_reader :test_dir, :test_suffix
 
-    def initialize()
+    def initialize(options)
+      @options = options
       if File.exist?("spec/spec_helper.rb")
         @runner = RspecRunner.new
         @test_dir = "spec"
@@ -23,18 +24,29 @@ module Testowl
       script = Watchr::Script.new
       # Watch the scripts themselves
       script.watch("#{test_dir}/.*/*_#{test_suffix}\.rb") do |match|
+        system("clear")
         puts "Detected change in #{match[0]}"
         run_test(match[0])
       end
       # Watch models
       script.watch("app/models/(.*)\.rb") do |match|
-        puts "Detected change in #{match[0]}"
-        run_model(match[1], "triggered by #{match[0]}")
+        if @options[:just_tests]
+          puts "Ignoring change in #{match[0]}"
+        else
+          system("clear")
+          puts "Detected change in #{match[0]}"
+          run_model(match[1], "triggered by #{match[0]}")
+        end
       end
       # Watch controllers
       script.watch("app/controllers/(.*)_controller\.rb") do |match|
-        puts "Detected change in #{match[0]}"
-        run_controller(match[1], "triggered by #{match[0]}")
+        if @options[:just_tests]
+          puts "Ignoring change in #{match[0]}"
+        else
+          system("clear")
+          puts "Detected change in #{match[0]}"
+          run_controller(match[1], "triggered by #{match[0]}")
+        end
       end
       puts "Waiting for code changes..."
       Watchr::Controller.new(script, Watchr.handler.new).run

data/lib/testowl/tester.rb

@@ -12,6 +12,10 @@ module Testowl
       @files_list << array unless array.empty?
     end
 
+    def identifier
+      Digest::MD5.hexdigest @files_list.flatten.join
+    end
+
     def run
       test_count = 0
       fail_count = 0
@@ -20,8 +24,8 @@ module Testowl
       begin
         @files_list.each do |files|
           puts "Running #{files.inspect}"
-          result = @runner.run(files)
           files_run += files
+          result = @runner.run(files)
           test_count += result[0]
           fail_count += result[1]
           seconds += result[2]
@@ -30,17 +34,17 @@ module Testowl
         if @files_list.empty?
           puts "No tests found"
         elsif test_count == 0
-          Growl.grr "Empty Test", "No tests run", seconds, :error, files_run, @reason
+          Growl.grr "Empty Test", "No tests run", seconds, :error, files_run, @reason, identifier
           return false
         elsif fail_count > 0
-          Growl.grr "Fail", "#{fail_count} out of #{test_count} test#{'s' if test_count > 1} failed :(", seconds, :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, identifier
           return false
         else
-          Growl.grr "Pass", "All #{test_count} example#{'s' if test_count > 1} passed :)", seconds, :success, files_run, @reason
+          Growl.grr "Pass", "All #{test_count} example#{'s' if test_count > 1} passed :)", seconds, :success, files_run, @reason, identifier
           return true
         end
       rescue => exc
-        Growl.grr "Exception", exc.message, nil, :error, files_run, @reason
+        Growl.grr "Exception", exc.message, nil, :error, files_run, @reason, identifier
       end
     end
 

data/lib/testowl/version.rb

@@ -1,3 +1,3 @@
 module Testowl
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,61 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: testowl
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
 platform: ruby
-authors: 
+authors:
 - Bill Horsman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-01 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :runtime
-  requirement: *id001
+date: 2012-02-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: watchr
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70318555640140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id002
+  prerelease: false
+  version_requirements: *70318555640140
+- !ruby/object:Gem::Dependency
   name: rails
+  requirement: &70318555639640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70318555639640
 description: TestUnit/RSpec, Watchr and Growl Integration for Continuous Testing
-email: 
+email:
 - bill@logicalcobwebs.com
-executables: 
+executables:
 - testowl
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - README.markdown
 - Rakefile
@@ -73,39 +58,34 @@ files:
 - lib/testowl/tester.rb
 - lib/testowl/version.rb
 - testowl.gemspec
-has_rdoc: true
 homepage: https://github.com/billhorsman/testowl
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4322040739528282819
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -4322040739528282819
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: TestUnit/RSpec, Watchr and Growl Integration for Continuous Testing
 test_files: []
-