parallel_tests 0.6.0 → 0.6.1

data/Readme.md

@@ -210,6 +210,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Michael Kintzer](https://github.com/rockrep)
  - [nathansobo](https://github.com/nathansobo)
  - [Joe Yates](http://titusd.co.uk)
+ - [asmega](http://www.ph-lee.com)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/bin/parallel_test

@@ -79,8 +79,7 @@ else
   #parse and print results
   results = klass.find_results(test_results.map{|result| result[:stdout] }*"")
   puts ""
-  puts "Results:"
-  results.each{|r| puts r }
+  puts klass.summarize_results(results)
 
   #report total time taken
   puts ""

data/lib/parallel_tests.rb

@@ -63,6 +63,16 @@ class ParallelTests
     '__foo__'
   end
 
+  def self.summarize_results(results)
+    results = results.join(' ').gsub(/s\b/,'') # combine and singularize results
+    counts = results.scan(/(\d+) (\w+)/)
+    sums = counts.inject(Hash.new(0)) do |sum, (number, word)|
+      sum[word] += number.to_i
+      sum
+    end
+    sums.sort.map{|word, number|  "#{number} #{word}#{'s' if number != 1}" }.join(', ')
+  end
+
   protected
 
   # read output of the process and print in in chucks

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-08-09}
+  s.date = %q{2011-08-14}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_cucumber", "parallel_test", "parallel_spec"]
   s.files = [

data/spec/integration_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe 'CLI' do
   before do
@@ -42,7 +42,8 @@ describe 'CLI' do
     result.should include('TEST2')
 
     # all results present
-    result.scan('1 example, 0 failure').size.should == 4 # 2 results + 2 result summary
+    result.scan('1 example, 0 failure').size.should == 2 # 2 results
+    result.scan('2 examples, 0 failures').size.should == 1 # 1 summary
     result.scan(/Finished in \d+\.\d+ seconds/).size.should == 2
     result.scan(/Took \d+\.\d+ seconds/).size.should == 1 # parallel summary
     $?.success?.should == true
@@ -53,8 +54,9 @@ describe 'CLI' do
     write 'xxx2_spec.rb', 'describe("it"){it("should"){1.should == 2}}'
     result = run_specs
 
-    result.scan('1 example, 1 failure').size.should == 2
-    result.scan('1 example, 0 failure').size.should == 2
+    result.scan('1 example, 1 failure').size.should == 1
+    result.scan('1 example, 0 failure').size.should == 1
+    result.scan('2 examples, 1 failure').size.should == 1
     $?.success?.should == false
   end
 

data/spec/parallel_cucumber_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ParallelCucumber do
   test_tests_in_groups(ParallelCucumber, 'features', ".feature")
@@ -12,36 +12,36 @@ describe ParallelCucumber do
 
     it "uses TEST_ENV_NUMBER=blank when called for process 0" do
       ParallelCucumber.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER= /}.and_return mocked_process
-      ParallelCucumber.run_tests(['xxx'],0,'')
+      ParallelCucumber.run_tests(['xxx'],0,{})
     end
 
     it "uses TEST_ENV_NUMBER=2 when called for process 1" do
       ParallelCucumber.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mocked_process
-      ParallelCucumber.run_tests(['xxx'],1,'')
+      ParallelCucumber.run_tests(['xxx'],1,{})
     end
 
     it "returns the output" do
       io = open('spec/spec_helper.rb')
       ParallelCucumber.stub!(:print)
       ParallelCucumber.should_receive(:open).and_return io
-      ParallelCucumber.run_tests(['xxx'],1,'')[:stdout].should =~ /\$LOAD_PATH << File/
+      ParallelCucumber.run_tests(['xxx'],1,{})[:stdout].should =~ /\$LOAD_PATH << File/
     end
 
     it "runs bundle exec cucumber when on bundler 0.9" do
       ParallelCucumber.stub!(:bundler_enabled?).and_return true
       ParallelCucumber.should_receive(:open).with{|x,y| x =~ %r{bundle exec cucumber}}.and_return mocked_process
-      ParallelCucumber.run_tests(['xxx'],1,'')
+      ParallelCucumber.run_tests(['xxx'],1,{})
     end
 
     it "runs script/cucumber when script/cucumber is found" do
       ParallelCucumber.should_receive(:open).with{|x,y| x =~ %r{script/cucumber}}.and_return mocked_process
-      ParallelCucumber.run_tests(['xxx'],1,'')
+      ParallelCucumber.run_tests(['xxx'],1,{})
     end
 
     it "runs cucumber by default" do
       File.stub!(:file?).with('script/cucumber').and_return false
       ParallelCucumber.should_receive(:open).with{|x,y| x !~ %r{(script/cucumber)|(bundle exec cucumber)}}.and_return mocked_process
-      ParallelCucumber.run_tests(['xxx'],1,'')
+      ParallelCucumber.run_tests(['xxx'],1,{})
     end
 
     it "uses options passed in" do

data/spec/parallel_specs_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'parallel_specs/spec_runtime_logger'
 require 'parallel_specs/spec_summary_logger'
 require 'parallel_specs/spec_failures_logger'
@@ -16,38 +16,38 @@ describe ParallelSpecs do
 
     it "uses TEST_ENV_NUMBER=blank when called for process 0" do
       ParallelSpecs.should_receive(:open).with{|x,y|x=~/TEST_ENV_NUMBER= /}.and_return mocked_process
-      ParallelSpecs.run_tests(['xxx'],0,'')
+      ParallelSpecs.run_tests(['xxx'],0,{})
     end
 
     it "uses TEST_ENV_NUMBER=2 when called for process 1" do
       ParallelSpecs.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mocked_process
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "runs with color when called from cmdline" do
       ParallelSpecs.should_receive(:open).with{|x,y| x=~/ --tty /}.and_return mocked_process
       $stdout.should_receive(:tty?).and_return true
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "runs without color when not called from cmdline" do
       ParallelSpecs.should_receive(:open).with{|x,y| x !~ / --tty /}.and_return mocked_process
       $stdout.should_receive(:tty?).and_return false
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "runs with color for rspec 1 when called for the cmdline" do
       File.should_receive(:file?).with('script/spec').and_return true
       ParallelSpecs.should_receive(:open).with{|x,y| x=~/ RSPEC_COLOR=1 /}.and_return mocked_process
       $stdout.should_receive(:tty?).and_return true
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "runs without color for rspec 1 when not called for the cmdline" do
       File.should_receive(:file?).with('script/spec').and_return true
       ParallelSpecs.should_receive(:open).with{|x,y| x !~ / RSPEC_COLOR=1 /}.and_return mocked_process
       $stdout.should_receive(:tty?).and_return false
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "run bundle exec spec when on bundler rspec 1" do
@@ -55,7 +55,7 @@ describe ParallelSpecs do
       ParallelSpecs.stub!(:bundler_enabled?).and_return true
       ParallelSpecs.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-1.0.2"
       ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{bundle exec spec}}.and_return mocked_process
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "run bundle exec rspec when on bundler rspec 2" do
@@ -63,39 +63,39 @@ describe ParallelSpecs do
       ParallelSpecs.stub!(:bundler_enabled?).and_return true
       ParallelSpecs.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-2.0.2"
       ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{bundle exec rspec}}.and_return mocked_process
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "runs script/spec when script/spec can be found" do
       File.should_receive(:file?).with('script/spec').and_return true
       ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec}}.and_return mocked_process
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "runs spec when script/spec cannot be found" do
       File.stub!(:file?).with('script/spec').and_return false
       ParallelSpecs.should_receive(:open).with{|x,y| x !~ %r{script/spec}}.and_return mocked_process
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "uses no -O when no opts where found" do
       File.stub!(:file?).with('spec/spec.opts').and_return false
       ParallelSpecs.should_receive(:open).with{|x,y| x !~ %r{spec/spec.opts}}.and_return mocked_process
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "uses -O spec/spec.opts when found (with script/spec)" do
       File.stub!(:file?).with('script/spec').and_return true
       File.stub!(:file?).with('spec/spec.opts').and_return true
       ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec\s+ -O spec/spec.opts}}.and_return mocked_process
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "uses -O spec/parallel_spec.opts when found (with script/spec)" do
       File.stub!(:file?).with('script/spec').and_return true
       File.should_receive(:file?).with('spec/parallel_spec.opts').and_return true
       ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec\s+ -O spec/parallel_spec.opts}}.and_return mocked_process
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "uses -O spec/parallel_spec.opts with rspec1" do
@@ -105,7 +105,7 @@ describe ParallelSpecs do
       ParallelSpecs.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-1.0.2"
 
       ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{spec\s+ -O spec/parallel_spec.opts}}.and_return mocked_process
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "uses -O spec/parallel_spec.opts with rspec2" do
@@ -115,7 +115,7 @@ describe ParallelSpecs do
       ParallelSpecs.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-2.4.2"
 
       ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{rspec\s+ --color --tty -O spec/parallel_spec.opts}}.and_return mocked_process
