bin/cuc in geordi-0.4.6 vs bin/cuc in geordi-0.5.0

@@ -1,7 +1,15 @@
 #!/usr/bin/env ruby
+require File.dirname(__FILE__) + "/../lib/geordi/setup_firefox_for_selenium"
 
+def exec_with_shell_expansion(*args)
+  escaped_args = args.collect do |arg|
+    arg.gsub(/([\\ "])/) { |match| "\\#{$1}" }
+  end
+  exec escaped_args.join(' ')
+end
+
 # Print some whitespace
 4.times { puts }
 puts "Running Cucumber tests..."
 puts "========================="
 
@@ -12,11 +20,13 @@
 # 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)
 
+use_firefox_for_selenium = "PATH=#{Geordi::SetupFirefoxForSelenium::FIREFOX_FOR_SELENIUM_PATH}:$PATH"
+
 if use_parallel_tests
   puts "Using parallel_tests ...\n\n"
-  exec *['b', 'rake', 'parallel:features', ARGV].flatten
+  exec_with_shell_expansion *[use_firefox_for_selenium, 'b', 'rake', 'parallel:features', ARGV].flatten
 else
-  exec *["b", "cucumber", format_args, ARGV].flatten
-end
\ No newline at end of file
+  exec_with_shell_expansion *[use_firefox_for_selenium, "b", "cucumber", format_args, ARGV].flatten
+end