tork 18.1.0 → 18.2.0

data/HISTORY.markdown

@@ -1,4 +1,23 @@
-## Version 18.1.0 (2012-02-13)
+## Version 18.2.0 (2012-03-27)
+
+Minor:
+
+  * Emit warnings when commands cannot be performed.  This improves the user
+    experience by giving them immediate feedback.  For example, if you issue
+    the "rerun_failed_tests" command and no tests have failed yet, you will
+    now see a warning message that explains the situation.  Thanks to
+    NagaChaitanya Vellanki (@chaitanyav) for suggesting this change.
+
+Patch:
+
+  * GH-32: Restore support for Selenium and Capybara by replacing the global
+    SIGCHLD handler in tork-master(1) with individual threads, one per forked
+    worker process.  Thanks to Bjørn Trondsen (@Sharagoz) for reporting this
+    issue and verifying the fix.
+
+  * README: Recommend a newer fork of the "memory_test_fix" Rails plugin.
+
+## Version 18.1.0 (2012-02-26)
 
 Minor:
 

data/LICENSE

@@ -15,6 +15,8 @@ Thanks to 2012 Mark Hayes <mark@deployfx.com>
 Thanks to 2012 Gumaro Melendez <cloudernew@gmail.com>
 Thanks to 2012 Scott Radcliff <radcliffsc@gmail.com>
 Thanks to 2012 David Burrows <david@imergent.com>
+Thanks to 2012 Bjørn Trondsen <contact@sharagoz.com>
+Thanks to 2012 NagaChaitanya Vellanki <me@chaitanyavellanki.com>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/README.markdown

@@ -408,7 +408,7 @@ For example, to see some real values:
 Released under the ISC license.  See the LICENSE file for details.
 
 [factory_girl]: https://github.com/thoughtbot/factory_girl
-[memory_test_fix]: https://github.com/mvz/memory_test_fix
+[memory_test_fix]: https://github.com/stepahn/memory_test_fix
 [parallel_tests]: https://github.com/grosser/parallel_tests
 [Ruby on Rails]: http://rubyonrails.org
 [Cucumber]: https://cukes.info

data/bin/tork

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK 1 2012-02-26 18.1.0
+# TORK 1 2012-03-27 18.2.0
 
 ## NAME
 

data/bin/tork-driver

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-DRIVER 1 2012-02-26 18.1.0
+# TORK-DRIVER 1 2012-03-27 18.2.0
 
 ## NAME
 

data/bin/tork-engine

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-ENGINE 1 2012-02-26 18.1.0
+# TORK-ENGINE 1 2012-03-27 18.2.0
 
 ## NAME
 

data/bin/tork-herald

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-HERALD 1 2012-02-26 18.1.0
+# TORK-HERALD 1 2012-03-27 18.2.0
 
 ## NAME
 

data/bin/tork-master

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-MASTER 1 2012-02-26 18.1.0
+# TORK-MASTER 1 2012-03-27 18.2.0
 
 ## NAME
 

data/lib/tork/driver.rb

@@ -44,7 +44,12 @@ class Driver < Engine
   end
 
   def run_all_test_files
-    run_test_files Dir[*Config.all_test_file_globs]
+    all_test_files = Dir[*Config.all_test_file_globs]
+    if all_test_files.empty?
+      warn "#{$0}: There are no test files to run."
+    else
+      run_test_files all_test_files
+    end
   end
 
   def reabsorb_overhead_files

data/lib/tork/engine.rb

@@ -37,16 +37,28 @@ class Engine < Server
   end
 
   def stop_running_test_files
-    @master.send [:stop]
-    @running_test_files.clear
+    if @running_test_files.empty?
+      warn "#{$0}: There are no running test files to stop."
+    else
+      @master.send [:stop]
+      @running_test_files.clear
+    end
   end
 
   def rerun_passed_test_files
-    run_test_files @passed_test_files
+    if @passed_test_files.empty?
+      warn "#{$0}: There are no passed test files to re-run."
+    else
+      run_test_files @passed_test_files
+    end
   end
 
   def rerun_failed_test_files
-    run_test_files @failed_test_files
+    if @failed_test_files.empty?
+      warn "#{$0}: There are no failed test files to re-run."
+    else
+      run_test_files @failed_test_files
+    end
   end
 
 protected

data/lib/tork/master.rb

@@ -9,24 +9,6 @@ class Master < Server
 
     @worker_number_pool = (0 ... Config.max_forked_workers).to_a
     @command_by_worker_pid = {}
-
-    # process exited child processes and report finished workers to client
-    trap :SIGCHLD do
-      begin
-        while wait2_array = Process.wait2(-1, Process::WNOHANG)
-          child_pid, child_status = wait2_array
-          if command = @command_by_worker_pid.delete(child_pid)
-            @worker_number_pool.push command.last
-            command[0] = if child_status.success? then :pass else :fail end
-            @client.send command.push(child_status.to_i, child_status.inspect)
-          else
-            warn "tork-master: unknown child exited: #{wait2_array.inspect}"
-          end
-        end
-      rescue SystemCallError
-        # raised by wait2() when there are currently no child processes
-      end
-    end
   end
 
   def load paths, files
@@ -81,6 +63,15 @@ class Master < Server
 
     @command_by_worker_pid[worker_pid] = @command.push(log_file, worker_number)
     @client.send @command
+
+    # wait for the worker to finish and report its status to the client
+    Thread.new do
+      worker_status = Process.wait2(worker_pid).last
+      command = @command_by_worker_pid.delete(worker_pid)
+      @worker_number_pool.push command.last
+      command[0] = if worker_status.success? then :pass else :fail end
+      @client.send command.push(worker_status.to_i, worker_status.inspect)
+    end
   end
 
   def stop

data/lib/tork/version.rb

@@ -1,3 +1,3 @@
 module Tork
-  VERSION = "18.1.0"
+  VERSION = "18.2.0"
 end

data/man/man1/tork-driver.1

@@ -1,4 +1,4 @@
-.TH TORK\-DRIVER 1 2012\-02\-26 18.1.0
+.TH TORK\-DRIVER 1 2012\-03\-27 18.2.0
 .SH NAME
 .PP
 tork\-driver \- drives 

data/man/man1/tork-engine.1

@@ -1,4 +1,4 @@
-.TH TORK\-ENGINE 1 2012\-02\-26 18.1.0
+.TH TORK\-ENGINE 1 2012\-03\-27 18.2.0
 .SH NAME
 .PP
 tork\-engine \- wraps 

data/man/man1/tork-herald.1

@@ -1,4 +1,4 @@
-.TH TORK\-HERALD 1 2012\-02\-26 18.1.0
+.TH TORK\-HERALD 1 2012\-03\-27 18.2.0
 .SH NAME
 .PP
 tork\-herald \- reports modified files

data/man/man1/tork-master.1

@@ -1,4 +1,4 @@
-.TH TORK\-MASTER 1 2012\-02\-26 18.1.0
+.TH TORK\-MASTER 1 2012\-03\-27 18.2.0
 .SH NAME
 .PP
 tork\-master \- absorbs overhead and runs tests

data/man/man1/tork.1

@@ -1,4 +1,4 @@
-.TH TORK 1 2012\-02\-26 18.1.0
+.TH TORK 1 2012\-03\-27 18.2.0
 .SH NAME
 .PP
 tork \- Continuous testing tool for Ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tork
 version: !ruby/object:Gem::Version
-  version: 18.1.0
+  version: 18.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
+date: 2012-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binman
-  requirement: &19106960 !ruby/object:Gem::Requirement
+  requirement: &19368900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *19106960
+  version_requirements: *19368900
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &19106080 !ruby/object:Gem::Requirement
+  requirement: &19454480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,10 +36,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *19106080
+  version_requirements: *19454480
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &19104800 !ruby/object:Gem::Requirement
+  requirement: &19538720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +47,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *19104800
+  version_requirements: *19538720
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &19103360 !ruby/object:Gem::Requirement
+  requirement: &19538220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -61,10 +61,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *19103360
+  version_requirements: *19538220
 - !ruby/object:Gem::Dependency
   name: md2man
-  requirement: &19101600 !ruby/object:Gem::Requirement
+  requirement: &19537320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *19101600
+  version_requirements: *19537320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19100640 !ruby/object:Gem::Requirement
+  requirement: &19536620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -86,7 +86,7 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *19100640
+  version_requirements: *19536620
 description: Runs your tests as they change, in parallel.
 email:
 - sunaku@gmail.com
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -120880762580593238
+      hash: 2543701647607658307
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -120880762580593238
+      hash: 2543701647607658307
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11