vinted-parallel_tests 0.13.3 → 1.7.0.1

data/lib/parallel_tests/test/runtime_logger.rb

@@ -4,70 +4,61 @@ require 'parallel_tests/test/runner'
 module ParallelTests
   module Test
     class RuntimeLogger
-      @@has_started = false
+      @@prepared = false
 
       class << self
-        def log(test, start_time, end_time)
-          return if test.is_a? ::Test::Unit::TestSuite # don't log for suites-of-suites
+        def log_test_run(test)
+          prepare
 
-          if !@@has_started # make empty log file
-            File.open(logfile, 'w'){}
-            @@has_started = true
-          end
+          result = nil
+          time = ParallelTests.delta { result = yield }
+          log(test, time)
+
+          result
+        end
 
-          locked_appending_to(logfile) do |file|
-            file.puts(message(test, start_time, end_time))
+        def unique_log
+          lock do
+            separator = "\n"
+            groups = File.read(logfile).split(separator).map { |line| line.split(":") }.group_by(&:first)
+            lines = groups.map do |file, times|
+              time = "%.2f" % times.map(&:last).map(&:to_f).inject(:+)
+              "#{file}:#{time}"
+            end
+            File.write(logfile, lines.join(separator) + separator)
           end
         end
 
         private
 
-        def message(test, start_time, end_time)
-          delta = "%.2f" % (end_time.to_f-start_time.to_f)
-          filename = class_directory(test.class) + class_to_filename(test.class) + ".rb"
-          "#{filename}:#{delta}"
+        # ensure folder exists + clean out previous log
+        # this will happen in multiple processes, but should be roughly at the same time
+        # so there should be no log message lost
+        def prepare
+          return if @@prepared
+          @@prepared = true
+          FileUtils.mkdir_p(File.dirname(logfile))
+          File.write(logfile, '')
         end
 
-        # Note: this is a best guess at conventional test directory structure, and may need
-        # tweaking / post-processing to match correctly for any given project
-        def class_directory(suspect)
-          result = "test/"
-
-          if defined?(Rails)
-            result += case suspect.superclass.name
-            when "ActionDispatch::IntegrationTest"
-              "integration/"
-            when "ActionDispatch::PerformanceTest"
-              "performance/"
-            when "ActionController::TestCase"
-              "functional/"
-            when "ActionView::TestCase"
-              "unit/helpers/"
-            else
-              "unit/"
-            end
+        def log(test, time)
+          return unless message = message(test, time)
+          lock do
+            File.open(logfile, 'a') { |f| f.puts message }
           end
-          result
         end
 
-        # based on https://github.com/grosser/single_test/blob/master/lib/single_test.rb#L117
-        def class_to_filename(suspect)
-          word = suspect.to_s.dup
-          return word unless word.match /^[A-Z]/ and not word.match %r{/[a-z]}
-
-          word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-          word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
-          word.gsub!(/\:\:/, '/')
-          word.tr!("-", "_")
-          word.downcase!
-          word
+        def message(test, delta)
+          return unless method = test.public_instance_methods(true).detect { |method| method =~ /^test_/ }
+          filename = test.instance_method(method).source_location.first.sub("#{Dir.pwd}/", "")
+          "#{filename}:#{delta}"
         end
 
-        def locked_appending_to(file)
-          File.open(file, 'a') do |f|
+        def lock
+          File.open(logfile, 'r') do |f|
             begin
               f.flock File::LOCK_EX
-              yield f
+              yield
             ensure
               f.flock File::LOCK_UN
             end
@@ -82,16 +73,56 @@ module ParallelTests
   end
 end
 
-require 'test/unit/testsuite'
-class ::Test::Unit::TestSuite
-  alias :run_without_timing :run unless defined? @@timing_installed
+if defined?(Minitest::Runnable) # Minitest 5
+  class << Minitest::Runnable
+    alias_method :run_without_runtime_log, :run
+    def run(*args)
+      ParallelTests::Test::RuntimeLogger.log_test_run(self) do
+        run_without_runtime_log(*args)
+      end
+    end
+  end
 
