parallel_tests 0.6.10 → 0.6.11

data/Readme.md

@@ -121,7 +121,7 @@ This logger produces pasteable command-line snippets for each failed example.
 
 E.g.
 
-    spec /path/to/my_spec.rb -e "should do something"
+    rspec /path/to/my_spec.rb:123 # should do something
 
 Add the following to your `spec/parallel_spec.opts` (or `spec/spec.opts`) :
 
@@ -185,6 +185,8 @@ TIPS
  - [Bundler] if you have a `Gemfile` then `bundle exec` will be used to run tests
  - [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
+ - [Test::Unit runtime logger](https://gist.github.com/1333414) some basic plumbing done (needs some love and a pull-request)
  - [SQL schema format] use :ruby schema format to get faster parallel:prepare`
  - `export PARALLEL_TEST_PROCESSORS=X` in your environment and parallel_tests will use this number of processors by default
  - with zsh this would be `rake "parallel:prepare[3]"`

data/VERSION

@@ -1 +1 @@
-0.6.10
+0.6.11

data/lib/parallel_specs/spec_failures_logger.rb

@@ -1,24 +1,43 @@
 require 'parallel_specs/spec_logger_base'
 
 class ParallelSpecs::SpecFailuresLogger < ParallelSpecs::SpecLoggerBase
-  def initialize(options, output=nil)
-    super
-    @failed_examples = []
+  # 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
 
-  def example_failed(example, count, failure)
-    @failed_examples << example
+  # RSpec 1: dumps 1 failed spec
+  def dump_failure(*args)
   end
 
-  def dump_failure(*args)
+  # RSpec 2: dumps all failed specs
+  def dump_failures(*args)
+  end
+
+  def dump_summary(*args)
     lock_output do
-      @failed_examples.each.with_index do | example, i |
-        spec_file = example.location.scan(/^[^:]+/)[0]
-        spec_file.gsub!(%r(^.*?/spec/), './spec/')
-        @output.puts "#{ParallelSpecs.executable} #{spec_file} -e \"#{example.description}\""
+      if RSPEC_1
+        dump_commands_to_rerun_failed_examples_rspec_1
+      else
+        dump_commands_to_rerun_failed_examples
       end
     end
     @output.flush
   end
 
+  private
+
+  def dump_commands_to_rerun_failed_examples_rspec_1
+    (@failed_examples||[]).each do |example|
+      file, line = example.location.to_s.split(':')
+      next unless file and line
+      file.gsub!(%r(^.*?/spec/), './spec/')
+      @output.puts "#{ParallelSpecs.executable} #{file}:#{line} # #{example.description}"
+    end
+  end
 end

data/lib/parallel_specs/spec_logger_base.rb

@@ -1,54 +1,30 @@
 require 'parallel_specs'
 
 begin
-  require 'rspec/core/formatters/progress_formatter'
-  base = RSpec::Core::Formatters::ProgressFormatter
+  require 'rspec/core/formatters/base_text_formatter'
+  base = RSpec::Core::Formatters::BaseTextFormatter
 rescue LoadError
-  require 'spec/runner/formatter/progress_bar_formatter'
+  require 'spec/runner/formatter/base_text_formatter'
   base = Spec::Runner::Formatter::BaseTextFormatter
 end
 ParallelSpecs::SpecLoggerBaseBase = base
 
 class ParallelSpecs::SpecLoggerBase < ParallelSpecs::SpecLoggerBaseBase
-  def initialize(options, output=nil)
-    output ||= options # rspec 2 has output as first argument
+  RSPEC_1 = defined? Spec::Runner
 
-    if String === output
-      FileUtils.mkdir_p(File.dirname(output))
-      File.open(output, 'w'){} # overwrite previous results
-      @output = File.open(output, 'a')
-    elsif File === output
-      output.close # close file opened with 'w'
-      @output = File.open(output.path, 'a')
-    else
-      @output = output
-    end
-
-    @failed_examples = [] # only needed for rspec 2
-  end
-
-  def example_started(*args)
-  end
-
-  def example_passed(example)
-  end
-
-  def example_pending(*args)
-  end
+  def initialize(*args)
+    super
 
-  def example_failed(*args)
-  end
+    @output ||= args[1] || args[0] # rspec 1 has output as second argument
 
-  def start_dump(*args)
-  end
-
-  def dump_summary(*args)
-  end
-
-  def dump_pending(*args)
-  end
-
-  def dump_failure(*args)
+    if String === @output # a path ?
+      FileUtils.mkdir_p(File.dirname(@output))
+      File.open(@output, 'w'){} # overwrite previous results
+      @output = File.open(@output, 'a')
+    elsif File === @output # close and restart in append mode
+      @output.close
+      @output = File.open(@output.path, 'a')
+    end
   end
 
   #stolen from Rspec

data/lib/parallel_specs/spec_runtime_logger.rb

@@ -1,7 +1,7 @@
 require 'parallel_specs/spec_logger_base'
 
 class ParallelSpecs::SpecRuntimeLogger < ParallelSpecs::SpecLoggerBase
-  def initialize(options, output=nil)
+  def initialize(*args)
     super
     @example_times = Hash.new(0)
   end
@@ -15,6 +15,10 @@ class ParallelSpecs::SpecRuntimeLogger < ParallelSpecs::SpecLoggerBase
     @example_times[file] += Time.now - @time
   end
 
+  def dump_summary(*args);end
+  def dump_failures(*args);end
+  def dump_failure(*args);end
+
   def start_dump(*args)
     return unless ENV['TEST_ENV_NUMBER'] #only record when running in parallel
     # TODO: Figure out why sometimes time can be less than 0

data/lib/parallel_specs/spec_summary_logger.rb

@@ -1,46 +1,19 @@
-require 'parallel_specs/spec_logger_base'
+require 'parallel_specs/spec_failures_logger'
 
 class ParallelSpecs::SpecSummaryLogger < ParallelSpecs::SpecLoggerBase
-  def initialize(options, output=nil)
-    super
-    @passed_examples = []
-    @pending_examples = []
-    @failed_examples = []
-  end
-
-  def example_passed(example)
-    @passed_examples << example
-  end
-
-  def example_pending(*args)
-    @pending_examples << args
-  end
-
-  def example_failed(example, count, failure)
-    @failed_examples << failure
-  end
-
-  def dump_summary(duration, example_count, failure_count, pending_count)
+  # RSpec 1: dumps 1 failed spec
+  def dump_failure(*args)
     lock_output do
-      @output.puts "#{ @passed_examples.size } examples passed"
+      super
     end
     @output.flush
   end
 
-  def dump_failure(*args)
+  # RSpec 2: dumps all failed specs
+  def dump_failures(*args)
     lock_output do
-      @output.puts "#{ @failed_examples.size } examples failed:"
-      @failed_examples.each.with_index do | failure, i |
-        @output.puts "#{ i + 1 })"
-        @output.puts failure.header
-        @output.puts failure.exception.to_s
-        failure.exception.backtrace.each do | caller |
-          @output.puts caller
-        end
-        @output.puts ''
-      end
+      super
     end
     @output.flush
   end
-
 end

data/lib/parallel_tests.rb

@@ -139,6 +139,7 @@ class ParallelTests
       times = Hash.new(1)
       lines.each do |line|
         test, time = line.split(":")
+        next unless test and time
         times[File.expand_path(test)] = time.to_f
       end
       tests.sort.map{|test| [test, times[test]] }

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "parallel_tests"
-  s.version = "0.6.10"
+  s.version = "0.6.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = "2011-11-08"
+  s.date = "2011-11-18"
   s.email = "grosser.michael@gmail.com"
   s.executables = ["parallel_cucumber", "parallel_spec", "parallel_test"]
   s.files = [
@@ -36,7 +36,9 @@ Gem::Specification.new do |s|
     "parallel_tests.gemspec",
     "spec/integration_spec.rb",
     "spec/parallel_cucumber_spec.rb",
+    "spec/parallel_specs/spec_failure_logger_spec.rb",
     "spec/parallel_specs/spec_runtime_logger_spec.rb",
+    "spec/parallel_specs/spec_summary_logger_spec.rb",
     "spec/parallel_specs_spec.rb",
     "spec/parallel_tests_spec.rb",
     "spec/spec_helper.rb"

data/spec/parallel_specs/spec_failure_logger_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe ParallelSpecs::SpecFailuresLogger do
+  def silence_warnings
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end
+
+  before do
+    @output     = OutputLogger.new([])
+    @example1   = mock( 'example', :location => "#{Dir.pwd}/spec/path/to/example:123", :full_description => 'should do stuff', :description => 'd' )
+    @example2   = mock( 'example', :location => "#{Dir.pwd}/spec/path/to/example2:456", :full_description => 'should do other stuff', :description => 'd')
+    @exception1 = mock( :to_s => 'exception', :backtrace => [ '/path/to/error/line:33' ] )
+    @failure1   = mock( 'example', :location => "#{Dir.pwd}/example:123", :header => 'header', :exception => @exception1 )
+    @logger = ParallelSpecs::SpecFailuresLogger.new( @output )
+  end
+
+  after do
+    silence_warnings{ ParallelSpecs::SpecLoggerBase::RSPEC_1 = false }
+  end
+
+  def clean_output
+    @output.output.join("\n").gsub(/\e\[\d+m/,'')
+  end
+
+  it "should produce a list of command lines for failing examples" do
+    @logger.example_failed @example1
+    @logger.example_failed @example2
+
+    @logger.dump_failures
+    @logger.dump_summary(1,2,3,4)
+
+    clean_output.should =~ /^rspec .*? should do stuff/
+    clean_output.should =~ /^rspec .*? should do other stuff/
+  end
+
+  it "should invoke spec for rspec 1" do
+    silence_warnings{ ParallelSpecs::SpecLoggerBase::RSPEC_1 = true }
+    ParallelSpecs.stub!(:bundler_enabled?).and_return true
+    ParallelSpecs.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-1.0.2"
+    @logger.example_failed @example1
+
+    @logger.dump_failures
+    @logger.dump_summary(1,2,3,4)
+
+    clean_output.should =~ /^bundle exec spec/
+  end
+
+  it "should invoke rspec for rspec 2" do
+    ParallelSpecs.stub!(:bundler_enabled?).and_return true
+    ParallelSpecs.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-2.0.2"
+    @logger.example_failed @example1
+
+    @logger.dump_failures
+    @logger.dump_summary(1,2,3,4)
+
+    clean_output.should =~ /^rspec/
+  end
+
+  it "should return relative paths" do
+    @logger.example_failed @example1
+    @logger.example_failed @example2
+
+    @logger.dump_failures
+    @logger.dump_summary(1,2,3,4)
+
+    clean_output.should =~ %r(\./spec/path/to/example:123)
+    clean_output.should =~ %r(\./spec/path/to/example2:456)
+  end
+
+
+  # should not longer be a problem since its using native rspec methods
+  xit "should not log examples without location" do
+    example = mock('example', :location => 'bla', :full_description => 'before :all')
+    @logger.example_failed example
+    @logger.dump_failures
+    @logger.dump_summary(1,2,3,4)
+    clean_output.should == ''
+  end
+end

data/spec/parallel_specs/spec_runtime_logger_spec.rb

@@ -19,8 +19,10 @@ describe ParallelSpecs::SpecRuntimeLogger do
       else
         ParallelSpecs::SpecRuntimeLogger.new(f)
       end
-      logger.example_started
-      logger.example_passed(mock(:location => "#{Dir.pwd}/spec/foo.rb:123"))
+
+      example = (mock(:location => "#{Dir.pwd}/spec/foo.rb:123"))
+      logger.example_started example
+      logger.example_passed example
       logger.start_dump
 
       #f.close
@@ -29,7 +31,7 @@ describe ParallelSpecs::SpecRuntimeLogger do
   end
 
   it "logs runtime with relative paths" do
-    log_for_a_file.should =~ %r{^spec/foo.rb:0.\d+$}m
+    log_for_a_file.should =~ %r{^spec/foo.rb:[-\.e\d]+$}m
   end
 
   it "does not log if we do not run in parallel" do

data/spec/parallel_specs/spec_summary_logger_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe ParallelSpecs::SpecSummaryLogger do
+  let(:output){ OutputLogger.new([]) }
+  let(:logger){ ParallelSpecs::SpecSummaryLogger.new(output) }
+
+  # TODO somehow generate a real example with an exception to test this
+  xit "prints failing examples" do
+    logger.example_failed XXX
+    logger.example_failed XXX
+    logger.dump_failures
+    output.output.should == [
+      "bundle exec rspec ./spec/path/to/example.rb:123 # should do stuff",
+      "bundle exec rspec ./spec/path/to/example.rb:125 # should not do stuff"
+    ]
+  end
+
+  it "does not print anything for passing examples" do
+    logger.example_passed mock(:location => "/my/spec/foo.rb:123")
+    logger.dump_failures
+    output.output.should == []
+    logger.dump_summary(1,2,3,4)
+    output.output.should == ["\nFinished in 1 seconds\n", "\e[31m2 examples, 3 failures, 4 pending\e[0m"]
+  end
+
+  it "does not print anything for pending examples" do
+    logger.example_pending mock(:location => "/my/spec/foo.rb:123")
+    logger.dump_failures
+    output.output.should == []
+    logger.dump_summary(1,2,3,4)
+    output.output.should == ["\nFinished in 1 seconds\n", "\e[31m2 examples, 3 failures, 4 pending\e[0m"]
+  end
+end

data/spec/parallel_specs_spec.rb

@@ -162,85 +162,4 @@ EOF
       ParallelSpecs.find_results(output).should == ['0 examples, 0 failures, 0 pending','1 examples, 1 failures, 1 pending']
     end
   end
-
-  context "logging" do
-
-    OutputLogger = Struct.new(:output) do
-      attr_reader :flock, :flush
-      def puts(s)
-        self.output << s
-      end
-    end
-
-    before :each do
-      @output     = OutputLogger.new([])
-      @example1   = mock( 'example', :location => '/my/spec/path/to/example:123', :description => 'should do stuff' )
-      @example2   = mock( 'example', :location => '/my/spec/path/to/example2:456', :description => 'should do other stuff' )
-      @exception1 = mock( :to_s => 'exception', :backtrace => [ '/path/to/error/line:33' ] )
-      @failure1   = mock( 'example', :location => '/path/to/example:123', :header => 'header', :exception => @exception1 )
-    end
-
-    describe ParallelSpecs::SpecSummaryLogger do
-      before :each do
-        @logger = ParallelSpecs::SpecSummaryLogger.new( @output )
-      end
-
-      it "should print a summary of failing examples" do
-        @logger.example_failed( nil, nil, @failure1 )
-
-        @logger.dump_failure
-
-        @output.output.should == ["1 examples failed:", "1)", "header", "exception", "/path/to/error/line:33", ""]
-      end
-    end
-
-    describe ParallelSpecs::SpecFailuresLogger do
-      before :each do
-        @logger = ParallelSpecs::SpecFailuresLogger.new( @output )
-      end
-
-      it "should produce a list of command lines for failing examples" do
-        @logger.example_failed( @example1, nil, nil )
-        @logger.example_failed( @example2, nil, nil )
-
-        @logger.dump_failure
-
-        @output.output.size.should == 2
-        @output.output[0].should =~ /r?spec .*? -e "should do stuff"/
-        @output.output[1].should =~ /r?spec .*? -e "should do other stuff"/
-      end
-
-      it "should invoke spec for rspec 1" do
-        ParallelSpecs.stub!(:bundler_enabled?).and_return true
-        ParallelSpecs.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-1.0.2"
-        @logger.example_failed( @example1, nil, nil )
-
-        @logger.dump_failure
-
-        @output.output[0].should =~ /^bundle exec spec/
-      end
-
-      it "should invoke rspec for rspec 2" do
-        ParallelSpecs.stub!(:bundler_enabled?).and_return true
-        ParallelSpecs.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-2.0.2"
-        @logger.example_failed( @example1, nil, nil )
-
-        @logger.dump_failure
-
-        @output.output[0].should =~ /^bundle exec rspec/
-      end
-
-      it "should return relative paths" do
-        @logger.example_failed( @example1, nil, nil )
-        @logger.example_failed( @example2, nil, nil )
-
-        @logger.dump_failure
-
-        @output.output[0].should =~ %r(\./spec/path/to/example)
-        @output.output[1].should =~ %r(\./spec/path/to/example2)
-      end
-
-    end
-
-  end
 end

data/spec/spec_helper.rb

@@ -7,8 +7,16 @@ FAKE_RAILS_ROOT = '/tmp/pspecs/fixtures'
 require 'tempfile'
 require 'parallel_specs'
 require 'parallel_specs/spec_runtime_logger'
+require 'parallel_specs/spec_summary_logger'
 require 'parallel_cucumber'
 
+OutputLogger = Struct.new(:output) do
+  attr_reader :flock, :flush
+  def puts(s=nil)
+    self.output << s.to_s
+  end
+end
+
 def mocked_process
   open('|cat /dev/null')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000 Z
+date: 2011-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &78420700 !ruby/object:Gem::Requirement
+  requirement: &84425390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78420700
+  version_requirements: *84425390
 description: 
 email: grosser.michael@gmail.com
 executables:
@@ -54,7 +54,9 @@ files:
 - parallel_tests.gemspec
 - spec/integration_spec.rb
 - spec/parallel_cucumber_spec.rb
+- spec/parallel_specs/spec_failure_logger_spec.rb
 - spec/parallel_specs/spec_runtime_logger_spec.rb
+- spec/parallel_specs/spec_summary_logger_spec.rb
 - spec/parallel_specs_spec.rb
 - spec/parallel_tests_spec.rb
 - spec/spec_helper.rb
@@ -72,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -622498067
+      hash: -300537841
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: