parallel_tests 0.4.12 → 0.4.13

data/VERSION

@@ -1 +1 @@
-0.4.12
+0.4.13

data/lib/parallel_specs.rb

@@ -2,8 +2,9 @@ require File.join(File.dirname(__FILE__), 'parallel_tests')
 
 class ParallelSpecs < ParallelTests
   def self.run_tests(test_files, process_number, options)
-    exe = executable # its expensive with bundler, so do not call it twice
-    cmd = "#{color} #{exe} #{options} #{spec_opts(exe)} #{test_files*' '}"
+    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)
   end
 
@@ -26,20 +27,23 @@ class ParallelSpecs < ParallelTests
     `#{cmd}`
   end
 
-  def self.spec_opts(executable)
-    opts = ['spec/parallel_spec.opts', 'spec/spec.opts'].detect{|f| File.file?(f) }
-    return unless opts
-    if executable =~ /\brspec\b/
-      # RSpec2 does not handle -O, so we inline the options
-      File.read(opts).tr("\n", ' ')
-    else
-      "-O #{opts}"
-    end
+  def self.rspec_1_color
+    'RSPEC_COLOR=1 ; export RSPEC_COLOR ;' if $stdout.tty?
+  end
+
+  def self.rspec_2_color
+    '--tty ' if $stdout.tty?
   end
 
-  #display color when we are in a terminal
-  def self.color
-    ($stdout.tty? ? 'RSPEC_COLOR=1 ; export RSPEC_COLOR ;' : '')
+  def self.spec_opts(rspec_version)
+    options_file = ['spec/parallel_spec.opts', 'spec/spec.opts'].detect{|f| File.file?(f) }
+    return unless options_file
+    if rspec_version == 2
+      # does not handle -O, so we inline the options
+      File.read(options_file).tr("\n", ' ')
+    else
+      "-O #{options_file}"
+    end
   end
 
   def self.test_suffix

data/parallel_tests.gemspec

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

data/spec/parallel_specs_spec.rb

@@ -22,13 +22,27 @@ describe ParallelSpecs do
     end
 
     it "runs with color when called from cmdline" do
-      ParallelSpecs.should_receive(:open).with{|x,y| x=~/RSPEC_COLOR=1/}.and_return mocked_process
+      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,'')
     end
 
     it "runs without color when not called from cmdline" do
-      ParallelSpecs.should_receive(:open).with{|x,y| x !~ /RSPEC_COLOR/}.and_return mocked_process
+      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,'')
+    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,'')
+    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,'')
     end
@@ -70,14 +84,14 @@ describe ParallelSpecs do
     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.should_receive(:open).with{|x,y| x =~ %r{script/spec\s+ -O spec/spec.opts}}.and_return mocked_process
       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.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,'')
     end
 
@@ -98,7 +112,7 @@ 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{rspec\s+ --foo --bar}}.and_return mocked_process
+      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{rspec\s+ --tty --foo --bar}}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
@@ -146,4 +160,4 @@ EOF
       ParallelSpecs.find_results(output).should == ['0 examples, 0 failures, 0 pending','1 examples, 1 failures, 1 pending']
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallel_tests
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 4
-  - 12
-  version: 0.4.12
+  - 13
+  version: 0.4.13
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +01:00
+date: 2011-04-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -28,10 +28,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  version_requirements: *id001
   type: :runtime
+  requirement: *id001
   name: parallel
+  prerelease: false
 description: 
 email: grosser.michael@gmail.com
 executables: