saucelabs-adapter 0.8.7 → 0.8.8

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'rake'
 
-require 'rake'
 require 'spec'
 require 'spec/rake/spectask'
 

data/VERSION

@@ -1 +1 @@
-0.8.7
+0.8.8

data/lib/saucelabs_adapter/selenium_config.rb

@@ -86,8 +86,8 @@ module SaucelabsAdapter
 
     def create_driver(selenium_args = {})
       args = selenium_client_driver_args.merge(selenium_args)
-      debug "Connecting to Selenium RC server at #{args[:host]}:#{args[:port]} (testing app at #{args[:url]})"
-      debug "args = #{args.inspect}"
+      say "Connecting to Selenium RC server at #{args[:host]}:#{args[:port]} (testing app at #{args[:url]})"
+      say "args = #{display_safely(args)}"
       driver = ::Selenium::Client::Driver.new(args)
       debug "done"
       driver
@@ -104,6 +104,14 @@ module SaucelabsAdapter
 
     private
 
+    def display_safely(selenium_args)
+      safe = selenium_args.dup
+      safe[:browser] = JSON.parse( safe[:browser])
+      safe[:browser]['access-key'] = safe[:browser]['access-key'][0..4] + '...'
+      safe[:browser] = safe[:browser].to_json
+      safe.inspect
+    end
+
     def build_configuration(configuration_name)
       @configuration = @@selenium_configs[configuration_name]
       raise "[saucelabs-adapter] stanza '#{configuration_name}' not found in #{@selenium_yml}" unless @configuration

data/lib/saucelabs_adapter/tunnels/sauce_tunnel.rb

@@ -2,6 +2,8 @@ require 'net/ssh'
 require 'net/ssh/gateway'
 require 'saucerest-ruby/saucerest'
 require 'saucerest-ruby/gateway'
+require 'saucelabs_adapter/run_utils'
+
 
 module SaucelabsAdapter
   class SauceTunnel < Tunnel
@@ -95,6 +97,7 @@ module SaucelabsAdapter
 
     def setup_ssh_reverse_tunnel
       debug "Starting ssh reverse tunnel"
+      RunUtils.run("sed -i.backup -e '/#{Regexp.escape(@tunnel_info['Host'])}/d' #{ENV['HOME']}/.ssh/known_hosts", :raise_on_fail => false)
       @gateway = Net::SSH::Gateway.new(@tunnel_info['Host'], @se_config.saucelabs_username, {:password => @se_config.saucelabs_access_key})
       @port = @gateway.open_remote(@se_config.tunnel_to_localhost_port.to_i, "127.0.0.1", @se_config.application_port.to_i, "0.0.0.0")
     end

data/spec/selenium_config_spec.rb

@@ -1,9 +1,9 @@
-require 'rubygems'
-require 'active_support'
+require File.join(File.dirname(__FILE__), 'spec_helper')
 # Don't pull in the entire saucelabs-adapter otherwise it will complain about: undefined method `setup' for ActiveSupport::TestCase:Class
 # Apparently this is added from outside
 require 'saucelabs_adapter/utilities'
 require 'saucelabs_adapter/selenium_config'
+require 'json'
 
 SELENIUM_YML_FIXTURE_FILE = File.join(File.dirname(__FILE__), 'fixtures', 'selenium.yml')
 
@@ -103,6 +103,20 @@ describe "SeleniumConfig" do
       it "should contain a job_name of our hostname" do
         @browser_data['job-name'].should == Socket.gethostname
       end
+
+      describe "#display_safely" do
+        it "should mask all but the first 5 characters of :browser=>access-key" do
+          private_key = "abcdefgh-ijkl-mnop-qrst-uvwxyz0123456"
+          @browser_data['otherkey'] = 'foo'
+          @browser_data['access-key'] = private_key
+          hash_with_browser_json = {:browser => @browser_data.to_json}
+          display_string = @selenium_config.send(:display_safely, hash_with_browser_json)
+
+          display_string.should match(/access-key.*:.*abcde\.\.\./)
+          display_string.should_not match(/"#{private_key}/)
+          display_string.should match(/otherkey.*:.*foo/)
+        end
+      end
     end
 
     describe "#configure_polonium" do

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require 'active_support'
+require 'spec'
+require "spec/autorun"
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 7
-  version: 0.8.7
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Kelly Felkins, Chad Woolley, Sam Pierson, Nate Clark
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 -07:00
+date: 2010-06-15 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,5 +151,6 @@ specification_version: 3
 summary: Adapter for running Selenium tests using SauceLabs.com
 test_files: 
 - spec/selenium_config_spec.rb
+- spec/spec_helper.rb
 - test/helper.rb
 - test/test_saucelabs-adapter.rb