tork 18.2.2 → 18.2.3

data/HISTORY.markdown

@@ -1,3 +1,23 @@
+## Version 18.2.3 (2012-09-26)
+
+Patch:
+
+  * Restored support for building Tork from its gemspec under Ruby 1.8.
+    Thanks to Ohno Shin'ichi for reporting this issue and contributing a
+    preliminary fix.
+
+  * Add resilience against failed command dispatch in `Tork::Server#loop()`.
+
+Other:
+
+  * It's not worth rescuing Interrupt only to exit silently.
+    Let the user see stack traces when they press Control-C.
+
+  * Update old comments about SIGCHLD handler, which was
+    replaced by reaping threads quite a few releases ago.
+
+  * Use $0 instead of hard-coding the program name.
+
 ## Version 18.2.2 (2012-07-11)
 
 Patch:

data/LICENSE

@@ -18,6 +18,7 @@ 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>
 Thanks to 2012 Jesse Cooke <jesse@jc00ke.com>
+Thanks to 2012 Ohno Shin'ichi <shin1ohno@me.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

@@ -35,7 +35,7 @@ Tork runs your tests as they change, in parallel:
 
   * You can override the modular `tork*` programs with your own in $PATH.
 
-  * Its core is written in about 410 lines (SLOC) of pure Ruby code! :-)
+  * Its core is written in about 420 lines (SLOC) of pure Ruby code! :-)
 
 ### Architecture
 
@@ -71,7 +71,6 @@ tests in your saved file, simply save the file *again* without changing it.
     To check if your system qualifies, launch `irb` and enter the following:
 
         Process.respond_to? :fork  # must be true
-        Signal.list.key? 'CHLD'    # must be true
         Signal.list.key? 'TERM'    # must be true
 
   * To make the `tork-herald` program's filesystem monitoring more efficient:

data/bin/tork

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK 1 2012-07-11 18.2.2
+# TORK 1 2012-09-26 18.2.3
 
 ## NAME
 
@@ -44,11 +44,11 @@ ENV['TORK_CONFIGS'] = JSON.dump(ARGV)
 
 require 'tork/client'
 
-warn 'tork: Absorbing test execution overhead...'
+warn "#{$0}: Absorbing test execution overhead..."
 @driver = Tork::Client::Transceiver.new('tork-driver') do |event, *details|
   case event_sym = event.to_sym
-  when :load then warn 'tork: Overhead absorbed. Ready for testing!'
-  when :over then warn 'tork: Reabsorbing changed overhead files...'
+  when :load then warn "#{$0}: Overhead absorbed. Ready for testing!"
+  when :over then warn "#{$0}: Reabsorbing changed overhead files..."
   else
     test_file, line_numbers, log_file, worker_number, exit_status = details
     message = [event.upcase, [test_file, *line_numbers].join(':'),
@@ -78,20 +78,16 @@ COMMANDS = {
   'q' => :quit,
 }
 
-begin
-  while key = STDIN.gets
-    if command = COMMANDS[key.strip]
-      warn "tork: Sending #{command.to_s.inspect} command..."
-      @driver.send [command]
-      break if command == :quit
-    else # invalid command
-      COMMANDS.each do |k, cmd|
-        warn "tork: Type #{k} then ENTER to #{cmd.to_s.tr('_', ' ')}."
-      end
+while key = STDIN.gets
+  if command = COMMANDS[key.strip]
+    warn "#{$0}: Sending #{command.to_s.inspect} command..."
+    @driver.send [command]
+    break if command == :quit
+  else # invalid command
+    COMMANDS.each do |key, cmd|
+      warn "#{$0}: Type #{key} then ENTER to #{cmd.to_s.tr('_', ' ')}."
     end
   end
-rescue Interrupt
-  # forced quit
 end
 
 Process.waitall

data/bin/tork-driver

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-DRIVER 1 2012-07-11 18.2.2
+# TORK-DRIVER 1 2012-09-26 18.2.3
 
 ## NAME
 

data/bin/tork-engine

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-ENGINE 1 2012-07-11 18.2.2
+# TORK-ENGINE 1 2012-09-26 18.2.3
 
 ## NAME
 

data/bin/tork-herald

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-HERALD 1 2012-07-11 18.2.2
+# TORK-HERALD 1 2012-09-26 18.2.3
 
 ## NAME
 

data/bin/tork-master

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# TORK-MASTER 1 2012-07-11 18.2.2
+# TORK-MASTER 1 2012-09-26 18.2.3
 
 ## NAME
 

data/lib/tork/master.rb

@@ -57,7 +57,7 @@ class Master < Server
       # 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 (below)
+      # handled by the reaping thread registered in the master process (below)
       Kernel.load test_file if test_file.end_with? '.rb'
     end
 
@@ -65,7 +65,7 @@ class Master < Server
     @client.send @command
 
     # wait for the worker to finish and report its status to the client
-    Thread.new do
+    Thread.new do # the reaping thread
       worker_status = Process.wait2(worker_pid).last
       command = @command_by_worker_pid.delete(worker_pid)
       @worker_number_pool.push command.last
@@ -75,7 +75,7 @@ class Master < Server
   end
 
   def stop
-    # NOTE: the SIGCHLD handler will reap these killed worker processes
+    # the reaping threads registered above will reap these killed workers
     Process.kill :SIGTERM, *@command_by_worker_pid.keys.map {|pid| -pid }
   rescue ArgumentError, SystemCallError
     # some workers might have already exited before we sent them the signal

data/lib/tork/server.rb

@@ -16,18 +16,16 @@ class Server
     STDOUT.reopen(STDERR).sync = true
 
     Client::Receiver.new(STDIN) do |command|
-      method = command.first
-      if respond_to? method and method != __method__ # prevent loops
+      if command.first != __method__ # prevent loops
         @command = command
-        __send__(*command)
-      else
-        warn "#{self}: invalid command: #{method}"
+        begin
+          __send__(*command)
+        rescue => error
+          warn "#{$0}: #{error}"
+          warn error.backtrace.join("\n")
+        end
       end
     end.join
-  rescue Interrupt
-    # forced quit
-  ensure
-    Process.waitall
   end
 
 end

data/lib/tork/version.rb

@@ -1,3 +1,3 @@
 module Tork
-  VERSION = "18.2.2"
+  VERSION = "18.2.3"
 end

data/man/man1/tork-driver.1

@@ -1,4 +1,4 @@
-.TH TORK\-DRIVER 1 2012\-07\-11 18.2.2
+.TH TORK\-DRIVER 1 2012\-09\-26 18.2.3
 .SH NAME
 .PP
 tork\-driver \- drives 

data/man/man1/tork-engine.1

@@ -1,4 +1,4 @@
-.TH TORK\-ENGINE 1 2012\-07\-11 18.2.2
+.TH TORK\-ENGINE 1 2012\-09\-26 18.2.3
 .SH NAME
 .PP
 tork\-engine \- wraps 

data/man/man1/tork-herald.1

@@ -1,4 +1,4 @@
-.TH TORK\-HERALD 1 2012\-07\-11 18.2.2
+.TH TORK\-HERALD 1 2012\-09\-26 18.2.3
 .SH NAME
 .PP
 tork\-herald \- reports modified files

data/man/man1/tork-master.1

@@ -1,4 +1,4 @@
-.TH TORK\-MASTER 1 2012\-07\-11 18.2.2
+.TH TORK\-MASTER 1 2012\-09\-26 18.2.3
 .SH NAME
 .PP
 tork\-master \- absorbs overhead and runs tests

data/man/man1/tork.1

@@ -1,4 +1,4 @@
-.TH TORK 1 2012\-07\-11 18.2.2
+.TH TORK 1 2012\-09\-26 18.2.3
 .SH NAME
 .PP
 tork \- Continuous testing tool for Ruby

data/tork.gemspec

@@ -6,8 +6,9 @@ Gem::Specification.new do |s|
   s.name          = 'tork'
   s.version       = Tork::VERSION
   s.authors,
-  s.email         = File.read('LICENSE').force_encoding('UTF-8').
-                    scan(/Copyright \d+ (.+) <(.+?)>/).transpose
+  s.email         = File.read(*['LICENSE',
+                      ({:encoding => 'utf-8'} if RUBY_VERSION >= '1.9')
+                    ].compact).scan(/Copyright \d+ (.+) <(.+?)>/).transpose
   s.homepage      = 'http://github.com/sunaku/tork'
   s.summary       = 'test with fork'
   s.description   = 'Runs your tests as they change, in parallel.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tork
 version: !ruby/object:Gem::Version
-  version: 18.2.2
+  version: 18.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binman
@@ -166,11 +166,11 @@ files:
 - lib/tork/server.rb
 - lib/tork/version.rb
 - tork.gemspec
-- man/man1/tork-master.1
-- man/man1/tork.1
-- man/man1/tork-engine.1
 - man/man1/tork-herald.1
+- man/man1/tork-engine.1
+- man/man1/tork-master.1
 - man/man1/tork-driver.1
+- man/man1/tork.1
 homepage: http://github.com/sunaku/tork
 licenses: []
 post_install_message: 
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3126932301270225000
+      hash: 2002680833994737282
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3126932301270225000
+      hash: 2002680833994737282
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23