saucelabs-adapter 0.8.24 → 0.9.0

data/README.markdown

@@ -168,6 +168,11 @@ Resources
 NOTABLE CHANGES
 ===============
 
+0.9.0
+-----
+- Added support for :sauce_connect_tunnel tunnel method, which uses 'sauce connect'
+  from the 'sauce' gem.  This also introduces a dependency on the sauce gem.
+
 0.8.7
 -----
 - No longer exits when the tunnel status is 'deploying'

data/Rakefile

@@ -37,6 +37,7 @@ begin
     gem.add_dependency 'net-ssh-gateway', '>= 1.0.1'
     gem.add_dependency 'selenium-client', '>= 1.2.17'
     gem.add_dependency 'lsof', '>= 0.3.0'
+    gem.add_dependency 'sauce', '>= 0.12.9'
     # gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.8.24
+0.9.0

data/generators/saucelabs_adapter/templates/selenium.yml

@@ -42,15 +42,17 @@ saucelabs: &saucelabs
   saucelabs_browser_version: "3."
   saucelabs_max_duration_seconds: 1800
   # Selenium RC browser connects to and tests the app at this URL:
-  application_address: "testhost.com" # this will be ovewritten if tunnel_method == :saucetunnel
+  # application_address: "localhost" # this will be overwritten if tunnel_method == :saucetunnel or :sauceconnecttunnel
   application_port: 4000
+  tunnel_to_localhost_port: 4000
 
   # App host can actually be a tunnel that tunnels from <application_address>:<application_port> to localhost:<tunnel_to_localhost_port>
-  # There are 3 kinds of tunnels:
+  # There are 4 kinds of tunnels:
   #
-  tunnel_method: :saucetunnel
-  tunnel_to_localhost_port: 4000 # Warning: application_port and tunnel_to_localhost_port must be identical if you are using Webrat
-  tunnel_startup_timeout: 240
+  tunnel_method: :sauceconnecttunnel # this is the new preferred 'sauce connect' tunnel method from the 'sauce' gem
+  #
+  # tunnel_method: :saucetunnel # NOTE: this is the 'old' deprecated sauce tunnel method
+  # tunnel_startup_timeout: 240
   #
   # tunnel_method: :sshtunnel # WARNING: if other projects use the same port on the same machine at the same time, you can get intermittent errors.
   # application_address: proxy.mycompany.com
@@ -64,7 +66,7 @@ saucelabs: &saucelabs
 saucelabs_jsunit: &saucelabs_jsunit
   <<: *saucelabs
   # We are using the Jetty server for Saucelabs JsUnit selenium testing.
-  localhost_app_server_port: "8080"
+  tunnel_to_localhost_port: "8080"
 
 saucelabs_jsunit_firefox:
   <<: *saucelabs_jsunit

data/lib/saucelabs_adapter.rb

@@ -1,5 +1,6 @@
 require 'saucelabs_adapter/utilities'
 require 'saucelabs_adapter/tunnel'
+require 'saucelabs_adapter/tunnels/sauce_connect_tunnel'
 require 'saucelabs_adapter/tunnels/sauce_tunnel'
 require 'saucelabs_adapter/tunnels/ssh_tunnel'
 require 'saucelabs_adapter/tunnels/other_tunnel'

data/lib/saucelabs_adapter/rspec_adapter.rb

@@ -29,7 +29,7 @@ if defined?(Spec::Runner)
       else
         puts "[saucelabs-adapter] Starting browser session" if ENV['SAUCELABS_ADAPTER_DEBUG']
         @browser = selenium_config.create_driver
-        @browser.start_new_browser_session
+        @browser.start_new_browser_session :trustAllSSLCertificates => false
       end
     end
 

data/lib/saucelabs_adapter/selenium_config.rb

@@ -46,9 +46,10 @@ module SaucelabsAdapter
     end
 
     def application_address
-      if start_tunnel? && @configuration['tunnel_method'].to_sym == :saucetunnel
-        # We are using Sauce Labs and Sauce Tunnel.
-        # We need to use a masquerade hostname on the EC2 end of the tunnel that will be unique within the scope of
+      if start_tunnel? &&
+          [:sauceconnecttunnel, :saucetunnel].include?(@configuration['tunnel_method'].to_sym)
+        # We are using Sauce Labs and Sauce Connect Tunnel or Sauce Tunnel.
+        # We need to use a masquerade hostname on the EC2/Sauce end of the tunnel that will be unique within the scope of
         # this account (e.g. pivotallabs).  Therefore we mint a fairly unique hostname here.
         hostname = Socket.gethostname.split(".").first
         "#{hostname}-#{Process.pid}.com"
@@ -60,11 +61,15 @@ module SaucelabsAdapter
 
     # Takes a Webrat::Configuration object and configures it by calling methods on it
     def configure_webrat(webrat_configuration_object)
+      # NOTE: application_port_for_selenium requires version > 0.7.3 of webrat
+      # Prior versions only have application_address, and don't have a concept of
+      # starting a rails server at one port, and hitting it at selenium via another
       {
         'selenium_server_address' => :selenium_server_address,
         'selenium_server_port'    => :selenium_server_port,
         'selenium_browser_key'    => :selenium_browser_key,
         'application_address'     => :application_address,
+        'application_port_for_selenium' => :tunnel_to_localhost_port,
         'application_port'        => :application_port
       }.each do |webrat_configuration_method, our_accessor|
         webrat_configuration_object.send("#{webrat_configuration_method}=", self.send(our_accessor).to_s)
@@ -145,12 +150,15 @@ module SaucelabsAdapter
                                         :saucelabs_max_duration_seconds ],
                                       :when => "when selenium_server_address is saucelabs.com")
         if tunnel_method
-          errors << require_attributes([:tunnel_to_localhost_port ], :when => "if tunnel_method is set")
           case tunnel_method.to_sym
             when nil, ""
             when :saucetunnel
+              errors << require_attributes([:tunnel_to_localhost_port ], :when => "if tunnel_method is :saucetunnel")
+            when :sauceconnecttunnel
+              errors << require_attributes([:tunnel_to_localhost_port ], :when => "if tunnel_method is :sauceconnecttunnel")
             when :othertunnel
               errors << require_attributes([:application_address], :when => "when tunnel_method is :othertunnel")
+              errors << require_attributes([:tunnel_to_localhost_port ], :when => "if tunnel_method is :othertunnel")
             when :sshtunnel
               errors << require_attributes([:application_address], :when => "when tunnel_method is :sshtunnel")
               errors << require_attributes([:tunnel_password, :tunnel_keyfile],

data/lib/saucelabs_adapter/test_unit_adapter.rb

@@ -17,7 +17,7 @@ if defined?(ActiveSupport::TestCase) && ActiveSupport::TestCase.respond_to?(:set
         else
           puts "[saucelabs-adapter] Starting browser session"
           @browser = selenium_config.create_driver
-          @browser.start_new_browser_session
+          @browser.start_new_browser_session :trustAllSSLCertificates => false
         end
       end
 

data/lib/saucelabs_adapter/tunnel.rb

@@ -5,6 +5,7 @@ module SaucelabsAdapter
     def self.factory(selenium_config)
       tunnels = {
         :saucetunnel => SauceTunnel,
+        :sauceconnecttunnel => SauceConnectTunnel,
         :sshtunnel => SshTunnel,
         :othertunnel => OtherTunnel
       }

data/lib/saucelabs_adapter/tunnels/sauce_connect_tunnel.rb

@@ -0,0 +1,37 @@
+require 'sauce'
+
+module SaucelabsAdapter
+  class SauceConnectTunnel < Tunnel
+
+    include Utilities
+
+    def start_tunnel
+      say "Setting up sauce connect tunnel from Saucelabs..."
+      # sauce connect --user=<saucelabs_username> --api-key=<saucelabs_access_key> --host=localhost --port=8080 --domain='<local hostname>-<pid>.com'
+      # --logfile=/tmp/sauce_connect.log --debug-ssh
+
+      sauce_connect_args = {
+        :user => @se_config.saucelabs_username,
+        :'api-key' => @se_config.saucelabs_access_key,
+        :host => 'localhost',
+        :port => @se_config.application_port,
+        :tunnel_port => @se_config.tunnel_to_localhost_port,
+        :domain => @se_config.application_address,
+        :logfile => '/tmp/sauce_connect.log',
+        :'debug-ssh' => true
+      }
+
+      say "Setting up sauce connect tunnel from Saucelabs: #{sauce_connect_args.inspect}"
+      @sauce_tunnel = Sauce::Connect.new(sauce_connect_args)
+      say "Waiting for sauce connect tunnel to be ready..."
+      @sauce_tunnel.wait_until_ready
+      sleep 2
+      say "Sauce connect tunnel ready."
+    end
+
+    def shutdown
+      say "Shutdown for Sauce Connect Tunnel..."
+      @sauce_tunnel.disconnect
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucelabs-adapter
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 24
-  version: 0.8.24
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Kelly Felkins, Chad Woolley, Sam Pierson, Nate Clark
@@ -15,14 +15,110 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -07:00
+date: 2011-01-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  name: rest-client
+  name: activesupport
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: sauce
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 12
+        - 9
+        version: 0.12.9
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rake
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: json
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 4
+        - 3
+        version: 1.4.3
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: jeweler
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: rest-client
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,12 +129,12 @@ dependencies:
         - 5
         - 0
         version: 1.5.0
-  requirement: *id001
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: net-ssh
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +145,12 @@ dependencies:
         - 0
         - 12
         version: 2.0.12
-  requirement: *id002
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: net-ssh-gateway
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,12 +161,12 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
-  requirement: *id003
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: selenium-client
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,12 +177,12 @@ dependencies:
         - 2
         - 17
         version: 1.2.17
-  requirement: *id004
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
   name: lsof
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,7 +193,23 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
-  requirement: *id005
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: sauce
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 12
+        - 9
+        version: 0.12.9
+  requirement: *id012
 description: "This gem augments Test::Unit and Polonium/Webrat to run Selenium tests in the cloud. "
 email: pair+kelly+sam@pivotallabs.com
 executables: []
@@ -127,6 +239,7 @@ files:
 - lib/saucelabs_adapter/test_unit_adapter.rb
 - lib/saucelabs_adapter/tunnel.rb
 - lib/saucelabs_adapter/tunnels/other_tunnel.rb
+- lib/saucelabs_adapter/tunnels/sauce_connect_tunnel.rb
 - lib/saucelabs_adapter/tunnels/sauce_tunnel.rb
 - lib/saucelabs_adapter/tunnels/ssh_tunnel.rb
 - lib/saucelabs_adapter/utilities.rb
@@ -145,8 +258,8 @@ homepage: http://github.com/pivotal/saucelabs-adapter
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement