test-loop 12.2.0 → 12.3.0

data/LICENSE

@@ -3,6 +3,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>
 
 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

@@ -246,6 +246,10 @@ configuration file:
       end
     }
 
+### Test::Loop.max_concurrent_tests
+
+Maximum number of test files to run concurrently.  The default value is 4.
+
 ------------------------------------------------------------------------------
 Configuration presets
 ------------------------------------------------------------------------------

data/lib/test/loop.rb

@@ -1,3 +1,4 @@
+require 'set'
 require 'ostruct'
 require 'diff/lcs'
 
@@ -6,6 +7,8 @@ module Test
 
   Loop.delay_per_iteration = 1
 
+  Loop.max_concurrent_tests = 4
+
   Loop.overhead_file_globs = ['{test,spec}/{test,spec}_helper.rb']
 
   Loop.reabsorb_file_globs = Loop.overhead_file_globs.dup
@@ -74,7 +77,7 @@ module Test
     private
 
     MASTER_EXECV = [$0, *ARGV].map {|s| s.dup.freeze }.freeze
-    MASTER_ENV = Hash[ENV.map {|k,v| [k.freeze, v.freeze] }].freeze
+    MASTER_ENV = ENV.to_hash.freeze
     RESUME_ENV_KEY = 'TEST_LOOP_RESUME_FILES'.freeze
 
     ANSI_CLEAR_LINE = "\e[2K\e[0G".freeze
@@ -115,10 +118,10 @@ module Test
 
     # The given test files are passed down (along with currently running
     # test files) to the next incarnation of test-loop for resumption.
-    def reload_master_process test_files = []
-      test_files.concat currently_running_test_files
+    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 => test_files.inspect)
+      ENV.replace MASTER_ENV.merge(RESUME_ENV_KEY => Marshal.dump(test_files))
       exec(*MASTER_EXECV)
     end
 
@@ -142,21 +145,22 @@ module Test
 
     def enter_testing_loop
       notify 'Ready for testing!'
+      test_files = Set.new
       loop do
         reap_worker_queue
 
         # find test files that have been modified since the last run
-        test_files = test_file_matchers.map do |source_glob, test_matcher|
+        test_files.merge test_file_matchers.map {|source_glob, test_matcher|
           Dir[source_glob].select {|file| File.mtime(file) > @last_ran_at }.
           map {|path| Dir[test_matcher.call(path).to_s] }
-        end.flatten.uniq
+        }.flatten
 
         # resume test files stopped by the previous incarnation of test-loop
         if ENV.key? RESUME_ENV_KEY
-          resume_files = eval(ENV.delete(RESUME_ENV_KEY))
+          resume_files = Marshal.load(ENV.delete(RESUME_ENV_KEY))
           unless resume_files.empty?
             notify 'Resuming tests...'
-            test_files.concat(resume_files).uniq!
+            test_files.merge resume_files
           end
         end
 
@@ -168,10 +172,14 @@ module Test
 
         # fork workers to run the test files in parallel,
         # excluding test files that are already running
-        test_files -= currently_running_test_files
+        test_files.subtract currently_running_test_files
         unless test_files.empty?
           @last_ran_at = Time.now
-          test_files.each {|file| fork_worker Worker.new(file) }
+          num_workers = Loop.max_concurrent_tests - @worker_by_pid.length
+          test_files.to_a.first(num_workers).each do |file|
+            fork_worker Worker.new(file)
+            test_files.delete file
+          end
         end
 
         pause_momentarily

data/lib/test/loop/rails.rb

@@ -9,6 +9,12 @@ Test::Loop.reabsorb_file_globs.push(
 Test::Loop.test_file_matchers['{app,lib,test,spec}/**/*.rb'] =
   Test::Loop.test_file_matchers.delete('lib/**/*.rb')
 
+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"
+  end
+
 require 'rails/railtie'
 Class.new Rails::Railtie do
   config.before_initialize do |app|

metadata

@@ -1,39 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: test-loop
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 12.3.0
   prerelease: 
-  version: 12.2.0
 platform: ruby
-authors: 
+authors:
 - Suraj N. Kurapati
 - Brian D. Burns
 - Daniel Pittman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: diff-lcs
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &8986060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *8986060
 description: 
 email: 
-executables: 
+executables:
 - test-loop
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - README.md
 - bin/test-loop
@@ -42,30 +39,26 @@ files:
 - lib/test/loop/rails.rb
 homepage: http://github.com/sunaku/test-loop
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Continuous testing for Ruby with fork/eval
 test_files: []
-