watirgrid 0.0.1 → 0.0.2

data/EXAMPLES.rdoc

@@ -0,0 +1,127 @@
+= Common Examples
+
+== Starting a Controller
+A controller has the following startup options:
+  controller --help
+  Usage: controller [options]
+  Specific options:
+      -H, --drb-server-host HOST       Specify DRb Server interface to host on
+      -d, --drb-server-port PORT       Specify DRb Server port to listen on
+      -h, --ring-server-host HOST      Specify Ring Server interface to host on
+      -r, --ring-server-port PORT      Specify Ring Server port to listen on
+      -a, --access-control-list ACLS   Specify a comma separated Access Control List
+      -l, --log-level LEVEL            Specify log level {DEBUG|INFO|ERROR}
+          --help                       Show this message
+
+=== Default
+To start a controller with default settings:
+  $ controller
+
+This will bind the controller to your external facing interface and register the ring server to listen on port 12358
+e.g.
+  DRb server started on : druby://143.238.105.61:11235
+  Ring server started on: druby://143.238.105.61:12358
+  
+=== Start on specific interface or ports
+To start a controller on specific interfaces or ports:
+  $  controller -H 127.0.0.1 -h 127.0.0.1 -d 12345 -r 54321
+
+This will bind the controller to the localhost (127.0.0.1) with the DRb server listening on port 12345 and the ring server listening on port 54321
+e.g.
+  DRb server started on : druby://127.0.0.1:12345
+  Ring server started on: druby://127.0.0.1:54321
+  
+
+=== Start with access control list
+To start a controller with an access control list:
+  $  controller -a deny,all,allow,127.0.0.1 -H 127.0.0.1 -h 127.0.0.1
+
+This will bind the controller to the localhost (127.0.0.1) and deny all access to the controller by default, whilst allowing access from localhost only. The ACL constructor takes an array of strings. The first string of a pair is always “allow” or “deny”, and it’s followed by the address or addresses to allow or deny access.
+
+== Starting a Provider
+A provider has similar startup options:
+  provider --help
+  # Usage: provider [options]
+  # Specific options:
+  #     -H, --drb-server-host HOST       Specify DRb Server interface to host on
+  #     -d, --drb-server-port PORT       Specify DRb Server port to listen on
+  #     -h, --ring-server-host HOST      Specify Ring Server host to connect to
+  #     -r, --ring-server-port PORT      Specify Ring Server port to broadcast on
+  #     -b, --browser-type TYPE          Specify browser type to register {ie|firefox|safari}
+  #     -a, --access-control-list ACLS   Specify a comma separated Access Control List
+  #     -l, --log-level LEVEL            Specify log level {DEBUG|INFO|ERROR}
+  #         --help                       Show this message
+
+=== Default
+To start a controller with default settings:
+  $ provider
+
+This will bind the provider to your external facing interface attempt to find the ring server on the default port of 12358
+e.g.
+  DRb server started on : druby://143.238.105.61:11236
+  Ring server found on  : druby://143.238.105.61:12358
+  New tuple registered  : druby://143.238.105.61:12358
+
+=== Start on specific interface or ports
+To start a provider on specific interfaces or ports:
+  $  provider -r 12358 -h 143.238.105.61
+
+This will attempt to find the ring server on the port and hostname specifed
+e.g.
+  DRb server started on : druby://143.238.105.61:11236
+  Ring server found on  : druby://143.238.105.61:12358
+  New tuple registered  : druby://143.238.105.61:12358
+
+=== Start with access control list
+To start a controller with an access control list:
+  $  provider -a deny,all,allow,127.0.0.1
+
+This will deny all access by default and allow access to this provider on localhost only.
+
+=== Start with a specific browser supported
+By default, the provider will try to instantiate a browser object based on availability with your operating system e.g. Internet Explorer, Firefox or Safari. You can force provision of a set browser type as follows:
+  $  provider -b safari
+  
+This will provide a Safari browser object. Other options are:
+  $  provider -b ie
+  $  provider -b firefox
+
+== Consuming Browser Objects on the Grid
+Watir has been extended with a Grid class that can be used as follows:
+  require 'rubygems'
+  require 'watirgrid'
+
+  browsers = Watir::Grid.new(:ring_server_port => 12358)
+  browsers.start(:quantity => 1, :read_all => true, :browser_type => 'ie')
+  browsers.each do |browser, browser_id, hostname, arch, type|
+    browser.goto("http://www.google.com")
+    browser.text_field(:name, 'q').set("watirgrid")
+    browser.button(:name, "btnI").click
+  end
+
+Stepping through this example we first instantiate a browsers object, specifying which ring server port to broadcast on when looking for available providers:
+  browsers = Watir::Grid.new(:ring_server_port => 12358)
+
+You may also need to tell the code which host the ring server is on:
+  browsers = Watir::Grid.new(:ring_server_port => 12358, :ring_server_host => 143.238.105.61)
+
+Next we start up the grid, specifying the number of browsers we wish to use, and the method of accessing the tuple space:
+  browsers.start(:quantity => 1, :read_all => true)
+  
+There are two methods for accessing the tuple space. 
+  :read_all => true
+  :take_all => true
+*Read* *All* will read all browsers in the tuple space provided by the providers. This leaves the tuple open to other clients. 
+
+*Take* *All* will take all browsers in the tuple space in a destructive manner. That is, once a tuple has been taken, no other clients will be able to re-use that tuple. This is useful if you do not want concurrent access to the same host, for example, multiple browsers running on the one machine.
+
+The quantity attribute will determine how many browsers are accessed.
+  :quantity => 10
+Will attempt to access 10 tuples if they are available.
+
+Other attributes include:
+  :hostnames => { "localhost" => "127.0.0.1"}
+Will determine which providers identified by a hash of hostnames that should be accessed. Useful if trying to limit the test to run from specific hostnames or IP addresses.
+
+  :browser_type => 'firefox'
+Will determine which providers identified by a browser type should be accessed. Useful if trying to to test with specific browser types.

data/{NOTES.txt → HISTORY.rdoc}

@@ -1,14 +1,18 @@
-= Release Notes
-== 0.0.1
+== Release Notes
+=== 0.0.1
 Added access control lists for the controller and provider. This lets the user specify ACLs by way of simple white/blacklist security similar to that used by the Unix /etc/hosts.allow and /etc/hosts.deny files. The ACL constructor takes an array of strings. The first string of a pair is always “allow” or “deny”, and it’s followed by the address or addresses to allow or deny access.
 
-e.g. ./provider.rb -a deny,all,allow,127.0.0.1
+e.g. 
+  provider.rb -a deny,all,allow,127.0.0.1
 This would deny all access to this provider by default and allow access only from the localhost (127.0.0.1). This is the default setting if no ACLs are specified from the command line. This would affect all connectivity from the controller to the providers.
 
-e.g. ./controller.rb -a deny,all,allow,192.168.1.*
+e.g. 
+  controller -a deny,all,allow,192.168.1.*
 This would deny all access to the controller by default with access allowed from any host in the 192.168.1.* subnet. This would affect all connectivity from the providers to the controller.
 
----
-
 Added startup bin scripts for the provider and controller. Ruby Gems will automatically deploy these on installation.
 
+---
+=== 0.0.2
+Allowed specification of remote host for ring server with -h option on provider.
+

data/README.rdoc

@@ -1,55 +1,77 @@
-= watirgrid
+= WatirGrid
 
 WatirGrid allows for distributed testing across a grid network using Watir.
 
-Basic instructions are:
+== Getting Started
+This gem is hosted on Gemcutter. Gemcutter is the next generation of gem hosting for the Ruby community. To get started:
+  gem install gemcutter
+  gem tumble
+  
+Then to install WatirGrid:
+  gem install watirgrid
+
+=== The Basics
+WatirGrid is built on Rinda which implements the Linda distributed computing paradigm in Ruby. According to Wikipedia: “Linda is a model of coordination and communication among several parallel processes operating upon objects stored in and retrieved from shared, virtual, associative memory.”
+
+In other words, WatirGrid allows multiple parallel processes to *_provide_* remote Watir objects in the form of tuple spaces across a grid network. This grid network is *_controlled_* by a ring server.
+
+==== Key Terminology
+The *controller* implements a repository of tuples (tuple space) that can be accessed concurrently. The controller hosts the *ring* *server* which advertises these tuples across a grid network. Typically you will host one controller on a central machine.
+
+The *providers* make remote Watir objects available to the tuple space hosted by the *ring* *server*. Typically you will host one or many providers on your grid network, for example, each PC may become a single provider of a Watir tuple in the form of an Internet Explorer, Firefox or Safari browser object.
+
+=== Simple Example
 
 Pick a server to host the 'controller' for the ring server and execute the following:
-  $ controller -l INFO
+  $ controller
 
 This should find your external facing IP and start the corresponding DRb and Ring Servers:
-  DRb server started on : druby://192.168.1.105:11235
-  Ring server started on: druby://192.168.1.105:12358
+  DRb server started on : druby://143.238.105.61:11235
+  Ring server started on: druby://143.238.105.61:12358
 
 On each client PC, host the 'provider' for the distributed (DRb) Watir objects
-  $  provider -l INFO
+  $  provider
 
 This should find the recently started Ring Server and register a tuple for the Watir object:
-  DRb server started on : druby://192.168.1.105:64864
-  New tuple registered  : druby://192.168.1.105:12358
+  DRb server started on : druby://143.238.105.61:11236
+  Ring server found on  : druby://143.238.105.61:12358
+  New tuple registered  : druby://143.238.105.61:12358
 
 You will now be able to execute commands across remote browsers on your grid network.
 
-Check the watirgid_spec.rb for some examples ...
-
 e.g.
-  browsers = Watir::Grid.new(:ring_server_port => 12351)
-	browsers.start(:quantity => 2, :read_all => true)
-	browsers.size.should == 2
-	browsers.each do |browser, browser_id|
+  browsers = Watir::Grid.new(:ring_server_port => 12358)
+  browsers.start(:quantity => 1, :read_all => true)
+  browsers.size.should == 1
+  browsers.each do |browser, browser_id|
     browser.goto("http://www.google.com")
     browser.text_field(:name, 'q').set("watirgrid")
     browser.button(:name, "btnI").click
   end
 
-For more help see:
-  $  controller -h
+You may wish to host the controller and providers on different machines in a real scenario. You can specify things like server hostnames, ports and access control lists for each of the different types of servers. For more help see:
+  $  controller --help
   Usage: controller [options]
   Specific options:
-    -d, --drb-server-port PORT       Specify DRb Server port to listen on
-    -r, --ring-server-port PORT      Specify Ring Server port to listen on
-    -l, --log-level LEVEL            Specify log level {DEBUG|INFO|ERROR}
-    -h, --help                       Show this message
-    
-  $  ./provider -h
+      -H, --drb-server-host HOST       Specify DRb Server interface to host on
+      -d, --drb-server-port PORT       Specify DRb Server port to listen on
+      -h, --ring-server-host HOST      Specify Ring Server interface to host on
+      -r, --ring-server-port PORT      Specify Ring Server port to listen on
+      -a, --access-control-list ACLS   Specify a comma separated Access Control List
+      -l, --log-level LEVEL            Specify log level {DEBUG|INFO|ERROR}
+          --help                       Show this message
+
+  $  provider --help
   Usage: provider [options]
   Specific options:
-    -r, --ring-server-port PORT      Specify Ring Server port to broadcast on
-    -b, --browser-type TYPE          Specify browser type to register {ie|firefox|safari}
-    -l, --log-level LEVEL            Specify log level {DEBUG|INFO|ERROR}
-    -h, --help                       Show this message
-  
-I'll update the wiki soon'ish!
+      -H, --drb-server-host HOST       Specify DRb Server interface to host on
+      -d, --drb-server-port PORT       Specify DRb Server port to listen on
+      -h, --ring-server-host HOST      Specify Ring Server host to connect to
+      -r, --ring-server-port PORT      Specify Ring Server port to broadcast on
+      -b, --browser-type TYPE          Specify browser type to register {ie|firefox|safari}
+      -a, --access-control-list ACLS   Specify a comma separated Access Control List
+      -l, --log-level LEVEL            Specify log level {DEBUG|INFO|ERROR}
+          --help                       Show this message                  
 
 == Copyright
 

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.1"
+    gem.version = "0.0.2"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/TODO.rdoc

