Merge branch 'master' into rack

History.txt

@@ -1,4 +1,10 @@
-== 0.4.5 / ?
+== Git
+
+* Minor enhancements
+
+  * Don't require rubygems at runtime (Simon Rozet)
+
+== 0.4.5 / 2009-08-10
 
 * Major enhancements
 
@@ -9,6 +15,8 @@
 
 * Minor enhancements
 
+  * Upgrade to selenium-client to 1.2.16 (Brian Landau)
+  * Upgrade selenium-server.jar to 1.0.1 (Brian Landau)
   * Make redirect detection work in the face of rational maths (like when ruby-units is active) (Piers Cawley)
   * Use Launchy to handle opening pages in the browser with cross-platform compatibility (Bryan Helmkamp)
   * Added support for field_labeled_locators ending in non word characters

Rakefile

@@ -1,55 +1,32 @@
-# require 'rubygems'
-require "rake/gempackagetask"
-require 'rake/rdoctask'
-require "rake/clean"
-gem "rspec", "1.2.6"
-require 'spec'
-require 'spec/rake/spectask'
-require 'spec/rake/verify_rcov'
-require File.expand_path('./lib/webrat.rb')
-
-##############################################################################
-# Package && release
-##############################################################################
-spec = Gem::Specification.new do |s|
-  s.name         = "webrat"
-  s.version      = Webrat::VERSION
-  s.platform     = Gem::Platform::RUBY
-  s.author       = "Bryan Helmkamp"
-  s.email        = "bryan" + "@" + "brynary.com"
-  s.homepage     = "http://github.com/brynary/webrat"
-  s.summary      = "Webrat. Ruby Acceptance Testing for Web applications"
-  s.bindir       = "bin"
-  s.description  = s.summary
-  s.require_path = "lib"
-  s.files        = %w(History.txt install.rb MIT-LICENSE.txt README.rdoc Rakefile) + Dir["lib/**/*"] + Dir["vendor/**/*"]
-
-  # rdoc
-  s.has_rdoc         = true
-  s.extra_rdoc_files = %w(README.rdoc MIT-LICENSE.txt)
-
-  # Dependencies
-  s.add_dependency "nokogiri", ">= 1.2.0"
-
-  s.rubyforge_project = "webrat"
-end
+begin
+  require 'jeweler'
 
-Rake::GemPackageTask.new(spec) do |package|
-  package.gem_spec = spec
-end
+  Jeweler::Tasks.new do |s|
+    s.name      = "webrat"
+    s.author    = "Bryan Helmkamp"
+    s.email     = "bryan" + "@" + "brynary.com"
+    s.homepage  = "http://github.com/brynary/webrat"
+    s.summary   = "Ruby Acceptance Testing for Web applications"
+    # s.description  = "TODO"
 
-desc 'Show information about the gem.'
-task :debug_gem do
-  puts spec.to_ruby
-end
+    s.rubyforge_project = "webrat"
+    s.extra_rdoc_files = %w[README.rdoc MIT-LICENSE.txt History.txt]
 
-CLEAN.include ["pkg", "*.gem", "doc", "ri", "coverage"]
+    # Dependencies
+    s.add_dependency "nokogiri", ">= 1.2.0"
 
-desc "Upload rdoc to brynary.com"
-task :publish_rdoc => :docs do
-  sh "scp -r doc/ brynary.com:/apps/uploads/webrat"
+    # TODO: Add development dependencies
+  end
+
+  Jeweler::RubyforgeTasks.new
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
 end
 
+# require 'spec'
+require 'spec/rake/spectask'
+require 'spec/rake/verify_rcov'
+
 desc "Run API and Core specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""]
@@ -70,22 +47,6 @@ RCov::VerifyTask.new(:verify_rcov => :rcov) do |t|
   t.threshold = 96.2 # Make sure you have rcov 0.7 or higher!
 end
 
-desc 'Install the package as a gem.'
-task :install_gem => [:clean, :package] do
-  gem_filename = Dir['pkg/*.gem'].first
-  sh "sudo gem install --no-rdoc --no-ri --local #{gem_filename}"
-end
-
-desc "Delete generated RDoc"
-task :clobber_docs do
-  FileUtils.rm_rf("doc")
-end
-
-desc "Generate RDoc"
-task :docs => :clobber_docs do
-  system "hanna --title 'Webrat #{Webrat::VERSION} API Documentation'"
-end
-
 desc "Run everything against multiruby"
 task :multiruby do
   result = system "multiruby -S rake spec"
@@ -192,9 +153,13 @@ namespace :spec do
   end
 end
 
-task :default => :spec
-
 desc 'Removes trailing whitespace'
 task :whitespace do
   sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
-end
+end
+
+if defined?(Jeweler)
+  task :spec => :check_dependencies
+end
+
+task :default => :spec

VERSION

@@ -0,0 +1 @@
+0.4.5

lib/webrat.rb

@@ -1,31 +1,9 @@
-require "rubygems"
-
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
-
 module Webrat
   # The common base class for all exceptions raised by Webrat.
   class WebratError < StandardError
   end
-
-  VERSION = '0.4.4'
-
-  def self.require_xml
-    if on_java?
-      gem "nokogiri", ">= 1.2.4"
-    else
-      gem "nokogiri", ">= 1.0.6"
-    end
-
-    require "nokogiri"
-    require "webrat/core/xml/nokogiri"
-  end
-
-  def self.on_java?
-    RUBY_PLATFORM =~ /java/
-  end
-
 end
 
-Webrat.require_xml
-
+require "nokogiri"
+require "webrat/core/xml/nokogiri"
 require "webrat/core"

lib/webrat/selenium.rb

@@ -1,5 +1,4 @@
 require "webrat"
-gem "selenium-client", ">=1.2.14"
 require "selenium/client"
 require "webrat/selenium/silence_stream"
 require "webrat/selenium/selenium_session"

lib/webrat/selenium/selenium_rc_server.rb

@@ -34,7 +34,7 @@ def remote_control
 
         @remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0",
                                                                        Webrat.configuration.selenium_server_port,
-                                                                       Webrat.configuration.selenium_browser_startup_timeout)
+                                                                       :timeout => Webrat.configuration.selenium_browser_startup_timeout)
         @remote_control.jar_file = jar_path
 
         return @remote_control
@@ -74,7 +74,9 @@ def fail
 
       def stop
         silence_stream(STDOUT) do
-          ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", Webrat.configuration.selenium_server_port, 5).stop
+          ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0", 
+                                                       Webrat.configuration.selenium_server_port, 
+                                                       :timeout => 5).stop
         end
       end
 

spec/private/core/field_spec.rb

@@ -2,7 +2,7 @@
 
 module Webrat
   describe Field do
-    unless Webrat.on_java?
+    unless RUBY_PLATFORM =~ /java/
       it "should have nice inspect output" do
         html = <<-HTML
           <html>