parallel_tests 1.3.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8126226af76d2ce93824461837f808b5e098af09
-  data.tar.gz: 802444bf82a369e183f8aa0b8e5c4c788f659d2e
+  metadata.gz: b3512429e43f2437a7ea406a482429d0aed04bc2
+  data.tar.gz: ecec8c02adeb6d47fac8fa5c91ad0c381dc29091
 SHA512:
-  metadata.gz: ec9c6cedfd0c129d4556fd6a44ffeea0d083bc7d1f8dbbdc5e3577b4a0a035bffc33ed7d9df80e3f9284458b590e7dc9e53f10f3ebf5535bf5209e68081cd241
-  data.tar.gz: 81e5fa727c44da60db4b81e8ca1ce056a7567625b996351860d7110e2ffb726aa894014be93c170b51e4a1b5adf5d30bfb1a1025b4c1d85296348d671cafcd86
+  metadata.gz: 88bb06f48e8d5a1e6baf5e5a2bd647c7b521b69ea7c94e8644da3f5a460ed5d685fcf6f6623dee97cf78710a8bf4d3d9313563d42407902cdd772f7996f2ee9f
+  data.tar.gz: 3f2616efa9a7a319b45b7fb0be87a6e37e81a50c99d94bf0442d0462ccebc7841e547b88dc5e3f822544ba157d4669739dcaf45e97cab8af6139aadd64693ec0

data/Readme.md

@@ -162,12 +162,17 @@ Setup for non-rails
     parallel_cucumber features/
     parallel_spinach features/
 
- - use ENV['TEST_ENV_NUMBER'] inside your tests to select separate db/memcache/etc.
+ - use `ENV['TEST_ENV_NUMBER']` inside your tests to select separate db/memcache/etc.
  - Only run selected files & folders:
 
-    parallel_test test/bar test/baz/foo_text.rb
+    `parallel_test test/bar test/baz/foo_text.rb`
+
+ - Pass test-options and files via `--`:
+
+    `parallel_test -- -t acceptance -f progress -- spec/foo_spec.rb spec/acceptance`
 
 Options are:
+<!-- copy output from bundle exec ./bin/parallel_test -h -->
 
     -n [PROCESSES]                   How many processes to use, default: available CPUs
     -p, --pattern [PATTERN]          run tests matching this pattern
@@ -182,7 +187,7 @@ Options are:
     -s, --single [PATTERN]           Run all matching files in the same process
     -i, --isolate                    Do not run any other tests in the group used by --single(-s)
         --only-group INT[, INT]
-    -e, --exec [COMMAND]             execute this code parallel and with ENV['TEST_ENV_NUM']
+    -e, --exec [COMMAND]             execute this code parallel and with ENV['TEST_ENV_NUMBER']
     -o, --test-options '[OPTIONS]'   execute test commands with those options
     -t, --type [TYPE]                test(default) / rspec / cucumber / spinach
         --serialize-stdout           Serialize stdout output, nothing will be written until everything is done
@@ -196,7 +201,7 @@ Options are:
     -v, --version                    Show Version
     -h, --help                       Show this.
 
-You can run any kind of code in parallel with -e / --execute
+You can run any kind of code in parallel with -e / --exec
 
     parallel_test -n 5 -e 'ruby -e "puts %[hello from process #{ENV[:TEST_ENV_NUMBER.to_s].inspect}]"'
     hello from process "2"
@@ -229,6 +234,7 @@ TIPS
  - [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)
  - Debug errors that only happen with multiple files using `--verbose` and [cleanser](https://github.com/grosser/cleanser)
+ - Shell alias: `alias prspec='parallel_rspec -m 2 --'`
  - Contribute your own gotaches to the [Wiki](https://github.com/grosser/parallel_tests/wiki) or even better open a PR :)
 
 TODO
@@ -309,6 +315,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Mike Mueller](https://github.com/mmueller)
  - [Aaron Jensen](https://github.com/aaronjensen)
  - [Ed Slocomb](https://github.com/edslocomb)
+ - [Cezary Baginski](https://github.com/e2)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel_tests/cli.rb

@@ -1,6 +1,7 @@
 require 'optparse'
 require 'tempfile'
 require 'parallel_tests'
+require 'shellwords'
 
 module ParallelTests
   class CLI
@@ -106,8 +107,11 @@ module ParallelTests
         opts.banner = <<-BANNER.gsub(/^          /, '')
           Run all tests in parallel, giving each process ENV['TEST_ENV_NUMBER'] ('', '2', '3', ...)
 
-          [optional] Only run selected files & folders:
-              parallel_test test/bar test/baz/xxx_text.rb
+          [optional] Only selected files & folders:
+            parallel_test test/bar test/baz/xxx_text.rb
+
+          [optional] Pass test-options and files via `--`:
+            parallel_test -- -t acceptance -f progress -- spec/foo_spec.rb spec/acceptance
 
           Options are:
         BANNER
@@ -140,8 +144,8 @@ module ParallelTests
 
         opts.on("--only-group INT[, INT]", Array) { |groups| options[:only_group] = groups.map(&:to_i) }
 
-        opts.on("-e", "--exec [COMMAND]", "execute this code parallel and with ENV['TEST_ENV_NUM']") { |path| options[:execute] = path }
-        opts.on("-o", "--test-options '[OPTIONS]'", "execute test commands with those options") { |arg| options[:test_options] = arg }
+        opts.on("-e", "--exec [COMMAND]", "execute this code parallel and with ENV['TEST_ENV_NUMBER']") { |path| options[:execute] = path }
+        opts.on("-o", "--test-options '[OPTIONS]'", "execute test commands with those options") { |arg| options[:test_options] = arg.lstrip }
         opts.on("-t", "--type [TYPE]", "test(default) / rspec / cucumber / spinach") do |type|
           begin
             @runner = load_runner(type)
@@ -167,9 +171,13 @@ module ParallelTests
         options[:non_parallel] = true
       end
 
-      abort "Pass files or folders to run" if argv.empty? && !options[:execute]
+      files, remaining = extract_file_paths(argv)
+      unless options[:execute]
+        abort "Pass files or folders to run" unless files.any?
+        options[:files] = files
+      end
 
-      options[:files] = argv
+      append_test_options(options, remaining)
 
       options[:group_by] ||= :filesize if options[:only_group]
 
@@ -182,6 +190,25 @@ module ParallelTests
       options
     end
 
+    def extract_file_paths(argv)
+      dash_index = argv.rindex("--")
+      file_args_at = (dash_index || -1) + 1
+      [argv[file_args_at..-1], argv[0...(dash_index || 0)]]
+    end
+
+    def extract_test_options(argv)
+      dash_index = argv.index("--") || -1
+      argv[dash_index+1..-1]
+    end
+
+    def append_test_options(options, argv)
+      new_opts = extract_test_options(argv)
+      return if new_opts.empty?
+
+      prev_and_new = [options[:test_options], new_opts.shelljoin]
+      options[:test_options] = prev_and_new.compact.join(' ')
+    end
+
     def load_runner(type)
       require "parallel_tests/#{type}/runner"
       runner_classname = type.split("_").map(&:capitalize).join.sub("Rspec", "RSpec")

data/lib/parallel_tests/rspec/failures_logger.rb

@@ -2,26 +2,24 @@ require 'parallel_tests/rspec/logger_base'
 require 'parallel_tests/rspec/runner'
 
 class ParallelTests::RSpec::FailuresLogger < ParallelTests::RSpec::LoggerBase
-  if RSPEC_3
-    RSpec::Core::Formatters.register self, :dump_failures, :dump_summary
-  end
-
-  # RSpec 1: does not keep track of failures, so we do
-  def example_failed(example, *args)
-    if RSPEC_1
-      @failed_examples ||= []
-      @failed_examples << example
-    else
-      super
+  if RSPEC_1
+    # RSpec 1: does not keep track of failures, so we do
+    def example_failed(example, *args)
+      if RSPEC_1
+        @failed_examples ||= []
+        @failed_examples << example
+      else
+        super
+      end
     end
-  end
 
-  if RSPEC_1
     def dump_failure(*args)
     end
-  else
+  elsif RSPEC_2
     def dump_failures(*args)
     end
+  else
+    RSpec::Core::Formatters.register self, :dump_summary
   end
 
   def dump_summary(*args)

data/lib/parallel_tests/rspec/logger_base.rb

@@ -15,6 +15,7 @@ ParallelTests::RSpec::LoggerBaseBase = base
 
 class ParallelTests::RSpec::LoggerBase < ParallelTests::RSpec::LoggerBaseBase
   RSPEC_1 = !defined?(RSpec::Core::Formatters::BaseTextFormatter) # do not test for Spec, this will trigger deprecation warning in rspec 2
+  RSPEC_2 = !RSPEC_1 && RSpec::Core::Version::STRING.start_with?('2')
   RSPEC_3 = !RSPEC_1 && RSpec::Core::Version::STRING.start_with?('3')
 
   def initialize(*args)

data/lib/parallel_tests/tasks.rb

@@ -102,7 +102,7 @@ namespace :parallel do
   # just load the schema (good for integration server <-> no development db)
   desc "load dumped schema for test databases via db:schema:load --> parallel:load_schema[num_cpus]"
   task :load_schema, :count do |t,args|
-    command = "rake db:schema:load RAILS_ENV=#{ParallelTests::Tasks.rails_env}"
+    command = "rake db:test:purge db:schema:load RAILS_ENV=#{ParallelTests::Tasks.rails_env}"
     ParallelTests::Tasks.run_in_parallel(ParallelTests::Tasks.suppress_output(command, "^   ->\\|^-- "), args)
   end
 

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '1.3.9'
+  VERSION = Version = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.5.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Run Test::Unit / RSpec / Cucumber / Spinach in parallel