parallel_tests 0.13.3 → 0.14.0

data/Gemfile

@@ -5,4 +5,5 @@ gem 'bump'
 gem 'test-unit'
 gem 'rspec', '>=2.4'
 gem 'cucumber'
+gem 'spinach'
 gem 'rake'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.13.3)
+    parallel_tests (0.14.0)
       parallel
 
 GEM
@@ -9,6 +9,7 @@ GEM
   specs:
     builder (3.0.0)
     bump (0.3.8)
+    colorize (0.5.8)
     cucumber (1.1.4)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -20,9 +21,10 @@ GEM
       json (>= 1.4.6)
     gherkin (2.7.6-java)
       json (>= 1.4.6)
+    gherkin-ruby (0.3.0)
     json (1.7.5)
     json (1.7.5-java)
-    parallel (0.6.5)
+    parallel (0.7.0)
     rake (10.0.3)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
@@ -32,6 +34,9 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
+    spinach (0.8.3)
+      colorize (= 0.5.8)
+      gherkin-ruby (~> 0.3.0)
     term-ansicolor (1.0.7)
     test-unit (2.4.4)
 
@@ -45,4 +50,5 @@ DEPENDENCIES
   parallel_tests!
   rake
   rspec (>= 2.4)
+  spinach
   test-unit

data/Rakefile

@@ -2,5 +2,9 @@ require 'bump/tasks'
 require 'bundler/gem_tasks'
 
 task :default do
-  sh "rspec spec/"
+  if RUBY_VERSION < "1.9.0"
+    sh "rspec --tag ~fails_on_ruby_187 spec/"
+  else
+    sh "rspec spec/"
+  end
 end

data/Readme.md

@@ -9,7 +9,7 @@ Setup for Rails
 [still using Rails 2?](https://github.com/grosser/parallel_tests/blob/master/ReadmeRails2.md)
 
 ### Install
-If you use RSpec: ensure you got >= 2.4
+If you use RSpec: ensure you have >= 2.4
 
 As gem
 
@@ -48,6 +48,7 @@ test:
     rake parallel:test          # Test::Unit
     rake parallel:spec          # RSpec
     rake parallel:features      # Cucumber
+    rake parallel:features-spinach       # Spinach
 
     rake parallel:test[1] --> force 1 CPU --> 86 seconds
     rake parallel:test    --> got 2 CPUs? --> 47 seconds
@@ -164,6 +165,7 @@ Setup for non-rails
     parallel_test test/
     parallel_rspec spec/
     parallel_cucumber features/
+    parallel_spinach features/
 
  - use ENV['TEST_ENV_NUMBER'] inside your tests to select separate db/memcache/etc.
  - Only run selected files & folders:
@@ -183,7 +185,7 @@ Options are:
     -i, --isolate                    Do not run any other tests in the group used by --single(-s)
     -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]                test(default) / rspec / cucumber
+    -t, --type [TYPE]                test(default) / rspec / cucumber / spinach
         --serialize-stdout           Serialize stdout output, nothing will be written until everything is done
         --non-parallel               execute same commands but do not in parallel, needs --exec
         --no-symlinks                Do not traverse symbolic links to find test files
@@ -286,6 +288,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Iain Beeston](https://github.com/iainbeeston)
  - [Alejandro Pulver](https://github.com/alepulver)
  - [Felix Clack](https://github.com/felixclack)
+ - [Izaak Alpert](https://github.com/karlhungus)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/bin/parallel_spinach

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+$LOAD_PATH << File.expand_path("../../lib", __FILE__)
+require "parallel_tests"
+
+ParallelTests::CLI.new.run(["--type", "spinach"] + ARGV)

data/lib/parallel_tests.rb

@@ -8,52 +8,54 @@ module ParallelTests
   autoload :VERSION, "parallel_tests/version"
   autoload :Grouper, "parallel_tests/grouper"
 
-  def self.determine_number_of_processes(count)
-    [
-      count,
-      ENV["PARALLEL_TEST_PROCESSORS"],
-      Parallel.processor_count
-    ].detect{|c| not c.to_s.strip.empty? }.to_i
-  end
+  class << self
+    def determine_number_of_processes(count)
+      [
+        count,
+        ENV["PARALLEL_TEST_PROCESSORS"],
+        Parallel.processor_count
+      ].detect{|c| not c.to_s.strip.empty? }.to_i
+    end
 
-  # copied from http://github.com/carlhuda/bundler Bundler::SharedHelpers#find_gemfile
-  def self.bundler_enabled?
-    return true if Object.const_defined?(:Bundler)
+    # copied from http://github.com/carlhuda/bundler Bundler::SharedHelpers#find_gemfile
+    def bundler_enabled?
+      return true if Object.const_defined?(:Bundler)
 
-    previous = nil
-    current = File.expand_path(Dir.pwd)
+      previous = nil
+      current = File.expand_path(Dir.pwd)
 
-    until !File.directory?(current) || current == previous
-      filename = File.join(current, "Gemfile")
-      return true if File.exists?(filename)
-      current, previous = File.expand_path("..", current), current
-    end
+      until !File.directory?(current) || current == previous
+        filename = File.join(current, "Gemfile")
+        return true if File.exists?(filename)
+        current, previous = File.expand_path("..", current), current
+      end
 
-    false
-  end
+      false
+    end
 
-  def self.first_process?
-    !ENV["TEST_ENV_NUMBER"] || ENV["TEST_ENV_NUMBER"].to_i == 0
-  end
+    def first_process?
+      !ENV["TEST_ENV_NUMBER"] || ENV["TEST_ENV_NUMBER"].to_i == 0
+    end
 
-  def self.wait_for_other_processes_to_finish
-    return unless ENV["TEST_ENV_NUMBER"]
-    sleep 1 until number_of_running_processes <= 1
-  end
+    def wait_for_other_processes_to_finish
+      return unless ENV["TEST_ENV_NUMBER"]
+      sleep 1 until number_of_running_processes <= 1
+    end
 
-  # Fun fact: this includes the current process if it's run via parallel_tests
-  def self.number_of_running_processes
-    result = `#{GREP_PROCESSES_COMMAND}`
-    raise "Could not grep for processes -> #{result}" if result.strip != "" && !$?.success?
-    result.split("\n").size
-  end
+    # Fun fact: this includes the current process if it's run via parallel_tests
+    def number_of_running_processes
+      result = `#{GREP_PROCESSES_COMMAND}`
+      raise "Could not grep for processes -> #{result}" if result.strip != "" && !$?.success?
+      result.split("\n").size
+    end
 
-  # real time even if someone messed with timecop in tests
-  def self.now
-    if Time.respond_to?(:now_without_mock_time) # Timecop
-      Time.now_without_mock_time
-    else
-      Time.now
+    # real time even if someone messed with timecop in tests
+    def now
+      if Time.respond_to?(:now_without_mock_time) # Timecop
+        Time.now_without_mock_time
+      else
+        Time.now
+      end
     end
   end
 end

data/lib/parallel_tests/cli.rb

@@ -96,7 +96,7 @@ BANNER
         opts.on("--group-by [TYPE]", <<-TEXT
 group tests by:
           found - order of finding files
-          steps - number of cucumber steps
+          steps - number of cucumber/spinach steps
           default - runtime or filesize
 TEXT
 ) { |type| options[:group_by] = type.to_sym }
@@ -117,7 +117,7 @@ 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") do |type|
+        opts.on("-t", "--type [TYPE]", "test(default) / rspec / cucumber / spinach") do |type|
           begin
             @runner = load_runner(type)
           rescue NameError, LoadError => e

data/lib/parallel_tests/cucumber/failures_logger.rb

@@ -1,10 +1,10 @@
 require 'cucumber/formatter/rerun'
-require 'parallel_tests/cucumber/io'
+require 'parallel_tests/gherkin/io'
 
 module ParallelTests
   module Cucumber
     class FailuresLogger < ::Cucumber::Formatter::Rerun
-      include Io
+      include ParallelTests::Gherkin::Io
 
       def initialize(runtime, path_or_io, options)
         @io = prepare_io(path_or_io)

data/lib/parallel_tests/cucumber/runner.rb

@@ -1,94 +1,11 @@
-require "parallel_tests/test/runner"
-require 'shellwords'
+require "parallel_tests/gherkin/runner"
 
 module ParallelTests
   module Cucumber
-    class Runner < ParallelTests::Test::Runner
-      NAME = 'Cucumber'
-
-      def self.run_tests(test_files, process_number, num_processes, options)
-        sanitized_test_files = test_files.map { |val| Shellwords.escape(val) }
-        options = options.merge(:env => {"AUTOTEST" => "1"}) if $stdout.tty? # display color when we are in a terminal
-        runtime_logging = " --format ParallelTests::Cucumber::RuntimeLogger --out #{runtime_log}"
-        cmd = [
-          executable,
-          (runtime_logging if File.directory?(File.dirname(runtime_log))),
-          cucumber_opts(options[:test_options]),
-          *sanitized_test_files
-        ].compact.join(" ")
-        execute_command(cmd, process_number, num_processes, options)
-      end
-
-      def self.determine_executable
-        case
-        when File.exists?("bin/cucumber")
-          "bin/cucumber"
-        when ParallelTests.bundler_enabled?
-          "bundle exec cucumber"
-        when File.file?("script/cucumber")
-          "script/cucumber"
-        else
-          "cucumber"
-        end
-      end
-
-      def self.runtime_log
-        'tmp/parallel_runtime_cucumber.log'
-      end
-
-      def self.test_file_name
-        "feature"
-      end
-
-      def self.test_suffix
-        ".feature"
-      end
-
-      def self.line_is_result?(line)
-        line =~ /^\d+ (steps?|scenarios?)/
-      end
-
-      # cucumber has 2 result lines per test run, that cannot be added
-      # 1 scenario (1 failed)
-      # 1 step (1 failed)
-      def self.summarize_results(results)
-        sort_order = %w[scenario step failed undefined skipped pending passed]
-
-        %w[scenario step].map do |group|
-          group_results = results.grep /^\d+ #{group}/
-          next if group_results.empty?
-
-          sums = sum_up_results(group_results)
-          sums = sums.sort_by { |word, _| sort_order.index(word) || 999 }
-          sums.map! do |word, number|
-            plural = "s" if word == group and number != 1
-            "#{number} #{word}#{plural}"
-          end
-          "#{sums[0]} (#{sums[1..-1].join(", ")})"
-        end.compact.join("\n")
-      end
-
-      def self.cucumber_opts(given)
-        if given =~ /--profile/ or given =~ /(^|\s)-p /
-          given
-        else
-          [given, profile_from_config].compact.join(" ")
-        end
-      end
-
-      def self.profile_from_config
-        # copied from https://github.com/cucumber/cucumber/blob/master/lib/cucumber/cli/profile_loader.rb#L85
-        config = Dir.glob('{,.config/,config/}cucumber{.yml,.yaml}').first
-        if config && File.read(config) =~ /^parallel:/
-          "--profile parallel"
-        end
-      end
-
-      def self.tests_in_groups(tests, num_groups, options={})
-        if options[:group_by] == :steps
-          Grouper.by_steps(find_tests(tests, options), num_groups, options)
-        else
-          super
+    class Runner < ParallelTests::Gherkin::Runner
+      class << self
+        def name
+          'cucumber'
         end
       end
     end

data/lib/parallel_tests/{cucumber → gherkin}/io.rb

@@ -1,7 +1,7 @@
 require 'parallel_tests'
 
 module ParallelTests
-  module Cucumber
+  module Gherkin
     module Io
 
       def prepare_io(path_or_io)

data/lib/parallel_tests/{cucumber/gherkin_listener.rb → gherkin/listener.rb}

@@ -1,8 +1,8 @@
 require 'gherkin'
 
 module ParallelTests
-  module Cucumber
-    class GherkinListener
+  module Gherkin
+    class Listener
       attr_reader :collect
 
       attr_writer :ignore_tag_pattern

data/lib/parallel_tests/gherkin/runner.rb

@@ -0,0 +1,102 @@
+require "parallel_tests/test/runner"
+require 'shellwords'
+
+module ParallelTests
+  module Gherkin
+    class Runner < ParallelTests::Test::Runner
+
+      class << self
+        def run_tests(test_files, process_number, num_processes, options)
+          sanitized_test_files = test_files.map { |val| Shellwords.escape(val) }
+          options = options.merge(:env => {"AUTOTEST" => "1"}) if $stdout.tty? # display color when we are in a terminal
+          cmd = [
+            executable,
+            (runtime_logging if File.directory?(File.dirname(runtime_log))),
+            cucumber_opts(options[:test_options]),
+            *sanitized_test_files
+          ].compact.join(" ")
+          execute_command(cmd, process_number, num_processes, options)
+        end
+
+        def test_file_name
+          "feature"
+        end
+
+        def test_suffix
+          ".feature"
+        end
+
+        def line_is_result?(line)
+          line =~ /^\d+ (steps?|scenarios?)/
+        end
+
+        # cucumber has 2 result lines per test run, that cannot be added
+        # 1 scenario (1 failed)
+        # 1 step (1 failed)
+        def summarize_results(results)
+          sort_order = %w[scenario step failed undefined skipped pending passed]
+
+          %w[scenario step].map do |group|
+            group_results = results.grep /^\d+ #{group}/
+            next if group_results.empty?
+
+            sums = sum_up_results(group_results)
+            sums = sums.sort_by { |word, _| sort_order.index(word) || 999 }
+            sums.map! do |word, number|
+              plural = "s" if word == group and number != 1
+              "#{number} #{word}#{plural}"
+            end
+            "#{sums[0]} (#{sums[1..-1].join(", ")})"
+          end.compact.join("\n")
+        end
+
+        def cucumber_opts(given)
+          if given =~ /--profile/ or given =~ /(^|\s)-p /
+            given
+          else
+            [given, profile_from_config].compact.join(" ")
+          end
+        end
+
+        def profile_from_config
+          # copied from https://github.com/cucumber/cucumber/blob/master/lib/cucumber/cli/profile_loader.rb#L85
+          config = Dir.glob("{,.config/,config/}#{name}{.yml,.yaml}").first
+          if config && File.read(config) =~ /^parallel:/
+            "--profile parallel"
+          end
+        end
+
+        def tests_in_groups(tests, num_groups, options={})
+          if options[:group_by] == :steps
+            Grouper.by_steps(find_tests(tests, options), num_groups, options)
+          else
+            super
+          end
+        end
+
+
+        def runtime_logging
+          " --format ParallelTests::Gherkin::RuntimeLogger --out #{runtime_log}"
+        end
+
+        def runtime_log
+          "tmp/parallel_runtime_#{name}.log"
+        end
+
+        def determine_executable
+          case
+            when File.exists?("bin/#{name}")
+              "bin/#{name}"
+            when ParallelTests.bundler_enabled?
+              "bundle exec #{name}"
+            when File.file?("script/#{name}")
+              "script/#{name}"
+            else
+              "#{name}"
+          end
+        end
+
+      end
+    end
+  end
+end