-      ParallelSpecs.run_tests(['xxx'],1,'')
+      ParallelSpecs.run_tests(['xxx'],1,{})
     end
 
     it "uses options passed in" do
@@ -127,7 +127,7 @@ describe ParallelSpecs do
       io = open('spec/spec_helper.rb')
       ParallelSpecs.stub!(:print)
       ParallelSpecs.should_receive(:open).and_return io
-      ParallelSpecs.run_tests(['xxx'],1,'')[:stdout].should =~ /\$LOAD_PATH << File/
+      ParallelSpecs.run_tests(['xxx'],1,{})[:stdout].should =~ /\$LOAD_PATH << File/
     end
   end
 

data/spec/parallel_tests_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ParallelTests do
   test_tests_in_groups(ParallelTests, 'test', '_test.rb')
@@ -28,12 +28,12 @@ describe ParallelTests do
   describe :run_tests do
     it "uses TEST_ENV_NUMBER=blank when called for process 0" do
       ParallelTests.should_receive(:open).with{|x,y|x=~/TEST_ENV_NUMBER= /}.and_return mocked_process
-      ParallelTests.run_tests(['xxx'],0,'')
+      ParallelTests.run_tests(['xxx'],0,{})
     end
 
     it "uses TEST_ENV_NUMBER=2 when called for process 1" do
       ParallelTests.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mocked_process
