saucelabs-adapter 0.8.17 → 0.8.18

data/VERSION

@@ -1 +1 @@
-0.8.17
+0.8.18

data/lib/saucelabs_adapter/rspec_adapter.rb

@@ -7,19 +7,22 @@ if defined?(Spec::Runner)
       end
     end
   end
-  Spec::Runner.configure do |config|
-    config.before :all do
-      selenium_config = SaucelabsAdapter::SeleniumConfig.new(ENV['SELENIUM_ENV'])
-      if selenium_config.start_tunnel? and config.saucelabs_tunnel.nil?
-        config.saucelabs_tunnel = SaucelabsAdapter::Tunnel.factory(selenium_config)
-        config.saucelabs_tunnel.start_tunnel
+
+  selenium_config = SaucelabsAdapter::SeleniumConfig.new(ENV['SELENIUM_ENV'])
+  if selenium_config.test_framework == :webrat
+    Spec::Runner.configure do |config|
+      config.before :all do
+        if selenium_config.start_tunnel? and config.saucelabs_tunnel.nil?
+          config.saucelabs_tunnel = SaucelabsAdapter::Tunnel.factory(selenium_config)
+          config.saucelabs_tunnel.start_tunnel
+        end
+        webrat_config = Webrat.configuration
+        selenium_config.configure_webrat(webrat_config)
       end
-      webrat_config = Webrat.configuration
-      selenium_config.configure_webrat(webrat_config)
-    end
 
-    at_exit do
-      config.saucelabs_tunnel.shutdown if config.saucelabs_tunnel
+      at_exit do
+        config.saucelabs_tunnel.shutdown if config.saucelabs_tunnel
+      end
     end
   end
 end

data/lib/saucelabs_adapter/selenium_config.rb

@@ -6,7 +6,7 @@ module SaucelabsAdapter
     attr_reader :configuration
 
     def initialize(configuration_name = nil, selenium_yml_path = nil)
-      selenium_yml_path = selenium_yml_path || File.join(RAILS_ROOT, 'config', 'selenium.yml')
+      selenium_yml_path = selenium_yml_path || File.join(ENV['RAILS_ROOT'] || RAILS_ROOT, 'config', 'selenium.yml')
       SeleniumConfig.parse_yaml(selenium_yml_path)
       build_configuration(configuration_name)
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucelabs-adapter
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 8
-  - 17
-  version: 0.8.17
+  - 18
+  version: 0.8.18
 platform: ruby
 authors: 
 - Kelly Felkins, Chad Woolley, Sam Pierson, Nate Clark
@@ -14,78 +15,88 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 -07:00
+date: 2010-07-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  prerelease: false
   type: :runtime
+  name: rest-client
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
         - 0
         version: 1.5.0
-  prerelease: false
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
+  prerelease: false
   type: :runtime
+  name: net-ssh
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
         - 0
         - 12
         version: 2.0.12
-  prerelease: false
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: net-ssh-gateway
+  prerelease: false
   type: :runtime
+  name: net-ssh-gateway
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
         - 1
         version: 1.0.1
-  prerelease: false
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: selenium-client
+  prerelease: false
   type: :runtime
+  name: selenium-client
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 61
         segments: 
         - 1
         - 2
         - 17
         version: 1.2.17
-  prerelease: false
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: lsof
+  prerelease: false
   type: :runtime
+  name: lsof
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 3
         - 0
         version: 0.3.0
-  prerelease: false
   requirement: *id005
 description: "This gem augments Test::Unit and Polonium/Webrat to run Selenium tests in the cloud. "
 email: pair+kelly+sam@pivotallabs.com
@@ -119,9 +130,11 @@ files:
 - lib/saucelabs_adapter/tunnels/sauce_tunnel.rb
 - lib/saucelabs_adapter/tunnels/ssh_tunnel.rb
 - lib/saucelabs_adapter/utilities.rb
-- lib/saucerest-ruby/gateway.rb
-- lib/saucerest-ruby/saucerest.rb
 - README.markdown
+- spec/selenium_config_spec.rb
+- spec/spec_helper.rb
+- test/helper.rb
+- test/test_saucelabs-adapter.rb
 has_rdoc: true
 homepage: http://github.com/pivotal/saucelabs-adapter
 licenses: []
@@ -132,23 +145,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Adapter for running Selenium tests using SauceLabs.com

data/lib/saucerest-ruby/gateway.rb

@@ -1,35 +0,0 @@
-# http://groups.google.com/group/capistrano/browse_thread/thread/455c0c8a6faa9cc8?pli=1
-class Net::SSH::Gateway
-  # Opens a SSH tunnel from a port on a remote host to a given host and port
-  # on the local side
-  # (equivalent to openssh -R parameter)
-  def open_remote(port, host, remote_port, remote_host = "127.0.0.1")
-    ensure_open!
-
-    @session_mutex.synchronize do
-      @session.forward.remote(port, host, remote_port, remote_host)
-    end
-
-    if block_given?
-      begin
-        yield [remote_port, remote_host]
-      ensure
-        close_remote(remote_port, remote_host)
-      end
-    else
-      return [remote_port, remote_host]
-    end
-  rescue Errno::EADDRINUSE
-    retry
-  end
-
-  # Cancels port-forwarding over an open port that was previously opened via
-  # #open_remote.
-  def close_remote(port, host = "127.0.0.1")
-    ensure_open!
-
-    @session_mutex.synchronize do
-      @session.forward.cancel_remote(port, host)
-    end
-  end
-end

data/lib/saucerest-ruby/saucerest.rb

@@ -1,56 +0,0 @@
-require 'rubygems'
-require 'rest_client'
-require 'json'
-
-module SauceREST
-
-  # A simple class for using the Sauce Labs REST API
-  class Client
-    @@roots = {
-      :script => 'scripts',
-      :job => 'jobs',
-      :result => 'results',
-      :tunnel => 'tunnels'
-    }
-
-    def initialize base_url
-      @base_url = base_url
-      @resource = RestClient::Resource.new @base_url
-    end
-
-    def create type, *args
-      doc = args[-1]
-      doc_json = doc.to_json
-      resp_json = @resource[@@roots[type]].post(doc_json,
-                                                :content_type =>
-                                                'application/octet-stream')
-      resp = JSON.parse resp_json
-      return resp
-    end
-
-    def get type, docid
-      resp_json = @resource[@@roots[type] + '/' + docid].get
-      resp = JSON.parse resp_json
-      return resp
-    end
-
-    def attach docid, name, data
-      resp_json = @resource[@@roots[:script] + '/' + docid + '/' + name].put data
-      resp = JSON.parse resp_json
-      return resp
-    end
-
-    def delete type, docid
-      resp_json = @resource[@@roots[type] + '/' + docid].delete
-      resp = JSON.parse resp_json
-      return resp
-    end
-
-    def list type
-      resp_json = @resource[@@roots[type] + '/'].get
-      resp = JSON.parse resp_json
-      return resp
-    end
-  end
-
-end