parallel_tests 0.4.7 → 0.4.8

data/Gemfile

@@ -0,0 +1,6 @@
+source 'http://rubygems.org'
+
+gem 'rake'
+gem 'rspec', '~>2'
+gem 'parallel'
+gem 'jeweler'

data/Gemfile.lock

@@ -0,0 +1,34 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    parallel (0.5.1)
+    rake (0.8.7)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  parallel
+  rake
+  rspec (~> 2)

data/Rakefile

@@ -1,6 +1,8 @@
 task :default => :spec
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color --backtrace']}
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--backtrace --color'
+end
 
 begin
   require 'jeweler'

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/lib/parallel_specs.rb

@@ -2,7 +2,8 @@ require File.join(File.dirname(__FILE__), 'parallel_tests')
 
 class ParallelSpecs < ParallelTests
   def self.run_tests(test_files, process_number, options)
-    cmd = "#{color} #{executable} #{options} #{spec_opts} #{test_files*' '}"
+    exe = executable # its expensive with bundler, so do not call it twice
+    cmd = "#{color} #{exe} #{options} #{spec_opts(exe)} #{test_files*' '}"
     execute_command(cmd, process_number)[:stdout]
   end
 
@@ -25,9 +26,15 @@ class ParallelSpecs < ParallelTests
     `#{cmd}`
   end
 
-  def self.spec_opts
+  def self.spec_opts(executable)
     opts = ['spec/parallel_spec.opts', 'spec/spec.opts'].detect{|f| File.file?(f) }
-    opts ? "-O #{opts}" : nil
+    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
   end
 
   #display color when we are in a terminal

data/parallel_tests.gemspec

@@ -5,15 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.4.7"
+  s.version = "0.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-09-24}
+  s.date = %q{2010-11-23}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_spec", "parallel_cucumber", "parallel_test"]
   s.files = [
     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "Rakefile",
      "Readme.md",
      "VERSION",
@@ -38,7 +40,7 @@ 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.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Run tests / specs / features in parallel}
   s.test_files = [
     "spec/parallel_cucumber_spec.rb",
@@ -52,7 +54,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<parallel>, [">= 0"])
     else
       s.add_dependency(%q<parallel>, [">= 0"])

data/spec/integration_spec.rb

@@ -106,6 +106,6 @@ describe 'CLI' do
     write "x1_spec.rb", ""
     write "x2_spec.rb", ""
     result = run_specs(:add => "--test-options ' --version'", :processes => 2)
-    result.should =~ /rspec \d+\.\d+\.\d+.*rspec \d+\.\d+\.\d+/m # prints version twice
+    result.should =~ /\d+\.\d+\.\d+.*\d+\.\d+\.\d+/m # prints version twice
   end
 end

data/spec/parallel_cucumber_spec.rb

@@ -1,10 +1,11 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec/spec_helper'
 
 describe ParallelCucumber do
   test_tests_in_groups(ParallelCucumber, 'features', ".feature")
 
   describe :run_tests do
-    before(:each) do
+    before do
+      ParallelCucumber.stub!(:bundler_enabled?).and_return false
       File.stub!(:file?).with('.bundle/environment.rb').and_return false
       File.stub!(:file?).with('script/cucumber').and_return true
     end

data/spec/parallel_specs_spec.rb

@@ -1,14 +1,14 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec/spec_helper'
 
 describe ParallelSpecs do
   test_tests_in_groups(ParallelSpecs, 'spec', '_spec.rb')
 
   describe :run_tests do
     before do
-      File.stub!(:file?).with('.bundle/environment.rb').and_return false
-      File.stub!(:file?).with('script/spec').and_return true
-      File.stub!(:file?).with('spec/spec.opts').and_return true
+      File.stub!(:file?).with('script/spec').and_return false
+      File.stub!(:file?).with('spec/spec.opts').and_return false
       File.stub!(:file?).with('spec/parallel_spec.opts').and_return false
+      ParallelSpecs.stub!(:bundler_enabled?).and_return false
     end
 
     it "uses TEST_ENV_NUMBER=blank when called for process 0" do
@@ -33,7 +33,7 @@ describe ParallelSpecs do
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
-    it "run bundle exec spec when on bundler 0.9 and rspec 1" do
+    it "run bundle exec spec when on bundler rspec 1" do
       File.stub!(:file?).with('script/spec').and_return false
       ParallelSpecs.stub!(:bundler_enabled?).and_return true
       ParallelSpecs.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-1.0.2"
@@ -41,7 +41,7 @@ describe ParallelSpecs do
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
-    it "run bundle exec rspec when on bundler 0.9 and rspec 2" do
+    it "run bundle exec rspec when on bundler rspec 2" do
       File.stub!(:file?).with('script/spec').and_return false
       ParallelSpecs.stub!(:bundler_enabled?).and_return true
       ParallelSpecs.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-2.0.2"
@@ -57,7 +57,7 @@ describe ParallelSpecs do
 
     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)|(bundle exec spec)}}.and_return mocked_process
+      ParallelSpecs.should_receive(:open).with{|x,y| x !~ %r{script/spec}}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
@@ -67,19 +67,43 @@ describe ParallelSpecs do
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
-    it "uses spec/spec.opts when found" 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.run_tests(['xxx'],1,'')
     end
 
-    it "uses spec/parallel_spec.opts when found" do
+    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,'')
     end
 
+    it "uses -O spec/parallel_spec.opts with rspec1" do
+      File.should_receive(:file?).with('spec/parallel_spec.opts').and_return true
+
+      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{spec\s+ -O spec/parallel_spec.opts}}.and_return mocked_process
+      ParallelSpecs.run_tests(['xxx'],1,'')
+    end
+
+    it "uses inline options with rspec2" do
+      File.should_receive(:file?).with('spec/parallel_spec.opts').and_return true
+      File.should_receive(:read).with('spec/parallel_spec.opts').and_return "--foo\n--bar\n"
+
+      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.run_tests(['xxx'],1,'')
+    end
+
     it "uses options passed in" do
-      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec -f n}}.and_return mocked_process
+      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{rspec -f n}}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],1,'-f n')
     end
 

data/spec/parallel_tests_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec/spec_helper'
 
 describe ParallelTests do
   test_tests_in_groups(ParallelTests, 'test', '_test.rb')
@@ -138,6 +138,10 @@ EOF
   end
 
   describe :bundler_enabled? do
+    before do
+      Object.stub!(:const_defined?).with(:Bundler).and_return false
+    end
+
     it "should return false" do
       use_temporary_directory_for do
         ParallelTests.send(:bundler_enabled?).should == false

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallel_tests
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 4
-  - 7
-  version: 0.4.7
+  - 8
+  version: 0.4.8
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,19 +15,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 +02:00
+date: 2010-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: parallel
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  name: parallel
+  prerelease: false
   type: :runtime
   version_requirements: *id001
 description: 
@@ -41,6 +44,8 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - Rakefile
 - Readme.md
 - VERSION
@@ -71,23 +76,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Run tests / specs / features in parallel