testr 14.0.1 → 14.0.2

data/{HISTORY.md → HISTORY.markdown}

@@ -1,10 +1,26 @@
+------------------------------------------------------------------------------
+Version 14.0.2 (2011-10-11)
+------------------------------------------------------------------------------
+
+Bug fixes:
+
+* Fix updating passed/failed test files bookkeeping.  Once a test file failed,
+  it was (incorrectly) always considered failed -- even if it passed later on.
+
+* Do not requeue test files that are waiting to run.
+
+Housekeeping:
+
+* Rename `*.md` files to `*.markdown` to avoid ambiguity.
+
 ------------------------------------------------------------------------------
 Version 14.0.1 (2011-10-10)
 ------------------------------------------------------------------------------
 
 Bug fixes:
 
-* Use blue/red (not red/green) for pass/fail to accomodate the color blind.
+* Use blue/red for pass/fail instead of green/red to accommodate the color
+  blind.
 
 * Incorrect test name regexp was passed down to Test::Unit.  This broke
   focused testing, where only changed tests in a changed test file are run.
@@ -13,7 +29,6 @@ Housekeeping:
 
 * Make `testr-master` wait for killed worker processes before exiting.
 
-
 ------------------------------------------------------------------------------
 Version 14.0.0 (2011-10-09)
 ------------------------------------------------------------------------------

data/{README.md → README.markdown}

@@ -55,7 +55,6 @@ Prerequisites
 
         Process.respond_to? :fork  # must be true
         Signal.list.key? 'TERM'    # must be true
-        Signal.list.key? 'KILL'    # must be true
 
 ------------------------------------------------------------------------------
 Installation

data/lib/testr/client.rb

@@ -8,10 +8,10 @@ module Client
     end
 
     def quit
-      kill # stop the receive loop
+      kill # stop receive loop
       Process.kill :SIGTERM, @io.pid
       Process.wait @io.pid # reap zombie
-      @io.close # prevent subsequent I/O
+      @io.close # prevent further I/O
     end
   end
 

data/lib/testr/driver.rb

@@ -35,15 +35,18 @@ module Driver
 
       case event.to_sym
       when :test
+        @waiting_test_files.delete file
         @running_test_files.push file
 
       when :pass
-        @passed_test_files.push file unless @passed_test_files.include? file
         @running_test_files.delete file
+        @failed_test_files.delete file
+        @passed_test_files.push file unless @passed_test_files.include? file
 
       when :fail
-        @failed_test_files.push file unless @failed_test_files.include? file
         @running_test_files.delete file
+        @passed_test_files.delete file
+        @failed_test_files.push file unless @failed_test_files.include? file
       end
 
       @upstream.print line
@@ -57,9 +60,9 @@ module Driver
       warn "testr-driver: herald: #{changed_file}" if $DEBUG
 
       # find and run the tests that correspond to the changed file
-      Config.test_file_globbers.each do |source_regexp, test_globber|
-        if source_regexp =~ changed_file
-          run_test_files Dir[test_globber.call(changed_file).to_s]
+      Config.test_file_globbers.each do |regexp, globber|
+        if regexp =~ changed_file and glob = globber.call(changed_file)
+          run_test_files Dir[glob]
         end
       end
 
@@ -87,6 +90,7 @@ private
     @master.quit
   end
 
+  @waiting_test_files = []
   @running_test_files = []
   @passed_test_files = []
   @failed_test_files = []
@@ -100,7 +104,10 @@ private
   end
 
   def run_test_file file
-    @master.send [:test, file, find_changed_test_names(file)]
+    unless @waiting_test_files.include? file
+      @waiting_test_files.push file
+      @master.send [:test, file, find_changed_test_names(file)]
+    end
   end
 
   @lines_by_file = {}

data/lib/testr/master.rb

@@ -53,7 +53,7 @@ module Master
       # after loading the user's test file, the at_exit() hook of the user's
       # testing framework will take care of running the tests and reflecting
       # any failures in the worker process' exit status, which will then be
-      # handled by the SIGCHLD trap registered in the master process (above)
+      # handled by the SIGCHLD trap registered in the master process (below)
       Kernel.load test_file
     end
 

data/lib/testr/version.rb

@@ -1,3 +1,3 @@
 module TestR
-  VERSION = "14.0.1"
+  VERSION = "14.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testr
 version: !ruby/object:Gem::Version
-  version: 14.0.1
+  version: 14.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-10 00:00:00.000000000 Z
+date: 2011-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &12830300 !ruby/object:Gem::Requirement
+  requirement: &11673440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *12830300
+  version_requirements: *11673440
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &12829360 !ruby/object:Gem::Requirement
+  requirement: &11672900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,10 +36,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *12829360
+  version_requirements: *11672900
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &12827820 !ruby/object:Gem::Requirement
+  requirement: &11670160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -47,7 +47,7 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *12827820
+  version_requirements: *11670160
 description: ''
 email:
 - sunaku@gmail.com
@@ -65,9 +65,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- HISTORY.md
+- HISTORY.markdown
 - LICENSE
-- README.md
+- README.markdown
 - Rakefile
 - bin/testr
 - bin/testr-driver