parallel_tests 0.4.4 → 0.4.5

data/README.markdown

@@ -57,15 +57,17 @@ Setup for non-rails
     sudo gem install parallel_tests
     # go to your project dir
     parallel_test OR parallel_spec OR parallel_cucumber
-    # [Optional] use ENV['TEST_ENV_NUMBER'] inside your tests for separate db/resources/etc.
+    # [Optional] use ENV['TEST_ENV_NUMBER'] inside your tests to select separate db/memcache/etc.
+
+[optional] Only run selected files & folders:
+    parallel_test test/bar test/baz/xxx_text.rb
 
 Options are:
     -n [PROCESSES]                   How many processes to use, default: available CPUs
     -p, --path [PATH]                run tests inside this path only
-    --no-sort                        do not sort files before running them
-    -r, --root [PATH]                execute test commands from this path
-    -f, --files [FILES]              run these test files (comma-separated list w/o spaces)
+        --no-sort                    do not sort files before running them
     -m, --multiply-processes [FLOAT] use given number as a multiplier of processes to run
+    -r, --root [PATH]                execute test commands from this path
     -e, --exec [COMMAND]             execute this code parallel and with ENV['TEST_ENV_NUM']
     -o, --test-options '[OPTIONS]' execute test commands with those options
     -t, --type [TYPE]                which type of tests to run? test, spec or features

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/bin/parallel_test

@@ -9,7 +9,10 @@ require "parallel_tests"
 options = {}
 OptionParser.new do |opts|
   opts.banner = <<BANNER
-Run tests in parallel, giving each process ENV['TEST_ENV_NUMBER'] ('', '2', '3', ...)
+Run all tests in parallel, giving each process ENV['TEST_ENV_NUMBER'] ('', '2', '3', ...)
+
+[optional] Only run selected files & folders:
+    parallel_test test/bar test/baz/xxx_text.rb
 
 Options are:
 BANNER
@@ -19,7 +22,7 @@ BANNER
   opts.on("-m [FLOAT]", "--multiply-processes [FLOAT]", Float, "use given number as a multiplier of processes to run"){ |multiply| options[:multiply] = multiply }
   opts.on("-r", '--root [PATH]', "execute test commands from this path"){|path| options[:root] = path }
   opts.on("-e", '--exec [COMMAND]', "execute this code parallel and with ENV['TEST_ENV_NUM']"){|path| options[:execute] = path }
-  opts.on("-o", "--test-options '[SOMETHING]'", "execute test commands with those options"){|arg| options[:test_options] = arg }
+  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('-v', '--version', 'Show Version'){ puts ParallelTests::VERSION; exit}
   opts.on("-h", "--help", "Show this.") { puts opts; exit }

data/lib/parallel_specs.rb

@@ -7,17 +7,24 @@ class ParallelSpecs < ParallelTests
   end
 
   def self.executable
-    if bundler_enabled?
-      "bundle exec spec"
-    elsif File.file?("script/spec")
+    cmd = if File.file?("script/spec")
       "script/spec"
+    elsif bundler_enabled?
+      cmd = (run("bundle show rspec") =~ %r{/rspec-1[^/]+$} ? "spec" : "rspec")
+      "bundle exec #{cmd}"
     else
-      "spec"
+      %w[spec rspec].detect{|cmd| system "#{cmd} --version > /dev/null 2>&1" }
     end
+    cmd or raise("Can't find executables rspec or spec")
   end
 
   protected
 
+  # so it can be stubbed....
+  def self.run(cmd)
+    `#{cmd}`
+  end
+
   def self.spec_opts
     opts = ['spec/parallel_spec.opts', 'spec/spec.opts'].detect{|f| File.file?(f) }
     opts ? "-O #{opts}" : nil

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-07-16}
+  s.date = %q{2010-08-17}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_spec", "parallel_cucumber", "parallel_test"]
   s.extra_rdoc_files = [

data/spec/integration_spec.rb

@@ -88,11 +88,11 @@ describe 'CLI' do
     write 'xxx6_spec.rb', 'describe("it"){it("should"){sleep 2}}'
     t = Time.now
     run_specs :processes => 6
-    expected = ((Parallel.processor_count == 1 or ENV['RUN_CODE_RUN']) ? 10 : 5)
+    expected = 10
     (Time.now - t).should <= expected
   end
 
-  it "can run with given files" do
+  it "can can with given files" do
     write "x1_spec.rb", "puts '111'"
     write "x2_spec.rb", "puts '222'"
     write "x3_spec.rb", "puts '333'"
@@ -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\.]+\nrspec [\d\.]+$/m # prints version twice
+    result.should =~ /\d+\.\d+\.\d+\..*\d+\.\d+\.\d+\./m # prints version twice
   end
 end

data/spec/parallel_specs_spec.rb

@@ -33,12 +33,22 @@ describe ParallelSpecs do
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
-    it "run bundle exec spec when on bundler 0.9" do
+    it "run bundle exec spec when on bundler 0.9 and 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"
       ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{bundle exec spec}}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
+    it "run bundle exec rspec when on bundler 0.9 and 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"
+      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{bundle exec rspec}}.and_return mocked_process
+      ParallelSpecs.run_tests(['xxx'],1,'')
+    end
+
     it "runs script/spec when script/spec can be found" do
       File.should_receive(:file?).with('script/spec').and_return true
       ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec}}.and_return mocked_process

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-16 00:00:00 +02:00
+date: 2010-08-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency