parallel_tests 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9936778844bea92756c550ca9ca6c224406ce07
-  data.tar.gz: 2e410f1e0d4b8e76b5eb0558bfc5fa01117650ee
+  metadata.gz: c3784fb4e94413d435daab2e99def28d2293562b
+  data.tar.gz: 65b533d73a5bfa04bdba27161c0d6baea8a202f8
 SHA512:
-  metadata.gz: eff8a7aa09428d7ac292d767b4ab79ff5a590c03e11d87e57764da3809bc933084d6ab34a23a848d519021e22fa220e33ff660f0f6eb681eb62c59c18153314a
-  data.tar.gz: aaf9d2d50339745e6c5f6a80d70000fd2b6f26f4ed36196a8dbc1e97b8e781e373195669cf127377d7264054d4988797076720c13e18a75f67e5ef165c279240
+  metadata.gz: ab5162168063cfba147586acf5219c7065edfdf3bb110cda69c952165a3dad045464cac76c4e4c04839afa1dcaa9e23fbbbd0a5f650027788db4b6ed7aae150e
+  data.tar.gz: 0cc7aedcc2978f92ef01a9c81d2d0807665cc8db6b1134d40ecaa4d078b7ca8722a9b0a26c7ae4625b4f07d57bf153234eec55a6e4ed390f232ed04906f65266

data/Readme.md

@@ -1,24 +1,19 @@
-Speedup Test::Unit + RSpec + Cucumber by running parallel on multiple CPUs (or cores).<br/>
-ParallelTests splits tests into even groups(by number of tests or runtime) and runs each group in a single process with its own database.
-
-[upgrading from 0.6 ?](https://github.com/grosser/parallel_tests/wiki/Upgrading-0.6.x-to-0.7.x)
+Speedup Test::Unit + RSpec + Cucumber + Spinach by running parallel on multiple CPU cores.<br/>
+ParallelTests splits tests into even groups (by number of lines or runtime) and runs each group in a single process with its own database.
 
 Setup for Rails
 ===============
 [RailsCasts episode #413 Fast Tests](http://railscasts.com/episodes/413-fast-tests)
-[still using Rails 2?](https://github.com/grosser/parallel_tests/blob/master/ReadmeRails2.md)
 
 ### Install
-If you use RSpec: ensure you have >= 2.4
-
-As gem
 
 ```ruby
-# add to Gemfile
+# Gemfile
 gem "parallel_tests", :group => :development
 ```
 
 ### Add to `config/database.yml`
+
 ParallelTests uses 1 database per test-process.
 <table>
   <tr><td>Process number</td><td>1</td><td>2</td><td>3</td></tr>
@@ -93,6 +88,8 @@ Loggers
 Even test group run-times
 -------------------------
 
+### RSpec
+
 Add the `RuntimeLogger` to log how long each test takes to run.
 This log file will be loaded on the next test run, and the tests will be grouped
 so that each process should finish around the same time.
@@ -102,15 +99,19 @@ Rspec: Add to your `.rspec_parallel` (or `.rspec`) :
     --format progress
     --format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
 
-Test::Unit:  Add to your `test_helper.rb`:
+### Test::Unit & Minitest 4
+
+Add to your `test_helper.rb`:
 ```ruby
 require 'parallel_tests/test/runtime_logger'
 ```
 
+results will be logged to tmp/parallel_runtime_test.log
+
 RSpec: SummaryLogger
 --------------------
 
-This logger logs the test output without the different processes overwriting each other.
+Log the test output without the different processes overwriting each other.
 
 Add the following to your `.rspec_parallel` (or `.rspec`) :
 
@@ -120,7 +121,7 @@ Add the following to your `.rspec_parallel` (or `.rspec`) :
 RSpec: FailuresLogger
 -----------------------
 
-This logger produces pasteable command-line snippets for each failed example.
+Produce pasteable command-line snippets for each failed example.
 
 E.g.
 
@@ -134,7 +135,7 @@ Add the following to your `.rspec_parallel` (or `.rspec`) :
 Cucumber: FailuresLogger
 -----------------------
 
-This logger logs failed cucumber scenarios to the specified file. The filename can be passed to cucumber, prefixed with '@' to rerun failures.
+Log failed cucumber scenarios to the specified file. The filename can be passed to cucumber, prefixed with '@' to rerun failures.
 
 Usage:
 
@@ -148,10 +149,11 @@ Note if your `cucumber.yml` default profile uses `<%= std_opts %>` you may need
 
 To rerun failures:
 
-	cucumber @tmp/cucumber_failures.log
+    cucumber @tmp/cucumber_failures.log
 
 Setup for non-rails
 ===================
+
     gem install parallel_tests
     # go to your project dir
     parallel_test test/
@@ -210,13 +212,10 @@ You can run any kind of code in parallel with -e / --execute
 TIPS
 ====
  - [RSpec] add a `.rspec_parallel` to use different options, e.g. **no --drb**
- - [RSpec] delete `script/spec`
- - [[Spork](https://github.com/sporkrb/spork)] does not work with parallel_tests except when using [sqlite in memory](https://github.com/grosser/parallel_tests/wiki#wiki-with-spork)
- - [RSpec] remove --loadby from you spec/*.opts
+ - Spring does not work with parallel_tests, use `DISABLE_SPRING=1 rake parallel:spec` if you have spring hardcoded in your binaries
+ - [RSpec] remove `--loadby` from `.rspec`
  - [RSpec] Instantly see failures (instead of just a red F) with [rspec-instafail](https://github.com/grosser/rspec-instafail)
- - [Bundler] if you have a `Gemfile` then `bundle exec` will be used to run tests
  - [Cucumber] add a `parallel: foo` profile to your `config/cucumber.yml` and it will be used to run parallel tests
- - [Cucumber] Pass in cucumber options by not giving the options an identifier ex: `rake parallel:features[,,'cucumber_opts']`
  - [Capybara setup](https://github.com/grosser/parallel_tests/wiki)
  - [Sphinx setup](https://github.com/grosser/parallel_tests/wiki)
  - [Capistrano setup](https://github.com/grosser/parallel_tests/wiki/Remotely-with-capistrano) let your tests run on a big box instead of your laptop
@@ -224,13 +223,13 @@ TIPS
  - `export PARALLEL_TEST_PROCESSORS=X` in your environment and parallel_tests will use this number of processors by default
  - [ZSH] use quotes to use rake arguments `rake "parallel:prepare[3]"`
  - [email_spec and/or action_mailer_cache_delivery](https://github.com/grosser/parallel_tests/wiki)
- - [Memcached] use different namespaces e.g. `config.cache_store = ..., :namespace => "test_#{ENV['TEST_ENV_NUMBER']}"`
+ - [Memcached] use different namespaces e.g. `config.cache_store = ..., namespace: "test_#{ENV['TEST_ENV_NUMBER']}"`
  - [zeus-parallel_tests](https://github.com/sevos/zeus-parallel_tests)
  - [Distributed parallel test (e.g. Travis Support)](https://github.com/grosser/parallel_tests/wiki/Distributed-Parallel-Tests-and-Travis-Support)
+ - Contribute your own gotaches to the [Wiki](https://github.com/grosser/parallel_tests/wiki) or even better open a PR :)
 
 TODO
 ====
- - make tests consistently pass with `--order random` in .rspec
  - fix tests vs cucumber >= 1.2 `unknown option --format`
  - add integration tests for the rake tasks, maybe generate a rails project ...
  - add unit tests for cucumber runtime formatter
@@ -240,7 +239,7 @@ Authors
 ====
 inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-parallelize-your-rspec-suite)
 
-### [Contributors](http://github.com/grosser/parallel_tests/contributors)
+### [Contributors](https://github.com/grosser/parallel_tests/contributors)
  - [Charles Finkel](http://charlesfinkel.com/)
  - [Indrek Juhkam](http://urgas.eu)
  - [Jason Morrison](http://jayunit.net)

data/lib/parallel_tests.rb

@@ -33,7 +33,7 @@ module ParallelTests
 
       until !File.directory?(current) || current == previous
         filename = File.join(current, "Gemfile")
-        return true if File.exists?(filename)
+        return true if File.exist?(filename)
         current, previous = File.expand_path("..", current), current
       end
 
@@ -64,5 +64,11 @@ module ParallelTests
         Time.now
       end
     end
+
+    def delta
+      before = now.to_f
+      yield
+      now.to_f - before
+    end
   end
 end

data/lib/parallel_tests/cli.rb

@@ -155,6 +155,8 @@ module ParallelTests
         options[:non_parallel] = true
       end
 
+      abort "Pass files or folders to run" if argv.empty? && !options[:execute]
+
       options[:files] = argv
 
       options[:group_by] ||= :filesize if options[:only_group]

data/lib/parallel_tests/gherkin/runner.rb

@@ -24,7 +24,7 @@ module ParallelTests
             (runtime_logging if File.directory?(File.dirname(runtime_log))),
             cucumber_opts(options[:test_options]),
             *sanitized_test_files
-          ].compact.join(' ')
+          ].compact.reject(&:empty?).join(' ')
           execute_command(cmd, process_number, num_processes, options)
         end
 
@@ -90,7 +90,7 @@ module ParallelTests
 
 
         def runtime_logging
-          " --format ParallelTests::Gherkin::RuntimeLogger --out #{runtime_log}"
+          "--format ParallelTests::Gherkin::RuntimeLogger --out #{runtime_log}"
         end
 
         def runtime_log
@@ -99,7 +99,7 @@ module ParallelTests
 
         def determine_executable
           case
-          when File.exists?("bin/#{name}")
+          when File.exist?("bin/#{name}")
             "bin/#{name}"
           when ParallelTests.bundler_enabled?
             "bundle exec #{name}"

data/lib/parallel_tests/rspec/runner.rb

@@ -17,7 +17,7 @@ module ParallelTests
 
         def determine_executable
           cmd = case
-          when File.exists?("bin/rspec")
+          when File.exist?("bin/rspec")
             WINDOWS ? "ruby bin/rspec" : "bin/rspec"
           when File.file?("script/spec")
             "script/spec"

data/lib/parallel_tests/test/runtime_logger.rb

@@ -4,70 +4,59 @@ 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)
 
-          locked_appending_to(logfile) do |file|
-            file.puts(message(test, start_time, end_time))
+          result
+        end
+
+        def unique_log
+          lock do
+            separator = "\n"
+            groups = File.read(logfile).split(separator).map { |line| line.split(":") }.group_by(&:first)
+            lines = groups.map { |file, times| "#{file}:#{times.map(&:last).map(&:to_f).inject(:+)}" }
+            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, time)
+          return unless method = test.public_instance_methods(true).detect { |method| method =~ /^test_/ }
+          delta = "%.2f" % time
+          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,17 +71,38 @@ module ParallelTests
   end
 end
 
-require 'test/unit/testsuite'
-class ::Test::Unit::TestSuite
-  alias :run_without_timing :run unless defined? @@timing_installed
+if defined?(MiniTest::Unit)
+  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
 
-  def run(result, &progress_block)
-    first_test = self.tests.first
-    start_time = ParallelTests.now
-    run_without_timing(result, &progress_block)
-    end_time = ParallelTests.now
-    ParallelTests::Test::RuntimeLogger.log(first_test, start_time, end_time)
+    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
+  require 'test/unit/testsuite'
+  class ::Test::Unit::TestSuite
+    alias_method :run_without_timing, :run
+
+    def run(result, &block)
+      test = tests.first
 
-  @@timing_installed = true
+      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 = '1.1.1'
+  VERSION = Version = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel