parallel_tests 0.9.4 → 0.10.0

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - ree
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org' 
 gemspec
 
 gem 'bump'

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.9.4)
+    parallel_tests (0.10.0)
       parallel
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     builder (3.0.0)
     bump (0.3.8)

data/Readme.md

@@ -26,7 +26,11 @@ gem "parallel", :group => :development
 ```
 
 ### Add to `config/database.yml`
-ParallelTests uses 1 database per test-process, 2 processes will use `*_test` and `*_test2`.
+ParallelTests uses 1 database per test-process.
+<table>
+  <tr><td>Process number</td><td>1</td><td>2</td><td>3</td></tr>
+  <tr><td>`ENV['TEST_ENV_NUMBER']`</td><td>''</td><td>'2'</td><td>'3'</td></tr>
+</table>
 
 ```yaml
 test:

data/bin/parallel_cucumber

@@ -1,2 +1,5 @@
 #!/usr/bin/env ruby
-exec "#{File.join(File.dirname(__FILE__), 'parallel_test')} -t cucumber #{ARGV.map{|a| "'#{a}'" } * ' '}"
+$LOAD_PATH << File.expand_path("../../lib", __FILE__)
+require "parallel_tests"
+
+ParallelTests::CLI.new.run(["--type", "cucumber"] + ARGV)

data/bin/parallel_rspec

@@ -1,2 +1,5 @@
 #!/usr/bin/env ruby
-exec "#{File.join(File.dirname(__FILE__), 'parallel_test')} -t rspec #{ARGV.map{|a| "'#{a}'" } * ' '}"
+$LOAD_PATH << File.expand_path("../../lib", __FILE__)
+require "parallel_tests"
+
+ParallelTests::CLI.new.run(["--type", "rspec"] + ARGV)

data/bin/parallel_test

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH << File.expand_path("../../lib", __FILE__)
 require "parallel_tests"
-require "parallel_tests/cli"
 
-ParallelTest::CLI.run(ARGV)
+ParallelTests::CLI.new.run(["--type", "test"] + ARGV)

data/lib/parallel_tests.rb

@@ -1,15 +1,17 @@
-require 'parallel'
-require 'parallel_tests/version'
-require 'parallel_tests/grouper'
-require 'parallel_tests/railtie' if defined? Rails::Railtie
+require "parallel"
+require "parallel_tests/railtie" if defined? Rails::Railtie
 
 module ParallelTests
   GREP_PROCESSES_COMMAND = "ps -ef | grep [T]EST_ENV_NUMBER= 2>&1"
 
+  autoload :CLI, "parallel_tests/cli"
+  autoload :VERSION, "parallel_tests/version"
+  autoload :Grouper, "parallel_tests/grouper"
+
   def self.determine_number_of_processes(count)
     [
       count,
-      ENV['PARALLEL_TEST_PROCESSORS'],
+      ENV["PARALLEL_TEST_PROCESSORS"],
       Parallel.processor_count
     ].detect{|c| not c.to_s.strip.empty? }.to_i
   end

data/lib/parallel_tests/cli.rb

@@ -1,9 +1,8 @@
 require 'optparse'
-require 'parallel_tests/test/runner'
 
-module ParallelTest
-  module CLI
-    def self.run(argv)
+module ParallelTests
+  class CLI
+    def run(argv)
       options = parse_options!(argv)
 
       num_processes = ParallelTests.determine_number_of_processes(options[:count])
@@ -18,57 +17,50 @@ module ParallelTest
 
     private
 
-    def self.run_tests_in_parallel(num_processes, options)
+    def run_tests_in_parallel(num_processes, options)
       test_results = nil
-      lib = options[:type] || 'test'
-      runner = load_runner_for(lib)
 
       report_time_taken do
-        groups = runner.tests_in_groups(options[:files], num_processes, options)
-        report_number_of_tests(runner, groups)
+        groups = @runner.tests_in_groups(options[:files], num_processes, options)
+        report_number_of_tests(groups)
 
         test_results = Parallel.map(groups, :in_processes => groups.size) do |group|
-          run_tests(runner, group, groups.index(group), num_processes, options)
+          run_tests(group, groups.index(group), num_processes, options)
         end
 
-        report_results(runner, test_results)
+        report_results(test_results)
       end
 
-      abort final_fail_message(lib) if any_test_failed?(test_results)
+      abort final_fail_message if any_test_failed?(test_results)
     end
 
-    def self.run_tests(runner, group, process_number, num_processes, options)
+    def run_tests(group, process_number, num_processes, options)
       if group.empty?
         {:stdout => '', :exit_status => 0}
       else
-        runner.run_tests(group, process_number, num_processes, options)
+        @runner.run_tests(group, process_number, num_processes, options)
       end
     end
 
-    def self.report_results(runner, test_results)
-      results = runner.find_results(test_results.map { |result| result[:stdout] }*"")
+    def report_results(test_results)
+      results = @runner.find_results(test_results.map { |result| result[:stdout] }*"")
       puts ""
-      puts runner.summarize_results(results)
+      puts @runner.summarize_results(results)
     end
 
-    def self.report_number_of_tests(runner, groups)
-      name = runner.test_file_name
+    def report_number_of_tests(groups)
+      name = @runner.test_file_name
       num_processes = groups.size
       num_tests = groups.map(&:size).inject(:+)
       puts "#{num_processes} processes for #{num_tests} #{name}s, ~ #{num_tests / groups.size} #{name}s per process"
     end
 
     #exit with correct status code so rake parallel:test && echo 123 works
-    def self.any_test_failed?(test_results)
+    def any_test_failed?(test_results)
       test_results.any? { |result| result[:exit_status] != 0 }
     end
 
-    def self.load_runner_for(lib)
-      require "parallel_tests/#{lib}/runner"
-      eval("ParallelTests::#{lib.capitalize.sub('Rspec','RSpec')}::Runner")
-    end
-
-    def self.parse_options!(argv)
+    def parse_options!(argv)
       options = {}
       OptionParser.new do |opts|
         opts.banner = <<BANNER
@@ -105,7 +97,14 @@ TEXT
 
         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]", "test(default) / rspec / cucumber") { |type| options[:type] = type }
+        opts.on("-t", "--type [TYPE]", "test(default) / rspec / cucumber") do |type|
+          begin
+            @runner = load_runner(type)
+          rescue NameError, LoadError => e
+            puts "Runner for `#{type}` type has not been found! (#{e})"
+            abort
+          end
+        end
         opts.on("--non-parallel", "execute same commands but do not in parallel, needs --exec") { options[:non_parallel] = true }
         opts.on("--no-symlinks", "Do not traverse symbolic links to find test files") { options[:symlinks] = false }
         opts.on('--ignore-tags [PATTERN]', 'When counting steps ignore scenarios with tags that match this pattern')  { |arg| options[:ignore_tag_pattern] = arg }
@@ -124,7 +123,13 @@ TEXT
       options
     end
 
-    def self.execute_shell_command_in_parallel(command, num_processes, options)
+    def load_runner(type)
+      require "parallel_tests/#{type}/runner"
+      klass_name = "ParallelTests::#{type.capitalize.sub("Rspec", "RSpec")}::Runner"
+      klass_name.split('::').inject(Object) { |x, y| x.const_get(y) }
+    end
+
+    def execute_shell_command_in_parallel(command, num_processes, options)
       runs = (0...num_processes).to_a
       results = if options[:non_parallel]
         runs.map do |i|
@@ -139,20 +144,20 @@ TEXT
       abort if results.any? { |r| r[:exit_status] != 0 }
     end
 
-    def self.report_time_taken
+    def report_time_taken
       start = Time.now
       yield
       puts "\nTook #{Time.now - start} seconds"
     end
 
-    def self.final_fail_message(lib)
-      fail_message = "#{lib.capitalize}s Failed"
+    def final_fail_message
+      fail_message = "#{@runner.name}s Failed"
       fail_message = "\e[31m#{fail_message}\e[0m" if use_colors?
 
       fail_message
     end
 
-    def self.use_colors?
+    def use_colors?
       $stdout.tty?
     end
   end

data/lib/parallel_tests/cucumber/runner.rb

@@ -1,8 +1,10 @@
-require 'parallel_tests/test/runner'
+require "parallel_tests/test/runner"
 
 module ParallelTests
   module Cucumber
     class Runner < ParallelTests::Test::Runner
+      NAME = 'Cucumber'
+
       def self.run_tests(test_files, process_number, num_processes, options)
         color = ($stdout.tty? ? 'AUTOTEST=1 ; export AUTOTEST ;' : '')#display color when we are in a terminal
         runtime_logging = " --format ParallelTests::Cucumber::RuntimeLogger --out #{runtime_log}"

data/lib/parallel_tests/rspec/runner.rb

@@ -1,8 +1,10 @@
-require 'parallel_tests/test/runner'
+require "parallel_tests/test/runner"
 
 module ParallelTests
   module RSpec
     class Runner < ParallelTests::Test::Runner
+      NAME = 'RSpec'
+
       def self.run_tests(test_files, process_number, num_processes, options)
         exe = executable # expensive, so we cache
         version = (exe =~ /\brspec\b/ ? 2 : 1)

data/lib/parallel_tests/test/runner.rb

@@ -1,8 +1,14 @@
 module ParallelTests
   module Test
     class Runner
+      NAME = 'Test'
+
       # --- usually overwritten by other runners
 
+      def self.name
+        NAME
+      end
+
       def self.runtime_log
         'tmp/parallel_runtime_test.log'
       end

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.9.4'
+  VERSION = Version = '0.10.0'
 end

data/spec/parallel_tests/cli_spec.rb

@@ -1,12 +1,16 @@
-require 'spec_helper'
-require 'parallel_tests/cli'
+require "spec_helper"
+require "parallel_tests/cli"
+require "parallel_tests/rspec/runner"
 
