parallel_tests 0.6.9 → 0.6.10

data/VERSION

@@ -1 +1 @@
-0.6.9
+0.6.10

data/lib/parallel_specs.rb

@@ -20,6 +20,7 @@ class ParallelSpecs < ParallelTests
     cmd or raise("Can't find executables rspec or spec")
   end
 
+  # legacy <-> people log to this file using rspec options
   def self.runtime_log
     'tmp/parallel_profile.log'
   end

data/lib/parallel_specs/spec_failures_logger.rb

@@ -1,5 +1,4 @@
-require 'parallel_specs'
-require File.join(File.dirname(__FILE__), 'spec_logger_base')
+require 'parallel_specs/spec_logger_base'
 
 class ParallelSpecs::SpecFailuresLogger < ParallelSpecs::SpecLoggerBase
   def initialize(options, output=nil)

data/lib/parallel_specs/spec_runtime_logger.rb

@@ -1,5 +1,4 @@
-require 'parallel_specs'
-require File.join(File.dirname(__FILE__), 'spec_logger_base')
+require 'parallel_specs/spec_logger_base'
 
 class ParallelSpecs::SpecRuntimeLogger < ParallelSpecs::SpecLoggerBase
   def initialize(options, output=nil)
@@ -20,9 +19,11 @@ class ParallelSpecs::SpecRuntimeLogger < ParallelSpecs::SpecLoggerBase
     return unless ENV['TEST_ENV_NUMBER'] #only record when running in parallel
     # TODO: Figure out why sometimes time can be less than 0
     lock_output do
-      @output.puts @example_times.map { |file, time| "#{file}:#{time > 0 ? time : 0}" }
+      @example_times.each do |file, time|
+        relative_path = file.sub(/^#{Regexp.escape Dir.pwd}\//,'')
+        @output.puts "#{relative_path}:#{time > 0 ? time : 0}"
+      end
     end
     @output.flush
   end
-
 end

data/lib/parallel_specs/spec_summary_logger.rb

@@ -1,5 +1,4 @@
-require 'parallel_specs'
-require File.join(File.dirname(__FILE__), 'spec_logger_base')
+require 'parallel_specs/spec_logger_base'
 
 class ParallelSpecs::SpecSummaryLogger < ParallelSpecs::SpecLoggerBase
   def initialize(options, output=nil)

data/lib/parallel_tests.rb

@@ -62,7 +62,7 @@ class ParallelTests
   end
 
   def self.runtime_log
-    '__foo__'
+    'tmp/parallel_runtime_test.log'
   end
 
   def self.summarize_results(results)
@@ -139,7 +139,7 @@ class ParallelTests
       times = Hash.new(1)
       lines.each do |line|
         test, time = line.split(":")
-        times[test] = time.to_f
+        times[File.expand_path(test)] = time.to_f
       end
       tests.sort.map{|test| [test, times[test]] }
     else # use file sizes

data/lib/parallel_tests/grouper.rb

@@ -18,7 +18,6 @@ class ParallelTests
       # 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 }
-        puts matched.inspect
         smallest = smallest_group(groups)
         matched.each{|item,size| add_to_group(smallest, item, size) }
       end

data/parallel_tests.gemspec

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

data/spec/integration_spec.rb

@@ -96,7 +96,7 @@ describe 'CLI' do
       write "spec/xxx#{i}_spec.rb",  'describe("it"){it("should"){sleep 5}}; $stderr.puts ENV["TEST_ENV_NUMBER"]'
     }
     t = Time.now
-    puts run_tests(:processes => 2)
+    run_tests(:processes => 2)
     expected = 10
     (Time.now - t).should <= expected
   end

data/spec/parallel_specs/spec_runtime_logger_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe ParallelSpecs::SpecRuntimeLogger do
+  before do
+    # pretend we run in parallel or the logger will log nothing
+    ENV['TEST_ENV_NUMBER'] = ''
+  end
+
+  after do
+    ENV.delete 'TEST_ENV_NUMBER'
+  end
+
+  def log_for_a_file
+    Tempfile.open('xxx') do |temp|
+      temp.close
+      f = File.open(temp.path,'w')
+      logger = if block_given?
+        yield(f)
+      else
+        ParallelSpecs::SpecRuntimeLogger.new(f)
+      end
+      logger.example_started
+      logger.example_passed(mock(:location => "#{Dir.pwd}/spec/foo.rb:123"))
+      logger.start_dump
+
+      #f.close
+      return File.read(f.path)
+    end
+  end
+
+  it "logs runtime with relative paths" do
+    log_for_a_file.should =~ %r{^spec/foo.rb:0.\d+$}m
+  end
+
+  it "does not log if we do not run in parallel" do
+    ENV.delete 'TEST_ENV_NUMBER'
+    log_for_a_file.should == ''
+  end
+
+  it "appends to a given file" do
+    result = log_for_a_file do |f|
+      f.write 'FooBar'
+      ParallelSpecs::SpecRuntimeLogger.new(f)
+    end
+    result.should include('FooBar')
+    result.should include('foo.rb')
+  end
+
+  it "overwrites a given path" do
+    result = log_for_a_file do |f|
+      f.write 'FooBar'
+      ParallelSpecs::SpecRuntimeLogger.new(f.path)
+    end
+    result.should_not include('FooBar')
+    result.should include('foo.rb')
+  end
+end

data/spec/parallel_specs_spec.rb

@@ -180,24 +180,6 @@ EOF
       @failure1   = mock( 'example', :location => '/path/to/example:123', :header => 'header', :exception => @exception1 )
     end
 
-    describe ParallelSpecs::SpecRuntimeLogger do
-      before :each do
-        ENV['TEST_ENV_NUMBER'] = '1'
-        @logger                = ParallelSpecs::SpecRuntimeLogger.new( @output )
-      end
-
-      it "collects runtime information" do
-        @logger.example_started
-        @logger.example_passed( @example1 )
-
-        @logger.start_dump
-
-        @output.output.size.should == 1
-        @output.output[0].size.should == 1
-        @output.output[0][0].should =~ %r(/path/to/example:([\d\.e\-]+))
-      end
-    end
-
     describe ParallelSpecs::SpecSummaryLogger do
       before :each do
         @logger = ParallelSpecs::SpecSummaryLogger.new( @output )

data/spec/spec_helper.rb

@@ -4,7 +4,9 @@ require 'rubygems'
 
 FAKE_RAILS_ROOT = '/tmp/pspecs/fixtures'
 
+require 'tempfile'
 require 'parallel_specs'
+require 'parallel_specs/spec_runtime_logger'
 require 'parallel_cucumber'
 
 def mocked_process

metadata

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