parallel_tests 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbd377cc06273701434d7d01cd12c2da000425f1
-  data.tar.gz: cb7bd407b705223e273146cefff4dad1e3845b1d
+  metadata.gz: d378dd684c7e7a13876bc30b017c2d7d38a65238
+  data.tar.gz: 15a61d401253bcff02d591f5d73345beb3244fec
 SHA512:
-  metadata.gz: 7d155b74b7ea83a7521decb4dcaf72d2cccb97f3eb8d43950424001e57b20b895d2f826d93b2960351e7d5435bf055e4d4a829d6baff7dcfe9d391591987ddac
-  data.tar.gz: 66a159a28709388b78930da6e2e772b6dcc2898f6d3743a869d6d45e4292af65edfa4960daa0cca41a5e0f313d6a5b6b17d1489ac3033d5d46b649165362ecb9
+  metadata.gz: 3a743c635bd8a247d26536bb163f1b5383edc75c5e4cc9ca923d774a81df3656cdac6cfd15ebab70ead6293e07b7b71633d90d71e8c687f9968b36ebfab6a0ad
+  data.tar.gz: 788fd6fb129d348952fe7ed52314d19d573c59f420fbbe06a9a2b08937ca7dd50a454f267154a80325f4845b1c18d563382909b4ebf34985336f7ae3d6e05689

data/Readme.md

@@ -170,12 +170,14 @@ Options are:
     -p, --pattern [PATTERN]          run tests matching this pattern
         --group-by [TYPE]            group tests by:
           found - order of finding files
-          steps - number of cucumber steps
-          filesize - size of files on disk
+          steps - number of cucumber/spinach steps
+          scenarios - individual cucumber scenarios
+          filesize - by size of the file
           default - runtime or filesize
     -m, --multiply-processes [FLOAT] use given number as a multiplier of processes to run
     -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']
     -o, --test-options '[OPTIONS]'   execute test commands with those options
     -t, --type [TYPE]                test(default) / rspec / cucumber / spinach
@@ -185,7 +187,8 @@ Options are:
         --no-symlinks                Do not traverse symbolic links to find test files
         --ignore-tags [PATTERN]      When counting steps ignore scenarios with tags that match this pattern
         --nice                       execute test commands with low priority.
-        --only-group INT[, INT]      Group the files, but only run the group(s) specified here. Requires group-by filesize (will be set automatically if group-by is blank and only-group is specified)
+        --runtime-log [PATH]         Location of previously recorded test runtimes
+        --verbose                    Print more output
     -v, --version                    Show Version
     -h, --help                       Show this.
 
@@ -302,6 +305,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Samer Masry](https://github.com/smasry)
  - [Volodymyr Mykhailyk](https:/github.com/volodymyr-mykhailyk)
  - [Mike Mueller](https://github.com/mmueller)
+ - [Aaron Jensen](https://github.com/aaronjensen)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/bin/parallel_cucumber

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
-$LOAD_PATH << File.expand_path("../../lib", __FILE__)
+
+# enable local usage from cloned repo
+root = File.expand_path("../..", __FILE__)
+$LOAD_PATH << "#{root}/lib" if File.exist?("#{root}/Gemfile")
+
 require "parallel_tests"
 
 ParallelTests::CLI.new.run(["--type", "cucumber"] + ARGV)

data/bin/parallel_rspec

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
-$LOAD_PATH << File.expand_path("../../lib", __FILE__)
+
+# enable local usage from cloned repo
+root = File.expand_path("../..", __FILE__)
+$LOAD_PATH << "#{root}/lib" if File.exist?("#{root}/Gemfile")
+
 require "parallel_tests"
 
 ParallelTests::CLI.new.run(["--type", "rspec"] + ARGV)

data/bin/parallel_spinach

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
-$LOAD_PATH << File.expand_path("../../lib", __FILE__)
+
+# enable local usage from cloned repo
+root = File.expand_path("../..", __FILE__)
+$LOAD_PATH << "#{root}/lib" if File.exist?("#{root}/Gemfile")
+
 require "parallel_tests"
 
 ParallelTests::CLI.new.run(["--type", "spinach"] + ARGV)

data/bin/parallel_test

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
-require 'rubygems' if RUBY_VERSION < "1.9"
-$LOAD_PATH << File.expand_path("../../lib", __FILE__)
+
+# enable local usage from cloned repo
+root = File.expand_path("../..", __FILE__)
+$LOAD_PATH << "#{root}/lib" if File.exist?("#{root}/Gemfile")
+
 require "parallel_tests"
 
 ParallelTests::CLI.new.run(["--type", "test"] + ARGV)

data/lib/parallel_tests.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require "parallel"
 require "parallel_tests/railtie" if defined? Rails::Railtie
 require "rbconfig"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -34,60 +34,12 @@ executables:
 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/runner.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
-- lib/parallel_tests/rspec/logger_base.rb
-- 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/runner_spec.rb
-- spec/parallel_tests/cucumber/scenarios_spec.rb
-- spec/parallel_tests/gherkin/listener_spec.rb
-- spec/parallel_tests/gherkin/runner_behaviour.rb
-- spec/parallel_tests/grouper_spec.rb
-- spec/parallel_tests/rspec/failures_logger_spec.rb
-- spec/parallel_tests/rspec/logger_base_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/spinach/runner_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/grosser/parallel_tests
 licenses:
 - MIT
@@ -100,7 +52,7 @@ 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:
   - - ">="

data/.gitignore

@@ -1,4 +0,0 @@
-*.sh
-tmp
-.bundle
-vendor

data/.rspec

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

data/.travis.yml

@@ -1,10 +0,0 @@
-rvm:
-  - ree
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - jruby-1.7.6
-  - jruby-head
-matrix:
-  allow_failures:
-    - rvm: jruby-head

data/Gemfile

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

data/Gemfile.lock

@@ -1,53 +0,0 @@
-PATH
-  remote: .
-  specs:
-    parallel_tests (1.0.9)
-      parallel
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.2)
-    bump (0.3.8)
-    colorize (0.5.8)
-    cucumber (1.3.10)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
-    diff-lcs (1.2.5)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    gherkin (2.12.2-java)
-      multi_json (~> 1.3)
-    gherkin-ruby (0.3.0)
-    multi_json (1.8.2)
-    multi_test (0.0.2)
-    parallel (1.3.3)
-    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)
-    spinach (0.8.3)
-      colorize (= 0.5.8)
-      gherkin-ruby (~> 0.3.0)
-    test-unit (2.4.4)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  bump
-  cucumber
-  parallel_tests!
-  rake
-  rspec (>= 2.4)
-  spinach
-  test-unit

data/Rakefile

@@ -1,10 +0,0 @@
-require 'bump/tasks'
-require 'bundler/gem_tasks'
-
-task :default do
-  if RUBY_VERSION < "1.9.0"
-    sh "rspec --tag ~fails_on_ruby_187 spec/"
-  else
-    sh "rspec spec/"
-  end
-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/lib/parallel_tests/cli.rb

@@ -1,206 +0,0 @@
-require 'optparse'
-require 'tempfile'
-require 'parallel_tests'
-
-module ParallelTests
-  class CLI
-    def run(argv)
-      options = parse_options!(argv)
-
-      num_processes = ParallelTests.determine_number_of_processes(options[:count])
-      num_processes = num_processes * (options[:multiply] || 1)
-
-      if options[:execute]
-        execute_shell_command_in_parallel(options[:execute], num_processes, options)
-      else
-        run_tests_in_parallel(num_processes, options)
-      end
-    end
-
-    private
-
-    def execute_in_parallel(items, num_processes, options)
-      Tempfile.open 'parallel_tests-lock' do |lock|
-        return Parallel.map(items, :in_threads => num_processes) do |item|
-          result = yield(item)
-          report_output(result, lock) if options[:serialize_stdout]
-          result
-        end
-      end
-    end
-
-    def run_tests_in_parallel(num_processes, options)
-      test_results = nil
-
-      report_time_taken do
-        groups = @runner.tests_in_groups(options[:files], num_processes, options)
-
-        test_results = if options[:only_group]
-          groups_to_run = options[:only_group].collect{|i| groups[i - 1]}
-          report_number_of_tests(groups_to_run)
-          execute_in_parallel(groups_to_run, groups_to_run.size, options) do |group|
-            run_tests(group, groups_to_run.index(group), 1, options)
-          end
-        else
-          report_number_of_tests(groups)
-
-          execute_in_parallel(groups, groups.size, options) do |group|
-            run_tests(group, groups.index(group), num_processes, options)
-          end
-        end
-
-        report_results(test_results)
-      end
-
-      abort final_fail_message if any_test_failed?(test_results)
-    end
-
-    def run_tests(group, process_number, num_processes, options)
-      if group.empty?
-        {:stdout => '', :exit_status => 0}
-      else
-        @runner.run_tests(group, process_number, num_processes, options)
-      end
-    end
-
-    def report_output(result, lock)
-      lock.flock File::LOCK_EX
-      $stdout.puts result[:stdout]
-      $stdout.flush
-    ensure
-      lock.flock File::LOCK_UN
-    end
-
-    def report_results(test_results)
-      results = @runner.find_results(test_results.map { |result| result[:stdout] }*"")
-      puts ""
-      puts @runner.summarize_results(results)
-    end
-
-    def report_number_of_tests(groups)
-      name = @runner.test_file_name
-      num_processes = groups.size
-      num_tests = groups.map(&:size).inject(:+)
-      puts "#{num_processes} processes for #{num_tests} #{name}s, ~ #{num_tests / groups.size} #{name}s per process"
-    end
-
-    #exit with correct status code so rake parallel:test && echo 123 works
-    def any_test_failed?(test_results)
-      test_results.any? { |result| result[:exit_status] != 0 }
-    end
-
-    def parse_options!(argv)
-      options = {}
-      OptionParser.new do |opts|
-        opts.banner = <<BANNER
-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
-
-Options are:
-BANNER
-        opts.on("-n [PROCESSES]", Integer, "How many processes to use, default: available CPUs") { |n| options[:count] = n }
-        opts.on("-p", "--pattern [PATTERN]", "run tests matching this pattern") { |pattern| options[:pattern] = /#{pattern}/ }
-        opts.on("--group-by [TYPE]", <<-TEXT
-group tests by:
-          found - order of finding files
-          steps - number of cucumber/spinach steps
-          scenarios - individual cucumber scenarios
-          filesize - by size of the file
-          default - runtime or filesize
-TEXT
-) { |type| options[:group_by] = type.to_sym }
-        opts.on("-m [FLOAT]", "--multiply-processes [FLOAT]", Float, "use given number as a multiplier of processes to run") { |multiply| options[:multiply] = multiply }
-
-        opts.on("-s [PATTERN]", "--single [PATTERN]",
-          "Run all matching files in the same process") do |pattern|
-
-          options[:single_process] ||= []
-          options[:single_process] << /#{pattern}/
-        end
-
-        opts.on("-i", "--isolate",
-          "Do not run any other tests in the group used by --single(-s)") do |pattern|
-
-          options[:isolate] = true
-        end
-
-        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("-t", "--type [TYPE]", "test(default) / rspec / cucumber / spinach") do |type|
-          begin
-            @runner = load_runner(type)
-          rescue NameError, LoadError => e
-            puts "Runner for `#{type}` type has not been found! (#{e})"
-            abort
-          end
-        end
-        opts.on("--serialize-stdout", "Serialize stdout output, nothing will be written until everything is done") { options[:serialize_stdout] = true }
-        opts.on("--combine-stderr", "Combine stderr into stdout, useful in conjunction with --serialize-stdout") { options[:combine_stderr] = true }
-        opts.on("--non-parallel", "execute same commands but do not in parallel, needs --exec") { options[:non_parallel] = true }
-        opts.on("--no-symlinks", "Do not traverse symbolic links to find test files") { options[:symlinks] = false }
-        opts.on('--ignore-tags [PATTERN]', 'When counting steps ignore scenarios with tags that match this pattern')  { |arg| options[:ignore_tag_pattern] = arg }
-        opts.on("--nice", "execute test commands with low priority.") { options[:nice] = true }
-        opts.on("--runtime-log [PATH]", "Location of previously recorded test runtimes") { |path| options[:runtime_log] = path }
-        opts.on("-v", "--version", "Show Version") { puts ParallelTests::VERSION; exit }
-        opts.on("-h", "--help", "Show this.") { puts opts; exit }
-      end.parse!(argv)
-
-      if options[:count] == 0
-        options.delete(:count)
-        options[:non_parallel] = true
-      end
-
-      options[:files] = argv
-
-      options[:group_by] ||= :filesize if options[:only_group]
-
-      raise "--group-by found and --single-process are not supported" if options[:group_by] == :found and options[:single_process]
-      raise "--group-by filesize is required for --only-group" if options[:group_by] != :filesize and options[:only_group]
-
-      options
-    end
-
-    def load_runner(type)
-      require "parallel_tests/#{type}/runner"
-      runner_classname = type.split("_").map(&:capitalize).join.sub("Rspec", "RSpec")
-      klass_name = "ParallelTests::#{runner_classname}::Runner"
-      klass_name.split('::').inject(Object) { |x, y| x.const_get(y) }
-    end
-
-    def execute_shell_command_in_parallel(command, num_processes, options)
-      runs = (0...num_processes).to_a
-      results = if options[:non_parallel]
-        runs.map do |i|
-          ParallelTests::Test::Runner.execute_command(command, i, num_processes, options)
-        end
-      else
-        execute_in_parallel(runs, num_processes, options) do |i|
-          ParallelTests::Test::Runner.execute_command(command, i, num_processes, options)
-        end
-      end.flatten
-
-      abort if results.any? { |r| r[:exit_status] != 0 }
-    end
-
-    def report_time_taken
-      start = Time.now
-      yield
-      puts "\nTook #{Time.now - start} seconds"
-    end
-
-    def final_fail_message
-      fail_message = "#{@runner.name}s Failed"
-      fail_message = "\e[31m#{fail_message}\e[0m" if use_colors?
-
-      fail_message
-    end
-
-    def use_colors?
-      $stdout.tty?
-    end
-  end
-end