-describe ParallelTest::CLI do
-  describe ".parse_options" do
+
+describe ParallelTests::CLI do
+  subject { ParallelTests::CLI.new }
+
+  describe "#parse_options" do
     let(:defaults){ {:files => []} }
 
     def call(*args)
-      ParallelTest::CLI.send(:parse_options!, *args)
+      subject.send(:parse_options!, *args)
     end
 
     it "parses regular count" do
@@ -20,17 +24,44 @@ describe ParallelTest::CLI do
     it "parses non-parallel as non-parallel" do
       call(["--non-parallel"]).should == defaults.merge(:non_parallel => true)
     end
+
+    it "finds the correct type when multiple are given" do
+      call(["--type", "test", "-t", "rspec"])
+      subject.instance_variable_get(:@runner).should == ParallelTests::RSpec::Runner
+    end
   end
 
-  describe ".final_fail_message" do
+  describe "#load_runner" do
+    it "requires and loads default runner" do
+      subject.should_receive(:require).with("parallel_tests/test/runner")
+      subject.send(:load_runner, "test").should == ParallelTests::Test::Runner
+    end
+
+    it "requires and loads rspec runner" do
+      subject.should_receive(:require).with("parallel_tests/rspec/runner")
+      subject.send(:load_runner, "rspec").should == ParallelTests::RSpec::Runner
+    end
+
+    it "fails to load unfindable runner" do
+      expect{
+        subject.send(:load_runner, "foo").should == ParallelTests::RSpec::Runner
+      }.to raise_error(LoadError)
+    end
+  end
+
+  describe "#final_fail_message" do
+    before do
+      subject.instance_variable_set(:@runner, ParallelTests::Test::Runner)
+    end
+
     it 'returns a plain fail message if colors are nor supported' do
-      ParallelTest::CLI.should_receive(:use_colors?).and_return false
-      ParallelTest::CLI.send(:final_fail_message, "Test").should ==  "Tests Failed"
+      subject.should_receive(:use_colors?).and_return(false)
+      subject.send(:final_fail_message).should ==  "Tests Failed"
     end
 
     it 'returns a colorized fail message if colors are supported' do
-      ParallelTest::CLI.should_receive(:use_colors?).and_return true
-      ParallelTest::CLI.send(:final_fail_message, "Test").should == "\e[31mTests Failed\e[0m"
+      subject.should_receive(:use_colors?).and_return(true)
+      subject.send(:final_fail_message).should == "\e[31mTests Failed\e[0m"
     end
   end
 end

data/spec/parallel_tests/cucumber/runner_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require "spec_helper"
+require "parallel_tests/cucumber/runner"
 
 describe ParallelTests::Cucumber do
   test_tests_in_groups(ParallelTests::Cucumber::Runner, 'features', ".feature")

data/spec/parallel_tests/rspec/runner_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require "spec_helper"
+require "parallel_tests/rspec/runner"
 
 describe ParallelTests::RSpec::Runner do
   test_tests_in_groups(ParallelTests::RSpec::Runner, 'spec', '_spec.rb')

data/spec/parallel_tests/test/runner_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require "spec_helper"
+require "parallel_tests/test/runner"
 
 describe ParallelTests::Test::Runner do
   test_tests_in_groups(ParallelTests::Test::Runner, 'test', '_test.rb')

data/spec/spec_helper.rb

@@ -3,15 +3,12 @@ $LOAD_PATH << File.expand_path("../lib", File.dirname(__FILE__))
 FAKE_RAILS_ROOT = './tmp/pspecs/fixtures'
 
 require 'tempfile'
+
 require 'parallel_tests'
-require 'parallel_tests/test/runner'
 require 'parallel_tests/test/runtime_logger'
-
-require 'parallel_tests/rspec/runner'
 require 'parallel_tests/rspec/runtime_logger'
 require 'parallel_tests/rspec/summary_logger'
 
-require 'parallel_tests/cucumber/runner'
 
 OutputLogger = Struct.new(:output) do
   attr_reader :flock, :flush
@@ -62,7 +59,7 @@ def test_tests_in_groups(klass, folder, suffix)
   test_root = "#{FAKE_RAILS_ROOT}/#{folder}"
 
   describe :tests_in_groups do
-    before :all do
+    before do
       system "rm -rf #{FAKE_RAILS_ROOT}; mkdir -p #{test_root}/temp"
 
       @files = [0,1,2,3,4,5,6,7].map do |i|
@@ -77,8 +74,8 @@ def test_tests_in_groups(klass, folder, suffix)
       `rm -f #{@log}`
     end
 
-    after :all do
-      `rm -f #{klass.runtime_log}`
+    after do
+      `rm -f #{@log}`
     end
 
     def setup_runtime_log

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -38,6 +38,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -92,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3550907709337093037
+      hash: 1708090776445772692
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3550907709337093037
+      hash: 1708090776445772692
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24