watirgrid 1.0.0 → 1.0.1

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

data/lib/watirgrid.rb

@@ -14,10 +14,10 @@ module Watir
     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
+      @controller_uri   = params[:controller_uri]
+      @ring_server_host = params[:ring_server_host] || external_interface unless @controller_uri
       @ring_server_port = params[:ring_server_port] || Rinda::Ring_PORT
-      @renewer = params[:renewer] || Rinda::SimpleRenewer.new
-
+      @renewer          = params[:renewer] || Rinda::SimpleRenewer.new
       logfile = params[:logfile] || STDOUT
       @log  = Logger.new(logfile, 'daily')
       @log.level = params[:loglevel] || Logger::ERROR
@@ -31,7 +31,7 @@ module Watir
     # Start required services
     def start(params = {})
       start_drb_server
-      find_ring_server
+      find_ring_server(params)
       get_tuples(params)
     end
 
@@ -53,7 +53,7 @@ module Watir
     # 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
@@ -70,11 +70,16 @@ module Watir
 
     ##
     # Locate the Rinda Ring Server via a UDP broadcast
-    def find_ring_server
-      @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}")
+    def find_ring_server(params = {})
+      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
 
     ##

data/spec/grid_spec.rb

@@ -188,3 +188,32 @@ 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/watirgrid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watirgrid}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirgrid
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Tim Koopmans