Merge branch 'master' of git://github.com/skippy/selenium-client into exp

Conflicts:
	README.markdown
	Rakefile
	lib/selenium/rake/remote_control_start_task.rb

Author: Philippe Hanrigou

README.markdown

@@ -283,6 +283,10 @@ Contribute and Join the Fun!
 * We also have a [continuous integration server](http://xserve.openqa.org:8080/view/Ruby%20Client)
 
 * Stories live in [Pivotal Tracker](https://www.pivotaltracker.com/projects/6280)
+* To build, run `rake clean default package`. You can then install the
+generated gem with `sudo gem install pkg/*.gem`
+* You can also run all integration tests with `rake ci:integration`
+
 
 Core Team
 =========
@@ -300,7 +304,6 @@ Contributors
 * Rick Lee-Morlang (`rleemorlang`):
    - Patch for incremental calls to `wait_for_text`
    - Regex support in `wait_for_text`
-
 
 * [Paul Boone](http://www.mindbucket.com) (`paulboone`)
    - Fixed method_missing in selenium_helper to only delegate to methods 

Rakefile

@@ -57,8 +57,11 @@ file "target/iedoc.xml" do
   end
 end
 
-desc "Generate driver from iedoc.xml"
-file "lib/selenium/client/generated_driver.rb" => [ "target/iedoc.xml" ] do
+task :clean_driver_build do
+  rm 'lib/selenium/client/generated_driver.rb'
+end
+
+file "lib/selenium/client/generated_driver.rb" => [ :clean_driver_build, "target/iedoc.xml" ] do
   sh "ant generate-sources"
 end
 
@@ -67,7 +70,6 @@ Rake::TestTask.new(:'test:unit') do |t|
   t.test_files = FileList['test/unit/**/*_test.rb']
   t.warning = true
 end
-task :"test:unit" => "lib/selenium/client/generated_driver.rb"
 
 Selenium::Rake::RemoteControlStartTask.new do |rc|
   rc.port = 4444
@@ -223,7 +225,14 @@ Rake::GemPackageTask.new(specification) do |package|
 end
 
 desc "Build the RubyGem"
-task :gem
+task :gem => "lib/selenium/client/generated_driver.rb"
+
+desc "Create a gemspec file"
+task :make_spec do
+  File.open("#{specification.name}.gemspec", "w") do |file|
+    file.puts specification.to_ruby
+  end
+end
 
 desc "Generate documentation"
 Rake::RDocTask.new("rdoc") do |rdoc|

lib/selenium/rake/remote_control_start_task.rb

@@ -24,7 +24,8 @@ module Rake
     # http://archiva.openqa.org/repository/snapshots/org/openqa/selenium/selenium-remote-control/1.0-SNAPSHOT/
     class RemoteControlStartTask
       attr_accessor :port, :timeout_in_seconds, :background, 
-                    :wait_until_up_and_running, :additional_args
+                    :wait_until_up_and_running, :additional_args,
+                    :log_to
       attr_reader :jar_file
 
       def initialize(name = :'selenium:rc:start')
@@ -51,6 +52,7 @@ def define
           remote_control = Selenium::RemoteControl::RemoteControl.new("0.0.0.0", @port, @timeout_in_seconds)
           remote_control.jar_file = @jar_file
           remote_control.additional_args = @additional_args
+          remote_control.log_to = @log_to
           remote_control.start :background => @background
           if @background && @wait_until_up_and_running
             puts "Waiting for Remote Control to be up and running..."

lib/selenium/remote_control/remote_control.rb

@@ -3,7 +3,7 @@ module RemoteControl
 
     class RemoteControl
       attr_reader :host, :port, :timeout_in_seconds
-      attr_accessor :additional_args, :jar_file
+      attr_accessor :additional_args, :jar_file, :log_to
 
       def initialize(host, port, timeout_in_seconds = 2 * 60)
         @host, @port, @timeout_in_seconds = host, port, timeout_in_seconds
@@ -16,6 +16,7 @@ def start(options = {})
         command << " -port #{@port}"
         command << " -timeout #{@timeout_in_seconds}"
         command << " #{additional_args.join(' ')}" unless additional_args.empty?
+        command << " > #{log_to}" if log_to
 
         @shell.run command, {:background => options[:background]}
       end