watirgrid 1.0.3.pre → 1.0.3

data/README.rdoc

@@ -12,7 +12,7 @@ WatirGrid is built on Rinda which implements the Linda distributed computing par
 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 *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 making it loosely coupled. 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.
 
@@ -22,29 +22,24 @@ Pick a server to host the 'controller' for the ring server and execute the follo
   $ controller
 
 This should find your external facing IP and start the corresponding DRb and Ring Servers:
-  DRb server started on : druby://143.238.105.61:11235
+  Controller 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
 
 This should find the recently started Ring Server and register a tuple for the Watir object:
-  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
+  Provider started on   : druby://143.238.105.61:11236
+  Controller found on   : druby://143.238.105.61:11355
+  New tuple registered  : druby://143.238.105.61:11355
 
 You will now be able to execute commands across remote browsers on your grid network.
 
 e.g.
-  grid = Watir::Grid.new(:ring_server_port => 12358)
-  grid.start(:quantity => 1, :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
+  Watir::Grid.control(:controller_uri => 'druby://143.238.105.61:11355') do |browser, id|
+      browser.goto("http://www.google.com")
+      browser.text_field(:name, 'q').set("watirgrid")
+      browser.button(:name, "btnI").click
     end
   end
   threads.each {|thread| thread.join}
@@ -68,11 +63,12 @@ You may wish to host the controller and providers on different machines in a rea
       -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}
+      -c, --controller-uri URI         Specify Controller URI e.g. druby://127.0.0.1:11235 to bypass Ring Server
+      -b, --browser-type TYPE          Specify browser type to register {ie|firefox|safari|webdriver}
       -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                  
+          --help                       Show this message
 
 == Copyright
 
-Copyright (c) 2009 Tim Koopmans. See LICENSE for details.
+Copyright (c) 2009-2011 Tim Koopmans. See LICENSE for details.

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.email = "tim.koops@gmail.com"
     gem.homepage = "http://github.com/90kts/watirgrid"
     gem.authors = ["Tim Koopmans"]
-    gem.version = "1.0.3.pre"
+    gem.version = "1.0.3"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/bin/provider

@@ -26,7 +26,7 @@ OptionParser.new do |opts|
     options[:ring_server_port] = r
   end
   opts.on("-c URI", "--controller-uri", String,
-  "Optional druby Controller URI e.g. druby://127.0.0.1:11235 to bypass Ring Server") do |h|
+  "Specify Controller URI e.g. druby://127.0.0.1:11235 to bypass Ring Server") do |h|
     options[:controller_uri] = h || nil
   end
   opts.on("-b TYPE", "--browser-type", String,

data/lib/controller.rb

@@ -65,7 +65,7 @@ class Controller
 
     # obtain DRb Server uri
     @drb_server_uri = drb_server.uri
-    @log.info("DRb server started on : #{@drb_server_uri}")
+    @log.info("Controller started on : #{@drb_server_uri}")
 
     # start the Ring Server
     ring_server = Rinda::RingServer.new(tuple_space,
@@ -86,7 +86,7 @@ class Controller
   # Stop the controller by shutting down the DRb service
   def stop
     DRb.stop_service
-    @log.info("DRb server stopped on: #{@drb_server_uri}")
+    @log.info("Controller stopped on: #{@drb_server_uri}")
   end
 
   private

data/lib/provider.rb

@@ -169,7 +169,7 @@ class Provider
 
     # obtain DRb Server uri
     @drb_server_uri = drb_server.uri
-    @log.info("DRb server started on : #{@drb_server_uri}")
+    @log.info("Provider started on   : #{@drb_server_uri}")
 
     # create a service tuple
     @tuple = [

data/watirgrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watirgrid}
-  s.version = "1.0.3.pre"
+  s.version = "1.0.3"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]
-  s.date = %q{2011-04-05}
+  s.date = %q{2011-04-06}
   s.description = %q{WatirGrid allows for distributed testing across a grid network using Watir.}
   s.email = %q{tim.koops@gmail.com}
   s.executables = ["controller", "provider"]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirgrid
 version: !ruby/object:Gem::Version 
-  hash: 961915992
-  prerelease: 6
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 0
   - 3
-  - pre
-  version: 1.0.3.pre
+  version: 1.0.3
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -07:00
+date: 2011-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -78,14 +77,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: