watirgrid 0.0.4 → 0.0.5

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/90kts/watirgrid"
     gem.authors = ["Tim Koopmans"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.version = "0.0.4"
+    gem.version = "0.0.5"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/bin/controller

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'controller'
 require 'provider'
+require 'optparse'
 
 options = {}
 OptionParser.new do |opts|

data/bin/provider

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'controller'
 require 'provider'
+require 'optparse'
 
 options = {}
 OptionParser.new do |opts|

data/examples/find_by_uuid.rb

@@ -0,0 +1,28 @@
+require 'rubygems'
+require '../lib/watirgrid'
+
+grid = Watir::Grid.new(:ring_server_port => 12358, 
+:ring_server_host => '192.168.1.102', 
+:loglevel => Logger::DEBUG)
+grid.start(:read_all => true)
+
+threads = []
+grid.browsers.each do |browser|
+  threads << Thread.new do 
+    @uuid = browser[:uuid]
+    p @uuid
+  end
+end
+threads.each {|thread| thread.join}
+
+grid.start(:read_all => true, :uuid => @uuid)
+
+threads = []
+grid.browsers.each do |browser|
+  threads << Thread.new do 
+    @uuid = browser[:uuid]
+    p @uuid
+  end
+end
+threads.each {|thread| thread.join}
+

data/examples/google.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require '../lib/watirgrid'
+
+grid = Watir::Grid.new(:ring_server_port => 12358, 
+:ring_server_host => '184.73.224.146', 
+:loglevel => Logger::DEBUG)
+grid.start(:read_all => true)
+
+threads = []
+grid.browsers.each do |browser|
+  threads << Thread.new do 
+    b = browser[:object].new_browser
+    b.goto("http://google.com.au/")
+    b.text_field(:name, 'q').set("performance & test automation specialists")
+    sleep 1
+    b.button(:name, 'btnI').click
+  end
+end
+threads.each {|thread| thread.join}

data/examples/info.rb

@@ -0,0 +1,14 @@
+require 'rubygems'
+require '../lib/watirgrid'
+
+grid = Watir::Grid.new(:ring_server_port => 12358, 
+:ring_server_host => '192.168.1.102', :loglevel => Logger::DEBUG)
+grid.start(:read_all => true)
+
+threads = []
+grid.browsers.each do |browser|
+  threads << Thread.new do 
+    p browser
+  end
+end
+threads.each {|thread| thread.join}

data/examples/restart_firefox.rb

@@ -0,0 +1,14 @@
+require 'rubygems'
+require '../lib/watirgrid'
+
+grid = Watir::Grid.new(:ring_server_port => 12358, 
+:ring_server_host => '192.168.1.102', :loglevel => Logger::DEBUG)
+grid.start(:read_all => true)
+
+threads = []
+grid.browsers.each do |browser|
+  threads << Thread.new do 
+    p browser
+  end
+end
+threads.each {|thread| thread.join}

data/examples/simple.rb

@@ -2,16 +2,18 @@ require 'rubygems'
 require '../lib/watirgrid'
 
 grid = Watir::Grid.new(:ring_server_port => 12358, 
-:ring_server_host => '192.168.1.101', :loglevel => Logger::DEBUG)
-grid.start(:quantity => 1, :read_all => true)
+:ring_server_host => '192.168.1.102', 
+:loglevel => Logger::DEBUG)
+grid.start(:read_all => true)
 
 threads = []
 grid.browsers.each do |browser|
   threads << Thread.new do 
     b = browser[:object].new_browser
-    b.goto("http://www.google.com")
-    b.text_field(:name, 'q').set("watirgrid")
-    b.button(:name, "btnI").click
+    b.goto("http://192.168.1.102:4567/")
+    b.text_field(:name, 'username').set("I am robot")
+    sleep 1
+    b.button(:id, 'go').click
   end
 end
 threads.each {|thread| thread.join}

data/lib/controller.rb

@@ -94,7 +94,7 @@ class Controller
   # Get the external facing interface for this server  
   def external_interface    
     begin