@@ -0,0 +1,16 @@
+=== Grid
+- Specify rampup times
+ 
+=== Providers
+- Remote registration of providers
+- Re-write tuple space during tear down
+- Response times
+- Network breakdown times
+
+=== Protocols
+- Support for tcp or http?
+
+=== Tests
+- How many providers is possible with druby?
+- Performance comparison proxied objects (DRbUndumped) vs. copied objects
+

data/bin/controller

@@ -8,10 +8,18 @@ OptionParser.new do |opts|
   opts.banner = "Usage: controller [options]"
   opts.separator ""
   opts.separator "Specific options:"
+  opts.on("-H HOST", "--drb-server-host", String, 
+  "Specify DRb Server interface to host on") do |H|
+    options[:drb_server_host] = H || nil
+  end
   opts.on("-d PORT", "--drb-server-port", Integer, 
     "Specify DRb Server port to listen on") do |d|
       options[:drb_server_port] = d
   end              
+  opts.on("-h HOST", "--ring-server-host", String, 
+  "Specify Ring Server interface to host on") do |h|
+    options[:ring_server_host] = h || nil
+  end
   opts.on("-r PORT", "--ring-server-port", Integer, 
     "Specify Ring Server port to listen on") do |r|
       options[:ring_server_port] = r 
@@ -40,9 +48,11 @@ OptionParser.new do |opts|
   end.parse!
 
 controller = Controller.new(
+  :drb_server_host => options[:drb_server_host],
   :drb_server_port  => options[:drb_server_port]  || 11235, 
+  :ring_server_host => options[:ring_server_host], 
   :ring_server_port => options[:ring_server_port] || 12358,
-  :acls => options[:acls] || %w{ deny all allow 127.0.0.1 },
+  :acls => options[:acls] || %w{ allow all },
   :loglevel => options[:loglevel]
 )
 controller.start

data/bin/provider

@@ -8,6 +8,18 @@ OptionParser.new do |opts|
   opts.banner = "Usage: provider [options]"
   opts.separator ""
   opts.separator "Specific options:"
+  opts.on("-H HOST", "--drb-server-host", String, 
+  "Specify DRb Server interface to host on") do |H|
+    options[:drb_server_host] = H || nil
+  end
+  opts.on("-d PORT", "--drb-server-port", Integer, 
+    "Specify DRb Server port to listen on") do |d|
+      options[:drb_server_port] = d
+  end
+  opts.on("-h HOST", "--ring-server-host", String, 
+  "Specify Ring Server host to connect to") do |h|
+    options[:ring_server_host] = h || nil
+  end
   opts.on("-r PORT", "--ring-server-port", Integer, 
   "Specify Ring Server port to broadcast on") do |r|
     options[:ring_server_port] = r 
@@ -40,9 +52,12 @@ OptionParser.new do |opts|
 end.parse!
 
 provider = Provider.new(
+  :drb_server_host => options[:drb_server_host],
+  :drb_server_port  => options[:drb_server_port]  || 11236,
+  :ring_server_host => options[:ring_server_host],
   :ring_server_port => options[:ring_server_port] || 12358,
   :browser_type => options[:browser_type] || nil,
-  :acls => options[:acls] || %w{ deny all allow 127.0.0.1 },
+  :acls => options[:acls] || %w{ allow all },
   :loglevel => options[:loglevel])
 provider.start
 DRb.thread.join

data/examples/simple.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require '../lib/watirgrid'
+
+browsers = Watir::Grid.new(:ring_server_port => 12358, :loglevel => Logger::DEBUG)
+browsers.start(:quantity => 1, :read_all => true, :browser_type => 'ie')
+browsers.each do |browser, browser_id, hostname, arch, type|
+  browser.goto("http://www.google.com")
+  browser.text_field(:name, 'q').set("watirgrid")
+  browser.button(:name, "btnI").click
+end

data/lib/controller.rb

@@ -34,9 +34,10 @@ class Controller
 
   attr_accessor :drb_server_uri, :ring_server_uri
 
-  def initialize(params = {})    
-    @host = params[:interface]  || external_interface
+  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
     @acls = params[:acls]
 
@@ -58,14 +59,16 @@ class Controller
     DRb.install_acl(ACL.new(@acls))
 
     # start the DRb Server
-    drb_server = DRb.start_service("druby://#{@host}:#{@drb_server_port}", tuple_space)  
+    drb_server = DRb.start_service(
+      "druby://#{@drb_server_host}:#{@drb_server_port}", tuple_space)  
 
     # obtain DRb Server uri
     @drb_server_uri = drb_server.uri
     @log.info("DRb server started on : #{@drb_server_uri}")
 
     # start the Ring Server
-    ring_server = Rinda::RingServer.new(tuple_space, @host, @ring_server_port)
+    ring_server = Rinda::RingServer.new(tuple_space, 
+      @ring_server_host, @ring_server_port)
 
     # obtain Ring Server uri
     @ring_server_uri = ring_server.uri  

data/lib/provider.rb

@@ -52,9 +52,9 @@ module Watir
     end
 
     def find_supported_browser
-      if Watir::Safari then return Watir::Safari end
       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   
@@ -74,8 +74,9 @@ class Provider
   attr_accessor :drb_server_uri, :ring_server_uri
 
   def initialize(params = {})   
-    @host = params[:interface]  || external_interface
+    @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
@@ -86,7 +87,6 @@ class Provider
     @log.level = params[:loglevel] || Logger::INFO
     @log.datetime_format = "%Y-%m-%d %H:%M:%S "   
 
-    @log.debug("DRB Server Port #{@drb_server_port}\nRing Server Port #{@ring_server_port}")
   end  
 
   ##
@@ -97,11 +97,12 @@ class Provider
     architecture = Config::CONFIG['arch']
     hostname = ENV['SERVER_NAME'] || %x{hostname}.strip
 
-    # Setup the security--remember to call before DRb.start_service()
+    # 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://#{@host}:#{@drb_server_port}")  
+    drb_server = DRb.start_service(
+      "druby://#{@drb_server_host}:#{@drb_server_port}")  
 
     # obtain DRb Server uri
     @drb_server_uri = drb_server.uri
@@ -119,15 +120,16 @@ class Provider
               ]   
 
     # locate the Rinda Ring Server via a UDP broadcast
-    ring_server = Rinda::RingFinger.new(@host, @ring_server_port)
+    @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://#{@host}:#{@ring_server_port}")
+    @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://#{@host}:#{@ring_server_port}")
+    @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  

data/lib/watirgrid.rb

@@ -13,13 +13,12 @@ module Watir
     attr_accessor :drb_server_uri, :ring_server, :browsers
 
     def initialize(params = {})   
-      @host = params[:interface]  || external_interface
+      @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
 
-      @quantity = params[:quantity]
-
       logfile = params[:logfile] || STDOUT
       @log  = Logger.new(logfile, 'daily')
       @log.level = params[:loglevel] || Logger::ERROR
@@ -42,7 +41,9 @@ module Watir
       @browsers.each do |browser|
         threads << Thread.new do 
           id += 1
-          yield(browser, id)
+          @log.debug(browser)
+          # yields a browser object, ID, hostname, architecture, type
+          yield(browser[2].new_browser, id, browser[4],browser[5],browser[6])
         end
       end
       threads.each {|thread| thread.join}
@@ -69,7 +70,8 @@ module Watir
     ##
     # Start the DRb Server
     def start_drb_server
-      drb_server = DRb.start_service("druby://#{@host}:#{@drb_server_port}")  
+      drb_server = DRb.start_service(
+        "druby://#{@drb_server_host}:#{@drb_server_port}")  
       @drb_server_uri = drb_server.uri
       @log.info("DRb server started on : #{@drb_server_uri}")
     end
@@ -77,20 +79,25 @@ module Watir
     ##
     # Locate the Rinda Ring Server via a UDP broadcast
     def find_ring_server
-      @ring_server = Rinda::RingFinger.new(@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://#{@host}:#{@ring_server_port}")
+      @log.info("Ring server found on : druby://#{@ring_server_host}:#{@ring_server_port}")
     end
 
     ##
     # Get all tuple spaces on ringserver
     def get_tuples(params = {})
-      quantity = params[:quantity] || -1
+      if (params[:quantity].nil? or params[:quantity] == 0) then
+        quantity = -1 
+      else
+        quantity = params[:quantity] - 1
+      end
       architecture = params[:architecture] || nil
       browser_type = params[:browser_type] || nil
       
       @browsers = []
-      services = @ring_server.read_all([
+      @tuples = @ring_server.read_all([
         :name,
         nil, # watir provider
         nil, # browser front object
@@ -99,23 +106,26 @@ module Watir
         architecture,
         browser_type])
 
-      @log.info("Found #{services.size} services.")
-      if services.size > 0 then
-        services[1..quantity].each do |service|
-          hostname = service[4]
+      @log.info("Found #{@tuples.size} tuples.")
+      if @tuples.size > 0 then
+         @log.debug("Iterating from 0 to #{quantity}")
+        @tuples[0..quantity].each do |tuple|
+          @log.debug("Iterating through #{@tuples.size} tuples")
+          hostname = tuple[4]
           if params[:hostnames] then
             if params[:hostnames][hostname] then
-              @browsers << service[2].new_browser
-              @ring_server.take(service)if params[:take_all] == true
+              @browsers << tuple
+              @ring_server.take(tuple)if params[:take_all] == true
             end
           else
-            @browsers << service[2].new_browser
-            @ring_server.take(service)if params[:take_all] == true
+            @browsers << tuple
+            @ring_server.take(tuple)if params[:take_all] == true
           end
         end
       else
         @browsers
       end
+      @browsers
     end
   end
 

data/spec/grid_spec.rb

@@ -2,11 +2,13 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe 'WatirGrid' do
   before(:all) do
-    controller = Controller.new(:ring_server_port => 12351,
+    controller = Controller.new(
+      :ring_server_port => 12351,
       :loglevel => Logger::ERROR)
     controller.start
     1.upto(5) do 
-      provider = Provider.new(:ring_server_port => 12351, 
+      provider = Provider.new(
+        :ring_server_port => 12351, 
         :loglevel => Logger::ERROR, :browser_type => 'safari')
       provider.start
     end
@@ -15,17 +17,13 @@ describe 'WatirGrid' do
   it 'should return how many browsers are available in the tuplespace' do
     browsers = Watir::Grid.new(:ring_server_port => 12351)
     browsers.start(:read_all => true)
-    browsers.size.should == 4
+    browsers.size.should == 5
   end
 
   it 'should read any 2 browsers in the tuplespace' do
     browsers = Watir::Grid.new(:ring_server_port => 12351)
     browsers.start(:quantity => 2, :read_all => true)
     browsers.size.should == 2
-    browsers.each do |browser, browser_id|
-      browser.goto(
-        "http://localhost:4567/load/#{browser_id}/#{browser.object_id}")
-    end
   end
 
   it 'should take any 1 browser in the tuplespace' do
@@ -37,7 +35,7 @@ describe 'WatirGrid' do
   it 'should take all browsers remaining in tuplespace' do
     browsers = Watir::Grid.new(:ring_server_port => 12351)
     browsers.start(:take_all => true)
-    browsers.size.should == 3
+    browsers.size.should == 4
   end
 
   it 'should find no more browsers in the tuplespace' do
@@ -46,8 +44,8 @@ describe 'WatirGrid' do
     browsers.size.should == 0
   end
 
-  it 'should register 3 new browsers in the tuplespace' do
-    1.upto(3) do 
+  it 'should register 4 new browsers in the tuplespace' do
+    1.upto(4) do 
       provider = Provider.new(:ring_server_port => 12351, 
         :loglevel => Logger::ERROR, :browser_type => 'safari')
       provider.start
@@ -90,10 +88,12 @@ describe 'WatirGrid' do
   end
 
   it 'should take any 1 browser based on specific hostname' do
+    hostname = `hostname`.strip
     browsers = Watir::Grid.new(:ring_server_port => 12351)
     browsers.start(:quantity => 1,
-      :take_all => true, :hostnames => { 
-        "90kts.local" => "127.0.0.1"})
+      :take_all => true, 
+      :hostnames => { hostname => "127.0.0.1"}
+      )
     browsers.size.should == 1
   end
 
@@ -105,6 +105,21 @@ describe 'WatirGrid' do
     browsers.size.should == 0
   end
 
+  it 'should take the last browser and execute some watir commands' do
+    browsers = Watir::Grid.new(:ring_server_port => 12351)
+    browsers.start(:quantity => 1,
+      :take_all => true)
+      browsers.each do |browser, browser_id, hostname, arch, type|
+        browser_id.should == 1
+        hostname.should == `hostname`.strip
+        arch.should == Config::CONFIG['arch']
+        type.should == 'safari'
+        browser.goto(
+          "http://localhost:4567/load/#{browser_id}/#{browser.object_id}")
+      end
+    browsers.size.should == 1
+  end
+
   it 'should find no more browsers in the tuplespace' do
     browsers = Watir::Grid.new(:ring_server_port => 12351)
     browsers.start(:read_all => true)

data/spec/watirgrid_spec.rb

@@ -9,14 +9,17 @@ describe Controller do
   end
 
   it 'should start a DRb and Ring Server on a specified interface' do
-    controller = Controller.new(:interface => '127.0.0.1')
+    controller = Controller.new(
+      :drb_server_host => '127.0.0.1', 
+      :ring_server_host => '127.0.0.1')
     controller.start
     controller.drb_server_uri.should =~ /druby/
     controller.stop
   end
 
   it 'should start a DRb and Ring Server on specified ports' do
-    controller = Controller.new(:drb_server_port => 11235, 
+    controller = Controller.new(
+      :drb_server_port => 11235, 
       :ring_server_port => 12358)
     controller.start
     controller.drb_server_uri.should =~ /druby/
@@ -26,12 +29,18 @@ end
 
 describe Provider do
   before(:all) do
-    @controller = Controller.new(:ring_server_port => 12350)
+    @controller = Controller.new(
+      :drb_server_host => '127.0.0.1', 
+      :ring_server_host => '127.0.0.1',
+      :ring_server_port => 12350)
     @controller.start
   end
 
   it 'should register a new provider on a specified port' do
-    provider = Provider.new(:ring_server_port => 12350)
+    provider = Provider.new(
+    :drb_server_host => '127.0.0.1', 
+    :ring_server_host => '127.0.0.1',
+    :ring_server_port => 12350)
     provider.start
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: watirgrid
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -35,13 +35,15 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- EXAMPLES.rdoc
+- HISTORY.rdoc
 - LICENSE
-- NOTES.txt
 - README.rdoc
 - Rakefile
-- TODO.txt
+- TODO.rdoc
 - bin/controller
 - bin/provider
+- examples/simple.rb
 - lib/controller.rb
 - lib/provider.rb
 - lib/watirgrid.rb
@@ -84,3 +86,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/stub.rb
 - spec/watirgrid_spec.rb
+- examples/simple.rb

data/TODO.txt

@@ -1,16 +0,0 @@
-== Docs
-better instructions in general
-
-== Providers
-Remote registration of providers
-Re-write tuple space during tear down
-Response times
-Network breakdown times
-
-== Protocol
-Support for tcp or http?
-
-== Tests
-How many providers is suitable with druby
-Comparison in performance with proxied objects (DRbUndumped) vs. copied objects
-