selenium-grid 0.2.1 → 0.2.2

data/Manifest.txt

@@ -24,6 +24,8 @@ lib/tasks/hoe.rake
 lib/tasks/hub.rake
 lib/tasks/rc.rake
 lib/tasks/rspec.rake
+lib/utils.rb
+lib/utils/netstat.rb
 spec/extensions/string_spec.rb
 spec/extensions_spec_suite.rb
 spec/java/vm_spec.rb
@@ -34,3 +36,4 @@ spec/selenium-grid_spec_suite.rb
 spec/spec.opts
 spec/spec_helper.rb
 spec/spec_suite.rb
+spec/utils/netstat_spec.rb

data/config/hoe.rb

@@ -1,4 +1,4 @@
-AUTHOR = ['Ryan Dy', 'Corey Innis']
+AUTHOR = ['Ryan Dy', 'Corey Innis', 'Kunal Anand']
 EMAIL = "ops+rubyforge@pivotallabs.com"
 DESCRIPTION = "Selenium Grid Ruby packages Selenium Grid as a gem"
 GEM_NAME = 'selenium-grid'

data/config/requirements.rb

@@ -25,3 +25,4 @@ end
 require 'extensions'
 require 'java'
 require 'selenium-grid'
+require 'utils'

data/lib/selenium-grid/hub.rb

@@ -3,6 +3,7 @@ require 'singleton'
 module SeleniumGrid
   class Hub
     include Singleton
+    include Utils
     
     HUB_PORT=4444
 
@@ -30,7 +31,7 @@ module SeleniumGrid
     end
 
     def running?
-      Lsof.running?(HUB_PORT)
+      Netstat.instance.running?(HUB_PORT)
     end
   end
 end

data/lib/selenium-grid/remote.rb

@@ -4,6 +4,7 @@ require File.join(File.dirname(__FILE__), "hub")
 module SeleniumGrid
   class Remote
     include Singleton
+    include Utils
 
     DEFAULT_BROWSER = "*chrome"
     DEFAULT_PORT = 5555
@@ -33,7 +34,7 @@ module SeleniumGrid
     end
 
     def list
-      return {} unless Lsof.running?(Hub::HUB_PORT)
+      return {} unless Netstat.instance.running?(Hub::HUB_PORT)
       remotes = ps.split(/\n|\r/)
       return {} if remotes.empty?
       
@@ -46,7 +47,7 @@ module SeleniumGrid
     end
     
     def running?(port = ENV['PORT'] || DEFAULT_PORT)
-      Lsof.running?(port)
+      Netstat.instance.running?(port)
     end
     
     def arguments(overrides = {})

data/lib/selenium-grid/version.rb

@@ -2,7 +2,7 @@ module SeleniumGrid #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/lib/utils.rb

@@ -0,0 +1,2 @@
+require File.join(File.dirname(__FILE__), '..', 'config', 'requirements')
+require_path '/lib/utils/**/*.rb'

data/lib/utils/netstat.rb

@@ -0,0 +1,12 @@
+require 'singleton'
+
+module Utils
+  class Netstat
+    include Singleton
+
+    def running?(port)
+      result = system("netstat -an | grep #{port}")
+      result
+    end
+  end
+end

data/spec/selenium-grid/hub_spec.rb

@@ -71,7 +71,7 @@ module SeleniumGrid
     describe "#list" do
       context "when the Hub is not running" do
         before do
-          mock(Lsof).running?(Hub::HUB_PORT) { false }
+          mock(Utils::Netstat.instance).running?(Hub::HUB_PORT) { false }
         end
 
         it "lists empty string" do
@@ -81,7 +81,7 @@ module SeleniumGrid
 
       context "when the Hub is running" do
         before do
-          mock(Lsof).running?(Hub::HUB_PORT) { true }
+          mock(Utils::Netstat.instance).running?(Hub::HUB_PORT) { true }
         end
 
         it "lists details about the running Hub" do
@@ -93,7 +93,7 @@ module SeleniumGrid
     describe "#running?" do
       context "when the Hub is not running" do
         before do
-          mock(Lsof).running?(Hub::HUB_PORT) { false }
+          mock(Utils::Netstat.instance).running?(Hub::HUB_PORT) { false }
         end
 
         it "returns false" do
@@ -103,7 +103,7 @@ module SeleniumGrid
 
       context "when the Hub is running" do
         before do
-          mock(Lsof).running?(Hub::HUB_PORT) { true }
+          mock(Utils::Netstat.instance).running?(Hub::HUB_PORT) { true }
         end
 
         it "lists returns true" do

data/spec/selenium-grid/remote_spec.rb

@@ -103,7 +103,7 @@ module SeleniumGrid
     describe "#list" do
       context "when there is no Remote running" do
         before do
-          mock(Lsof).running?(anything) { false }
+          mock(Utils::Netstat.instance).running?(anything) { false }
         end
 
         it "lists nothing" do
@@ -113,7 +113,7 @@ module SeleniumGrid
       
       context "when a single Remote is running" do
         before do
-          mock(Lsof).running?(Hub::HUB_PORT) { true }
+          mock(Utils::Netstat.instance).running?(Hub::HUB_PORT) { true }
           mock(remote).ps { "prefix -port #{Remote::DEFAULT_PORT} -env #{Remote::DEFAULT_BROWSER} suffix" }
         end
 
@@ -124,7 +124,7 @@ module SeleniumGrid
 
       context "when multiple Remotes are running" do
         before do
-          mock(Lsof).running?(Hub::HUB_PORT) { true }
+          mock(Utils::Netstat.instance).running?(Hub::HUB_PORT) { true }
           mock(remote).ps do
             "prefix -port #{Remote::DEFAULT_PORT} -env #{Remote::DEFAULT_BROWSER} suffix\n" +
             "prefix -port 1234 -env *safari suffix\n"
@@ -143,7 +143,7 @@ module SeleniumGrid
       context "when a port number is not provided" do
         context "when a Remote is not running on the default port" do
           before do
-            mock(Lsof).running?(Remote::DEFAULT_PORT) { false }
+            mock(Utils::Netstat.instance).running?(Remote::DEFAULT_PORT) { false }
           end
 
           it "returns false" do
@@ -153,7 +153,7 @@ module SeleniumGrid
       
         context "when a Remote is running on the default port" do
           before do
-            mock(Lsof).running?(Remote::DEFAULT_PORT) { true }
+            mock(Utils::Netstat.instance).running?(Remote::DEFAULT_PORT) { true }
           end
 
           it "returns true" do
@@ -163,23 +163,29 @@ module SeleniumGrid
       end
 
       context "when a port number is provided" do
+        attr_reader :port
+        
+        before do
+          @port = 1234
+        end
+        
         context "when a Remote is not running on the provided port" do
           before do
-            mock(Lsof).running?(1234) { false }
+            mock(Utils::Netstat.instance).running?(port) { false }
           end
 
           it "returns false" do
-            remote.running?(1234).should be_false
+            remote.running?(port).should be_false
           end
         end
       
         context "when a Remote is running on the provided port" do
           before do
-            mock(Lsof).running?(1234) { true }
+            mock(Utils::Netstat.instance).running?(port) { true }
           end
 
           it "returns true" do
-            remote.running?(1234).should be_true
+            remote.running?(port).should be_true
           end
         end
       end

data/spec/utils/netstat_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module Utils
+  describe Netstat do
+    describe "#running?" do
+      context "when passed a valid port number" do
+        attr_reader :port
+        
+        before do
+          @port = 1234
+        end
+        
+        context "when the port is in use" do
+          before do
+            mock(Netstat.instance).system(anything) { true }
+          end
+
+          it "returns true" do
+            Utils::Netstat.instance.running?(port).should be_true
+          end
+        end
+
+        context "when the port is not in use" do
+          before do
+            mock(Netstat.instance).system(anything) { false }
+          end
+
+          it "returns false" do
+            Utils::Netstat.instance.running?(port).should be_false
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-grid
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ryan Dy
 - Corey Innis
+- Kunal Anand
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-07 00:00:00 -07:00
+date: 2008-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,6 +91,8 @@ files:
 - lib/tasks/hub.rake
 - lib/tasks/rc.rake
 - lib/tasks/rspec.rake
+- lib/utils.rb
+- lib/utils/netstat.rb
 - spec/extensions/string_spec.rb
 - spec/extensions_spec_suite.rb
 - spec/java/vm_spec.rb
@@ -100,6 +103,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spec_suite.rb
+- spec/utils/netstat_spec.rb
 has_rdoc: true
 homepage: http://selenium-grid.rubyforge.org
 post_install_message: 
@@ -132,3 +136,4 @@ test_files:
 - spec/java/vm_spec.rb
 - spec/selenium-grid/hub_spec.rb
 - spec/selenium-grid/remote_spec.rb
+- spec/utils/netstat_spec.rb