saucelabs-adapter 0.8.11 → 0.8.12

data/VERSION

@@ -1 +1 @@
-0.8.11
+0.8.12

data/generators/saucelabs_adapter/templates/selenium.yml

@@ -1,4 +1,9 @@
+common: &common
+  # Try to kill mongrel after suite if tmp/pids/mongrel_selenium.pid exists
+  # kill_mongrel_after_suite: true
+
 local: &local
+  <<: *common
   selenium_server_address: "127.0.0.1"
   selenium_server_port: "4444"
   selenium_browser_key: "*chrome /Applications/Firefox.app/Contents/MacOS/firefox-bin"
@@ -21,6 +26,7 @@ local_jsunit:
 #                       "googlechrome"      ""
 # "Linux"               "firefox"           "3."
 saucelabs: &saucelabs
+  <<: *common
   test_framework: webrat
   # URL of Selenium RC server:
   selenium_server_address: "saucelabs.com"

data/lib/saucelabs_adapter/selenium_config.rb

@@ -23,7 +23,7 @@ module SaucelabsAdapter
       :saucelabs_max_duration_seconds,
       :tunnel_method, :tunnel_to_localhost_port, :tunnel_startup_timeout,
       :tunnel_username, :tunnel_password, :tunnel_keyfile,
-      :jsunit_polling_interval_seconds ].each do |attr|
+      :jsunit_polling_interval_seconds, :kill_mongrel_after_suite ].each do |attr|
       define_method(attr) do
         @configuration[attr.to_s]
       end
@@ -97,6 +97,11 @@ module SaucelabsAdapter
       !tunnel_method.nil? && tunnel_method.to_sym != :othertunnel
     end
 
+    def kill_mongrel_after_suite?
+      return true if kill_mongrel_after_suite.nil?
+      kill_mongrel_after_suite.to_s == 'true'
+    end
+
     def self.parse_yaml(selenium_yml_path)
       raise "[saucelabs-adapter] could not open #{selenium_yml_path}" unless File.exist?(selenium_yml_path)
       file_contents = File.open(selenium_yml_path).read

data/lib/saucelabs_adapter/test_unit_adapter.rb

@@ -24,6 +24,7 @@ if defined?(Test::Unit::UI::Console::TestRunner)
   puts "[saucelabs-adapter] Inserting Test::Unit::UI::Console::TestRunner attach_to_mediator tunnel start hook" if ENV['SAUCELABS_ADAPTER_DEBUG']
 
   class Test::Unit::UI::Console::TestRunner
+    include SaucelabsAdapter::Utilities
 
     private
 
@@ -34,6 +35,9 @@ if defined?(Test::Unit::UI::Console::TestRunner)
         @mediator.add_listener(Test::Unit::UI::TestRunnerMediator::STARTED, &method(:setup_tunnel))
         @mediator.add_listener(Test::Unit::UI::TestRunnerMediator::FINISHED, &method(:teardown_tunnel))
       end
+      if @selenium_config.kill_mongrel_after_suite?
+        @mediator.add_listener(Test::Unit::UI::TestRunnerMediator::FINISHED, &method(:kill_mongrel_if_needed))
+      end
     end
 
     alias_method_chain :attach_to_mediator, :sauce_tunnel unless private_method_defined?(:attach_to_mediator_without_sauce_tunnel)
@@ -46,5 +50,17 @@ if defined?(Test::Unit::UI::Console::TestRunner)
     def teardown_tunnel(suite_name)
       @tunnel.shutdown
     end
+
+    def kill_mongrel_if_needed(suite_name)
+      mongrel_pid_file = File.join(RAILS_ROOT, "tmp", "pids", "mongrel_selenium.pid")
+      if File.exists?(mongrel_pid_file)
+        pid = File.read(mongrel_pid_file).to_i
+        say "Killing mongrel at #{pid}"
+        Process.kill("KILL", pid)
+      end
+      if File.exists?(mongrel_pid_file)
+        FileUtils.rm(mongrel_pid_file)
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucelabs-adapter
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 39
   prerelease: false
   segments: 
   - 0
   - 8
-  - 11
-  version: 0.8.11
+  - 12
+  version: 0.8.12
 platform: ruby
 authors: 
 - Kelly Felkins, Chad Woolley, Sam Pierson, Nate Clark
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -07:00
+date: 2010-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         version: 1.2.0
   type: :runtime
   name: rest-client
-  prerelease: false
   version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -48,8 +48,8 @@ dependencies:
         version: 2.0.12
   type: :runtime
   name: net-ssh
-  prerelease: false
   version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -64,8 +64,8 @@ dependencies:
         version: 1.0.1
   type: :runtime
   name: net-ssh-gateway
-  prerelease: false
   version_requirements: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -80,8 +80,8 @@ dependencies:
         version: 1.2.17
   type: :runtime
   name: selenium-client
-  prerelease: false
   version_requirements: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -96,8 +96,8 @@ dependencies:
         version: 0.3.0
   type: :runtime
   name: lsof
-  prerelease: false
   version_requirements: *id005
+  prerelease: false
 description: "This gem augments Test::Unit and Polonium/Webrat to run Selenium tests in the cloud. "
 email: pair+kelly+sam@pivotallabs.com
 executables: []