-  def run(result, &progress_block)
-    start_time = ParallelTests.now
-    run_without_timing(result, &progress_block)
-    end_time = ParallelTests.now
-    ParallelTests::Test::RuntimeLogger.log(self.tests.first, start_time, end_time)
+  class << Minitest
+    alias_method :run_without_runtime_log, :run
+    def run(*args)
+      result = run_without_runtime_log(*args)
+      ParallelTests::Test::RuntimeLogger.unique_log
+      result
+    end
+  end
+elsif defined?(MiniTest::Unit) # Minitest 4
+  MiniTest::Unit.class_eval do
+    alias_method :_run_suite_without_runtime_log, :_run_suite
+    def _run_suite(*args)
+      ParallelTests::Test::RuntimeLogger.log_test_run(args.first) do
+        _run_suite_without_runtime_log(*args)
+      end
+    end
+
+    alias_method :_run_suites_without_runtime_log, :_run_suites
+    def _run_suites(*args)
+      result = _run_suites_without_runtime_log(*args)
+      ParallelTests::Test::RuntimeLogger.unique_log
+      result
+    end
   end
+else # Test::Unit
+  require 'test/unit/testsuite'
+  class ::Test::Unit::TestSuite
+    alias_method :run_without_timing, :run
 
-  @@timing_installed = true
+    def run(result, &block)
+      test = tests.first
+
+      if test.is_a? ::Test::Unit::TestSuite # all tests ?
+        run_without_timing(result, &block)
+        ParallelTests::Test::RuntimeLogger.unique_log
+      else
+        ParallelTests::Test::RuntimeLogger.log_test_run(test.class) do
+          run_without_timing(result, &block)
+        end
+      end
+    end
+  end
 end

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.13.3'
+  VERSION = Version = '1.7.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vinted-parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 1.7.0.1
 platform: ruby
 authors:
 - Laurynas Butkus
@@ -10,20 +10,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -32,30 +32,28 @@ email:
 - tomas.varaneckas@gmail.com
 - jjanauskas@gmail.com
 executables:
+- parallel_spinach
 - parallel_cucumber
 - parallel_rspec
 - parallel_test
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- Gemfile
-- Gemfile.lock
-- Rakefile
 - Readme.md
-- ReadmeRails2.md
 - bin/parallel_cucumber
 - bin/parallel_rspec
+- bin/parallel_spinach
 - bin/parallel_test
 - lib/parallel_tests.rb
 - lib/parallel_tests/cli.rb
 - lib/parallel_tests/cucumber/failures_logger.rb
-- lib/parallel_tests/cucumber/gherkin_listener.rb
-- lib/parallel_tests/cucumber/io.rb
 - lib/parallel_tests/cucumber/runner.rb
-- lib/parallel_tests/cucumber/runtime_logger.rb
+- lib/parallel_tests/cucumber/scenario_line_logger.rb
+- lib/parallel_tests/cucumber/scenarios.rb
+- lib/parallel_tests/gherkin/io.rb
+- lib/parallel_tests/gherkin/listener.rb
+- lib/parallel_tests/gherkin/runner.rb
+- lib/parallel_tests/gherkin/runtime_logger.rb
 - lib/parallel_tests/grouper.rb
 - lib/parallel_tests/railtie.rb
 - lib/parallel_tests/rspec/failures_logger.rb
@@ -63,26 +61,11 @@ files:
 - lib/parallel_tests/rspec/runner.rb
 - lib/parallel_tests/rspec/runtime_logger.rb
 - lib/parallel_tests/rspec/summary_logger.rb
+- lib/parallel_tests/spinach/runner.rb
 - lib/parallel_tests/tasks.rb
 - lib/parallel_tests/test/runner.rb
 - lib/parallel_tests/test/runtime_logger.rb
 - lib/parallel_tests/version.rb
-- parallel_tests.gemspec
-- spec/integration_spec.rb
-- spec/parallel_tests/cli_spec.rb
-- spec/parallel_tests/cucumber/failure_logger_spec.rb
-- spec/parallel_tests/cucumber/gherkin_listener_spec.rb
-- spec/parallel_tests/cucumber/runner_spec.rb
-- spec/parallel_tests/grouper_spec.rb
-- spec/parallel_tests/rspec/failures_logger_spec.rb
-- spec/parallel_tests/rspec/runner_spec.rb
-- spec/parallel_tests/rspec/runtime_logger_spec.rb
-- spec/parallel_tests/rspec/summary_logger_spec.rb
-- spec/parallel_tests/tasks_spec.rb
-- spec/parallel_tests/test/runner_spec.rb
-- spec/parallel_tests/test/runtime_logger_spec.rb
-- spec/parallel_tests_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/vinted/parallel_tests
 licenses:
 - MIT
@@ -93,18 +76,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Run Test::Unit / RSpec / Cucumber in parallel
+summary: Run Test::Unit / RSpec / Cucumber / Spinach in parallel
 test_files: []

data/.gitignore

@@ -1,2 +0,0 @@
-*.sh
-tmp

data/.rspec

@@ -1,2 +0,0 @@
---color
---backtrace

data/.travis.yml

@@ -1,6 +0,0 @@
-rvm:
-  - ree
-  - 1.9.3
-  - 2.0.0
-  - jruby-1.7.3
-  - jruby-head

data/Gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'bump'
-gem 'test-unit'
-gem 'rspec', '>=2.4'
-gem 'cucumber'
-gem 'rake'

data/Gemfile.lock

@@ -1,48 +0,0 @@
-PATH
-  remote: .
-  specs:
-    parallel_tests (0.13.3)
-      parallel
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.0.0)
-    bump (0.3.8)
-    cucumber (1.1.4)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.7.1)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    diff-lcs (1.2.4)
-    gherkin (2.7.6)
-      json (>= 1.4.6)
-    gherkin (2.7.6-java)
-      json (>= 1.4.6)
-    json (1.7.5)
-    json (1.7.5-java)
-    parallel (0.6.5)
-    rake (10.0.3)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    term-ansicolor (1.0.7)
-    test-unit (2.4.4)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  bump
-  cucumber
-  parallel_tests!
-  rake
-  rspec (>= 2.4)
-  test-unit

data/Rakefile

@@ -1,6 +0,0 @@
-require 'bump/tasks'
-require 'bundler/gem_tasks'
-
-task :default do
-  sh "rspec spec/"
-end

data/ReadmeRails2.md

@@ -1,48 +0,0 @@
-### Install
-
-As gem
-
-    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
-
-    gem install parallel
-
-    # add to config/environments/development.rb
-    config.gem "parallel"
-
-    ./script/plugin install git://github.com/grosser/parallel_tests.git
-
-    # add to Rakefile
-    begin; require 'vendor/plugins/parallel_tests/lib/parallel_tests/tasks'; rescue LoadError; end
-
-
-Even process runtimes
------------------
-
-    RSpec 1.x:
-      --format progress
-      --require parallel_tests/rspec/runtime_logger
-      --format ParallelTests::RSpec::RuntimeLogger:tmp/parallel_runtime_rspec.log
-
-SpecSummaryLogger
---------------------
-
-    RSpec 1.x:
-      --format progress
-      --require parallel_tests/rspec/summary_logger
-      --format ParallelTests::RSpec::SummaryLogger:tmp/spec_summary.log
-
-SpecFailuresLogger
------------------------
-
-    RSpec 1.x:
-      --format progress
-      --require parallel_tests/rspec/failures_logger
-      --format ParallelTests::RSpec::FailuresLogger:tmp/failing_specs.log

data/parallel_tests.gemspec

@@ -1,14 +0,0 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-name = "vinted-parallel_tests"
-require "parallel_tests/version"
-
-Gem::Specification.new name, ParallelTests::VERSION do |s|
-  s.summary = "Run Test::Unit / RSpec / Cucumber in parallel"
-  s.authors = ["Laurynas Butkus", "Tomas Varaneckas", "Justas Janauskas"]
-  s.email = ["laurynas.butkus@gmail.com", "tomas.varaneckas@gmail.com", "jjanauskas@gmail.com"]
-  s.homepage = "http://github.com/vinted/parallel_tests"
-  s.files = `git ls-files`.split("\n")
-  s.license = "MIT"
-  s.executables = ["parallel_cucumber", "parallel_rspec", "parallel_test"]
-  s.add_runtime_dependency "parallel"
-end