-      ParallelTests.run_tests(['xxx'],1,'')
+      ParallelTests.run_tests(['xxx'],1,{})
     end
 
     it "uses options" do
@@ -45,7 +45,7 @@ describe ParallelTests do
       io = open('spec/spec_helper.rb')
       ParallelTests.stub!(:print)
       ParallelTests.should_receive(:open).and_return io
-      ParallelTests.run_tests(['xxx'],1,'')[:stdout].should =~ /\$LOAD_PATH << File/
+      ParallelTests.run_tests(['xxx'],1,{})[:stdout].should =~ /\$LOAD_PATH << File/
     end
   end
 
@@ -184,6 +184,28 @@ EOF
     end
   end
 
+  describe :summarize_results do
+    it "adds results" do
+      ParallelTests.summarize_results(['1 foo 3 bar','2 foo 5 bar']).should == '8 bars, 3 foos'
+    end
+
+    it "adds results with braces" do
+      ParallelTests.summarize_results(['1 foo(s) 3 bar(s)','2 foo 5 bar']).should == '8 bars, 3 foos'
+    end
+
+    it "adds same results with plurals" do
+      ParallelTests.summarize_results(['1 foo 3 bar','2 foos 5 bar']).should == '8 bars, 3 foos'
+    end
+
+    it "adds non-similar results" do
+      ParallelTests.summarize_results(['1 xxx 2 yyy','1 xxx 2 zzz']).should == '2 xxxs, 2 yyys, 2 zzzs'
+    end
+
+    it "does not pluralize 1" do
+      ParallelTests.summarize_results(['1 xxx 2 yyy']).should == '1 xxx, 2 yyys'
+    end
+  end
+
   it "has a version" do
     ParallelTests::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallel_tests
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 +02:00
+date: 2011-08-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency