geordi 0.8.1 → 0.9.0

data/bin/cuc

@@ -1,36 +1,4 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + "/../lib/geordi/setup_firefox_for_selenium"
+require File.join(File.dirname(__FILE__), '../lib/geordi/cuc')
 
-def exec_with_shell_expansion(*args)
-  escaped_args = args.collect do |arg|
-    arg.gsub(/([\\ "])/) { |match| "\\#{$1}" }
-  end
-  exec escaped_args.join(' ')
-end
-
-def rerun_txt_exists_and_has_content?
-  File.exists?("rerun.txt") && !IO.read("rerun.txt").to_s.strip.empty?
-end
-
-# Print some whitespace
-4.times { puts }
-puts "Running Cucumber tests..."
-puts "========================="
-
-# Check if cucumber_spinner is available
-spinner_available = File.exists?('Gemfile') && File.open('Gemfile').read.scan(/cucumber_spinner/).any?
-format_args = spinner_available ? ['--format', 'CucumberSpinner::CuriousProgressBarFormatter'] : ['--format', 'progress']
-
-# Check if parallel_tests is available
-parallel_tests_available = ['rake', 'parallel:spec'] if File.exists?('Gemfile') && File.open('Gemfile').read.scan(/parallel_tests/).any?
-
-use_parallel_tests = parallel_tests_available && (ARGV[0] == nil) && !rerun_txt_exists_and_has_content?
-
-use_firefox_for_selenium = "PATH=#{Geordi::SetupFirefoxForSelenium::FIREFOX_FOR_SELENIUM_PATH}:$PATH"
-
-if use_parallel_tests
-  puts "Using parallel_tests ...\n\n"
-  exec_with_shell_expansion *[use_firefox_for_selenium, 'b', 'rake', 'parallel:features', ARGV].flatten
-else
-  exec_with_shell_expansion *[use_firefox_for_selenium, "b", "cucumber", format_args, ARGV].flatten
-end
+Geordi::Cucumber.new.run

data/lib/geordi/cuc.rb

@@ -0,0 +1,98 @@
+require 'rubygems'
+require 'geordi/setup_firefox_for_selenium'
+
+module Geordi
+  class Cucumber
+
+    def run
+      4.times { puts }
+      puts "Running Cucumber tests..."
+      puts "========================="
+
+      consolidate_rerun_txt_files
+      show_rerun_txt_file_content
+
+      command = use_parallel_tests? ? parallel_execution_command : serial_execution_command
+      exec command
+    end
+
+    def serial_execution_command
+      format_args = spinner_available ? ['--format', 'CucumberSpinner::CuriousProgressBarFormatter'] : ['--format', 'progress']
+      [use_firefox_for_selenium, "b", "cucumber", format_args, escape_shell_args(ARGV)].flatten.compact.join(" ")
+    end
+
+
+    def parallel_execution_command
+      puts "Using parallel_tests ...\n\n"
+      parallel_tests_args = '-t features'
+      cucumber_args = ARGV.empty? ? '' : "-o '#{escape_shell_args(ARGV).join(" ")}'"
+      [use_firefox_for_selenium, 'b', 'parallel_test', parallel_tests_args, cucumber_args].flatten.compact.join(" ")
+    end
+
+
+    def use_firefox_for_selenium
+      "PATH=#{Geordi::SetupFirefoxForSelenium::FIREFOX_FOR_SELENIUM_PATH}:$PATH"
+    end
+
+
+    def escape_shell_args(*args)
+      args.flatten.collect do |arg|
+        arg.gsub(/([\\ "])/) { |match| "\\#{$1}" }
+      end
+    end
+
+
+    def rerun_txt_exists_and_has_content?
+      File.exists?("rerun.txt") && !IO.read("rerun.txt").to_s.strip.empty?
+    end
+
+
+    def consolidate_rerun_txt_files
+      parallel_rerun_files = Dir.glob("parallel_rerun*.txt")
+      unless parallel_rerun_files.empty?
+        2.times { puts }
+        puts "consolidating parallel_rerun.txt files ..."
+
+        rerun_content = []
+        parallel_rerun_files.each do |filename|
+          rerun_content << File.read(filename).strip
+          File.unlink(filename)
+        end
+
+        File.open("rerun.txt", "w") do |f|
+          f.puts(rerun_content.join(" "))
+        end
+      end
+    end
+
+
+    def show_rerun_txt_file_content
+      return unless rerun_txt_exists_and_has_content?
+
+      2.times { puts }
+      puts "content of rerun.txt:"
+      puts "-------------------------"
+      puts File.read('rerun.txt')
+      puts "-------------------------"
+      2.times { puts }
+    end
+
+
+    # Check if cucumber_spinner is available
+    def spinner_available?
+      @spinner_available ||= File.exists?('Gemfile') && File.open('Gemfile').read.scan(/cucumber_spinner/).any?
+    end
+
+
+    # Check if parallel_tests is available
+    def parallel_tests_available?
+      @parallel_tests_available ||= File.exists?('Gemfile') && File.open('Gemfile').read.scan(/parallel_tests/).any?
+    end
+
+
+    def use_parallel_tests?
+      parallel_tests_available? && !rerun_txt_exists_and_has_content?
+    end
+
+  end
+end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geordi
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
-  - 1
-  version: 0.8.1
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 +01:00
+date: 2012-02-20 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -72,6 +72,7 @@ files:
 - bin/tests
 - geordi.gemspec
 - lib/geordi.rb
+- lib/geordi/cuc.rb
 - lib/geordi/gitpt.rb
 - lib/geordi/setup_firefox_for_selenium.rb
 - lib/geordi/version.rb