watirgrid 0.0.7 → 0.0.8.pre

data/lib/provider.rb

@@ -1,242 +1,228 @@
-#!/usr/bin/env ruby 
-# provider.rb
-# Rinda Ring Provider
-
-require 'rubygems'
-require 'rinda/ring'
-require 'rinda/tuplespace'
-require 'logger'
-require 'drb/acl'
-require 'uuid'
-
-begin
-    require 'watir'
-rescue LoadError
-end
-
-begin
-    require 'firewatir'
-rescue LoadError
-
-begin
-    require 'safariwatir'
-rescue LoadError
-end
-
-end
-
-module Watir
-  
-  ##
-  # Extend Watir with a Provider class
-  # to determine which browser type is supported by the 
-  # remote DRb process. This returns the DRb front object.
-  class Provider
-
-    include DRbUndumped # all objects will be proxied, not copied
-
-    attr_reader :browser
-
-    def initialize(browser = nil)
-      browser = (browser || 'tmp').downcase.to_sym  
-      case browser
-        when :safari
-          @browser = Watir::Safari
-        when :firefox
-          @browser = FireWatir::Firefox 
-        when :ie
-          @browser = Watir::IE
-        else
-          @browser = find_supported_browser
-      end    
-    end
-
-    def find_supported_browser
-      if Watir::IE then return Watir::IE end
-      if FireWatir::Firefox then return FireWatir::Firefox end
-      if Watir::Safari then return Watir::Safari end
-    end
-
-    def new_browser   
-      if @browser.nil?
-        find_supported_browser.new
-      else
-        @browser.new
-      end 
-    end
-    
-    ##
-    # Get a list of running browsers (optionally specified by browser)
-    # 'iexplore','firefox','firefox-bin','chrome','safari','opera'
-    def get_running_browsers(browser=nil)
-      browsers = browser || \
-        ['iexplore','firefox','firefox-bin','chrome','safari','opera']
-      case Config::CONFIG['arch']
-      when /mswin/
-        %x[tasklist].split(/\s+/).collect { |x| x[/\w+/]} \
-          & browsers.collect { |x| x.downcase }
-      when /linux|darwin/
-        %x[ps -A | grep -v ruby].split(/\/|\s+/).collect { |x| x.downcase} \
-          & browsers
-      end
-    end
-    
-    def get_running_processes
-      %x[ps -A | grep -v ruby].split(/\/|\s+/).collect.uniq
-    end
-    
-    ##
-    # Kill any browser running
-    def kill_all_browsers
-      case Config::CONFIG['arch']
-      when /mswin/
-        browsers = ['iexplore.exe', 'firefox.exe', 'chrome.exe']
-        browsers.each { |browser| %x[taskkill /F /IM #{browser}] } 
-      when /linux/
-        browsers = ['firefox', 'chrome', 'opera']
-        browsers.each { |browser| %x[killall -r #{browser}] } 
-      when /darwin/
-        browsers = ['firefox-bin', 'Chrome', 'Safari']
-        browsers.each { |browser| %x[killall -m #{browser}] } 
-      end
-    end
-    
-    ##
-    # Kill all browsers specified by browser name
-    # Windows: 'iexplore.exe', 'firefox.exe', 'chrome.exe'
-    # Linux: 'firefox', 'chrome', 'opera'
-    # OSX: 'firefox-bin', 'Chrome', 'Safari'
-    def kill_browser(browser)
-      case Config::CONFIG['arch']
-      when /mswin/
-        %x[taskkill /F /IM #{browser}]
-      when /linux/
-        %x[killall -r #{browser}]
-      when /darwin/
-        %x[killall -m #{browser}]
-      end
-    end
-    
-    ##
-    # Start firefox (with an optional bin path) using the -jssh extension
-    def start_firefox_jssh(path=nil)
-      case Config::CONFIG['arch']
-      when /mswin/
-        bin = path || "C:/Program Files/Mozilla Firefox/firefox.exe"
-      when /linux/
-        bin = path || "/usr/bin/firefox"
-      when /darwin/
-        bin = path || "/Applications/Firefox.app/Contents/MacOS/firefox-bin" 
-      end      
-      # fork off and die!
-      Thread.new {system(bin, "about:blank", "-jssh")}
-    end
-    
-    ##
-    # Get the logged-in user
-    def get_logged_in_user
-      %x[whoami].chomp
-    end
-    
-    ##
-    # Grep for a process (Linux/OSX-with-port only)
-    def process_grep(pattern)
-      %x[pgrep -l #{pattern}].split(/\n/)
-    end
-    
-    def renew_provider
-      self.class.superclass
-    end
-  
-  end
-
-end
-
-class Provider
-
-  attr_accessor :drb_server_uri, :ring_server_uri
-
-  def initialize(params = {})   
-    @drb_server_host  = params[:drb_server_host]  || external_interface
-    @drb_server_port  = params[:drb_server_port]  || 0
-    @ring_server_host = params[:ring_server_host] || external_interface
-    @ring_server_port = params[:ring_server_port] || Rinda::Ring_PORT
-
-    @renewer = params[:renewer] || Rinda::SimpleRenewer.new
-    @browser_type = params[:browser_type] || nil
-
-    logfile = params[:logfile] || STDOUT
-    @log  = Logger.new(logfile, 'daily')
-    @log.level = params[:loglevel] || Logger::INFO
-    @log.datetime_format = "%Y-%m-%d %H:%M:%S "   
-
-  end  
-
-  ##
-  # Start providing watir objects on the ring server  
-  def start
-    # create a DRb 'front' object
-    watir_provider = Watir::Provider.new(@browser_type)
-    architecture = Config::CONFIG['arch']
-    hostname = ENV['SERVER_NAME'] || %x{hostname}.strip
-
-    # setup the security--remember to call before DRb.start_service()
-    DRb.install_acl(ACL.new(@acls))
-
-    # start the DRb Server
-    drb_server = DRb.start_service(
-      "druby://#{@drb_server_host}:#{@drb_server_port}")  
-
-    # obtain DRb Server uri
-    @drb_server_uri = drb_server.uri
-    @log.info("DRb server started on : #{@drb_server_uri}")
-
-    # create a service tuple
-    @tuple = [
-                :WatirGrid, 
-                :WatirProvider, 
-                watir_provider, 
-                'A watir provider', 
-                hostname,
-                architecture,
-                @browser_type,
-                UUID.new.generate
-              ]   
-
-    # locate the Rinda Ring Server via a UDP broadcast
-    @log.debug("Attempting to find ring server on : druby://#{@ring_server_host}:#{@ring_server_port}")
-    ring_server = Rinda::RingFinger.new(@ring_server_host, @ring_server_port)
-    ring_server = ring_server.lookup_ring_any
-    @log.info("Ring server found on  : druby://#{@ring_server_host}:#{@ring_server_port}")
-
-    # advertise this service on the primary remote tuple space
-    ring_server.write(@tuple, @renewer)
-
-    # log DRb server uri
-    @log.info("New tuple registered  : druby://#{@ring_server_host}:#{@ring_server_port}")
-
-    # wait for explicit stop via ctrl-c
-    DRb.thread.join if __FILE__ == $0  
-  end
-
-  ##
-  # Stop the provider by shutting down the DRb service
-  def stop    
-    DRb.stop_service
-    @log.info("DRb server stopped on : #{@drb_server_uri}")    
-  end
-
-  private
-
-  ##
-  # Get the external facing interface for this server  
-  def external_interface    
-    begin
-      UDPSocket.open {|s| s.connect('ping.watirgrid.com', 1); s.addr.last }      
-    rescue
-      '127.0.0.1'
-    end
-  end
-
-end
-
+#!/usr/bin/env ruby 
+# provider.rb
+# Rinda Ring Provider
+
+require 'rubygems'
+require 'rinda/ring'
+require 'rinda/tuplespace'
+require 'logger'
+require 'drb/acl'
+require 'uuid'
+
+module Watir
+  
+  ##
+  # Extend Watir with a Provider class
+  # to determine which browser type is supported by the 
+  # remote DRb process. This returns the DRb front object.
+  class Provider
+
+    include DRbUndumped # all objects will be proxied, not copied
+
+    attr_reader :browser
+
+    def initialize(browser = nil)
+      browser = (browser || 'tmp').downcase.to_sym  
+      case browser
+        when :safari
+					require 'safariwatir'
+          @browser = Watir::Safari
+        when :firefox
+					require 'firewatir'
+          @browser = FireWatir::Firefox 
+        when :ie
+					require 'watir'
+          @browser = Watir::IE
+				when :webdriver
+					require 'watir-webdriver'
+          @browser = Watir::Browser
+        else
+          @browser = find_supported_browser
+      end    
+    end
+
+    #~ def find_supported_browser
+      #~ if Watir::IE then return Watir::IE end
+      #~ if FireWatir::Firefox then return FireWatir::Firefox end
+      #~ if Watir::Safari then return Watir::Safari end
+    #~ end
+
+    def new_browser(webdriver_browser_type = nil)   
+			@browser.new(webdriver_browser_type)
+    end
+    
+    ##
+    # Get a list of running browsers (optionally specified by browser)
+    # 'iexplore','firefox','firefox-bin','chrome','safari','opera'
+    def get_running_browsers(browser=nil)
+      browsers = browser || \
+        ['iexplore','firefox','firefox-bin','chrome','safari','opera']
+      case Config::CONFIG['arch']
+      when /mswin/
+        %x[tasklist].split(/\s+/).collect { |x| x[/\w+/]} \
+          & browsers.collect { |x| x.downcase }
+      when /linux|darwin/
+        %x[ps -A | grep -v ruby].split(/\/|\s+/).collect { |x| x.downcase} \
+          & browsers
+      end
+    end
+    
+    def get_running_processes
+      %x[ps -A | grep -v ruby].split(/\/|\s+/).collect.uniq
+    end
+    
+    ##
+    # Kill any browser running
+    def kill_all_browsers
+      case Config::CONFIG['arch']
+      when /mswin/
+        browsers = ['iexplore.exe', 'firefox.exe', 'chrome.exe']
+        browsers.each { |browser| %x[taskkill /F /IM #{browser}] } 
+      when /linux/
+        browsers = ['firefox', 'chrome', 'opera']
+        browsers.each { |browser| %x[killall -r #{browser}] } 
+      when /darwin/
+        browsers = ['firefox-bin', 'Chrome', 'Safari']
+        browsers.each { |browser| %x[killall -m #{browser}] } 
+      end
+    end
+    
+    ##
+    # Kill all browsers specified by browser name
+    # Windows: 'iexplore.exe', 'firefox.exe', 'chrome.exe'
+    # Linux: 'firefox', 'chrome', 'opera'
+    # OSX: 'firefox-bin', 'Chrome', 'Safari'
+    def kill_browser(browser)
+      case Config::CONFIG['arch']
+      when /mswin/
+        %x[taskkill /F /IM #{browser}]
+      when /linux/
+        %x[killall -r #{browser}]
+      when /darwin/
+        %x[killall -m #{browser}]
+      end
+    end
+    
+    ##
+    # Start firefox (with an optional bin path) using the -jssh extension
+    def start_firefox_jssh(path=nil)
+      case Config::CONFIG['arch']
+      when /mswin/
+        bin = path || "C:/Program Files/Mozilla Firefox/firefox.exe"
+      when /linux/
+        bin = path || "/usr/bin/firefox"
+      when /darwin/
+        bin = path || "/Applications/Firefox.app/Contents/MacOS/firefox-bin" 
+      end      
+      # fork off and die!
+      Thread.new {system(bin, "about:blank", "-jssh")}
+    end
+    
+    ##
+    # Get the logged-in user
+    def get_logged_in_user
+      %x[whoami].chomp
+    end
+    
+    ##
+    # Grep for a process (Linux/OSX-with-port only)
+    def process_grep(pattern)
+      %x[pgrep -l #{pattern}].split(/\n/)
+    end
+    
+    def renew_provider
+      self.class.superclass
+    end
+  
+  end
+
+end
+
+class Provider
+
+  attr_accessor :drb_server_uri, :ring_server_uri
+
+  def initialize(params = {})   
+    @drb_server_host  = params[:drb_server_host]  || external_interface
+    @drb_server_port  = params[:drb_server_port]  || 0
+    @ring_server_host = params[:ring_server_host] || external_interface
+    @ring_server_port = params[:ring_server_port] || Rinda::Ring_PORT
+
+    @renewer = params[:renewer] || Rinda::SimpleRenewer.new
+    @browser_type = params[:browser_type] || nil
+
+    logfile = params[:logfile] || STDOUT
+    @log  = Logger.new(logfile, 'daily')
+    @log.level = params[:loglevel] || Logger::INFO
+    @log.datetime_format = "%Y-%m-%d %H:%M:%S "   
+
+  end  
+
+  ##
+  # Start providing watir objects on the ring server  
+  def start
+    # create a DRb 'front' object
+    watir_provider = Watir::Provider.new(@browser_type)
+    architecture = Config::CONFIG['arch']
+    hostname = ENV['SERVER_NAME'] || %x{hostname}.strip
+
+    # setup the security--remember to call before DRb.start_service()
+    DRb.install_acl(ACL.new(@acls))
+
+    # start the DRb Server
+    drb_server = DRb.start_service(
+      "druby://#{@drb_server_host}:#{@drb_server_port}")  
+
+    # obtain DRb Server uri
+    @drb_server_uri = drb_server.uri
+    @log.info("DRb server started on : #{@drb_server_uri}")
+
+    # create a service tuple
+    @tuple = [
+                :WatirGrid, 
+                :WatirProvider, 
+                watir_provider, 
+                'A watir provider', 
+                hostname,
+                architecture,
+                @browser_type,
+                UUID.new.generate
+              ]   
+
+    # locate the Rinda Ring Server via a UDP broadcast
+    @log.debug("Attempting to find ring server on : druby://#{@ring_server_host}:#{@ring_server_port}")
+    ring_server = Rinda::RingFinger.new(@ring_server_host, @ring_server_port)
+    ring_server = ring_server.lookup_ring_any
+    @log.info("Ring server found on  : druby://#{@ring_server_host}:#{@ring_server_port}")
+
+    # advertise this service on the primary remote tuple space
+    ring_server.write(@tuple, @renewer)
+
+    # log DRb server uri
+    @log.info("New tuple registered  : druby://#{@ring_server_host}:#{@ring_server_port}")
+
+    # wait for explicit stop via ctrl-c
+    DRb.thread.join if __FILE__ == $0  
+  end
+
+  ##
+  # Stop the provider by shutting down the DRb service
+  def stop    
+    DRb.stop_service
+    @log.info("DRb server stopped on : #{@drb_server_uri}")    
+  end
+
+  private
+
+  ##
+  # Get the external facing interface for this server  
+  def external_interface    
+    begin
+      UDPSocket.open {|s| s.connect('ping.watirgrid.com', 1); s.addr.last }      
+    rescue
+      '127.0.0.1'
+    end
+  end
+
+end
+