sauce-connect 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc8a2218111865bb0670b851cbc325f83abb22c7
-  data.tar.gz: d41b9285fe3fc9039201eb65a83d971e40cba6af
+  metadata.gz: 8e56f0e098b6b876d3190333c6cb082263201e1c
+  data.tar.gz: dd32b2cafdd18a958ca2cdb67fc30a34e9fc814b
 SHA512:
-  metadata.gz: 9d334b97fded3edbd49ec1db40a81a444e9443588e54eff637649d704a3fa0f5966edc80bafd4f6518f982a1cc431b370e444b116cf06357770e0899ea4dc1bc
-  data.tar.gz: fe5387816660f34f1c59192eaaa1614f3905224fa4cb40a7d3555ac620c8eca7caa224d121c5febf18bbb189d5b76a58db6a448914f98f169db655a93ce510dd
+  metadata.gz: 2fdca2ab4ed85bcaa83a4d3bb50b27bf88652654a8f5fb771a4c64c1d95a0dba6b49606925c4539c92aaab1e2b493a882c51db6c83cd693a6a691758bb309c13
+  data.tar.gz: 30ec0d104a39d3998b34c0f3977ebb5ce09308cab795e6b180b9c1487fa460d9abb8dfb15537bd3233ad5322e6ecc39c3952d852eab696a996ba75dd12db9fa2

data/lib/sauce/connect.rb

@@ -1,4 +1,3 @@
-require 'sauce/config'
 require 'net/http'
 require 'socket'
 
@@ -10,26 +9,52 @@ module Sauce
     TIMEOUT = 90
 
     attr_reader :status, :error
+    attr_accessor :username, :access_key
 
     def initialize(options={})
       @ready = false
       @status = "uninitialized"
       @error = nil
+
+      extract_config options
+
+      error_on_missing_creds
+      error_on_missing_executable
+    end
+
+    # extract options from the options hash with highest priority over Sauce.config
+    # but fall back on Sauce.config otherwise
+    def extract_config options
+      @username = options[:username]
+      @access_key = options[:access_key]
+      @cli_options = options[:connect_options]
+      @sc4_executable = options[:sauce_connect_4_executable]
+      @skip_connection_test = options[:skip_connection_test]
       @quiet = options[:quiet]
       @timeout = options.fetch(:timeout) { TIMEOUT }
-      @config = Sauce::Config.new(options)
-      @skip_connection_test = @config[:skip_connection_test]
-      @cli_options = @config[:connect_options]
-      @sc4_executable = @config[:sauce_connect_4_executable]
 
-      if @config.username.nil?
+      unless options.fetch(:skip_sauce_config, false)
+        require 'sauce/config'
+        @config = Sauce::Config.new(options)
+        @username ||= @config.username
+        @access_key ||= @config.access_key
+        @cli_options ||= @config[:connect_options]
+        @sc4_executable ||= @config[:sauce_connect_4_executable]
+        @skip_connection_test = @config[:skip_connection_test]  
+      end
+    end
+
+    def error_on_missing_creds
+      if @username.nil?
         raise ArgumentError, "Username required to launch Sauce Connect. Please set the environment variable $SAUCE_USERNAME"
       end
 
-      if @config.access_key.nil?
+      if @access_key.nil?
         raise ArgumentError, "Access key required to launch Sauce Connect. Please set the environment variable $SAUCE_ACCESS_KEY"
       end
+    end
 
+    def error_on_missing_executable
       if @sc4_executable.nil?
         raise TunnelNotPossibleException, Sauce::Connect.plzGetSC4
       end
@@ -37,11 +62,11 @@ module Sauce
 
     def ensure_connection_is_possible
       $stderr.puts "[Checking REST API is contactable...]" unless @quiet
-      uri = URI("http://saucelabs.com/rest/v1/#{@config[:username]}/tunnels")
+      uri = URI("http://saucelabs.com/rest/v1/#{@username}/tunnels")
       
       response = Net::HTTP.start(uri.host, uri.port) do |http|
         request = Net::HTTP::Get.new uri.request_uri
-        request.basic_auth(@config[:username], @config[:access_key])
+        request.basic_auth(@username, @access_key)
         response = http.request request
       end
 
@@ -69,7 +94,7 @@ module Sauce
 
       formatted_cli_options = array_of_formatted_cli_options_from_hash(cli_options)
 
-      command_args = ['-u', @config.username, '-k', @config.access_key]
+      command_args = ['-u', @username, '-k', @access_key]
       command_args << formatted_cli_options
 
       command = "exec #{find_sauce_connect} #{command_args.join(' ')} 2>&1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce-connect
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - R. Tyler Croy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sauce