parallel_tests 0.4.16 → 0.4.17

data/Readme.md

@@ -76,7 +76,7 @@ Add to your `spec/parallel_spec.opts` (or `spec/spec.opts`) :
     RSpec 1.x:
       --format progress
       --format ParallelSpecs::SpecRuntimeLogger:tmp/parallel_profile.log
-    RSpec 2.x:
+    RSpec >= 2.2:
       Installed as plugin: -I vendor/plugins/parallel_tests/lib
       --format progress
       --format ParallelSpecs::SpecRuntimeLogger --out tmp/parallel_profile.log

data/VERSION

@@ -1 +1 @@
-0.4.16
+0.4.17

data/bin/parallel_test

@@ -24,7 +24,8 @@ BANNER
   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]", "which type of tests to run? test, spec or features"){|type| options[:type] = type }
-  opts.on("--non-parallel", "execute same commands but do not in parallel, needs --exec"){|type| options[:non_parallel] = true }
+  opts.on("--non-parallel", "execute same commands but do not in parallel, needs --exec"){ options[:non_parallel] = true }
+  opts.on("--chunk-timeout [TIMEOUT]", "timeout before re-printing the output of a child-process"){|timeout| options[:chunk_timeout] = timeout.to_f }
   opts.on('-v', '--version', 'Show Version'){ puts ParallelTests::VERSION; exit}
   opts.on("-h", "--help", "Show this.") { puts opts; exit }
 end.parse!
@@ -39,11 +40,11 @@ if options[:execute]
   runs = (0...num_processes).to_a
   results = if options[:non_parallel]
     runs.map do |i|
-      ParallelTests.execute_command(options[:execute], i)
+      ParallelTests.execute_command(options[:execute], i, options)
     end
   else
     Parallel.map(runs, :in_processes => num_processes) do |i|
-      ParallelTests.execute_command(options[:execute], i)
+      ParallelTests.execute_command(options[:execute], i, options)
     end
   end.flatten
   abort if results.any?{|r| r[:exit_status] != 0 }
@@ -72,7 +73,7 @@ else
   puts "#{num_processes} processes for #{num_tests} #{name}s, ~ #{num_tests / groups.size} #{name}s per process"
 
   test_results = Parallel.map(groups, :in_processes => num_processes) do |group|
-    klass.run_tests(group, groups.index(group), options[:test_options])
+    klass.run_tests(group, groups.index(group), options)
   end
 
   #parse and print results
@@ -88,4 +89,4 @@ else
   #exit with correct status code so rake parallel:test && echo 123 works
   failed = test_results.any?{|result| result[:exit_status] != 0 }
   abort "#{name.capitalize}s Failed" if failed
-end
+end

data/lib/parallel_cucumber.rb

@@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), 'parallel_tests')
 class ParallelCucumber < ParallelTests
   def self.run_tests(test_files, process_number, options)
     color = ($stdout.tty? ? 'AUTOTEST=1 ; export AUTOTEST ;' : '')#display color when we are in a terminal
-    cmd = "#{color} #{executable} #{options} #{test_files*' '}"
-    execute_command(cmd, process_number)
+    cmd = "#{color} #{executable} #{options[:test_options]} #{test_files*' '}"
+    execute_command(cmd, process_number, options)
   end
 
   def self.executable

data/lib/parallel_specs.rb

@@ -4,8 +4,8 @@ class ParallelSpecs < ParallelTests
   def self.run_tests(test_files, process_number, options)
     exe = executable # expensive, so we cache
     version = (exe =~ /\brspec\b/ ? 2 : 1)
-    cmd = "#{rspec_1_color if version == 1}#{exe} #{options} #{rspec_2_color if version == 2}#{spec_opts(version)} #{test_files*' '}"
-    execute_command(cmd, process_number)
+    cmd = "#{rspec_1_color if version == 1}#{exe} #{options[:test_options]} #{rspec_2_color if version == 2}#{spec_opts(version)} #{test_files*' '}"
+    execute_command(cmd, process_number, options)
   end
 
   def self.executable

data/lib/parallel_specs/spec_runtime_logger.rb

@@ -17,7 +17,6 @@ class ParallelSpecs::SpecRuntimeLogger < ParallelSpecs::SpecRuntimeLoggerBase
       FileUtils.mkdir_p(File.dirname(output))
       File.open(output, 'w'){} # overwrite previous results
       @output = File.open(output, 'a')
-      puts 'string'
     elsif File === output
       output.close # close file opened with 'w'
       @output = File.open(output.path, 'a')

data/lib/parallel_tests.rb

@@ -30,22 +30,16 @@ class ParallelTests
 
   def self.run_tests(test_files, process_number, options)
     require_list = test_files.map { |filename| "\"#{filename}\"" }.join(",")
-    cmd = "ruby -Itest #{options} -e '[#{require_list}].each {|f| require f }'"
-    execute_command(cmd, process_number)
+    cmd = "ruby -Itest #{options[:test_options]} -e '[#{require_list}].each {|f| require f }'"
+    execute_command(cmd, process_number, options)
   end
 
-  def self.execute_command(cmd, process_number)
+  def self.execute_command(cmd, process_number, options)
     cmd = "TEST_ENV_NUMBER=#{test_env_number(process_number)} ; export TEST_ENV_NUMBER; #{cmd}"
     f = open("|#{cmd}", 'r')
-    all = ''
-    while char = f.getc
-      char = (char.is_a?(Fixnum) ? char.chr : char) # 1.8 <-> 1.9
-      all << char
-      print char
-      STDOUT.flush
-    end
+    output = fetch_output(f, options)
     f.close
-    {:stdout => all, :exit_status => $?.exitstatus}
+    {:stdout => output, :exit_status => $?.exitstatus}
   end
 
   def self.find_results(test_output)
@@ -62,6 +56,35 @@ class ParallelTests
 
   protected
 
+  # read output of the process and print in in chucks
+  def self.fetch_output(process, options)
+    all = ''
+    buffer = ''
+    timeout = options[:chunk_timeout] || 0.2
+    flushed = Time.now.to_f
+
+    while char = process.getc
+      char = (char.is_a?(Fixnum) ? char.chr : char) # 1.8 <-> 1.9
+      all << char
+
+      # print in chunks so large blocks stay together
+      now = Time.now.to_f
+      buffer << char
+      if flushed + timeout < now
+        print buffer
+        STDOUT.flush
+        buffer = ''
+        flushed = now
+      end
+    end
+
+    # print the remainder
+    print buffer
+    STDOUT.flush
+
+    all
+  end
+
   # copied from http://github.com/carlhuda/bundler Bundler::SharedHelpers#find_gemfile
   def self.bundler_enabled?
     return true if Object.const_defined?(:Bundler) 

data/parallel_tests.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.4.16"
+  s.version = "0.4.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-04-29}
+  s.date = %q{2011-05-12}
   s.email = %q{grosser.michael@gmail.com}
-  s.executables = ["parallel_spec", "parallel_cucumber", "parallel_test"]
+  s.executables = ["parallel_cucumber", "parallel_spec", "parallel_test"]
   s.files = [
     ".gitignore",
      "Gemfile",
@@ -40,14 +40,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/grosser/parallel_tests}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Run tests / specs / features in parallel}
   s.test_files = [
-    "spec/parallel_cucumber_spec.rb",
+    "spec/parallel_tests_spec.rb",
      "spec/integration_spec.rb",
      "spec/parallel_specs_spec.rb",
-     "spec/parallel_tests_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/parallel_cucumber_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/integration_spec.rb

@@ -29,7 +29,7 @@ describe 'CLI' do
   end
 
   def run_specs(options={})
-    `cd #{folder} && #{executable} -t spec -n #{options[:processes]||2} #{options[:add]} 2>&1`
+    `cd #{folder} && #{executable} --chunk-timeout 999 -t spec -n #{options[:processes]||2} #{options[:add]} 2>&1`
   end
 
   it "runs tests in parallel" do
@@ -111,4 +111,4 @@ describe 'CLI' do
     result = run_specs(:add => "--test-options ' --version'", :processes => 2)
     result.should =~ /\d+\.\d+\.\d+.*\d+\.\d+\.\d+/m # prints version twice
   end
-end
+end

data/spec/parallel_cucumber_spec.rb

@@ -46,7 +46,7 @@ describe ParallelCucumber do
 
     it "uses options passed in" do
       ParallelCucumber.should_receive(:open).with{|x,y| x =~ %r{script/cucumber -p default}}.and_return mocked_process
-      ParallelCucumber.run_tests(['xxx'],1,'-p default')
+      ParallelCucumber.run_tests(['xxx'],1,:test_options => '-p default')
     end
   end
 
@@ -69,4 +69,4 @@ EOF
       ParallelCucumber.find_results(output).should == ["7 scenarios (3 failed, 4 passed)", "33 steps (3 failed, 2 skipped, 28 passed)", "4 scenarios (4 passed)", "40 steps (40 passed)"]
     end
   end
-end
+end

data/spec/parallel_specs_spec.rb

@@ -118,7 +118,7 @@ describe ParallelSpecs do
 
     it "uses options passed in" do
       ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{rspec -f n}}.and_return mocked_process
-      ParallelSpecs.run_tests(['xxx'],1,'-f n')
+      ParallelSpecs.run_tests(['xxx'],1, :test_options => '-f n')
     end
 
     it "returns the output" do

data/spec/parallel_tests_spec.rb

@@ -38,7 +38,7 @@ describe ParallelTests do
 
     it "uses options" do
       ParallelTests.should_receive(:open).with{|x,y| x=~ %r{ruby -Itest -v}}.and_return mocked_process
-      ParallelTests.run_tests(['xxx'],1,'-v')
+      ParallelTests.run_tests(['xxx'],1,:test_options => '-v')
     end
 
     it "returns the output" do
@@ -139,4 +139,4 @@ EOF
   it "has a version" do
     ParallelTests::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallel_tests
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 4
-  - 16
-  version: 0.4.16
+  - 17
+  version: 0.4.17
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 +02:00
+date: 2011-05-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,15 +28,15 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id001
-  name: parallel
   prerelease: false
+  type: :runtime
+  name: parallel
 description: 
 email: grosser.michael@gmail.com
 executables: 
-- parallel_spec
 - parallel_cucumber
+- parallel_spec
 - parallel_test
 extensions: []
 
@@ -96,13 +96,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Run tests / specs / features in parallel
 test_files: 
-- spec/parallel_cucumber_spec.rb
+- spec/parallel_tests_spec.rb
 - spec/integration_spec.rb
 - spec/parallel_specs_spec.rb
-- spec/parallel_tests_spec.rb
 - spec/spec_helper.rb
+- spec/parallel_cucumber_spec.rb