watirgrid 1.0.1 → 1.0.3.pre

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.1"
+    gem.version = "1.0.3.pre"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/bin/provider

@@ -9,37 +9,41 @@ OptionParser.new do |opts|
   opts.banner = "Usage: provider [options]"
   opts.separator ""
   opts.separator "Specific options:"
-  opts.on("-H HOST", "--drb-server-host", String, 
+  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, 
+  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, 
+  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, 
+  opts.on("-r PORT", "--ring-server-port", Integer,
   "Specify Ring Server port to broadcast on") do |r|
-    options[:ring_server_port] = r 
+    options[:ring_server_port] = r
   end
-  opts.on("-b TYPE", "--browser-type", String, 
+  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|
+    options[:controller_uri] = h || nil
+  end
+  opts.on("-b TYPE", "--browser-type", String,
   "Specify browser type to register {ie|firefox|safari}") do |b|
-    options[:browser_type] = b 
+    options[:browser_type] = b
   end
   opts.on("-a ACLS", "--access-control-list", Array,
     "Specify a comma separated Access Control List") do |a|
       options[:acls] = a
   end
-  opts.on("-l LEVEL", "--log-level", String, 
+  opts.on("-l LEVEL", "--log-level", String,
   "Specify log level {DEBUG|INFO|ERROR}") do |l|
     case l
     when 'DEBUG'
       options[:loglevel] = Logger::DEBUG
     when 'INFO'
-      options[:loglevel] = Logger::INFO 
+      options[:loglevel] = Logger::INFO
     when 'ERROR'
       options[:loglevel] = Logger::ERROR
     else
@@ -49,16 +53,17 @@ OptionParser.new do |opts|
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
-  end          
+  end
 end.parse!
 
 provider = Provider.new(
-  :drb_server_host => options[:drb_server_host],
+  :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{ allow all },
-  :loglevel => options[:loglevel])
+  :browser_type     => options[:browser_type] || nil,
+  :controller_uri   => options[:controller_uri] || nil,
+  :acls             => options[:acls] || %w{ allow all },
+  :loglevel         => options[:loglevel])
 provider.start
 DRb.thread.join

data/lib/provider.rb

@@ -140,6 +140,7 @@ class Provider
     @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
+    @controller_uri   = params[:controller_uri]
 
     @renewer = params[:renewer] || Rinda::SimpleRenewer.new
     @browser_type = params[:browser_type] || nil
@@ -183,15 +184,13 @@ class Provider
 
     # 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}")
+    find_ring_server
 
     # advertise this service on the primary remote tuple space
-    ring_server.write(@tuple, @renewer)
+    @ring_server.write(@tuple, @renewer)
 
     # log DRb server uri
-    @log.info("New tuple registered  : druby://#{@ring_server_host}:#{@ring_server_port}")
+    @log.info("New tuple registered  : #{@controller_uri}")
 
     # wait for explicit stop via ctrl-c
     DRb.thread.join if __FILE__ == $0
@@ -206,6 +205,20 @@ class Provider
 
   private
 
+  ##
+  # Locate the Rinda Ring Server via a UDP broadcast or direct URI
+  def find_ring_server
+    if @controller_uri
+      @ring_server = DRbObject.new(nil, @controller_uri)
+    else
+      @ring_server = Rinda::RingFinger.new(
+        @ring_server_host, @ring_server_port)
+      @ring_server = @ring_server.lookup_ring_any
+      @controller_uri = "druby://#{@ring_server_host}:#{@ring_server_port}"
+    end
+    @log.info("Controller found on   : #{@controller_uri}")
+  end
+
   ##
   # Get the external facing interface for this server
   def external_interface

data/lib/watirgrid.rb

@@ -47,8 +47,49 @@ module Watir
       @tuples.each { |tuple| @ring_server.write(tuple) }
     end
 
+    ##
+    # This is a helper method to control a grid.
+    # It involves some general block thuggery and could
+    # honestly benefit from some brutal refactoring...
+    def self.control(params = {}, &block)
+      log  = Logger.new(STDOUT, 'daily')
+      log.level = params[:loglevel] || Logger::ERROR
+      grid = self.new(params)
+      grid.start(:take_all => true)
+      log.debug("Grid size                         : #{grid.size}")
+      log.debug("Grid rampup                       : #{rampup(grid.size, params)} secs")
+      threads = []
+      grid.browsers.each_with_index do |browser, index|
+        sleep rampup(grid.size, params)
+        threads << Thread.new do
+          start = ::Time.now
+          log.debug("Browser #{index+1}##{Thread.current.object_id} start         : #{::Time.now}")
+          log.debug("Browser #{index+1}##{Thread.current.object_id} architecture  : #{browser[:architecture]}")
+          log.debug("Browser #{index+1}##{Thread.current.object_id} type          : #{browser[:browser_type]}")
+          log.debug("Browser #{index+1}##{Thread.current.object_id} hostname      : #{browser[:hostname]}")
+          @browser = browser[:object].new_browser
+          yield @browser, "#{index+1}##{Thread.current.object_id}"
+          log.debug("Browser #{index+1}##{Thread.current.object_id} stop          : #{::Time.now}")
+          log.debug("Browser #{index+1}##{Thread.current.object_id} elapsed       : #{(::Time.now - start).to_i} secs")
+          #@browser.close
+        end
+      end
+      threads.each {|thread| thread.join}
+      grid.release_tuples
+    end
+
     private
 
+    ##
+    # Calculate rampup in seconds
+    def self.rampup(total_threads, params = {})
+      if params[:rampup]
+        params[:rampup] / total_threads
+      else
+        0.5
+      end
+    end
+
     ##
     # Get the external facing interface for this server
     def external_interface
@@ -69,7 +110,7 @@ module Watir
     end
 
     ##
-    # Locate the Rinda Ring Server via a UDP broadcast
+    # Locate the Rinda Ring Server via a UDP broadcast or direct URI
     def find_ring_server(params = {})
       if @controller_uri
         @ring_server = DRbObject.new(nil, @controller_uri)
@@ -79,7 +120,7 @@ module Watir
         @ring_server = @ring_server.lookup_ring_any
         @controller_uri = "druby://#{@ring_server_host}:#{@ring_server_port}"
       end
-      @log.info("Controller found on :#{@controller_uri}")
+      @log.info("Controller found on   : #{@controller_uri}")
     end
 
     ##

data/spec/grid_spec.rb

@@ -188,32 +188,3 @@ describe 'Using the Grid' do
     grid.size.should == 0
   end
 end
-
-describe 'Using the Grid via direct Controller URI' do
-  before(:all) do
-    @controller = Controller.new(
-      :ring_server_port => 12366,
-      :ring_server_host => '127.0.0.1',
-      :drb_server_port => '8866',
-      :loglevel => Logger::ERROR)
-    @controller.start
-    1.upto(5) do
-      provider = Provider.new(
-        :ring_server_port => 12366,
-        :ring_server_host => '127.0.0.1',
-        :loglevel => Logger::ERROR, :browser_type => 'safari')
-      provider.start
-    end
-  end
-
-  after(:all) do
-    @controller.stop
-  end
-
-  it 'should take all providers' do
-    grid = Watir::Grid.new(:controller_uri => 'druby://127.0.0.1:8866', 
-                           :drb_server_host => '127.0.0.1')
-    grid.start(:quantity => 5, :take_all => true, :browser_type => 'safari')
-    grid.size.should == 5
-  end
-end

data/spec/gridinit_spec.rb

@@ -0,0 +1,63 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'Using the Grid in GRIDinit style' do
+  before(:all) do
+    @controller = Controller.new(
+      :drb_server_port  => 12357,
+      :ring_server_port => 12358,
+      :ring_server_host => '127.0.0.1',
+      :loglevel => Logger::ERROR)
+    @controller.start
+    1.upto(5) do
+      provider = Provider.new(
+        :ring_server_port => 12358,
+        :ring_server_host => '127.0.0.1',
+        :drb_server_host => '127.0.0.1',
+        :loglevel => Logger::ERROR,
+        :browser_type => 'webdriver')
+      provider.start
+    end
+  end
+
+  after(:all) do
+    @controller.stop
+  end
+
+  it 'should take 1 provider via a direct controller_uri' do
+    grid = Watir::Grid.new(:controller_uri => 'druby://127.0.0.1:12357',
+                           :drb_server_host => '127.0.0.1')
+    grid.start(:quantity => 3, :take_all => true, :browser_type => 'webdriver')
+    grid.size.should == 3
+  end
+
+  it 'should control the grid using a helper method' do
+    Watir::Grid.control({:controller_uri => 'druby://127.0.0.1:12357',:loglevel => Logger::DEBUG}) do |browser, id|
+      3.times do |iteration|
+        browser.goto "http://127.0.0.1/#id=#{id}&iter=#{iteration}"
+        sleep 0.5
+      end
+      browser.close
+    end
+  end
+
+  it 'should take all remaining providers via a direct controller_uri' do
+    grid = Watir::Grid.new(:controller_uri => 'druby://127.0.0.1:12357',
+                           :drb_server_host => '127.0.0.1')
+    grid.start(:take_all => true, :browser_type => 'webdriver')
+    grid.size.should == 2
+  end
+
+  it 'should add new providers via a direct controller_uri' do
+    provider = Provider.new(
+      :controller_uri => 'druby://127.0.0.1:12357',
+      :drb_server_host => '127.0.0.1',
+      :loglevel => Logger::ERROR,
+      :browser_type => 'webdriver')
+    provider.start
+    grid = Watir::Grid.new(:controller_uri => 'druby://127.0.0.1:12357',
+                           :drb_server_host => '127.0.0.1')
+    grid.start(:take_all => true, :browser_type => 'webdriver')
+    grid.size.should == 1
+  end
+
+end

data/watirgrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watirgrid}
-  s.version = "1.0.1"
+  s.version = "1.0.3.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]
-  s.date = %q{2011-04-04}
+  s.date = %q{2011-04-05}
   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"]
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
      "lib/watirgrid.rb",
      "rdoc/logo.png",
      "spec/grid_spec.rb",
+     "spec/gridinit_spec.rb",
      "spec/memory_spec.rb",
      "spec/spec_helper.rb",
      "spec/utilities_spec.rb",
@@ -51,6 +52,7 @@ Gem::Specification.new do |s|
   s.summary = %q{WatirGrid: Web Application Testing in Ruby across a grid network.}
   s.test_files = [
     "spec/grid_spec.rb",
+     "spec/gridinit_spec.rb",
      "spec/memory_spec.rb",
      "spec/spec_helper.rb",
      "spec/utilities_spec.rb",

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: watirgrid
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
+  hash: 961915992
+  prerelease: 6
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 3
+  - pre
+  version: 1.0.3.pre
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -07:00
+date: 2011-04-05 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -49,6 +50,7 @@ files:
 - lib/watirgrid.rb
 - rdoc/logo.png
 - spec/grid_spec.rb
+- spec/gridinit_spec.rb
 - spec/memory_spec.rb
 - spec/spec_helper.rb
 - spec/utilities_spec.rb
@@ -76,12 +78,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -91,6 +95,7 @@ specification_version: 3
 summary: "WatirGrid: Web Application Testing in Ruby across a grid network."
 test_files: 
 - spec/grid_spec.rb
+- spec/gridinit_spec.rb
 - spec/memory_spec.rb
 - spec/spec_helper.rb
 - spec/utilities_spec.rb