selenium-server 1.0.0 → 1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    selenium-server (0.3.0)
+    selenium-server (1.0.0)
       rake
       selenium-webdriver
 

data/README.md

@@ -3,7 +3,6 @@
 
 This library aims to make configuring and running your Selenium tests against a Selenium Server simple for both local and remote execution.
 
-
 ## Getting Started
 ```ruby
 require 'selenium-server'
@@ -24,17 +23,17 @@ SeleniumServer.finish
 
 ## Helpful bits
 
-### Selenium Actions Reference  
+### Selenium Actions  
 This library uses the Selenium WebDriver Remote Bridge actions. You can find them [here](http://www.ruby-doc.org/gems/docs/b/bbc-selenium-webdriver-1.17.0/Selenium/WebDriver/Remote/Bridge.html).  
 
 ### Start  
-If host is set to "localhost", it will download the latest selenium-standalone-server.jar (unless it already has) and run it. If no additional parameters are set, it will be exected in the background, with logging disabled. This functionality is driven using the [Selenium Rake Server Task](http://selenium.googlecode.com/svn/trunk/docs/api/rb/Selenium/Rake/ServerTask.html).
+If host is set to "localhost", it will download the latest selenium-standalone-server.jar (unless it already has) and run it. Or, you can specify your own jar (if you have one you prefer to use). If no additional parameters are set, it will be exected in the background, with logging disabled. This functionality is driven using the [Selenium Rake Server Task](http://selenium.googlecode.com/svn/trunk/docs/api/rb/Selenium/Rake/ServerTask.html). 
 
 ### Finish  
 Issues a quit command to the driver (and stops the local server if your host is set to "localhost").  
 
 ### Support  
-Currently, Firefox is is all that is supported. More coming soon!  
+Currently, Firefox with a custom profile is all that is supported. More coming soon!  
 
 ### Versioning  
 This project loosely follows [Semantic Versioning](http://semver.org/).

data/lib/selenium-server/configuration.rb

@@ -1,5 +1,5 @@
 module SeleniumServer
   class Configuration
-    attr_accessor :host, :port, :browser, :profile_path, :version, :background, :log
+    attr_accessor :host, :port, :browser, :profile_path, :version, :background, :log, :jar
   end
 end

data/lib/selenium-server/rake.task

@@ -1,7 +1,9 @@
 require 'selenium/rake/server_task'
 
-Selenium::Rake::ServerTask.new(:server) do |t|
-  t.version = :latest
-  t.background
-  t.log = false
-end
+       Selenium::Rake::ServerTask.new(:server) do |t|
+         t.version = :latest
+         
+         t.background
+         t.log = false
+         t.port = 4444
+       end

data/lib/selenium-server/runner.rb

@@ -4,28 +4,36 @@
 
 module SeleniumServer
   class Runner
-    attr_reader :driver
+    attr_reader :driver, :configuration
 
     def initialize(configuration)
-      @driver = initialize_server(configuration)
+      @configuration = configuration
+      set_sensible_defaults
+      @driver = initialize_selenium
     end
 
     private
 
-    def set_profile(profile_path)
-      profile = Selenium::WebDriver::Firefox::Profile.new(profile_path)
+    def set_sensible_defaults
+      configuration.host     = "localhost" unless configuration.host
+      configuration.port     = "4444"      unless configuration.port
+      configuration.browser  = "firefox"   unless configuration.browser
+    end
+
+    def set_profile
+      profile = Selenium::WebDriver::Firefox::Profile.new(configuration.profile_path)
       profile.assume_untrusted_certificate_issuer = false
       Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile => profile)
     end
 
-    def set_server_url(host, port)
-      "http://#{host}:#{port}/wd/hub"
+    def set_server_url
+      "http://#{configuration.host}:#{configuration.port}/wd/hub"
     end
 
-    def initialize_server(configuration)
+    def initialize_selenium
       Selenium::WebDriver::Remote::Bridge.new(
-        :url => set_server_url(configuration.host, configuration.port),
-        :desired_capabilities => set_profile(configuration.profile_path))
+        :url => set_server_url,
+        :desired_capabilities => set_profile)
     end
   end
 end

data/lib/selenium-server/selenium-server.rb

@@ -9,7 +9,7 @@ module SeleniumServer
     @configuration = Configuration.new
   end
 
-  attr_reader :driver
+  attr_reader :driver, :server
 
   def localhost?
     case @configuration.host
@@ -19,14 +19,17 @@ module SeleniumServer
   end
 
   def run
-    if localhost? then Server.start end
+    if localhost?
+      @server = Server.new(@configuration)
+      server.start
+    end
     @driver = Runner.new(@configuration).driver
     return driver
   end
 
   def finish
     driver.quit
-    if localhost? then Server.stop end
+    if localhost? then server.stop end
   end
 
   alias :start :run

data/lib/selenium-server/server.rb

@@ -1,6 +1,10 @@
 module SeleniumServer
-  module Server
-    extend self
+  class Server
+    attr_reader :configuration
+
+    def initialize(configuration)
+      @configuration = configuration
+    end
 
     def start
       rake "start"
@@ -16,12 +20,28 @@ module SeleniumServer
 
     private
 
-    def rake_file
-      "#{File.join(File.dirname(File.expand_path(__FILE__)), 'rake.task')}"
+    def generate_rake_task
+      "require 'selenium/rake/server_task'
+
+       Selenium::Rake::ServerTask.new(:server) do |t|
+         #{"t.version = :latest" unless configuration.jar}
+         #{if configuration.jar then "t.jar = #{configuration.jar}" end}
+         t.background
+         t.log = #{configuration.log ? configuration.log : "false"}
+         t.port = #{configuration.port ? configuration.port : "4444"}
+       end"
+    end
+
+    def get_rake_file
+      rake_file = File.join(File.dirname(File.expand_path(__FILE__)))
+      file = File.open(rake_file<<"/rake.task", "w")
+      file << generate_rake_task
+      file.close
+      return rake_file
     end
 
     def rake(task)
-      system "rake -f #{rake_file} server:#{task}"
+      system "rake -f #{get_rake_file} server:#{task}"
     end
   end
 end

data/selenium-server.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name          = 'selenium-server'
-  s.version       = '1.0.0'
+  s.version       = '1.1.0'
   s.platform      = Gem::Platform::RUBY
   s.authors       = ['Dave Haeffner']
   s.email         = ['dave@arrgyle.com']
   s.homepage      = 'https://github.com/arrgyle/selenium-server'
-  s.summary       = 'A configurator and runner for you Selenium tests against a Selenium Server.'
+  s.summary       = 'A configurator and runner for your Selenium tests against a Selenium Server.'
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split($/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-server
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -87,5 +87,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A configurator and runner for you Selenium tests against a Selenium Server.
+summary: A configurator and runner for your Selenium tests against a Selenium Server.
 test_files: []