parallel_tests 0.4.18 → 0.4.19

data/Readme.md

@@ -6,26 +6,35 @@ Setup for Rails
 ## Install
 ### Rails 3
 As gem
-    sudo gem install parallel_tests
+
+    gem install parallel_tests
+
     # add to Gemfile
-    gem "parallel_tests", :group=>:development
+    gem "parallel_tests", :group => :development
 
 OR as plugin
-    sudo gem install parallel
+
+    gem install parallel
     rails plugin install git://github.com/grosser/parallel_tests.git
 
+    # add to Gemfile
+    gem "parallel", :group => :development
+
 ### Rails 2
 
 As gem
-    sudo gem install parallel_tests
+
+    gem install parallel_tests
+
     # add to config/environments/development.rb
     config.gem "parallel_tests"
+
     # add to Rakefile
     begin; require 'parallel_tests/tasks'; rescue LoadError; end
 
 OR as plugin
 
-    sudo gem install parallel
+    gem install parallel
     ./script/plugin install git://github.com/grosser/parallel_tests.git
 
 ## Setup

data/VERSION

@@ -1 +1 @@
-0.4.18
+0.4.19

data/lib/parallel_cucumber.rb

@@ -3,7 +3,10 @@ require File.join(File.dirname(__FILE__), 'parallel_tests')
 class ParallelCucumber < ParallelTests
   def self.run_tests(test_files, process_number, options)
     color = ($stdout.tty? ? 'AUTOTEST=1 ; export AUTOTEST ;' : '')#display color when we are in a terminal
-    cmd = "#{color} #{executable} #{options[:test_options]} #{test_files*' '}"
+    runtime_logging = "--format ParallelCucumber::RuntimeLogger --out #{runtime_log}"
+    cmd = "#{color} #{executable}"
+    cmd << runtime_logging if File.directory?(File.dirname(runtime_log))
+    cmd << " #{options[:test_options]} #{test_files*' '}"
     execute_command(cmd, process_number, options)
   end
 
@@ -17,6 +20,10 @@ class ParallelCucumber < ParallelTests
     end
   end
 
+  def self.runtime_log
+    'tmp/parallel_runtime_cucumber.log'
+  end
+
   protected
 
   def self.test_suffix

data/lib/parallel_cucumber/runtime_logger.rb

@@ -0,0 +1,57 @@
+class ParallelCucumber
+  class RuntimeLogger
+
+    def initialize(step_mother, path_or_io, options=nil)
+      @io = prepare_io(path_or_io)
+      @example_times = Hash.new(0)
+    end
+
+    def before_feature(_)
+      @start_at = Time.now.to_f
+    end
+
+    def after_feature(feature)
+      @example_times[feature.file] += Time.now.to_f - @start_at
+    end
+
+    def after_features(*args)
+      lock_output do
+        @io.puts @example_times.map { |file, time| "#{file}:#{time}" }
+      end
+    end
+
+    private
+
+    def prepare_io(path_or_io)
+      if path_or_io.respond_to?(:write)
+        path_or_io
+      else # its a path
+        File.open(path_or_io, 'w').close # clean out the file
+        file = File.open(path_or_io, 'a')
+
+        at_exit do
+          unless file.closed?
+            file.flush
+            file.close
+          end
+        end
+
+        file
+      end
+    end
+
+    # do not let multiple processes get in each others way
+    def lock_output
+      if File === @io
+        begin
+          @io.flock File::LOCK_EX
+          yield
+        ensure
+          @io.flock File::LOCK_UN
+        end
+      else
+        yield
+      end
+    end
+  end
+end

data/lib/parallel_specs.rb

@@ -20,6 +20,10 @@ class ParallelSpecs < ParallelTests
     cmd or raise("Can't find executables rspec or spec")
   end
 
+  def self.runtime_log
+    'tmp/parallel_profile.log'
+  end
+
   protected
 
   # so it can be stubbed....

data/lib/parallel_tests.rb

@@ -54,6 +54,10 @@ class ParallelTests
     process_number == 0 ? '' : process_number + 1
   end
 
+  def self.runtime_log
+    '__foo__'
+  end
+
   protected
 
   # read output of the process and print in in chucks
@@ -111,7 +115,7 @@ class ParallelTests
 
   def self.tests_with_runtime(root)
     tests = find_tests(root)
-    lines = File.read("#{root}/../tmp/parallel_profile.log").split("\n") rescue []
+    lines = File.read("#{root}/../#{runtime_log}").split("\n") rescue []
 
     # use recorded test runtime if we got enough data
     if lines.size * 1.5 > tests.size

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.4.18"
+  s.version = "0.4.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-05-17}
+  s.date = %q{2011-06-04}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_cucumber", "parallel_spec", "parallel_test"]
   s.files = [
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "bin/parallel_spec",
      "bin/parallel_test",
      "lib/parallel_cucumber.rb",
+     "lib/parallel_cucumber/runtime_logger.rb",
      "lib/parallel_specs.rb",
      "lib/parallel_specs/spec_runtime_logger.rb",
      "lib/parallel_tests.rb",

data/spec/spec_helper.rb

@@ -53,7 +53,7 @@ def test_tests_in_groups(klass, folder, suffix)
         file
       end
 
-      @log = "#{FAKE_RAILS_ROOT}/tmp/parallel_profile.log"
+      @log = "#{FAKE_RAILS_ROOT}/#{klass.runtime_log}"
       `mkdir #{File.dirname(@log)}`
       `rm -f #{@log}`
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallel_tests
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 4
-  - 18
-  version: 0.4.18
+  - 19
+  version: 0.4.19
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +02:00
+date: 2011-06-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -28,10 +28,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  prerelease: false
   type: :runtime
   name: parallel
+  version_requirements: *id001
+  prerelease: false
 description: 
 email: grosser.michael@gmail.com
 executables: 
@@ -53,6 +53,7 @@ files:
 - bin/parallel_spec
 - bin/parallel_test
 - lib/parallel_cucumber.rb
+- lib/parallel_cucumber/runtime_logger.rb
 - lib/parallel_specs.rb
 - lib/parallel_specs/spec_runtime_logger.rb
 - lib/parallel_tests.rb