pivotal-selenium-grid 0.0.2 → 0.0.4

data/History.txt

@@ -1,12 +1,18 @@
-=== 0.0.2 / 2008-10-03
+=== 0.0.4 / 2008-10-06
 
-* 1 major enhancement
+* added hub:list
+* added rc:list
+* added hub:running
+* added rc:running
 
-  * selenium-grid path fix
+=== 0.0.3 / 2008-10-06
 
-=== 0.0.1 / 2008-10-01
+* add log option, and default to current directory
 
-* 1 major enhancement
+=== 0.0.2 / 2008-10-03
 
-  * Initial development
+* selenium-grid path fix
+
+=== 0.0.1 / 2008-10-01
 
+* Initial development

data/bin/selenium-grid

@@ -91,22 +91,51 @@ class RcStopOptions < SeleniumGridOptions
   end
 end
 
+class RcRunningOptions < SeleniumGridOptions
+
+  protected
+  
+  def initialize_options
+    return OptionParser.new do |opts|
+      opts.banner = "rc:running"
+      
+      opts.on('-p', '--port <port>', "listening port to check if running?", "\tdefault:\t#{Remote::DEFAULT_PORT}") do |port|
+        @options[:port] = port
+      end
+    end
+  end
+end
+
 case ARGV.first
   when 'hub:start':
     options = HubStartOptions.new.parse(ARGV)
     Hub.instance.start(options)
   when 'hub:stop':
     Hub.instance.stop
+  when 'hub:running':
+    puts Hub.instance.running?
+  when 'hub:list':
+    puts Hub.instance.list
   when 'rc:start':
     options = RcStartOptions.new.parse(ARGV)
     Remote.instance.start(options)
   when 'rc:stop':
     options = RcStopOptions.new.parse(ARGV)
     Remote.instance.stop(options)
+  when 'rc:running':
+    options = RcRunningOptions.new.parse(ARGV)
+    puts options[:port] ? Remote.instance.running?(options[:port]) : Remote.instance.running?
+  when 'rc:list':
+    puts Remote.instance.list.collect { |port, browser| "#{port}\tremote\t#{browser}"}.sort.join("\n")
   else
-    puts "Usage: selenium-grid <hub:start|hub:stop|rc:start|rc:stop> [options]"
+    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 ""
+
     HubStartOptions.new.summarize
     RcStartOptions.new.summarize
     RcStopOptions.new.summarize
+    RcRunningOptions.new.summarize
 end

data/config/hoe.rb

@@ -2,7 +2,29 @@ AUTHOR = ['Ryan Dy', 'Corey Innis']
 EMAIL = "ops+rubyforge@pivotallabs.com"
 DESCRIPTION = "Selenium Grid Ruby packages Selenium Grid as a gem"
 GEM_NAME = 'selenium-grid'
-HOMEPATH = "https://github.com/pivotal/selenium-grid"
+
+RUBYFORGE_PROJECT = 'selenium-grid'
+HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
+DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
+
+@config_file = "~/.rubyforge/user-config.yml"
+@config = nil
+RUBYFORGE_USERNAME = "unknown"
+def rubyforge_username
+  unless @config
+    begin
+      @config = YAML.load(File.read(File.expand_path(@config_file)))
+    rescue
+      puts <<-EOS
+ERROR: No rubyforge config file found: #{@config_file}"
+Run 'rubyforge setup' to prepare your env for access to Rubyforge
+ - See http://newgem.rubyforge.org/rubyforge.html for more details
+      EOS
+      exit
+    end
+  end
+  RUBYFORGE_USERNAME.replace @config["username"]
+end
 
 RDOC_OPTS = ['--quiet', '--title', 'selenium-grid documentation',
     "--opname", "index.html",
@@ -25,6 +47,7 @@ hoe = Hoe.new(GEM_NAME, SeleniumGrid::VERSION::STRING) do |p|
   p.description = DESCRIPTION
   p.summary = DESCRIPTION
   p.url = HOMEPATH
+  p.rubyforge_name = RUBYFORGE_PROJECT
   p.test_globs = ["spec/**/*_spec.rb"]
   p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']
   p.extra_deps = [
@@ -39,3 +62,5 @@ hoe = Hoe.new(GEM_NAME, SeleniumGrid::VERSION::STRING) do |p|
 end
 
 CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
+PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
+hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')

data/lib/selenium-grid/hub.rb

@@ -12,7 +12,7 @@ module SeleniumGrid
 
       requirements = {
         :classpath => classpath.definition,
-        :log => File.join(File.dirname(__FILE__), "..", "..", "log", "hub.log")
+        :log => ENV['LOG'] || overrides[:log] || File.join(".", "log", "hub.log")
       }
       options = {
         :background => ENV['BACKGROUND'] || false,
@@ -24,5 +24,13 @@ module SeleniumGrid
     def stop
       Lsof.kill(HUB_PORT)
     end
+
+    def list
+      "#{HUB_PORT}\thub" if running?
+    end
+    
+    def running?
+      Lsof.running?(HUB_PORT)
+    end
   end
 end

data/lib/selenium-grid/remote.rb

@@ -3,27 +3,27 @@ require 'singleton'
 module SeleniumGrid
   class Remote
     include Singleton
-    
+
     DEFAULT_BROWSER = "*chrome"
     DEFAULT_PORT = 5555
     DEFAULT_HOST = "localhost"
     DEFAULT_HUB_URL = "http://#{DEFAULT_HOST}:#{Hub::HUB_PORT}",
-  
+
     def start(overrides = {})
       classpath = Java::Classpath.new(File.join(File.dirname(__FILE__), %w(.. ..)))
       classpath =  classpath << "." << "lib/openqa/selenium-server-*.jar" << "lib/openqa/selenium-grid-remote-control-standalone-*.jar"
       args = arguments(overrides.reject { |key, value| key == :background })
-      
+
       options = {
        :classpath => classpath.definition,
-       :log => File.join(File.dirname(__FILE__), "..", "..", "log", "rc-#{args[:port]}.log"),
+       :log => ENV['LOG'] || overrides[:log] || File.join(".", "log", "rc-#{args[:port]}.log"),
        :arguments => args,
        :background => overrides[:background] || ENV['BACKGROUND'] || false,
       }
 
       Java::VM.new.run "com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher", options
     end
-      
+
     def stop(overrides = {})
       options = {
         :port => ENV['PORT'] || DEFAULT_PORT
@@ -31,6 +31,23 @@ module SeleniumGrid
       Lsof.kill(options[:port].to_i)
     end
 
+    def list
+      return {} unless Lsof.running?(Hub::HUB_PORT)
+      remotes = ps.split(/\n|\r/)
+      return {} if remotes.empty?
+      
+      remotes.inject({}) do |remotes, remote|
+        parts = remote.split(/\s/)
+        port = parts[parts.index('-port') + 1]
+        browser = parts[parts.index('-env') + 1]
+        remotes.merge({ port => browser })
+      end
+    end
+    
+    def running?(port = ENV['PORT'] || DEFAULT_PORT)
+      Lsof.running?(port)
+    end
+    
     def arguments(overrides = {})
       options = {
         :host => ENV['HOST'] || DEFAULT_HOST,
@@ -42,5 +59,9 @@ module SeleniumGrid
       options[:env] = "'#{options[:env].gsub(/["']/, '')}'"
       options
     end
+
+    def ps
+      %x{ ps auwx | grep com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControlLauncher | sed '/sh -c java/d' | grep -v grep }
+    end
   end
 end

data/lib/selenium-grid/version.rb

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

data/lib/tasks/hub.rake

@@ -12,4 +12,14 @@ namespace :hub do
   task(:stop) do
     Hub.instance.stop
   end
+  
+  desc "List details about the Hub."
+  task(:list) do
+    puts Hub.instance.list
+  end
+  
+  desc "Check whether the Hub is running."
+  task(:running) do
+    puts Hub.instance.running?
+  end
 end

data/lib/tasks/rc.rake

@@ -3,13 +3,23 @@ require 'rake'
 namespace :rc do
   include SeleniumGrid
 
-  desc "Launch Remote Control. Usage rake rc:start [PORT=#{Remote::DEFAULT_PORT}]"
+  desc "Launch Remote Control (rake rc:start [PORT=#{Remote::DEFAULT_PORT}])"
   task(:start) do
     Remote.instance.start
   end
 
-  desc "Stop Remote Control. Usage rake rc:stop [PORT=#{Remote::DEFAULT_PORT}]"
+  desc "Stop Remote Control (rake rc:stop [PORT=#{Remote::DEFAULT_PORT}])"
   task(:stop) do
     Remote.instance.stop
   end
+
+  desc "List details about the Remotes."
+  task(:list) do
+    puts Remote.instance.list.collect { |port, browser| "#{port}\tremote\t#{browser}"}.sort.join("\n")
+  end
+  
+  desc "Check whether a Remote is running (rake rc:running [PORT=#{Remote::DEFAULT_PORT}])"
+  task(:running) do
+    puts Remote.instance.running?
+  end
 end

data/spec/selenium-grid/hub_spec.rb

@@ -32,15 +32,18 @@ module SeleniumGrid
         context "when called with environment settings" do
           before do
             ENV['BACKGROUND'] = "true"
+            ENV['LOG'] = "/var/dummy_log/hub.log"
           end
           
           after do
             ENV.delete('BACKGROUND')
+            ENV.delete('LOG')
           end
           
           it "includes the environment settings as parameters" do
             mock.instance_of(Java::VM).run(anything, anything) do |class_name, options|
               options[:background].should == "true"
+              options[:log].should == "/var/dummy_log/hub.log"
             end
             hub.start
           end
@@ -50,8 +53,9 @@ module SeleniumGrid
           it "includes the options as parameters" do
             mock.instance_of(Java::VM).run(anything, anything) do |class_name, options|
               options[:background].should be_true
+              options[:log].should == "/var/dummy_log/hub.log"
             end
-            hub.start(:background => true)
+            hub.start(:background => true, :log => "/var/dummy_log/hub.log")
           end
         end
       end
@@ -63,5 +67,49 @@ module SeleniumGrid
         hub.stop
       end
     end
+
+    describe "#list" do
+      context "when the Hub is not running" do
+        before do
+          mock(Lsof).running?(Hub::HUB_PORT) { false }
+        end
+
+        it "lists nothing" do
+          hub.list.should be_nil
+        end
+      end
+
+      context "when the Hub is running" do
+        before do
+          mock(Lsof).running?(Hub::HUB_PORT) { true }
+        end
+
+        it "lists details about the running Hub" do
+          hub.list.should == "#{Hub::HUB_PORT}\thub"
+        end
+      end
+    end
+    
+    describe "#running?" do
+      context "when the Hub is not running" do
+        before do
+          mock(Lsof).running?(Hub::HUB_PORT) { false }
+        end
+
+        it "returns false" do
+          hub.running?.should be_false
+        end
+      end
+
+      context "when the Hub is running" do
+        before do
+          mock(Lsof).running?(Hub::HUB_PORT) { true }
+        end
+
+        it "lists returns true" do
+          hub.running?.should be_true
+        end
+      end
+    end
   end
 end

data/spec/selenium-grid/remote_spec.rb

@@ -45,12 +45,14 @@ module SeleniumGrid
           before do
             ENV['BACKGROUND'] = 'true'
             ENV['PORT'] = "1234"
+            ENV['LOG'] = "/var/dummy_log/remote.log"
           end
 
           it "includes the environment settings as parameters" do
             mock.instance_of(Java::VM).run(anything, anything) do |class_name, options|
               options[:background].should == "true"
               options[:arguments][:port].should == "1234"
+              options[:log].should == "/var/dummy_log/remote.log"
             end
             remote.start
           end
@@ -61,8 +63,9 @@ module SeleniumGrid
             mock.instance_of(Java::VM).run(anything, anything) do |class_name, options|
               options[:background].should be_true
               options[:arguments][:port].should == 1234
+              options[:log].should == "/var/dummy_log/remote.log"
             end
-            remote.start(:background => true, :port => 1234)
+            remote.start(:background => true, :port => 1234, :log => "/var/dummy_log/remote.log")
           end
         end
       end
@@ -76,18 +79,18 @@ module SeleniumGrid
             remote.stop
           end
         end
-        
+
         context "when called with environment settings" do
           before do
             ENV['PORT'] = "1234"
           end
-          
+
           it "uses the environment settings" do
             mock(Lsof).kill(ENV['PORT'].to_i)
             remote.stop 
           end
         end
-        
+
         context "when called with options" do
           it "uses the options" do
             mock(Lsof).kill(1234)
@@ -96,7 +99,92 @@ module SeleniumGrid
         end
       end
     end
-  
+
+    describe "#list" do
+      context "when there is no Remote running" do
+        before do
+          mock(Lsof).running?(anything) { false }
+        end
+
+        it "lists nothing" do
+          remote.list.should be_empty
+        end
+      end
+      
+      context "when a single Remote is running" do
+        before do
+          mock(Lsof).running?(Hub::HUB_PORT) { true }
+          mock(remote).ps { "prefix -port #{Remote::DEFAULT_PORT} -env #{Remote::DEFAULT_BROWSER} suffix" }
+        end
+
+        it "lists details about the running Remote" do
+          remote.list.should == { Remote::DEFAULT_PORT.to_s => Remote::DEFAULT_BROWSER }
+        end
+      end
+
+      context "when multiple Remotes are running" do
+        before do
+          mock(Lsof).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"
+          end
+        end
+
+        it "lists details about the running Remotes" do
+          list = remote.list
+          list[Remote::DEFAULT_PORT.to_s].should == Remote::DEFAULT_BROWSER
+          list["1234"].should == '*safari'
+        end
+      end
+    end
+
+    describe "#running?" do
+      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 }
+          end
+
+          it "returns false" do
+            remote.running?.should be_false
+          end
+        end
+      
+        context "when a Remote is running on the default port" do
+          before do
+            mock(Lsof).running?(Remote::DEFAULT_PORT) { true }
+          end
+
+          it "returns true" do
+            remote.running?.should be_true
+          end
+        end
+      end
+
+      context "when a port number is provided" do
+        context "when a Remote is not running on the provided port" do
+          before do
+            mock(Lsof).running?(1234) { false }
+          end
+
+          it "returns false" do
+            remote.running?(1234).should be_false
+          end
+        end
+      
+        context "when a Remote is running on the provided port" do
+          before do
+            mock(Lsof).running?(1234) { true }
+          end
+
+          it "returns true" do
+            remote.running?(1234).should be_true
+          end
+        end
+      end
+    end
+
     describe "#args" do
       attr_reader :args, :defaults
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pivotal-selenium-grid
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ryan Dy
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-03 00:00:00 -07:00
+date: 2008-10-06 00:00:00 -07:00
 default_executable: selenium-grid
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,7 +96,7 @@ files:
 - spec/spec_helper.rb
 - spec/spec_suite.rb
 has_rdoc: true
-homepage: https://github.com/pivotal/selenium-grid
+homepage: http://selenium-grid.rubyforge.org
 post_install_message: 
 rdoc_options: 
 - --main