parallel_tests 0.8.14 → 0.9.0

data/Gemfile

@@ -1,9 +1,8 @@
 source :rubygems
 gemspec
 
-group :development do
-  gem 'test-unit', :platform => :ruby_19
-  gem 'rspec', '>=2.4'
-  gem 'cucumber'
-  gem 'rake'
-end
+gem 'bump'
+gem 'test-unit', :platform => :ruby_19
+gem 'rspec', '>=2.4'
+gem 'cucumber'
+gem 'rake'

data/Gemfile.lock

@@ -1,33 +1,34 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.8.14)
+    parallel_tests (0.9.0)
       parallel
 
 GEM
   remote: http://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.1.2)
+    diff-lcs (1.1.3)
     gherkin (2.7.6)
       json (>= 1.4.6)
-    json (1.6.4)
-    parallel (0.5.18)
-    rake (0.8.7)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    json (1.7.5)
+    parallel (0.6.1)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
     term-ansicolor (1.0.7)
     test-unit (2.4.4)
 
@@ -35,6 +36,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bump
   cucumber
   parallel_tests!
   rake

data/Rakefile

@@ -1,22 +1,6 @@
+require 'bump/tasks'
 require 'bundler/gem_tasks'
 
 task :default do
   sh "rspec spec/"
 end
-
-# extracted from https://github.com/grosser/project_template
-rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/parallel_tests/version.rb'
-
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  version_parts[2] = 0 if index < 2 # remove patch for minor
-  version_parts[1] = 0 if index < 1 # remove minor for major
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
-end

data/Readme.md

@@ -132,7 +132,8 @@ Options are:
           steps - number of cucumber steps
           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 only one process
+    -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)
     -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
@@ -176,6 +177,7 @@ TIPS
 
 TODO
 ====
+ - fix tests vs cucumber >= 1.2 `unknown option --format`
  - add tests for the rake tasks, maybe generate a rails project ...
  - add unit tests for cucumber runtime formatter
  - make jRuby compatible [basics](http://yehudakatz.com/2009/07/01/new-rails-isolation-testing/)
@@ -222,6 +224,8 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Ulrich Berkmüller](https://github.com/ulrich-berkmueller)
  - [Grzegorz Derebecki](https://github.com/madmax)
  - [Florian Motlik](https://github.com/flomotlik)
+ - [Artem Kuzko](https://github.com/akuzko)
+ - [Zeke Fast](https://github.com/zekefast)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel_tests/cli.rb

@@ -25,13 +25,13 @@ module ParallelTest
 
       report_time_taken do
         groups = runner.tests_in_groups(options[:files], num_processes, options)
-        report_number_of_tests runner, groups
+        report_number_of_tests(runner, groups)
 
         test_results = Parallel.map(groups, :in_processes => groups.size) do |group|
           run_tests(runner, group, groups.index(group), options)
         end
 
-        report_results runner, test_results
+        report_results(runner, test_results)
       end
 
       abort final_fail_message(lib) if any_test_failed?(test_results)
@@ -89,10 +89,20 @@ group tests by:
 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 only one process") do |pattern|
+
+        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("-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") { |type| options[:type] = type }
@@ -131,13 +141,13 @@ TEXT
     def self.report_time_taken
       start = Time.now
       yield
-      puts ""
-      puts "Took #{Time.now - start} seconds"
+      puts "\nTook #{Time.now - start} seconds"
     end
 
     def self.final_fail_message(lib)
       fail_message = "#{lib.capitalize}s Failed"
       fail_message = "\e[31m#{fail_message}\e[0m" if use_colors?
+
       fail_message
     end
 

data/lib/parallel_tests/grouper.rb

@@ -1,32 +1,19 @@
 module ParallelTests
   class Grouper
-    def self.in_groups(items, num_groups)
-      groups = Array.new(num_groups){ [] }
-
-      until items.empty?
-        num_groups.times do |group_number|
-          if item = items.shift
-            groups[group_number] << item
-          end
-        end
-      end
-
-      groups.map!(&:sort!)
-    end
-
-    def self.in_even_groups_by_size(items_with_sizes, num_groups, options={})
-      groups = Array.new(num_groups){{:items => [], :size => 0}}
+    def self.in_even_groups_by_size(items_with_sizes, num_groups, options = {})
+      groups = Array.new(num_groups) { {:items => [], :size => 0} }
 
       # add all files that should run in a single process to one group
-      (options[:single_process]||[]).each do |pattern|
-        matched, items_with_sizes = items_with_sizes.partition{|item, size| item =~ pattern }
-        smallest = smallest_group(groups)
-        matched.each{|item,size| add_to_group(smallest, item, size) }
+      (options[:single_process] || []).each do |pattern|
+        matched, items_with_sizes = items_with_sizes.partition { |item, size| item =~ pattern }
+        matched.each { |item, size| add_to_group(groups.first, item, size) }
       end
 
+      groups_to_fill = (options[:isolate] ? groups[1..-1] : groups)
+
       # add all other files
       largest_first(items_with_sizes).each do |item, size|
-        smallest = smallest_group(groups)
+        smallest = smallest_group(groups_to_fill)
         add_to_group(smallest, item, size)
       end
 

data/lib/parallel_tests/tasks.rb

@@ -108,18 +108,25 @@ namespace :parallel do
 
   ['test', 'spec', 'features'].each do |type|
     desc "run #{type} in parallel with parallel:#{type}[num_cpus]"
-    task type, [:count, :pattern, :options] do |t,args|
+    task type, [:count, :pattern, :options] do |t, args|
       ParallelTests::Tasks.check_for_pending_migrations
+
       $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..'))
       require "parallel_tests"
+
       count, pattern, options = ParallelTests::Tasks.parse_args(args)
       test_framework = {
         'spec' => 'rspec',
         'test' => 'test',
         'features' => 'cucumber'
       }[type]
+
       executable = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')
-      command = "#{executable} #{type} --type #{test_framework} -n #{count} -p '#{pattern}' -o '#{options}'"
+      command = "#{executable} #{type} --type #{test_framework} " \
+        "-n #{count} "                     \
+        "--pattern '#{pattern}' "          \
+        "--test-options '#{options}'"
+
       abort unless system(command) # allow to chain tasks e.g. rake parallel:spec parallel:features
     end
   end

data/lib/parallel_tests/test/runner.rb

@@ -31,12 +31,12 @@ module ParallelTests
       def self.tests_in_groups(tests, num_groups, options={})
         tests = find_tests(tests, options)
 
-        if options[:group_by] == :found
-          Grouper.in_groups(tests, num_groups)
+        tests = if options[:group_by] == :found
+          tests.map { |t| [t, 1] }
         else
-          tests = with_runtime_info(tests)
-          Grouper.in_even_groups_by_size(tests, num_groups, options)
+          with_runtime_info(tests)
         end
+        Grouper.in_even_groups_by_size(tests, num_groups, options)
       end
 
       def self.execute_command(cmd, process_number, options)
@@ -73,10 +73,11 @@ module ParallelTests
           sum[word] += number.to_i
           sum
         end
+
         sums
       end
 
-      # read output of the process and print in in chucks
+      # read output of the process and print it in chunks
       def self.fetch_output(process)
         all = ''
         while buffer = process.readpartial(1000000)
@@ -84,6 +85,7 @@ module ParallelTests
           $stdout.print buffer
           $stdout.flush
         end rescue EOFError
+
         all
       end
 
@@ -105,8 +107,8 @@ module ParallelTests
         end
       end
 
-      def self.find_tests(tests, options={})
-        (tests||[]).map do |file_or_folder|
+      def self.find_tests(tests, options = {})
+        (tests || []).map do |file_or_folder|
           if File.directory?(file_or_folder)
             files = files_in_folder(file_or_folder, options)
             files.grep(/#{Regexp.escape test_suffix}$/).grep(options[:pattern]||//)

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.8.14'
+  VERSION = Version = '0.9.0'
 end

data/spec/parallel_tests/grouper_spec.rb

@@ -49,14 +49,4 @@ describe ParallelTests::Grouper do
       call(6).should == [["5"], ["4"], ["3"], ["2"], ["1"], []]
     end
   end
-
-  describe :in_groups do
-    it "groups" do
-      ParallelTests::Grouper.in_groups([1,2,3],2).should == [[1,3],[2]]
-    end
-
-    it "keeps groups sorted" do
-      ParallelTests::Grouper.in_groups([3,2,1],2).should == [[1,3],[2]]
-    end
-  end
 end

data/spec/parallel_tests/rspec/summary_logger_spec.rb

@@ -24,7 +24,7 @@ describe ParallelTests::RSpec::SummaryLogger do
     logger.dump_failures
     output.output.should == []
     logger.dump_summary(1,2,3,4)
-    output.output.map{|o| decolorize(o) }.should == ["\nFinished in 1 seconds\n", "2 examples, 3 failures, 4 pending"]
+    output.output.map{|o| decolorize(o) }.should == ["\nFinished in 1 second\n", "2 examples, 3 failures, 4 pending"]
   end
 
   it "does not print anything for pending examples" do
@@ -32,6 +32,6 @@ describe ParallelTests::RSpec::SummaryLogger do
     logger.dump_failures
     output.output.should == []
     logger.dump_summary(1,2,3,4)
-    output.output.map{|o| decolorize(o) }.should == ["\nFinished in 1 seconds\n", "2 examples, 3 failures, 4 pending"]
+    output.output.map{|o| decolorize(o) }.should == ["\nFinished in 1 second\n", "2 examples, 3 failures, 4 pending"]
   end
 end

data/spec/parallel_tests/tasks_spec.rb

@@ -5,7 +5,7 @@ describe ParallelTests::Tasks do
   describe ".parse_args" do
     it "should return the count" do
       args = {:count => 2}
-      ParallelTests::Tasks.parse_args(args).should == [2, '', ""]
+      ParallelTests::Tasks.parse_args(args).should == [2, "", ""]
     end
 
     it "should default to the prefix" do
@@ -19,7 +19,7 @@ describe ParallelTests::Tasks do
     end
 
     it "should return the count, pattern, and options" do
-      args = {:count => 2, :pattern => "plain", :options => "-p default" }
+      args = {:count => 2, :pattern => "plain", :options => "-p default"}
       ParallelTests::Tasks.parse_args(args).should == [2, "plain", "-p default"]
     end
   end

data/spec/parallel_tests/test/runner_spec.rb

@@ -38,20 +38,41 @@ describe ParallelTests::Test::Runner do
 
     it "does not sort when passed false do_sort option" do
       ParallelTests::Test::Runner.should_not_receive(:smallest_first)
-      call [], 1, :group_by => :found
+      call([], 1, :group_by => :found)
     end
 
     it "does sort when not passed do_sort option" do
       ParallelTests::Test::Runner.stub!(:tests_with_runtime).and_return([])
       ParallelTests::Grouper.should_receive(:largest_first).and_return([])
-      call [], 1
+      call([], 1)
     end
 
     it "groups by single_process pattern and then via size" do
-      ParallelTests::Test::Runner.should_receive(:with_runtime_info).and_return([['aaa',5],['aaa2',5],['bbb',2],['ccc',1],['ddd',1]])
-      result = call [], 3, :single_process => [/^a.a/]
+      ParallelTests::Test::Runner.should_receive(:with_runtime_info).
+        and_return([
+          ['aaa', 5],
+          ['aaa2', 5],
+          ['bbb', 2],
+          ['ccc', 1],
+          ['ddd', 1]
+        ])
+      result = call([], 3, :single_process => [/^a.a/])
       result.should == [["aaa", "aaa2"], ["bbb"], ["ccc", "ddd"]]
     end
+
+    it "groups by size and adds isolated separately" do
+      ParallelTests::Test::Runner.should_receive(:with_runtime_info).
+        and_return([
+          ['aaa', 0],
+          ['bbb', 3],
+          ['ccc', 1],
+          ['ddd', 2],
+          ['eee', 1]
+        ])
+
+      result = call([], 3, :isolate => true, :single_process => [/^aaa/])
+      result.should == [["aaa"], ["bbb", "eee"], ["ccc", "ddd"]]
+    end
   end
 
   describe :find_results do

data/spec/spec_helper.rb

@@ -135,7 +135,7 @@ def test_tests_in_groups(klass, folder, suffix)
     it "partitions by round-robin when not sorting" do
       files = ["file1.rb", "file2.rb", "file3.rb", "file4.rb"]
       klass.should_receive(:find_tests).and_return(files)
-      groups = klass.tests_in_groups(files, 2, :group_by => :found)
+      groups = klass.tests_in_groups(files, 2, :group_by => :found).sort
       groups[0].should == ["file1.rb", "file3.rb"]
       groups[1].should == ["file2.rb", "file4.rb"]
     end
@@ -143,7 +143,7 @@ def test_tests_in_groups(klass, folder, suffix)
     it "alpha-sorts partitions when not sorting by runtime" do
       files = %w[q w e r t y u i o p a s d f g h j k l z x c v b n m]
       klass.should_receive(:find_tests).and_return(files)
-      groups = klass.tests_in_groups(files, 2, :group_by => :found)
+      groups = klass.tests_in_groups(files, 2, :group_by => :found).sort
       groups[0].should == groups[0].sort
       groups[1].should == groups[1].sort
     end

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.8.14
   prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  type: :runtime
 description: 
 email: michael@grosser.it
 executables:
@@ -84,23 +84,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 1255476358488583165
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: -4090660521181020432
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 1255476358488583165
+      hash: -4090660521181020432
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24