-      UDPSocket.open {|s| s.connect('watir.com', 1); s.addr.last }      
+      UDPSocket.open {|s| s.connect('ping.watirgrid.com', 1); s.addr.last }      
     rescue
       '127.0.0.1'
     end

data/lib/provider.rb

@@ -6,8 +6,8 @@ require 'rubygems'
 require 'rinda/ring'
 require 'rinda/tuplespace'
 require 'logger'
-require 'optparse'
 require 'drb/acl'
+require 'uuid'
 
 begin
     require 'watir'
@@ -15,16 +15,16 @@ rescue LoadError
 end
 
 begin
-    require 'safariwatir'
+    require 'firewatir'
 rescue LoadError
-end
 
 begin
-    require 'firewatir'
-    include FireWatir
+    require 'safariwatir'
 rescue LoadError
 end
 
+end
+
 module Watir
   
   ##
@@ -63,8 +63,91 @@ module Watir
       else
         @browser.new
       end 
-    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
@@ -110,13 +193,14 @@ class Provider
 
     # create a service tuple
     @tuple = [
-                :name, 
+                :WatirGrid, 
                 :WatirProvider, 
                 watir_provider, 
                 'A watir provider', 
                 hostname,
                 architecture,
-                @browser_type
+                @browser_type,
+                UUID.new.generate
               ]   
 
     # locate the Rinda Ring Server via a UDP broadcast
@@ -148,7 +232,7 @@ class Provider
   # Get the external facing interface for this server  
   def external_interface    
     begin
-      UDPSocket.open {|s| s.connect('watir.com', 1); s.addr.last }      
+      UDPSocket.open {|s| s.connect('ping.watirgrid.com', 1); s.addr.last }      
     rescue
       '127.0.0.1'
     end

data/lib/watirgrid.rb

@@ -10,7 +10,7 @@ module Watir
   # and instatiating remote browser objects on nominated providers.
   class Grid
 
-    attr_accessor :drb_server_uri, :ring_server, :browsers
+    attr_accessor :drb_server_uri, :ring_server, :browsers, :tuples
 
     def initialize(params = {})   
       @drb_server_host  = params[:drb_server_host]  || external_interface
@@ -41,6 +41,12 @@ module Watir
     def size
       @browsers.size
     end
+    
+    ##
+    # Write tuple back to tuplespace when finished using it
+    def release_tuples
+      @tuples.each { |tuple| @ring_server.write(tuple) }
+    end
 
     private
 
@@ -76,7 +82,7 @@ module Watir
     # Get all tuple spaces on ringserver
     def get_tuples(params = {})
       quantity = calculate_quantity(params[:quantity]) 
-      read_tuples(params[:architecture], params[:browser_type])
+      read_tuples(params)
       @log.info("Found #{@tuples.size} tuples.")
       if @tuples.size > -1 then
         @tuples[0..quantity].each do |tuple|
@@ -105,15 +111,17 @@ module Watir
     ##
     # Read all tuples filtered by architecture and browser type
     # then populate the tuples accessor
-    def read_tuples(architecture, browser_type)
+    def read_tuples(params={})
       @tuples = @ring_server.read_all([
-        :name,
+        :WatirGrid,
         nil, # watir provider
         nil, # browser front object
         nil, # provider description
         nil, # hostname
-        architecture,
-        browser_type])
+        params[:architecture],
+        params[:browser_type],
+        params[:uuid]
+        ])
     end
 
     ##
@@ -149,6 +157,7 @@ module Watir
       tuple_hash[:hostname]     = tuple[4]
       tuple_hash[:architecture] = tuple[5]
       tuple_hash[:browser_type] = tuple[6]
+      tuple_hash[:uuid]         = tuple[7]
       tuple_hash
     end
   

data/spec/grid_spec.rb

