pivotal-selenium-grid 0.0.4 → 0.2.0

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.2.0 / 2008-10-06
+
+* added grid:list and grid:stop
+* capturing std error on kill of hub and remotes
+
+=== 0.1.0 / 2008-10-06
+
+* bugfix: backgrounding argument position was wrong (needs to be last)
+* bugfix: config/requirement needed to be required
+
 === 0.0.4 / 2008-10-06
 
 * added hub:list

data/Manifest.txt

@@ -19,6 +19,7 @@ lib/selenium-grid.rb
 lib/selenium-grid/hub.rb
 lib/selenium-grid/remote.rb
 lib/selenium-grid/version.rb
+lib/tasks/grid.rake
 lib/tasks/hoe.rake
 lib/tasks/hub.rake
 lib/tasks/rc.rake

data/bin/selenium-grid

@@ -107,6 +107,13 @@ class RcRunningOptions < SeleniumGridOptions
 end
 
 case ARGV.first
+  when 'grid:list':
+    hub = Hub.instance.list.collect { |port, component| "#{port}\t#{component}"}
+    remotes = Remote.instance.list.collect { |port, browser| "#{port}\tremote\t#{browser}"}.sort
+    puts hub.concat(remotes).join("\n")
+  when 'grid:stop': 
+    Hub.instance.stop
+    Remote.instance.list.keys.each { |port| Remote.instance.stop(:port => port) }
   when 'hub:start':
     options = HubStartOptions.new.parse(ARGV)
     Hub.instance.start(options)
@@ -115,7 +122,7 @@ case ARGV.first
   when 'hub:running':
     puts Hub.instance.running?
   when 'hub:list':
-    puts Hub.instance.list
+    puts Hub.instance.list.collect { |port, component| "#{port}\t#{component}"}
   when 'rc:start':
     options = RcStartOptions.new.parse(ARGV)
     Remote.instance.start(options)
@@ -131,7 +138,7 @@ case ARGV.first
     puts "Usage: selenium-grid <command> [options]"
     puts ""
     puts "commands"
-    puts "\t" + %w(hub:start hub:stop hub:list hub:running rc:start rc:stop rc:list rc:running).join("\n\t")
+    puts "\t" + %w(grid:list grid:stop hub:start hub:stop hub:list hub:running rc:start rc:stop rc:list rc:running).join("\n\t")
     puts ""
 
     HubStartOptions.new.summarize

data/lib/extensions.rb

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

data/lib/java/vm.rb

@@ -8,10 +8,10 @@ module Java
       command << classname
       include_settings(command, options)
       include_arguments(command, options)
-      include_background(command, options)
       include_log(command, options)
+      include_background(command, options)
 
-      sh command.compact.join(' ')
+      hide_error_stream { sh command.compact.join(' ') }
     end
     
     private
@@ -56,5 +56,17 @@ module Java
         command << options[:settings].collect { |key, value| "-D#{key}=#{value}" }.join(' ')
       end
     end
+
+    def hide_error_stream
+      old_stderr = $stderr
+      begin
+        $stderr = StringIO.new
+        yield
+      rescue Exception => e
+        $stderr = old_stderr
+      ensure
+        $stderr = old_stderr
+      end
+    end
   end
 end

data/lib/java.rb

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

data/lib/selenium-grid/hub.rb

@@ -3,7 +3,7 @@ require 'singleton'
 module SeleniumGrid
   class Hub
     include Singleton
-
+    
     HUB_PORT=4444
 
     def start(overrides = {})
@@ -15,7 +15,7 @@ module SeleniumGrid
         :log => ENV['LOG'] || overrides[:log] || File.join(".", "log", "hub.log")
       }
       options = {
-        :background => ENV['BACKGROUND'] || false,
+        :background => ENV['BACKGROUND'] || false
       }.merge(overrides).merge(requirements)
 
       Java::VM.new.run "com.thoughtworks.selenium.grid.hub.HubServer", options
@@ -26,9 +26,9 @@ module SeleniumGrid
     end
 
     def list
-      "#{HUB_PORT}\thub" if running?
+      running? ? { HUB_PORT.to_s => "hub" } : {} 
     end
-    
+
     def running?
       Lsof.running?(HUB_PORT)
     end

data/lib/selenium-grid/remote.rb

@@ -20,7 +20,6 @@ module SeleniumGrid
        :arguments => args,
        :background => overrides[:background] || ENV['BACKGROUND'] || false,
       }
-
       Java::VM.new.run "com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher", options
     end
 
@@ -28,6 +27,7 @@ module SeleniumGrid
       options = {
         :port => ENV['PORT'] || DEFAULT_PORT
       }.merge(overrides)
+      
       Lsof.kill(options[:port].to_i)
     end
 

data/lib/selenium-grid/version.rb

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

data/lib/selenium-grid.rb

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

data/lib/tasks/grid.rake

@@ -0,0 +1,18 @@
+require 'rake'
+
+namespace :grid do
+  include SeleniumGrid
+
+  desc "Stop the entire Grid."
+  task(:stop) do
+    Hub.instance.stop
+    Remote.instance.list.keys.each { |port| Remote.instance.stop(:port => port) }
+  end
+  
+  desc "List details about the Grid."
+  task(:list) do
+    hub = Hub.instance.list.collect { |port, component| "#{port}\t#{component}"}
+    remotes = Remote.instance.list.collect { |port, browser| "#{port}\tremote\t#{browser}"}.sort
+    puts hub.concat(remotes).join("\n")
+  end
+end

data/lib/tasks/hub.rake

@@ -15,7 +15,7 @@ namespace :hub do
   
   desc "List details about the Hub."
   task(:list) do
-    puts Hub.instance.list
+    puts Hub.instance.list.collect { |port, component| "#{port}\t#{component}"}
   end
   
   desc "Check whether the Hub is running."

data/spec/java/vm_spec.rb

@@ -38,6 +38,11 @@ module Java
             mock(vm).sh('java test.ClassName &')
             vm.run "test.ClassName", { :background => true }
           end
+          
+          it "is the last option" do
+            mock(vm).sh("java test.ClassName > '/var/log/test.log' 2>&1 &")
+            vm.run "test.ClassName", {:background => true, :log => '/var/log/test.log'}
+          end
         end
 
         context "when the options include :classpath" do

data/spec/selenium-grid/hub_spec.rb

@@ -74,8 +74,8 @@ module SeleniumGrid
           mock(Lsof).running?(Hub::HUB_PORT) { false }
         end
 
-        it "lists nothing" do
-          hub.list.should be_nil
+        it "lists empty string" do
+          hub.list.should be_empty
         end
       end
 
@@ -85,7 +85,7 @@ module SeleniumGrid
         end
 
         it "lists details about the running Hub" do
-          hub.list.should == "#{Hub::HUB_PORT}\thub"
+          hub.list.should == { Hub::HUB_PORT.to_s => "hub" }
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pivotal-selenium-grid
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ryan Dy
@@ -81,6 +81,7 @@ files:
 - lib/selenium-grid/hub.rb
 - lib/selenium-grid/remote.rb
 - lib/selenium-grid/version.rb
+- lib/tasks/grid.rake
 - lib/tasks/hoe.rake
 - lib/tasks/hub.rake
 - lib/tasks/rc.rake