tork 17.1.0 → 18.0.0

data/bin/tork-herald

@@ -1,36 +1,30 @@
 #!/usr/bin/env ruby
-=begin
+=begin =======================================================================
 
-TORK-HERALD 1 2012-01-30 17.1.0
-==============================================================================
+# TORK-HERALD 1 2012-02-06 18.0.0
 
-NAME
-------------------------------------------------------------------------------
+## NAME
 
 tork-herald - reports modified files
 
-SYNOPSIS
-------------------------------------------------------------------------------
+## SYNOPSIS
 
 `tork-herald` [*OPTION*]...
 
-DESCRIPTION
-------------------------------------------------------------------------------
+## DESCRIPTION
 
 This program monitors the current working directory and prints relative paths
 of modified files in batches of single-line JSON arrays to the standard output
 stream.
 
-OPTIONS
-------------------------------------------------------------------------------
+## OPTIONS
 
 `-h`, `--help`
-  Display this help manual using man(1).
+  Show this help manual.
 
-SEE ALSO
-------------------------------------------------------------------------------
+## SEE ALSO
 
-tork(1), tork-driver(1), tork-master(1), tork-herald(1)
+tork(1), tork-herald(1), tork-driver(1), tork-engine(1), tork-master(1)
 
 =end =========================================================================
 

data/bin/tork-master

@@ -1,24 +1,21 @@
 #!/usr/bin/env ruby
-=begin
+=begin =======================================================================
 
-TORK-MASTER 1 2012-01-30 17.1.0
-==============================================================================
+# TORK-MASTER 1 2012-02-06 18.0.0
 
-NAME
-------------------------------------------------------------------------------
+## NAME
 
 tork-master - absorbs overhead and runs tests
 
-SYNOPSIS
-------------------------------------------------------------------------------
+## SYNOPSIS
 
 `tork-master` [*OPTION*]...
 
-DESCRIPTION
-------------------------------------------------------------------------------
+## DESCRIPTION
 
-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.
 
 `["load",` *paths*`,` *files*`]`
   Adds the given array of *paths* to Ruby's $LOAD_PATH, loads the given array
@@ -38,10 +35,10 @@ standard input stream and performs the respective actions as described below.
     `["test",` *test_file*`,` *line_numbers*`,` *log_file*`,` *worker_number*`]`
 
   * Test has passed:
-    `["pass",` *test_file*`,` *line_numbers*`,` *log_file*`,` *worker_number*`,` *exit_status*`]`
+    `["pass",` *test_file*`,` *line_numbers*`,` *log_file*`,` *worker_number*`,` *exit_code*`,` *exit_info*`]`
 
   * Test has failed:
-    `["fail",` *test_file*`,` *line_numbers*`,` *log_file*`,` *worker_number*`,` *exit_status*`]`
+    `["fail",` *test_file*`,` *line_numbers*`,` *log_file*`,` *worker_number*`,` *exit_code*`,` *exit_info*`]`
 
 `["stop"]`
   Stops all tests that are currently running and prints the given command line
@@ -50,30 +47,26 @@ standard input stream and performs the respective actions as described below.
 `["quit"]`
   Stops all tests that are currently running and exits.
 
-OPTIONS
-------------------------------------------------------------------------------
+## OPTIONS
 
 `-h`, `--help`
-  Display this help manual using man(1).
+  Show this help manual.
 
-FILES
-------------------------------------------------------------------------------
+## FILES
 
 *.tork.rb*
   Optional Ruby script for configuring tork(1).
 
-ENVIRONMENT
-------------------------------------------------------------------------------
+## ENVIRONMENT
 
 `TORK_CONFIGS`
   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 *.tork.rb* is loaded.
 
-SEE ALSO
-------------------------------------------------------------------------------
+## SEE ALSO
 
-tork(1), tork-driver(1), tork-master(1), tork-herald(1)
+tork(1), tork-herald(1), tork-driver(1), tork-engine(1), tork-master(1)
 
 =end =========================================================================
 
@@ -83,7 +76,6 @@ require 'binman'
 BinMan.help
 
 require 'tork/master'
-Tork::Master.loop
+Tork::Master.new.loop
 
-Process.waitall
 raise SystemExit # prevent empty test suite from running in the master process

data/lib/tork/config.rb

@@ -1,9 +1,10 @@
-require 'ostruct'
-
 module Tork
-  _user_config_file = '.tork.rb'
 
-  Config = OpenStruct.new
+  Config = Struct.new(:max_forked_workers, :overhead_load_paths,
+                      :overhead_file_globs, :reabsorb_file_greps,
+                      :all_test_file_globs, :test_file_globbers,
+                      :before_fork_hooks, :after_fork_hooks,
+                      :test_event_hooks).new
 
   #---------------------------------------------------------------------------
   # defaults
@@ -21,22 +22,21 @@ module Tork
 
   Config.overhead_file_globs = ['{test,spec}/{test,spec}_helper.rb']
 
-  Config.reabsorb_file_greps = [/^#{Regexp.quote(_user_config_file)}$/,
-                                %r<^(test|spec)/\1_helper\.rb$>]
+  Config.reabsorb_file_greps = [%r<^(test|spec)/\1_helper\.rb$>]
 
   Config.all_test_file_globs = ['{test,spec}/**/*_{test,spec}.rb',
                                 '{test,spec}/**/{test,spec}_*.rb']
 
   Config.test_file_globbers = {
     # source files that correspond to test files
-    %r<^lib/.+\.rb$> => lambda do |path, matches|
-      base = File.basename(path, '.rb')
-      ["{test,spec}/**/#{base}_{test,spec}.rb",
-       "{test,spec}/**/{test,spec}_#{base}.rb"]
+    %r<^lib/.*?([^/]+)\.rb$> => lambda do |matches|
+      name = matches[1]
+      ["{test,spec}/**/#{name}_{test,spec}.rb",
+       "{test,spec}/**/{test,spec}_#{name}.rb"]
     end,
 
     # the actual test files themselves
-    %r<^(test|spec)/.*(\1_[^/]+|[^/]+_\1)\.rb$> => proc {|path| path }
+    %r<^(test|spec)/.*?(\1_[^/]+|[^/]+_\1)\.rb$> => lambda {|m| m[0] }
   }
 
   Config.before_fork_hooks = []
@@ -82,7 +82,9 @@ module Tork
   # overrides
   #---------------------------------------------------------------------------
 
-  load _user_config_file if File.exist? _user_config_file
+  if File.exist? user_config_file = '.tork.rb'
+    load user_config_file
+  end
 
   if ENV.key? 'TORK_CONFIGS'
     require 'json'
@@ -94,4 +96,5 @@ module Tork
       end
     end
   end
+
 end

data/lib/tork/config/cucumber.rb

@@ -4,12 +4,12 @@ Tork::Config.all_test_file_globs << 'features/**/*.feature'
 
 Tork::Config.test_file_globbers.update(
   # source files that correspond to test files
-  %r<^(features/(.+/)?)step_definitions/.+\.rb$> => lambda do |path, matches|
+  %r<^(features/(.+/)?)step_definitions/.+\.rb$> => lambda do |matches|
     matches[1] + '*.feature'
   end,
 
   # the actual test files themselves
-  %r<^features/.+\.feature$> => lambda {|path, matches| path }
+  %r<^features/.+\.feature$> => lambda {|matches| matches[0] }
 )
 
 Tork::Config.after_fork_hooks.push lambda {

data/lib/tork/config/notify.rb

@@ -4,7 +4,7 @@ require 'set'
 failed_test_files = Set.new
 
 Tork::Config.test_event_hooks.push lambda {|message|
-  event, test_file, line_numbers, log_file, worker_number, exit_status = message
+  event, test_file, line_numbers, log_file = message
 
   # make notifications edge-triggered: pass => fail or vice versa.
   # we do not care about pass => pass or fail => fail transitions.

data/lib/tork/config/rails.rb

@@ -8,16 +8,10 @@ Tork::Config.reabsorb_file_greps.push(
 )
 
 Tork::Config.test_file_globbers.update(
-  %r<^(app|lib|test|spec)/.+\.rb$> => lambda do |path, matches|
-    base = File.basename(path, '.rb')
-    poly = ActiveSupport::Inflector.pluralize(base)
-    "{test,spec}/**/{#{base},#{poly}_*}_{test,spec}.rb"
-  end,
-
-  %r<^(test|spec)/factories/.+_factory\.rb$> => lambda do |path, matches|
-    base = File.basename(path, '_factory.rb')
-    poly = ActiveSupport::Inflector.pluralize(base)
-    "{test,spec}/**/{#{base},#{poly}_*}_{test,spec}.rb"
+  %r<^(app|lib|test|spec)/.*?([^/]+?)(_factory)?\.rb$> => lambda do |matches|
+    single = matches[2]
+    plural = ActiveSupport::Inflector.pluralize(single)
+    "{test,spec}/**/{#{single},#{plural}_*}_{test,spec}.rb"
   end
 )
 

data/lib/tork/driver.rb

@@ -1,131 +1,54 @@
 require 'set'
-require 'diff/lcs'
 require 'tork/client'
-require 'tork/server'
+require 'tork/engine'
 require 'tork/config'
 
 module Tork
-module Driver
+class Driver < Engine
 
-  extend Server
-  extend self
-
-  def run_all_test_files
-    run_test_files Dir[*Config.all_test_file_globs]
-  end
-
-  def stop_running_test_files
-    @master.send [:stop]
-    @running_test_files.clear
-  end
-
-  def rerun_passed_test_files
-    run_test_files @passed_test_files
-  end
-
-  def rerun_failed_test_files
-    run_test_files @failed_test_files
-  end
-
-  def reabsorb_overhead_files
-    @master.quit if defined? @master
-
-    @master = Client::Transceiver.new('tork-master') do |message|
-      event, file, line_numbers = message
-
-      case event.to_sym
-      when :test
-        @waiting_test_files.delete file
-        @running_test_files.add file
-
-      when :pass
-        @running_test_files.delete file
-
-        # only whole test file runs qualify as pass
-        if line_numbers.empty?
-          @failed_test_files.delete file
-          @passed_test_files.add file
-        end
-
-      when :fail
-        @running_test_files.delete file
-        @failed_test_files.add file
-        @passed_test_files.delete file
-      end
-
-      @client.send message # propagate output downstream
-      Config.test_event_hooks.each {|hook| hook.call message }
-    end
-
-    @master.send [:load, Config.overhead_load_paths,
-                  Dir[*Config.overhead_file_globs]]
-
-    rerun_running_test_files
-  end
-
-  def loop
-    reabsorb_overhead_files
+  def initialize
+    super
 
     @herald = Client::Transceiver.new('tork-herald') do |changed_files|
-      warn "#{$0}(#{$$}): FILE BATCH #{changed_files.size}" if $DEBUG
       changed_files.each do |changed_file|
-        warn "#{$0}(#{$$}): FILE #{changed_file}" if $DEBUG
-
         # find and run the tests that correspond to the changed file
-        Config.test_file_globbers.each do |regexp, globber|
-          if regexp =~ changed_file and globs = globber.call(changed_file, $~)
-            run_test_files Dir[*globs]
+        visited = Set.new
+        visitor = lambda do |source_file|
+          Config.test_file_globbers.each do |regexp, globber|
+            if regexp =~ source_file and globs = globber.call($~)
+              Dir[*globs].each do |test_file|
+                if visited.add? test_file
+                  run_test_file test_file
+                  visitor.call test_file
+                end
+              end
+            end
           end
         end
+        visitor.call changed_file
 
         # reabsorb text execution overhead if overhead files changed
         if Config.reabsorb_file_greps.any? {|r| r =~ changed_file }
           @client.send [:over, changed_file]
-          # NOTE: new thread because reabsorb_overhead_files will kill this one
-          Thread.new { reabsorb_overhead_files }.join
+          reabsorb_overhead_files
         end
       end
     end
 
-    super
-
-    @herald.quit
-    @master.quit
-  end
-
-private
-
-  @waiting_test_files = Set.new
-  @running_test_files = Set.new
-  @passed_test_files = Set.new
-  @failed_test_files = Set.new
-
-  def rerun_running_test_files
-    run_test_files @running_test_files
+    reabsorb_overhead_files
   end
 
-  def run_test_files files
-    files.each {|f| run_test_file f }
+  def quit
+    @herald.quit
+    super
   end
 
-  def run_test_file file
-    if File.exist? file and @waiting_test_files.add? file
-      @master.send [:test, file, find_changed_line_numbers(file)]
-    end
+  def run_all_test_files
+    run_test_files Dir[*Config.all_test_file_globs]
   end
 
-  @lines_by_file = {}
-
-  def find_changed_line_numbers test_file
-    # cache the contents of the test file for diffing below
-    new_lines = File.readlines(test_file)
-    old_lines = @lines_by_file[test_file] || new_lines
-    @lines_by_file[test_file] = new_lines
-
-    # find which line numbers have changed inside the test file
-    Diff::LCS.diff(old_lines, new_lines).flatten.
-      # +1 because line numbers start at 1, not 0
-      map {|change| change.position + 1 }.uniq
+  def reabsorb_overhead_files
+    reabsorb_overhead Config.overhead_load_paths, Dir[*Config.overhead_file_globs]
   end
 
 end

data/lib/tork/engine.rb

@@ -0,0 +1,102 @@
+require 'set'
+require 'diff/lcs'
+require 'tork/client'
+require 'tork/server'
+require 'tork/config'
+
+module Tork
+class Engine < Server
+
+  def initialize
+    super
+    @waiting_test_files = Set.new
+    @running_test_files = Set.new
+    @passed_test_files = Set.new
+    @failed_test_files = Set.new
+    @lines_by_file = {}
+    @master = create_master_process
+  end
+
+  def quit
+    @master.quit
+    super
+  end
+
+  def reabsorb_overhead load_paths, overhead_files
+    @master.quit
+    @master = create_master_process
+    @master.send [:load, load_paths, overhead_files]
+    run_test_files @running_test_files # resume running them in the new master
+  end
+
+  def run_test_file test_file, line_numbers=nil
+    if File.exist? test_file and @waiting_test_files.add? test_file
+      line_numbers ||= find_changed_line_numbers(test_file)
+      @master.send [:test, test_file, line_numbers]
+    end
+  end
+
+  def stop_running_test_files
+    @master.send [:stop]
+    @running_test_files.clear
+  end
+
+  def rerun_passed_test_files
+    run_test_files @passed_test_files
+  end
+
+  def rerun_failed_test_files
+    run_test_files @failed_test_files
+  end
+
+protected
+
+  def run_test_files files
+    files.each {|f| run_test_file f }
+  end
+
+private
+
+  def create_master_process
+    Client::Transceiver.new('tork-master') do |message|
+      @client.send message # propagate output downstream
+
+      event, file, line_numbers = message
+      case event.to_sym
+      when :test
+        @waiting_test_files.delete file
+        @running_test_files.add file
+
+      when :pass
+        @running_test_files.delete file
+
+        # only whole test file runs qualify as pass
+        if line_numbers.empty?
+          @failed_test_files.delete file
+          @passed_test_files.add file
+        end
+
+      when :fail
+        @running_test_files.delete file
+        @failed_test_files.add file
+        @passed_test_files.delete file
+      end
+
+      Config.test_event_hooks.each {|hook| hook.call message }
+    end
+  end
+
+  def find_changed_line_numbers test_file
+    # cache test file contents for diffing below
+    new_lines = File.readlines(test_file)
+    old_lines = @lines_by_file[test_file] || new_lines
+    @lines_by_file[test_file] = new_lines
+
+    # find changed line numbers in the test file
+    Diff::LCS.diff(old_lines, new_lines).flatten.
+      # +1 because line numbers start at 1, not 0
+      map {|change| change.position + 1 }.uniq
+  end
+
+end
+end