sauce-connect 3.3.0 → 3.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2YxMTk3ZjhiYmUyMTlhNDcwMmQ5MDNhMDdmYWMyNjkxOTZhYWVlZQ==
+    MzQ1YTExNjUwNTc3ZTg0MWE0NWQzYjU1YmE2YmM2YTAzNzQ4ODA5Yw==
   data.tar.gz: !binary |-
-    ZTdhOGNmNjg3ZDQxYTU2M2E2OGQ0NjU2MzVkNDM3Y2E1MzFjMGEyMQ==
+    MDk1ZmNkYzA0YTllMTM1YTA4NDQ3N2NmOWM2Y2M3MzY3MmI2MDk3NQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjcxNWI5NTEwYmRmNGNiZmFlNmEyOTljZTI0MTExMGVmMmE5ZWFmODFiMjg2
-    OTc5ZTQ0ODM1M2I0MGNjNzZkZDFkNzA2NjYwYTI1YmUxNzBiNjljYzFhMjhk
-    ZTY4ZTVhMjNmMGE3NzEyZjE2YWVjOGEyYzNhNDczNWYzNzU0MTE=
+    ZTYxNTY0MDk3NDZhNjZjYWM0YTY4MDBkNmUzMjY5YWRiMWE4MDI5ODgxNzA5
+    ZjZmYjQyNDY4YWRlZGRkM2JmZTFhZDAyN2M1ZmYwZTU3YWI4ZTEyMjY4NDFh
+    NDUzMTczYTNiNjdlZGQ3NTQxZDcxMjYxNDZmNzNhM2QwMmI0MzY=
   data.tar.gz: !binary |-
-    NDc3OTAxMjk5MzQxY2VjZjdmZjdiMWIzMDViNjI1NTU1ZTRkOTY5NGI2YTQz
-    MTI2ZGMyNjZhN2VmODUxM2M3ZWI2OGE1ZDEzZWFkOTAyODU0ZDE5Y2FjNTY1
-    MGVlNTVlNmNlM2VmZTY2YTFkNTc5OGY0Zjg5NTFiYzRhZTIwZmE=
+    YWIwNmIyMDkzNzdjZDEyNjRmMGQ3YzMyMTM4OGZlOTRkNzc0Zjc3MTk2MzMw
+    MmZiMGNlMjk1MDM4ODg2MjM2Zjg3ZDE4Y2QzNDZiMmYzYWQ2MGVkYzU1MjAz
+    ZDc1MjYwYjgzZDE3M2MyYzM2MjhkMGM4ZTI3MzNkMDdhODQ4Mzk=

data/lib/sauce/connect.rb

@@ -1,7 +1,12 @@
 require 'sauce/config'
+require 'net/http'
+require 'socket'
 
 module Sauce
   class Connect
+    class TunnelNotPossibleException < StandardError
+    end
+
     TIMEOUT = 90
 
     attr_reader :status, :error
@@ -13,6 +18,7 @@ module Sauce
       @quiet = options[:quiet]
       @timeout = options.fetch(:timeout) { TIMEOUT }
       @config = Sauce::Config.new(options)
+      @skip_connection_test = @config[:skip_connection_test]
 
       if @config.username.nil?
         raise ArgumentError, "Username required to launch Sauce Connect. Please set the environment variable $SAUCE_USERNAME"
@@ -23,7 +29,37 @@ module Sauce
       end
     end
 
+    def ensure_connection_is_possible
+      $stderr.puts "[Checking REST API is contactable...]" unless @quiet
+      uri = URI("http://saucelabs.com/rest/v1/#{@config[: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])
+        response = http.request request
+      end
+
+      unless response.kind_of? Net::HTTPOK
+        $stderr.puts Sauce::Connect.cant_access_rest_api_message
+        raise TunnelNotPossibleException "Couldn't access REST API"
+      end
+
+      begin
+        $stderr.puts "[Checking port 443 is open...]" unless @quiet
+        socket = TCPSocket.new 'saucelabs.com', 443
+      rescue SystemCallError => e
+        raise e unless e.class.name.start_with? 'Errno::'
+        $stderr.puts Sauce::Connect.port_not_open_message
+        raise TunnelNotPossibleException, "Couldn't use port 443"
+      end
+
+    end
+
     def connect
+      unless @skip_connection_test
+        ensure_connection_is_possible
+      end
+
       puts "[Connecting to Sauce Labs...]"
 
       formatted_cli_options = array_of_formatted_cli_options_from_hash(cli_options)
@@ -129,5 +165,37 @@ module Sauce
         "--#{opt_name}=#{value}"
       end
     end
+
+    def self.port_not_open_message
+      <<-ENDLINE
+        Unable to connect to port 443 on saucelabs.com, which may interfere with
+        Sauce Connect.
+
+        This might be caused by a HTTP mocking framework like WebMock or 
+        FakeWeb.  Check out 
+        (https://github.com/saucelabs/sauce_ruby#network-mocking) 
+        if you're using one.  Sauce Connect needs access to *.saucelabs.com,
+        port 80 and port 443.
+
+        You can disable network tests by setting :skip_connection_test to true in
+        your Sauce.config block.
+      ENDLINE
+    end
+
+    def self.cant_access_rest_api_message
+      <<-ENDLINE
+        Unable to connect to the Sauce REST API, which may interfere with
+        Sauce Connect.
+
+        This might be caused by a HTTP mocking framework like WebMock or 
+        FakeWeb.  Check out 
+        (https://github.com/saucelabs/sauce_ruby#network-mocking) 
+        if you're using one.  Sauce Connect needs access to *.saucelabs.com,
+        port 80 and port 443.
+        
+        You can disable network tests by setting :skip_connection_test to true in
+        your Sauce.config block.
+      ENDLINE
+    end
   end
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: sauce-connect
 version: !ruby/object:Gem::Version
   version: !binary |-
-    My4zLjA=
+    My4zLjE=
 platform: ruby
 authors:
 - R. Tyler Croy
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sauce
@@ -64,3 +64,4 @@ signing_key:
 specification_version: 4
 summary: ''
 test_files: []
+has_rdoc: