watir 3.0.0 → 4.0.0.rc1

data/lib/watir.rb

@@ -1 +1,2 @@
-require 'watir/loader'
+require File.expand_path('watir/version', File.dirname(__FILE__))
+require File.expand_path('watir/loader', File.dirname(__FILE__))

data/lib/watir/loader.rb

@@ -1,2 +1,50 @@
-require 'watir-classic'
-require 'watir/version'
+module Watir
+  class Browser
+    class << self
+      def new(browser=nil, *args)
+        if browser && browser.to_sym != :ie && Watir.driver == :classic
+          Watir.driver = :webdriver 
+        end
+        Watir.load_driver
+
+        if Watir.driver == :webdriver
+          # remove this class method for WebDriver to avoid endless loop
+          singleton_class = class << self; self end
+          singleton_class.send :remove_method, :new
+        end
+
+        new browser, *args
+      end
+    end
+  end
+
+  class << self
+    def load_driver
+      require "watir-#{driver}"
+    rescue LoadError
+      warn "watir-#{driver} gem is missing. Install it with the following command:"
+      warn "  gem install watir-#{driver}"
+      exit 1
+    end
+
+    def driver
+      @driver || ENV["WATIR_DRIVER"] || default_driver
+    end
+
+    def driver=(driver)
+      allowed_drivers = %w[webdriver classic]
+      unless allowed_drivers.map(&:to_sym).include?(driver.to_sym)
+        raise "Supported drivers are #{allowed_drivers.join(", ")}." 
+      end
+      @driver = driver
+    end
+
+    def default_driver
+      if ENV['OS'] == 'Windows_NT'
+        :classic
+      else
+        :webdriver
+      end
+    end
+  end
+end

data/lib/watir/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  BUNDLE_VERSION = '3.0.0'
+  BUNDLE_VERSION = '4.0.0.rc1'
 end

data/watir.gemspec

@@ -15,7 +15,4 @@ Gem::Specification.new do |s|
   s.files = %x{git ls-files}.split("\n")
   s.require_paths = ["lib"]
   s.add_dependency "commonwatir", Watir::BUNDLE_VERSION
-
-  # bundled gems
-  s.add_dependency "watir-classic", '~> 3'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 3.0.0
-  prerelease: 
+  version: 4.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Bret Pettichord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonwatir
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: watir-classic
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: 4.0.0.rc1
 description: Automated testing tool for web applications. By Testers. For Testers.
 email:
 - bret@pettichord.com
@@ -70,13 +54,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: watir
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Watir
 test_files: []
+has_rdoc: