saucelabs-adapter 0.8.0 → 0.8.1

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/saucelabs_adapter/tunnels/ssh_tunnel.rb

@@ -16,8 +16,15 @@ module SaucelabsAdapter
     def shutdown
       if @gateway
         say "Shutting down ssh reverse tunnel"
-        @gateway.close(@port) if @port
-        @gateway.shutdown! if @gateway
+        begin
+          @gateway.close(@port) if @port
+          @gateway.shutdown! if @gateway
+        rescue => e
+          say "Error shutting down ssh reverse tunnel: #{e.message}"
+          say e.backtrace
+          # Do not raise an error if tunnel shutdown failed; we don't want to abort the whole test suite; and it is all in transient memory anyway
+          # This could potentially be a problem when opening an SshTunnel multiple times during a single interpreter, but we'll see...
+        end
       end
     end
 

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: saucelabs-adapter
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 0
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Kelly Felkins, Chad Woolley & Sam Pierson
@@ -14,79 +9,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -08:00
+date: 2010-03-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
         version: 1.2.0
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 12
         version: 2.0.12
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh-gateway
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: selenium-client
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 17
         version: 1.2.17
-  type: :runtime
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: lsof
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
         version: 0.3.0
-  type: :runtime
-  version_requirements: *id005
+    version: 
 description: "This gem augments Test::Unit and Polonium/Webrat to run Selenium tests in the cloud. "
 email: pair+kelly+sam@pivotallabs.com
 executables: []
@@ -95,7 +70,6 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.html
 - README.markdown
 files: 
 - LICENSE
@@ -119,7 +93,6 @@ files:
 - lib/saucelabs_adapter/utilities.rb
 - lib/saucerest-ruby/gateway.rb
 - lib/saucerest-ruby/saucerest.rb
-- README.html
 - README.markdown
 has_rdoc: true
 homepage: http://github.com/pivotal/saucelabs-adapter
@@ -134,20 +107,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Adapter for running Selenium tests using SauceLabs.com

data/README.html

@@ -1,180 +0,0 @@
-
-<html>
-  <head><title>README.markdown</title></head>
-  <body>
-<h1>Saucelabs-Adapter</h1>
-
-<p>Saucelabs-adapter provides the glue to connect Rails Selenium tests to saucelabs.com.</p>
-
-<p>Currently it supports tests written using Webrat, Polonium and JSUnit.</p>
-
-<h2>Getting Started - Webrat or Polonium test suites</h2>
-
-<ol>
-<li><p>Prerequisites:</p>
-
-<p>You must be able to run selenium tests locally using test/selenium/selenium_suite.rb</p></li>
-<li><p>Install the gem:</p>
-
-<pre><code>gem install saucelabs-adapter
-</code></pre></li>
-<li><p>Run the saucelabs_adapter generator in your project:</p>
-
-<pre><code>cd your_project
-
-script/generate saucelabs_adapter
-</code></pre></li>
-<li><p>Configure it.  In config/selenium.yml, replace YOUR-SAUCELABS-USERNAME and
-YOUR-SAUCELABS-ACCESS-KEY with your saucelabs.com account information.</p></li>
-<li><p>Run Tests</p>
-
-<p>To run Selenium Test::Unit tests locally:</p>
-
-<pre><code>rake selenium:local
-</code></pre>
-
-<p>To run Selenium Test::Unit tests using saucelabs.com:</p>
-
-<pre><code>rake selenium:sauce
-</code></pre></li>
-</ol>
-
-
-<h2>Getting Started - JsUnit test suite</h2>
-
-<ol>
-<li><p>Prerequisites:</p>
-
-<p>Install the latest JsUnit from http://github.com/pivotal/jsunit</p>
-
-<p>JsUnit must be installed in RAILS_ROOT/public/jsunit as follows:</p>
-
-<pre><code>public/jsunit/jsunit_jar/jsunit.jar      -- the compiled jar
-public/jsunit/jsunit/build.xml etc...    -- jsunit sources
-</code></pre></li>
-<li><p>Install the saucelabs-adapter gem:</p>
-
-<pre><code>gem install saucelabs-adapter
-</code></pre></li>
-<li><p>Run the saucelabs_adapter generator in your project:</p>
-
-<pre><code>cd your_project
-
-script/generate saucelabs_adapter --jsunit
-</code></pre></li>
-<li><p>Configure it.</p>
-
-<p>In config/selenium.yml, replace YOUR-SAUCELABS-USERNAME and
-YOUR-SAUCELABS-ACCESS-KEY with your saucelabs.com account information.</p>
-
-<p>Rename RAILS_ROOT/test/jsunit/jsunit_suite_example.rb to RAILS_ROOT/test/jsunit/jsunit_suite.rb
-and modify it if necessary:
-test_page needs to be set to the path under /public where your JsUnit test page (suite.html or similar) lives,
-with '/jsunit' prepended. e.g. if your JsUnit suite runs from RAILS_ROOT/public/javascripts/test-pages/suite.html
-then test_page needs to be set to '/jsunit/javascripts/test-pages/suite.html'.</p></li>
-<li><p>Run Tests</p>
-
-<p>To run JsUnit tests locally:</p>
-
-<pre><code>rake jsunit:selenium_rc:local
-</code></pre>
-
-<p>To run JsUnit tests using saucelabs.com:</p>
-
-<pre><code>rake jsunit:selenium_rc:sauce
-</code></pre></li>
-</ol>
-
-
-<h2>What You Should See</h2>
-
-<p>When running tests, intermixed with your test output you should see the following lines:</p>
-
-<pre><code>    [saucelabs-adapter] Setting up tunnel from Saucelabs (yourhostname-12345.com:80) to localhost:4000
-    [saucelabs-adapter] Tunnel ID 717909c571b8319dc5ae708b689fd7f5 for yourhostname-12345.com is up.
-    Started
-    ....................
-    [saucelabs-adapter] Shutting down tunnel to Saucelabs...
-    [saucelabs-adapter] done.
-</code></pre>
-
-<h2>In Case of Problems</h2>
-
-<p>Try setting environment variable SAUCELABS_ADAPTER_DEBUG to "true".  This enables more verbose output.</p>
-
-<h2>Continuous Integration</h2>
-
-<p>Sauce Labs now lets you set the name of a test job.
-By default the SaucelabsAdapter will set this to the name of the machine it is currently running on,
-however you may override this by setting the environment variable SAUCELABS_JOB_NAME.</p>
-
-<p>This can be useful if you run many tests from the same CI machine and would like to differentiate between
-them without actually viewing the video.</p>
-
-<h2>What it Does</h2>
-
-<p>The saucelabs-adapter performs two functions when it detects you are running a test that will use saucelabs.com:</p>
-
-<ol>
-<li><p>It sets up a SauceTunnel before the test run starts and tears it down after the test ends.  This happens once for the entire test run.</p></li>
-<li><p>It configures the selenium client to connect to the correct address at saucelabs.com.  This happens at the start of each test.</p></li>
-</ol>
-
-<h1>Resources</h1>
-
-<ul>
-<li><a href="http://gemcutter.org/gems/saucelabs-adapter">The gem</a></li>
-<li><a href="http://github.com/pivotal/saucelabs-adapter">Source code</a></li>
-<li><a href="http://www.pivotaltracker.com/projects/59050">Tracker project</a></li>
-<li><a href="http://ci.pivotallabs.com:3333/builds/SaucelabsCanary">Canary CI build</a></li>
-<li><a href="http://github.com/pivotal/saucelabs-canary">Canary project source code</a></li>
-</ul>
-
-
-<h1>CHANGES</h1>
-
-<h2>0.7.6</h2>
-
-<ul>
-<li>Added saucelabs_max_duration configuration option.</li>
-</ul>
-
-
-<h2>0.7.0</h2>
-
-<ul>
-<li><p>The gem has been reorganized to better conform with Gem best-practices.</p></li>
-<li><p>The rakefile generator has changed.  If you are upgrading, you will need to rerun the generator and overwrite lib/tasks/saucelabs_adapter.rake,
-or just change line 1 of that file to read:</p>
-
-<pre><code>require 'saucelabs_adapter/run_utils'
-</code></pre></li>
-<li><p>The selenium.yml syntax has changed to break out all the saucelabs info into separate lines, and the tunnel method is now explicitly stated:</p>
-
-<ul>
-<li><p>Old:</p>
-
-<pre><code>  selenium_browser_key: '{"username": "YOUR-SAUCELABS-USERNAME", "access-key": "YOUR-SAUCELABS-ACCESS-KEY", "os": "Linux", "browser": "firefox", "browser-version": "3."}'
-  #
-  localhost_app_server_port: "4000"
-  tunnel_startup_timeout: 240
-</code></pre></li>
-<li><p>New:</p>
-
-<pre><code>  saucelabs_username: "YOUR-SAUCELABS-USERNAME"
-  saucelabs_access_key: "YOUR-SAUCELABS-ACCESS-KEY"
-  saucelabs_browser_os: "Linux"
-  saucelabs_browser: "firefox"
-  saucelabs_browser_version: "3."
-  #
-  tunnel_method: :saucetunnel
-  tunnel_to_localhost_port: 4000
-  tunnel_startup_timeout: 240
-</code></pre></li>
-</ul>
-</li>
-<li><p>The dependency on Python has been removed.</p></li>
-</ul>
-
-  </body>
-</html>