@@ -15,31 +15,36 @@ describe 'WatirGrid' do
   end
 
   it 'should return how many grid are available in the tuplespace' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:read_all => true)
     grid.size.should == 5
   end
 
   it 'should read any 2 grid in the tuplespace' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:quantity => 2, :read_all => true)
     grid.size.should == 2
   end
 
   it 'should take any 1 browser in the tuplespace' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:quantity => 1, :take_all => true)
     grid.size.should == 1 
   end
 
   it 'should take all grid remaining in tuplespace' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:take_all => true)
     grid.size.should == 4
   end
 
   it 'should find no more grid in the tuplespace' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:read_all => true)
     grid.size.should == 0
   end
@@ -53,35 +58,40 @@ describe 'WatirGrid' do
   end
 
   it 'should take any 1 browser based on browser type' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:quantity => 1,
       :take_all => true, :browser_type => 'safari')
     grid.size.should == 1
   end
 
   it 'should fail to find any grid based on a specific browser type' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:quantity => 1,
       :take_all => true, :browser_type => 'firefox')
     grid.size.should == 0
   end
 
   it 'should fail to find any grid based on a unknown browser type' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:quantity => 1,
       :take_all => true, :browser_type => 'penguin')
     grid.size.should == 0
   end
 
   it 'should take any 1 browser based on specific architecture type' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:quantity => 1, 
-      :take_all => true, :architecture => 'universal-darwin10.0')
+      :take_all => true, :architecture => Config::CONFIG['arch'])
     grid.size.should == 1
   end
 
   it 'should fail to find any grid based on unknown architecture type' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:quantity => 1, 
       :take_all => true, :architecture => 'geos-1992')
     grid.size.should == 0
@@ -89,7 +99,8 @@ describe 'WatirGrid' do
 
   it 'should take any 1 browser based on specific hostname' do
     hostname = `hostname`.strip
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:quantity => 1,
       :take_all => true, 
       :hostnames => { hostname => "127.0.0.1"}
@@ -98,15 +109,17 @@ describe 'WatirGrid' do
   end
 
   it 'should fail to find any grid based on unknown hostname' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:quantity => 1,
       :take_all => true, :hostnames => { 
         "tokyo" => "127.0.0.1"})
     grid.size.should == 0
   end
-
+  
   it 'should take the last browser and execute some watir commands' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:quantity => 1, :take_all => true)
     threads = []
     grid.browsers.each do |browser|
@@ -124,17 +137,12 @@ describe 'WatirGrid' do
     grid.size.should == 1
   end
 
-  it 'should find no more grid in the tuplespace' do
-    grid = Watir::Grid.new(:ring_server_port => 12351)
+  it 'should find no more tuples in the tuplespace' do
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
     grid.start(:read_all => true)
     grid.size.should == 0
   end
 
-  it 'should register a new browser on a remote provider' do
-    pending('provision of remote registration') do
-      grid.size.should == 0
-    end
-  end
-
 end
 

data/spec/stub.rb

@@ -1,7 +1,48 @@
 require 'rubygems'
 require 'sinatra'
+require 'haml'
 
 get '/load/:browser_id/:browser_object_id' do
   params[:browser_object_id]
 end
 
+get '/' do
+   haml :example
+end
+
+post '/' do
+   "Congratulations #{params[:username]}, you hit the button!"
+end
+
+__END__
+
+@@ layout
+%html
+  = yield
+
+@@ example
+%style{:type=>"text/css"}
+  :plain
+    input {
+      border-bottom-style: inset;
+      border-bottom-width: 2px;
+      border-left-style: inset;
+      border-left-width: 2px;
+      border-right-style: inset;
+      border-right-width: 2px;
+      border-top-style: inset;
+      border-top-width: 2px;
+      font-family: arial, sans-serif;
+      font-size: 30px;
+      font-style: normal;
+      font-variant: normal;
+      font-weight: normal;
+      height: 40px;
+      width: 200px;
+    }
+%form{:action=>'/', :method=>'POST'}
+  %input{:name=>'username', :value=>'username'}
+  %button{:id=>'go', :type=>'submit'} GO
+
+
+

data/spec/tuples_spec.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'When taking tuples from the grid' do
+  before(:all) do
+    controller = Controller.new(
+      :ring_server_port => 12351,
+      :loglevel => Logger::ERROR)
+    controller.start
+    1.upto(5) do 
+      provider = Provider.new(
+        :ring_server_port => 12351, 
+        :loglevel => Logger::ERROR, :browser_type => 'safari')
+      provider.start
+    end
+  end
+
+  it 'should start 1st grid and take all tuples' do
+    grid1 = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
+    grid1.start(:take_all => true)
+    grid1.size.should == 5
+  
+    describe 'Then for subsequent grids' do
+      it 'should start 2nd grid and confirm there are no more tuples' do
+        grid2 = Watir::Grid.new(:ring_server_port => 12351, 
+        :ring_server_host => '127.0.0.1')
+        grid2.start(:take_all => true)
+        grid2.size.should == 0
+      end
+  
+      it 'should release the tuples taken by the 1st grid' do
+        grid1.release_tuples
+      end
+  
+      it 'should start 3rd grid and confirm there are tuples available' do
+        grid3 = Watir::Grid.new(:ring_server_port => 12351, 
+        :ring_server_host => '127.0.0.1')
+        grid3.start(:take_all => true)
+        grid3.size.should == 5
+      end  
+    
+    end
+
+end
+  
+end

data/spec/utilities_spec.rb

@@ -0,0 +1,51 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'WatirGrid Utilities' do
+  before(:all) do
+    controller = Controller.new(
+      :ring_server_port => 12351,
+      :loglevel => Logger::ERROR)
+    controller.start
+    1.upto(1) do 
+      provider = Provider.new(
+        :ring_server_port => 12351, 
+        :loglevel => Logger::ERROR, :browser_type => 'safari')
+      provider.start
+    end
+    grid = Watir::Grid.new(:ring_server_port => 12351, 
+    :ring_server_host => '127.0.0.1')
+    grid.start(:read_all => true)
+    @browser = grid.browsers[0]
+  end
+  
+  it 'should get the logged-in user for the remote provider' do
+    @browser[:object].get_logged_in_user.should == `whoami`.chomp
+  end
+
+  it 'should enumerate any running browsers on the remote provider' do
+    @browser[:object].get_running_browsers(['firefox-bin']).size.should == 0
+  end
+
+  it 'should be able to start a new firefox browser' do
+    @browser[:object].start_firefox_jssh
+    sleep 5
+    @browser[:object].get_running_browsers(['firefox-bin']).size.should == 1
+  end
+  
+  it 'should be able to kill all firefox browsers' do
+    @browser[:object].kill_browser('firefox-bin')
+    @browser[:object].get_running_browsers(['firefox-bin']).size.should == 0
+  end
+  
+  it 'should be able to start a new firefox browser specified by path' do
+    @browser[:object].start_firefox_jssh
+      ("/Applications/Firefox.app/Contents/MacOS/firefox-bin")
+    sleep 5
+    @browser[:object].get_running_browsers(['firefox-bin']).size.should == 1
+  end
+  
+  it 'should be able to kill all browsers' do
+    @browser[:object].kill_all_browsers
+    @browser[:object].get_running_browsers.size.should == 0
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: watirgrid
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-05 00:00:00 +11:00
+date: 2010-03-02 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,10 @@ files:
 - Rakefile
 - bin/controller
 - bin/provider
+- examples/find_by_uuid.rb
+- examples/google.rb
+- examples/info.rb
+- examples/restart_firefox.rb
 - examples/simple.rb
 - lib/controller.rb
 - lib/provider.rb
@@ -50,6 +54,8 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/stub.rb
+- spec/tuples_spec.rb
+- spec/utilities_spec.rb
 - spec/watirgrid_spec.rb
 - watirgrid.gemspec
 has_rdoc: true
@@ -84,5 +90,11 @@ test_files:
 - spec/grid_spec.rb
 - spec/spec_helper.rb
 - spec/stub.rb
+- spec/tuples_spec.rb
+- spec/utilities_spec.rb
 - spec/watirgrid_spec.rb
+- examples/find_by_uuid.rb
+- examples/google.rb
+- examples/info.rb
+- examples/restart_firefox.rb
 - examples/simple.rb