tork 17.1.0 → 18.0.0

data/lib/tork/master.rb

@@ -2,10 +2,32 @@ require 'tork/server'
 require 'tork/config'
 
 module Tork
-module Master
+class Master < Server
 
-  extend Server
-  extend self
+  def initialize
+    super
+
+    @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
     $LOAD_PATH.unshift(*paths)
@@ -68,32 +90,9 @@ module Master
     # some workers might have already exited before we sent them the signal
   end
 
-  def loop
-    super
+  def quit
     stop
-  end
-
-private
-
-  @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)
-        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
+    super
   end
 
 end

data/lib/tork/server.rb

@@ -1,7 +1,11 @@
 require 'tork/client'
 
 module Tork
-module Server
+class Server
+
+  def initialize
+    trap(:SIGTERM){ quit }
+  end
 
   def quit
     Thread.exit # kill Client::Receiver in loop()
@@ -22,10 +26,8 @@ module Server
     end.join
   rescue Interrupt
     # forced quit
-  end
-
-  def self.extended server
-    trap(:SIGTERM){ server.quit }
+  ensure
+    Process.waitall
   end
 
 end

data/lib/tork/version.rb

@@ -1,3 +1,3 @@
 module Tork
-  VERSION = "17.1.0"
+  VERSION = "18.0.0"
 end

data/man/man1/tork-driver.1

@@ -1,35 +1,36 @@
-.TH TORK\-DRIVER 1 2012\-01\-30 17.1.0
+.TH TORK\-DRIVER 1 2012\-02\-06 18.0.0
 .SH NAME
 .PP
 tork\-driver \- drives 
-.BR tork\-master (1) 
-and does bookkeeping
+.BR tork\-engine (1) 
+when files change
 .SH SYNOPSIS
 .PP
 \fB\fCtork-driver\fR [\fIOPTION\fP]...
 .SH DESCRIPTION
 .PP
-This program reads the following single\-line commands (JSON arrays) from its
-standard input stream and performs the respective actions as described below.
-It also funnels the standard output stream of 
-.BR tork\-master (1) 
+This program drives 
+.BR tork\-engine (1) 
+according to 
+.BR tork\-herald (1)'
+s observations.
+It reads the following single\-line commands (JSON arrays) from its standard
+input stream and performs the respective actions as described below.  It also
+funnels the standard output stream of 
+.BR tork\-engine (1) 
 into its own.
 .TP
 \fB\fC["run_all_test_files"]\fR
 Runs all test files found within and beneath the current working directory.
 .TP
-\fB\fC["stop_running_test_files"]\fR
-Stops any test files that are currently running.
-.TP
-\fB\fC["rerun_passed_test_files"]\fR
-Runs all test files that have passed during their most recent run.
-.TP
 \fB\fC["reabsorb_overhead_files"]\fR
 Stops any test files that are currently running, reabsorbs the test
 execution overhead, and resumes running those interrupted test files.
 .TP
-\fB\fC["quit"]\fR
-Stops all tests that are currently running and exits.
+\fI...\fP
+This program accepts 
+.BR tork\-engine (1) 
+commands and delegates them accordingly.
 .PP
 When 
 .BR tork\-herald (1) 
@@ -49,8 +50,7 @@ with a new instance, because \fIoverhead_file\fP has changed.
 .SH OPTIONS
 .TP
 \fB\fC-h\fR, \fB\fC--help\fR
-Display this help manual using 
-.BR man (1).
+Show this help manual.
 .SH FILES
 .TP
 \fI.tork.rb\fP
@@ -65,6 +65,7 @@ These configuration files are loaded just before \fI.tork.rb\fP is loaded.
 .SH SEE ALSO
 .PP
 .BR tork (1), 
+.BR tork\-herald (1), 
 .BR tork\-driver (1), 
-.BR tork\-master (1), 
-.BR tork\-herald (1)
+.BR tork\-engine (1), 
+.BR tork\-master (1)

data/man/man1/tork-engine.1

@@ -0,0 +1,66 @@
+.TH TORK\-ENGINE 1 2012\-02\-06 18.0.0
+.SH NAME
+.PP
+tork\-engine \- wraps 
+.BR tork\-master (1) 
+with bookkeeping
+.SH SYNOPSIS
+.PP
+\fB\fCtork-engine\fR [\fIOPTION\fP]...
+.SH DESCRIPTION
+.PP
+This program tells 
+.BR tork\-master (1) 
+to run your tests and keeps track of test
+results.  It reads the following single\-line commands (JSON arrays) from its
+standard input stream and performs the respective actions as described below.
+It also funnels the standard output stream of 
+.BR tork\-master (1) 
+into its own.
+.TP
+\fB\fC["reabsorb_overhead",\fR \fIpaths\fP\fB\fC,\fR \fIfiles\fP\fB\fC]\fR
+Stops any test files that are currently running, reabsorbs the given test
+execution overhead, and resumes running those interrupted test files.  See
+the "load" command in 
+.BR tork\-master (1) 
+for more information.
+.TP
+\fB\fC["run_test_file"\fR, \fItest_file\fP\fB\fC,\fR \fIline_numbers\fP\fB\fC]\fR
+Runs tests that correspond to the given \fIline_numbers\fP array in the given
+\fItest_file\fP.  If \fIline_numbers\fP is \fB\fCnull\fR, then only those lines that have
+changed since the last time the \fItest_file\fP was run will be substituted.  If
+\fIline_numbers\fP is an empty array, then the entire \fItest_file\fP will be run.
+.TP
+\fB\fC["stop_running_test_files"]\fR
+Stops any test files that are currently running.
+.TP
+\fB\fC["rerun_passed_test_files"]\fR
+Runs all test files that have passed during their most recent run.
+.TP
+\fB\fC["rerun_failed_test_files"]\fR
+Runs all test files that have failed during their most recent run.
+.TP
+\fB\fC["quit"]\fR
+Stops all tests that are currently running and exits.
+.SH OPTIONS
+.TP
+\fB\fC-h\fR, \fB\fC--help\fR
+Show this help manual.
+.SH FILES
+.TP
+\fI.tork.rb\fP
+Optional Ruby script for configuring 
+.BR tork (1).
+.SH ENVIRONMENT
+.TP
+\fB\fCTORK_CONFIGS\fR
+A single\-line JSON array containing paths to actual files or names of
+helper libraries in the tork/config/ namespace of Ruby's load path.
+These configuration files are loaded just before \fI.tork.rb\fP is loaded.
+.SH SEE ALSO
+.PP
+.BR tork (1), 
+.BR tork\-herald (1), 
+.BR tork\-driver (1), 
+.BR tork\-engine (1), 
+.BR tork\-master (1)

data/man/man1/tork-herald.1

@@ -1,4 +1,4 @@
-.TH TORK\-HERALD 1 2012\-01\-30 17.1.0
+.TH TORK\-HERALD 1 2012\-02\-06 18.0.0
 .SH NAME
 .PP
 tork\-herald \- reports modified files
@@ -13,11 +13,11 @@ stream.
 .SH OPTIONS
 .TP
 \fB\fC-h\fR, \fB\fC--help\fR
-Display this help manual using 
-.BR man (1).
+Show this help manual.
 .SH SEE ALSO
 .PP
 .BR tork (1), 
+.BR tork\-herald (1), 
 .BR tork\-driver (1), 
-.BR tork\-master (1), 
-.BR tork\-herald (1)
+.BR tork\-engine (1), 
+.BR tork\-master (1)

data/man/man1/tork-master.1

@@ -1,4 +1,4 @@
-.TH TORK\-MASTER 1 2012\-01\-30 17.1.0
+.TH TORK\-MASTER 1 2012\-02\-06 18.0.0
 .SH NAME
 .PP
 tork\-master \- absorbs overhead and runs tests
@@ -7,8 +7,9 @@ tork\-master \- absorbs overhead and runs tests
 \fB\fCtork-master\fR [\fIOPTION\fP]...
 .SH DESCRIPTION
 .PP
-This program reads the following single\-line commands (JSON arrays) from its
-standard input stream and performs the respective actions as described below.
+This program absorbs the test execution overhead and forks to run your tests.
+It reads the following single\-line commands (JSON arrays) from its standard
+input stream and performs the respective actions as described below.
 .TP
 \fB\fC["load",\fR \fIpaths\fP\fB\fC,\fR \fIfiles\fP\fB\fC]\fR
 Adds the given array of \fIpaths\fP to Ruby's $LOAD_PATH, loads the given array
@@ -29,10 +30,10 @@ Test is running:
 \fB\fC["test",\fR \fItest_file\fP\fB\fC,\fR \fIline_numbers\fP\fB\fC,\fR \fIlog_file\fP\fB\fC,\fR \fIworker_number\fP\fB\fC]\fR
 .IP \(bu 2
 Test has passed:
-\fB\fC["pass",\fR \fItest_file\fP\fB\fC,\fR \fIline_numbers\fP\fB\fC,\fR \fIlog_file\fP\fB\fC,\fR \fIworker_number\fP\fB\fC,\fR \fIexit_status\fP\fB\fC]\fR
+\fB\fC["pass",\fR \fItest_file\fP\fB\fC,\fR \fIline_numbers\fP\fB\fC,\fR \fIlog_file\fP\fB\fC,\fR \fIworker_number\fP\fB\fC,\fR \fIexit_code\fP\fB\fC,\fR \fIexit_info\fP\fB\fC]\fR
 .IP \(bu 2
 Test has failed:
-\fB\fC["fail",\fR \fItest_file\fP\fB\fC,\fR \fIline_numbers\fP\fB\fC,\fR \fIlog_file\fP\fB\fC,\fR \fIworker_number\fP\fB\fC,\fR \fIexit_status\fP\fB\fC]\fR
+\fB\fC["fail",\fR \fItest_file\fP\fB\fC,\fR \fIline_numbers\fP\fB\fC,\fR \fIlog_file\fP\fB\fC,\fR \fIworker_number\fP\fB\fC,\fR \fIexit_code\fP\fB\fC,\fR \fIexit_info\fP\fB\fC]\fR
 .RE
 .TP
 \fB\fC["stop"]\fR
@@ -44,8 +45,7 @@ Stops all tests that are currently running and exits.
 .SH OPTIONS
 .TP
 \fB\fC-h\fR, \fB\fC--help\fR
-Display this help manual using 
-.BR man (1).
+Show this help manual.
 .SH FILES
 .TP
 \fI.tork.rb\fP
@@ -60,6 +60,7 @@ These configuration files are loaded just before \fI.tork.rb\fP is loaded.
 .SH SEE ALSO
 .PP
 .BR tork (1), 
+.BR tork\-herald (1), 
 .BR tork\-driver (1), 
-.BR tork\-master (1), 
-.BR tork\-herald (1)
+.BR tork\-engine (1), 
+.BR tork\-master (1)

data/man/man1/tork.1

@@ -1,4 +1,4 @@
-.TH TORK 1 2012\-01\-30 17.1.0
+.TH TORK 1 2012\-02\-06 18.0.0
 .SH NAME
 .PP
 tork \- Continuous testing tool for Ruby
@@ -17,11 +17,10 @@ press the ENTER key (supplying no command) to see a menu of accepted commands.
 .SH OPTIONS
 .TP
 \fB\fC-h\fR, \fB\fC--help\fR
-Display this help manual using 
-.BR man (1).
+Show this help manual.
 .SH SEE ALSO
 .PP
 .BR tork (1), 
 .BR tork\-driver (1), 
 .BR tork\-master (1), 
-.BR tork\-herald (1)
+.BR tork\-herald (1)

data/tork.gemspec

@@ -1,24 +1,24 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "tork/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'tork/version'
 
 Gem::Specification.new do |s|
-  s.name          = "tork"
+  s.name          = 'tork'
   s.version       = Tork::VERSION
   s.authors,
   s.email         = File.read('LICENSE').scan(/Copyright \d+ (.+) <(.+?)>/).transpose
-  s.homepage      = "http://github.com/sunaku/tork"
-  s.summary       = "Test with fork."
-  s.description   = "Continuous testing tool for Ruby."
+  s.homepage      = 'http://github.com/sunaku/tork'
+  s.summary       = 'test with fork'
+  s.description   = 'Runs your tests as they change, in parallel.'
 
-  s.files         = `git ls-files`.split("\n") + Dir["man/**/*"]
+  s.files         = `git ls-files`.split("\n") + Dir['man/**/*']
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
   s.add_runtime_dependency 'binman', '~> 3'
   s.add_runtime_dependency 'json', '>= 1.6.1', '< 2'
-  s.add_runtime_dependency 'guard', '>= 0.9.0', '< 1'
+  s.add_runtime_dependency 'guard', '~> 1'
   s.add_runtime_dependency 'diff-lcs', '>= 1.1.2', '< 2'
   s.add_development_dependency 'md2man', '~> 1'
   s.add_development_dependency 'rake', '>= 0.9.2.2', '< 1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tork
 version: !ruby/object:Gem::Version
-  version: 17.1.0
+  version: 18.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binman
-  requirement: &9258640 !ruby/object:Gem::Requirement
+  requirement: &9855300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *9258640
+  version_requirements: *9855300
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &9258120 !ruby/object:Gem::Requirement
+  requirement: &9854280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,24 +36,21 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *9258120
+  version_requirements: *9854280
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &9257380 !ruby/object:Gem::Requirement
+  requirement: &9853540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *9257380
+  version_requirements: *9853540
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &9256640 !ruby/object:Gem::Requirement
+  requirement: &9852840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -64,10 +61,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *9256640
+  version_requirements: *9852840
 - !ruby/object:Gem::Dependency
   name: md2man
-  requirement: &9255920 !ruby/object:Gem::Requirement
+  requirement: &9851800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -75,10 +72,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *9255920
+  version_requirements: *9851800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9255380 !ruby/object:Gem::Requirement
+  requirement: &9851220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,14 +86,15 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *9255380
-description: Continuous testing tool for Ruby.
+  version_requirements: *9851220
+description: Runs your tests as they change, in parallel.
 email:
 - sunaku@gmail.com
 - burns180@gmail.com
 executables:
 - tork
 - tork-driver
+- tork-engine
 - tork-herald
 - tork-master
 extensions: []
@@ -110,6 +108,7 @@ files:
 - Rakefile
 - bin/tork
 - bin/tork-driver
+- bin/tork-engine
 - bin/tork-herald
 - bin/tork-master
 - lib/tork/client.rb
@@ -122,10 +121,12 @@ files:
 - lib/tork/config/parallel_tests.rb
 - lib/tork/config/rails.rb
 - lib/tork/driver.rb
+- lib/tork/engine.rb
 - lib/tork/master.rb
 - lib/tork/server.rb
 - lib/tork/version.rb
 - tork.gemspec
+- man/man1/tork-engine.1
 - man/man1/tork-herald.1
 - man/man1/tork-master.1
 - man/man1/tork-driver.1
@@ -153,6 +154,6 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Test with fork.
+summary: test with fork
 test_files: []
 has_rdoc: