test-loop 12.3.1 → 13.0.0

data/LICENSE

@@ -4,6 +4,7 @@ Copyright 2010 Suraj N. Kurapati <sunaku@gmail.com>
 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>
 
 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.md

@@ -100,7 +100,34 @@ Configuration
 
 test-loop looks for a configuration file named `.test-loop` in the current
 working directory.  This configuration file is a normal Ruby script in which
-you can query and modify the `Test::Loop` OpenStruct configuration as follows:
+you can query and modify the `Test::Loop` OpenStruct configuration object
+according to the configuration options listed below.
+
+------------------------------------------------------------------------------
+Configuration presets
+------------------------------------------------------------------------------
+
+The following sub-libraries provide "preset" configurations.  To use them,
+simply add the require() lines shown below to your `.test-loop` file or to
+your application's `test/test_helper.rb` or `spec/spec_helper.rb` file.
+
+### require 'test/loop/notify'
+
+Shows on-screen-display notifications for test failures.
+
+### require 'test/loop/rails'
+
+Provides support for the Ruby on Rails web framework.
+
+### require 'test-loop/coco'
+
+Integrates the [coco](https://github.com/lkdjiin/coco) code coverage library.
+
+------------------------------------------------------------------------------
+Configuration options
+------------------------------------------------------------------------------
+
+The `Test::Loop` OpenStruct configuration object holds the following options:
 
 ### Test::Loop.delay_per_iteration
 
@@ -133,9 +160,8 @@ by an underscore and the file name in reverse like this:
 Then you would add the following to your configuration file:
 
     Test::Loop.test_file_matchers['{lib,app}/**/*.rb'] = lambda do |path|
-      extn = File.extname(path)
-      name = File.basename(path, extn)
-      "{test,spec}/**/#{name}_#{name.reverse}#{extn}"
+      name = File.basename(path, '.rb')
+      "{test,spec}/**/#{name}_#{name.reverse}.rb"
     end
 
 In addition, these lambda functions can return `nil` if they do not wish for a
@@ -162,18 +188,20 @@ name of the test being defined.
 Array of lambda functions that are executed inside the worker process before
 loading the test file.
 
-These functions are passed (1) the path to the test file, (2) the path to
-the log file containing the live output of running the test file, and (3) an
-array containing the names of tests (which were identified by
+These functions are passed (1) the path to the test file, (2) the path to the
+log file containing the live output of running the test file, (3) an array
+containing the names of tests (which were identified by
 `Test::Loop.test_name_parser`) inside the test file that have changed since
-the last run of the test file.
+the last run of the test file, and (4) a rotating sequence number of the
+worker process that will run the test file.
 
 For example, to print a worker process' ID and what work it will perform:
 
     Test::Loop.before_each_test.push lambda {
-      |test_file, log_file, test_names|
+     |test_file, log_file, test_names, worker_id|
 
       p :worker_pid => $$,
+        :worker_id => worker_id,
         :test_file => test_file,
         :log_file => log_file,
         :test_names => test_names
@@ -191,14 +219,15 @@ test has finished running.
 These functions are passed (1) the path to the test file, (2) the path to the
 log file containing the output of running the test file, (3) a
 `Process::Status` object describing the exit status of the worker process that
-ran the test file, (4) the time when test execution began, and (5) how many
-seconds it took for the overall test execution to complete.
+ran the test file, (4) the time when test execution began, (5) how many
+seconds it took for the overall test execution to complete, and (6) a rotating
+sequence number of the worker process that ran the test file.
 
 For example, to delete log files for successful tests, add the following to
 your configuration file:
 
     Test::Loop.after_each_test.push lambda {
-      |test_file, log_file, run_status, started_at, elapsed_time|
+      |test_file, log_file, run_status, started_at, elapsed_time, worker_id|
 
       File.delete(log_file) if run_status.success?
     }
@@ -208,7 +237,7 @@ add the following to your configuration file (**NOTE:** the `test/loop/notify`
 preset does this for you):
 
     Test::Loop.after_each_test.push lambda {
-      |test_file, log_file, run_status, started_at, elapsed_time|
+      |test_file, log_file, run_status, started_at, elapsed_time, worker_id|
 
       unless run_status.success? or run_status.signaled?
         title = 'FAIL at %s in %0.1fs' % [started_at.strftime('%r'), elapsed_time]
@@ -229,7 +258,7 @@ regardless of whether they passed or failed, add the following to your
 configuration file:
 
     Test::Loop.after_each_test.push lambda {
-      |test_file, log_file, run_status, started_at, elapsed_time|
+      |test_file, log_file, run_status, started_at, elapsed_time, worker_id|
 
       success = run_status.success?
 
@@ -250,26 +279,6 @@ configuration file:
 
 Maximum number of test files to run concurrently.  The default value is 4.
 
-------------------------------------------------------------------------------
-Configuration presets
-------------------------------------------------------------------------------
-
-The following sub-libraries provide "preset" configurations.  To use them,
-simply add the require() lines shown below to your `.test-loop` file or to
-your application's `test/test_helper.rb` or `spec/spec_helper.rb` file.
-
-### require 'test/loop/notify'
-
-Shows on-screen-display notifications for test failures.
-
-### require 'test/loop/rails'
-
-Provides support for the Ruby on Rails web framework.
-
-### require 'test-loop/coco'
-
-Integrates the [coco](https://github.com/lkdjiin/coco) code coverage library.
-
 ------------------------------------------------------------------------------
 Known issues
 ------------------------------------------------------------------------------

data/lib/test/loop.rb

@@ -17,9 +17,8 @@ module Test
   Loop.test_file_matchers = {
     # source files that correspond to test files
     'lib/**/*.rb' => lambda do |path|
-      extn = File.extname(path)
-      base = File.basename(path, extn)
-      "{test,spec}/**/#{base}_{test,spec}#{extn}"
+      base = File.basename(path, '.rb')
+      "{test,spec}/**/#{base}_{test,spec}.rb"
     end,
 
     # the actual test files themselves
@@ -34,7 +33,7 @@ module Test
   end
 
   Loop.before_each_test = [
-    lambda {|test_file, log_file, test_names|
+    lambda {|test_file, log_file, test_names, worker_id|
       unless test_names.empty?
         test_name_pattern = test_names.map do |name|
           # sanitize string interpolations and invalid method name characters
@@ -86,7 +85,7 @@ module Test
     ANSI_RED = "\e[31m%s\e[0m".freeze
 
     Worker = Struct.new(:test_file, :log_file, :started_at, :finished_at,
-                        :exit_status)
+                        :exit_status, :id)
 
     def notify message
       # using print() because puts() is not an atomic operation.
@@ -122,9 +121,8 @@ module Test
     def reload_master_process test_files = Set.new
       test_files.merge currently_running_test_files
       stop_worker_queue
-      ENV.replace MASTER_ENV.merge(RESUME_ENV_KEY =>
-                                   Base64.encode64(Marshal.dump(test_files)))
-      exec(*MASTER_EXECV)
+      resume_env = Base64.encode64(Marshal.dump(test_files))
+      exec MASTER_ENV.merge(RESUME_ENV_KEY => resume_env), *MASTER_EXECV
     end
 
     def load_user_config
@@ -195,6 +193,8 @@ module Test
     end
 
     def init_worker_queue
+      @worker_id_pool = (0 ... max_concurrent_tests).to_a
+
       # collect children (of which some may be workers) for reaping below
       @exited_child_infos = []
       trap :CHLD do
@@ -237,6 +237,7 @@ module Test
     def fork_worker worker
       notify "TEST #{worker.test_file}"
 
+      worker.id = @worker_id_pool.shift
       worker.log_file = worker.test_file + '.log'
 
       # cache the contents of the test file for diffing below
@@ -275,7 +276,7 @@ module Test
 
         # tell the testing framework to run only the changed test blocks
         before_each_test.each do |hook|
-          hook.call worker.test_file, worker.log_file, test_names
+          hook.call worker.test_file, worker.log_file, test_names, worker.id
         end
 
         # make the process title Test::Unit friendly and ps(1) searchable
@@ -301,8 +302,11 @@ module Test
 
       after_each_test.each do |hook|
         hook.call worker.test_file, worker.log_file, worker.exit_status,
-                  worker.started_at, worker.finished_at - worker.started_at
+                  worker.started_at, worker.finished_at - worker.started_at,
+                  worker.id
       end
+
+      @worker_id_pool.push worker.id
     end
   end
 end

data/lib/test/loop/notify.rb

@@ -1,7 +1,8 @@
 require 'test/loop'
 
 Test::Loop.after_each_test.push lambda {
-  |test_file, log_file, run_status, started_at, elapsed_time|
+  |test_file, log_file, run_status, started_at, elapsed_time, worker_id|
+
   unless run_status.success? or run_status.signaled?
     title = 'FAIL at %s in %0.1fs' % [started_at.strftime('%r'), elapsed_time]
     statistics = File.readlines(log_file).grep(/^\d+ \w+,/)

data/lib/test/loop/parallel_tests.rb

@@ -0,0 +1,9 @@
+require 'test/loop'
+
+Test::Loop.before_each_test.push lambda {
+  |test_file, log_file, test_names, worker_id|
+
+  # for compatitibilty with parallel_tests gem,
+  # use numbers as strings: "", "2", "3", "4"
+  ENV['TEST_ENV_NUMBER'] = worker_id.next.to_s if worker_id > 0
+}

data/lib/test/loop/rails.rb

@@ -1,4 +1,5 @@
 require 'test/loop'
+require 'active_support/inflector'
 
 Test::Loop.reabsorb_file_globs.push(
   'config/**/*.{rb,yml}',
@@ -7,20 +8,30 @@ Test::Loop.reabsorb_file_globs.push(
 )
 
 Test::Loop.test_file_matchers['{app,lib,test,spec}/**/*.rb'] =
-  Test::Loop.test_file_matchers.delete('lib/**/*.rb')
+  lambda do |path|
+    base = File.basename(path, '.rb')
+    poly = ActiveSupport::Inflector.pluralize(base)
+    "{test,spec}/**/{#{base},#{poly}_*}_{test,spec}.rb"
+  end
 
 Test::Loop.test_file_matchers['{test,spec}/factories/**/*_factory.rb'] =
   lambda do |path|
     base = File.basename(path, '_factory.rb')
-    "{test,spec}/**/#{base}_{test,spec}.rb"
+    poly = ActiveSupport::Inflector.pluralize(base)
+    "{test,spec}/**/{#{base},#{poly}_*}_{test,spec}.rb"
   end
 
-require 'rails/railtie'
-Class.new Rails::Railtie do
-  config.before_initialize do |app|
-    if app.config.cache_classes
-      warn "test-loop: Setting #{app.class}.config.cache_classes = false"
-      app.config.cache_classes = false
+begin
+  require 'rails/railtie'
+  Class.new Rails::Railtie do
+    config.before_initialize do |app|
+      if app.config.cache_classes
+        warn "test-loop: Setting #{app.class}.config.cache_classes = false"
+        app.config.cache_classes = false
+      end
     end
   end
+rescue LoadError
+  warn "test-loop: Railtie not available; please manually set:\n\t"\
+       "config.cache_classes = false"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-loop
 version: !ruby/object:Gem::Version
-  version: 12.3.1
+  version: 13.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,15 @@ authors:
 - Brian D. Burns
 - Daniel Pittman
 - Jacob Helwig
+- Corné Verbruggen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-19 00:00:00.000000000 Z
+date: 2011-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &21852080 !ruby/object:Gem::Requirement
+  requirement: &19985940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,7 +25,7 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *21852080
+  version_requirements: *19985940
 description: 
 email: 
 executables:
@@ -38,6 +39,7 @@ files:
 - lib/test/loop.rb
 - lib/test/loop/notify.rb
 - lib/test/loop/rails.rb
+- lib/test/loop/parallel_tests.rb
 homepage: http://github.com/sunaku/test-loop
 licenses: []
 post_install_message: 
@@ -58,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Continuous testing for Ruby with fork/eval