testr 14.2.0 → 14.3.0

data/HISTORY.markdown

@@ -1,3 +1,38 @@
+------------------------------------------------------------------------------
+Version 14.3.0 (2012-01-20)
+------------------------------------------------------------------------------
+
+External changes:
+
+  * testr(1): notify user while dispatching their commands. This is especially
+    useful when the "rerun_passed_test_files" command has been dispatched but
+    there are no passed test files, so nothing happens and from the user's
+    perspective: TestR sucks because it's unresponsive.
+
+  * config/testr/rails: Reopen connections in forked workers to fix errors:
+
+        Mysql2::Error: MySQL server has gone away
+        PGError: connection not open
+
+    Thanks to Spencer Steffen for [contributing this solution](
+    https://github.com/sunaku/testr/issues/14#issuecomment-3539470).
+
+  * testr-driver(1): document the "over" status message in manual page.
+
+Internal changes:
+
+  * testr-driver(1): keep same herald; only replace master.
+
+  * testr(1): shorten code for loop break on quit command.
+
+  * server: rename `@upstream` to `@client` for coherence.
+
+  * Can pass lambda and proc with block to `<<` method.
+
+  * Explain `$0` override at the start of bin/ scripts.
+
+  * LICENSE: credit our most recent contributors.
+
 ------------------------------------------------------------------------------
 Version 14.2.0 (2012-01-16)
 ------------------------------------------------------------------------------

data/LICENSE

@@ -5,6 +5,8 @@ Copyright 2011 Brian D. Burns <burns180@gmail.com>
 Copyright 2011 Daniel Pittman <daniel@rimspace.net>
 Copyright 2011 Jacob Helwig <jacob@technosorcery.net>
 Copyright 2011 Corné Verbruggen <corne@g-majeur.nl>
+Copyright 2012 Jose Pablo Barrantes <xjpablobrx@gmail.com>
+Copyright 2012 Spencer Steffen <spencer@citrusme.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

@@ -193,16 +193,14 @@ worker process is forked to run a test file.  These functions are given:
 
 For example, to see some real values:
 
-    TestR::Config.before_fork_hooks << lambda {
-      |worker_number, log_file, test_file, test_names|
-
+    TestR::Config.before_fork_hooks << lambda do |worker_number, log_file, test_file, test_names|
       p :before_fork_hooks => {
         :worker_number => worker_number,
         :log_file      => log_file,
         :test_file     => test_file,
         :test_names    => test_names,
       }
-    }
+    end
 
 ### TestR::Config.after_fork_hooks
 
@@ -220,9 +218,7 @@ by `testr-master`.  These functions are given:
 
 For example, to see some real values, including the worker process' PID:
 
-    TestR::Config.after_fork_hooks << lambda {
-      |worker_number, log_file, test_file, test_names|
-
+    TestR::Config.after_fork_hooks << lambda do |worker_number, log_file, test_file, test_names|
       p :after_fork_hooks => {
         :worker_pid    => $$,
         :worker_number => worker_number,
@@ -230,7 +226,7 @@ For example, to see some real values, including the worker process' PID:
         :test_file     => test_file,
         :test_names    => test_names,
       }
-    }
+    end
 
 The first function in this array instructs Test::Unit and RSpec to only run
 those tests that correspond to the given `test_names` values.  This

data/bin/testr

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin
 
-TESTR 1 "2012-01-16" "14.2.0"
+TESTR 1 "2012-01-20" "14.3.0"
 =============================
 
 NAME
@@ -36,7 +36,7 @@ testr(1), testr-driver(1), testr-master(1), testr-herald(1)
 
 =end =========================================================================
 
-$0 = File.basename(__FILE__)
+$0 = File.basename(__FILE__) # for easier indentification in ps(1) output
 
 require 'binman'
 BinMan.help
@@ -89,15 +89,12 @@ COMMANDS = {
 begin
   while key = STDIN.gets.chomp
     if command = COMMANDS[key]
-      if command == :quit
-        @driver.quit
-        break
-      else
-        @driver.send [command]
-      end
-    else
-      COMMANDS.each do |key, cmd|
-        warn "testr: Type #{key} then ENTER to #{cmd.to_s.tr('_', ' ')}."
+      warn "testr: Sending #{command.to_s.inspect} command..."
+      @driver.send [command]
+      break if command == :quit
+    else # invalid command
+      COMMANDS.each do |key, command|
+        warn "testr: Type #{key} then ENTER to #{command.to_s.tr('_', ' ')}."
       end
     end
   end

data/bin/testr-driver

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin
 
-TESTR-DRIVER 1 "2012-01-16" "14.2.0"
+TESTR-DRIVER 1 "2012-01-20" "14.3.0"
 ====================================
 
 NAME
@@ -21,10 +21,6 @@ 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 testr-master(1) into its own.
 
-When testr-herald(1) reports that a file belonging to the test execution
-overhead has been modified, this program replaces testr-master(1) with a new
-instance, which then absorbs the modified test execution overhead into itself.
-
 `["run_all_test_files"]`
   Runs all test files found within and beneath the current working directory.
 
@@ -41,6 +37,17 @@ instance, which then absorbs the modified test execution overhead into itself.
 `["quit"]`
   Stops all tests that are currently running and exits.
 
+When testr-herald(1) reports that a file belonging to the test execution
+overhead has been modified, this program replaces testr-master(1) with a new
+instance, which then absorbs the modified test execution overhead into itself.
+
+This program emits the following single-line status messages (JSON arrays) on
+its standard output stream to provide notifications about its activity:
+
+`["over",` *overhead_file*`]`
+  The test execution overhead is currently being reabsorbed, by replacing
+  testr-master(1) with a new instance, because *overhead_file* has changed.
+
 OPTIONS
 -------
 
@@ -68,7 +75,7 @@ testr(1), testr-driver(1), testr-master(1), testr-herald(1)
 
 =end =========================================================================
 
-$0 = File.basename(__FILE__)
+$0 = File.basename(__FILE__) # for easier indentification in ps(1) output
 
 require 'binman'
 BinMan.help

data/bin/testr-herald

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin
 
-TESTR-HERALD 1 "2012-01-16" "14.2.0"
+TESTR-HERALD 1 "2012-01-20" "14.3.0"
 ====================================
 
 NAME
@@ -33,7 +33,7 @@ testr(1), testr-driver(1), testr-master(1), testr-herald(1)
 
 =end =========================================================================
 
-$0 = File.basename(__FILE__)
+$0 = File.basename(__FILE__) # for easier indentification in ps(1) output
 
 require 'binman'
 BinMan.help

data/bin/testr-master

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin
 
-TESTR-MASTER 1 "2012-01-16" "14.2.0"
+TESTR-MASTER 1 "2012-01-20" "14.3.0"
 ====================================
 
 NAME
@@ -75,7 +75,7 @@ testr(1), testr-driver(1), testr-master(1), testr-herald(1)
 
 =end =========================================================================
 
-$0 = File.basename(__FILE__)
+$0 = File.basename(__FILE__) # for easier indentification in ps(1) output
 
 require 'binman'
 BinMan.help

data/lib/testr/config/parallel_tests.rb

@@ -1,9 +1,7 @@
 require 'testr/config'
 
-TestR::Config.after_fork_hooks << lambda {
-  |worker_number, log_file, test_file, test_names|
-
+TestR::Config.after_fork_hooks << proc do |worker_number|
   # for compatitibilty with parallel_tests gem,
   # store numbers as strings: "", "2", "3", "4"
   ENV['TEST_ENV_NUMBER'] = (worker_number + 1).to_s if worker_number > 0
-}
+end

data/lib/testr/config/rails.rb

@@ -21,6 +21,12 @@ TestR::Config.test_file_globbers[%r<^(test|spec)/factories/.+_factory\.rb$>] =
     "{test,spec}/**/{#{base},#{poly}_*}_{test,spec}.rb"
   end
 
+TestR::Config.after_fork_hooks << proc do
+  unless ActiveRecord::Base.connection_config[:database] == ':memory:'
+    ActiveRecord::Base.connection.reconnect!
+  end
+end
+
 begin
   require 'rails/railtie'
   Class.new Rails::Railtie do

data/lib/testr/driver.rb

@@ -27,8 +27,8 @@ module Driver
     run_test_files @failed_test_files
   end
 
-  def reabsorb_overhead_files very_first_time = false
-    quit_herald_and_master unless very_first_time
+  def reabsorb_overhead_files
+    @master.quit if defined? @master
 
     @master = Client::Transceiver.new('testr-master') do |line|
       event, file, tests = JSON.load(line)
@@ -51,12 +51,18 @@ module Driver
         @failed_test_files.push file unless @failed_test_files.include? file
       end
 
-      @upstream.print line
+      @client.print line
     end
 
     @master.send [:load, Config.overhead_load_paths,
                   Dir[*Config.overhead_file_globs]]
 
+    rerun_running_test_files
+  end
+
+  def loop
+    reabsorb_overhead_files
+
     @herald = Client::Receiver.new('testr-herald') do |line|
       changed_file = line.chomp
       warn "testr-driver: herald: #{changed_file}" if $DEBUG
@@ -70,28 +76,20 @@ module Driver
 
       # reabsorb text execution overhead if overhead files changed
       if Config.reabsorb_file_greps.any? {|r| r =~ changed_file }
-        @upstream.puts JSON.dump([:over, changed_file])
+        @client.puts JSON.dump([:over, changed_file])
         # NOTE: new thread because reabsorb_overhead_files will kill this one
         Thread.new { reabsorb_overhead_files }.join
       end
     end
 
-    rerun_running_test_files
-  end
-
-  def loop
-    reabsorb_overhead_files true
     super
-    quit_herald_and_master
-  end
 
-private
-
-  def quit_herald_and_master
     @herald.quit
     @master.quit
   end
 
+private
+
   @waiting_test_files = []
   @running_test_files = []
   @passed_test_files = []

data/lib/testr/master.rb

@@ -17,7 +17,7 @@ module Master
       require file.sub(/\.rb$/, '')
     end
 
-    @upstream.print @command_line
+    @client.print @command_line
   end
 
   def test test_file, test_names
@@ -57,7 +57,7 @@ module Master
     end
 
     @command_by_worker_pid[worker_pid] = @command.push(worker_number)
-    @upstream.print @command_line
+    @client.print @command_line
   end
 
   def stop
@@ -77,7 +77,7 @@ private
   @worker_number_pool = (0 ... Config.max_forked_workers).to_a
   @command_by_worker_pid = {}
 
-  # process exited child processes and report finished workers to upstream
+  # process exited child processes and report finished workers to client
   trap :SIGCHLD do
     begin
       while wait2_array = Process.wait2(-1, Process::WNOHANG)
@@ -85,7 +85,7 @@ private
         if command = @command_by_worker_pid.delete(child_pid)
           @worker_number_pool.push command.pop
           command[0] = child_status.success? ? 'pass' : 'fail'
-          @upstream.puts JSON.dump(command.push(child_status))
+          @client.puts JSON.dump(command.push(child_status))
         else
           warn "testr-master: unknown child exited: #{wait2_array.inspect}"
         end

data/lib/testr/server.rb

@@ -8,7 +8,7 @@ module Server
   end
 
   def loop
-    (@upstream = STDOUT.dup).sync = true
+    (@client = STDOUT.dup).sync = true
     STDOUT.reopen(STDERR).sync = true
 
     catch :testr_server_quit do

data/lib/testr/version.rb

@@ -1,3 +1,3 @@
 module TestR
-  VERSION = "14.2.0"
+  VERSION = "14.3.0"
 end

data/man/man1/testr-driver.1

@@ -1,4 +1,4 @@
-.TH TESTR\-DRIVER 1 "2012\-01\-16" "14.2.0"
+.TH TESTR\-DRIVER 1 "2012\-01\-20" "14.3.0"
 .SH NAME
 .PP
 testr\-driver \- drives 
@@ -14,14 +14,6 @@ standard input stream and performs the respective actions as described below.
 It also funnels the standard output stream of 
 .BR testr\-master (1) 
 into its own.
-.PP
-When 
-.BR testr\-herald (1) 
-reports that a file belonging to the test execution
-overhead has been modified, this program replaces 
-.BR testr\-master (1) 
-with a new
-instance, which then absorbs the modified test execution overhead into itself.
 .TP
 \fB\fC["run_all_test_files"]\fR
 Runs all test files found within and beneath the current working directory.
@@ -38,6 +30,22 @@ execution overhead, and resumes running those interrupted test files.
 .TP
 \fB\fC["quit"]\fR
 Stops all tests that are currently running and exits.
+.PP
+When 
+.BR testr\-herald (1) 
+reports that a file belonging to the test execution
+overhead has been modified, this program replaces 
+.BR testr\-master (1) 
+with a new
+instance, which then absorbs the modified test execution overhead into itself.
+.PP
+This program emits the following single\-line status messages (JSON arrays) on
+its standard output stream to provide notifications about its activity:
+.TP
+\fB\fC["over",\fR \fIoverhead_file\fP\fB\fC]\fR
+The test execution overhead is currently being reabsorbed, by replacing
+.BR testr\-master (1) 
+with a new instance, because \fIoverhead_file\fP has changed.
 .SH OPTIONS
 .TP
 \fB\fC-h\fR, \fB\fC--help\fR

data/man/man1/testr-herald.1

@@ -1,4 +1,4 @@
-.TH TESTR\-HERALD 1 "2012\-01\-16" "14.2.0"
+.TH TESTR\-HERALD 1 "2012\-01\-20" "14.3.0"
 .SH NAME
 .PP
 testr\-herald \- reports modified files

data/man/man1/testr-master.1

@@ -1,4 +1,4 @@
-.TH TESTR\-MASTER 1 "2012\-01\-16" "14.2.0"
+.TH TESTR\-MASTER 1 "2012\-01\-20" "14.3.0"
 .SH NAME
 .PP
 testr\-master \- absorbs overhead and runs tests

data/man/man1/testr.1

@@ -1,4 +1,4 @@
-.TH TESTR 1 "2012\-01\-16" "14.2.0"
+.TH TESTR 1 "2012\-01\-20" "14.3.0"
 .SH NAME
 .PP
 testr \- Continuous testing tool for Ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testr
 version: !ruby/object:Gem::Version
-  version: 14.2.0
+  version: 14.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,14 +10,16 @@ authors:
 - Daniel Pittman
 - Jacob Helwig
 - Corné Verbruggen
+- Jose Pablo Barrantes
+- Spencer Steffen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
+date: 2012-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binman
-  requirement: &9134380 !ruby/object:Gem::Requirement
+  requirement: &20451640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -25,10 +27,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *9134380
+  version_requirements: *20451640
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &9133860 !ruby/object:Gem::Requirement
+  requirement: &20451120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -39,10 +41,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *9133860
+  version_requirements: *20451120
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &9133120 !ruby/object:Gem::Requirement
+  requirement: &20450380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,10 +55,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *9133120
+  version_requirements: *20450380
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &9132380 !ruby/object:Gem::Requirement
+  requirement: &20449640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +69,7 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *9132380
+  version_requirements: *20449640
 description: ''
 email:
 - sunaku@gmail.com
@@ -75,6 +77,8 @@ email:
 - daniel@rimspace.net
 - jacob@technosorcery.net
 - corne@g-majeur.nl
+- xjpablobrx@gmail.com
+- spencer@citrusme.com
 executables:
 - testr
 - testr-driver