parallel_tests 0.4.13 → 0.4.14

data/Readme.md

@@ -67,11 +67,17 @@ Example output
 
     Took 29.925333 seconds
 
-Even process runtimes (for specs only atm)
+Even process runtimes (for specs only)
 -----------------
+
+Log test runtime to give each process the same test runtime.<br/>
 Add to your `spec/parallel_spec.opts` (or `spec/spec.opts`) :
-    --format ParallelSpecs::SpecRuntimeLogger:tmp/parallel_profile.log
-It will log test runtime and partition the test-load accordingly.
+
+    RSpec 1.x:
+      --format ParallelSpecs::SpecRuntimeLogger:tmp/parallel_profile.log
+    RSpec 2.x:
+      Installed as plugin: -I vendor/plugins/parallel_tests/lib
+      --format ParallelSpecs::SpecRuntimeLogger --out tmp/parallel_profile.log
 
 Setup for non-rails
 ===================
@@ -150,6 +156,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Fred Wu](http://fredwu.me)
  - [xxx](https://github.com/xxx)
  - [Levent Ali](http://purebreeze.com/)
+ - [Michael Kintzer](https://github.com/rockrep)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/VERSION

@@ -1 +1 @@
-0.4.13
+0.4.14

data/lib/parallel_specs/spec_runtime_logger.rb

@@ -1,7 +1,18 @@
-require 'spec/runner/formatter/progress_bar_formatter'
+require 'parallel_specs'
+
+begin
+  require 'rspec/core/formatters/progress_formatter'
+  base = RSpec::Core::Formatters::ProgressFormatter
+rescue LoadError
+  require 'spec/runner/formatter/progress_bar_formatter'
+  base = Spec::Runner::Formatter::BaseTextFormatter
+end
+ParallelSpecs::SpecRuntimeLoggerBase = base
+
+class ParallelSpecs::SpecRuntimeLogger < ParallelSpecs::SpecRuntimeLoggerBase
+  def initialize(options, output=nil)
+    output ||= options # rspec 2 has output as first argument
 
-class ParallelSpecs::SpecRuntimeLogger < Spec::Runner::Formatter::BaseTextFormatter
-  def initialize(options, output)
     if String === output
       FileUtils.mkdir_p(File.dirname(output))
       File.open(output,'w'){|f| f.write ''} # clean the file
@@ -10,6 +21,7 @@ class ParallelSpecs::SpecRuntimeLogger < Spec::Runner::Formatter::BaseTextFormat
       @output = output
     end
     @example_times = Hash.new(0)
+    @failed_examples = [] # only needed for rspec 2
   end
 
   def example_started(*args)
@@ -24,7 +36,9 @@ class ParallelSpecs::SpecRuntimeLogger < Spec::Runner::Formatter::BaseTextFormat
   def start_dump(*args)
     return unless ENV['TEST_ENV_NUMBER'] #only record when running in parallel
     # TODO: Figure out why sometimes time can be less than 0
-    @output.puts @example_times.map { |file, time| "#{file}:#{time > 0 ? time : 0}" }
+    lock_output do
+      @output.puts @example_times.map { |file, time| "#{file}:#{time > 0 ? time : 0}" }
+    end
     @output.flush
   end
 
@@ -46,4 +60,18 @@ class ParallelSpecs::SpecRuntimeLogger < Spec::Runner::Formatter::BaseTextFormat
   def close
     @output.close  if (IO === @output) & (@output != $stdout)
   end
-end
+
+  # do not let multiple processes get in each others way
+  def lock_output
+    if File === @output
+      begin
+        @output.flock File::LOCK_EX
+        yield
+      ensure
+        @output.flock File::LOCK_UN
+      end
+    else
+      yield
+    end
+  end
+end

data/lib/parallel_tests.rb

@@ -88,11 +88,11 @@ class ParallelTests
 
   def self.tests_with_runtime(root)
     tests = find_tests(root)
-    runtime_file = File.join(root,'..','tmp','parallel_profile.log')
-    lines = File.read(runtime_file).split("\n") rescue []
+    lines = File.read('tmp/parallel_profile.log').split("\n") rescue []
 
     # use recorded test runtime if we got enough data
     if lines.size * 1.5 > tests.size
+      puts "Using recorded test runtime"
       times = Hash.new(1)
       lines.each do |line|
         test, time = line.split(":")
@@ -111,4 +111,4 @@ class ParallelTests
       Dir["#{root}**/**/*#{self.test_suffix}"]
     end
   end
-end
+end

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.4.13"
+  s.version = "0.4.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-04-17}
+  s.date = %q{2011-04-27}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_spec", "parallel_cucumber", "parallel_test"]
   s.files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallel_tests
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 4
-  - 13
-  version: 0.4.13
+  - 14
+  version: 0.4.14
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-17 00:00:00 +02:00
+date: 2011-04-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency