sauce-connect 3.5.0 → 3.5.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmFjYTAwZTI2N2U0ZDJjY2UxMjM0ZjQ4YWJhNzJkNGJhZWEzZmViYQ==
-  data.tar.gz: !binary |-
-    N2JjMTg1YmM5YzQzNmUyNDNhZTI4M2U2NGM4MTg5OTBiMWJhNWVkMg==
+SHA1:
+  metadata.gz: ac85a3af79d626f0f58d6deed1db7ebe445ffdbe
+  data.tar.gz: d4fb55c8c1ec84446d79acd73ccebb66029d72aa
 SHA512:
-  metadata.gz: !binary |-
-    N2Q0YjBlMzYyYzE5MjYyNGQ3MTkyMWNmMWNlMDE5MTY1NGY5NjI5ZGE2ZTFm
-    NjVjZGMxNjY2OTYxZWFmN2YwMmFmZDY4MzcxNzQyMGFlNzBhOWM5Yzg1NzQ0
-    OTIxMjhjZDcyYThkYmYwNDEwOGJjNzgxYjMxNWE0YjJmMDhkNTQ=
-  data.tar.gz: !binary |-
-    NzMyN2I5YzIxMDg3ZjRkZGRhNTcwZTNiMTE3N2M5OWEwMzM1NzZhNjYzNTZm
-    M2M2NTBhNTYyZjNhYWY1MDlmMWJlZjdjZTExZjFkYzI0YTljM2MyN2VmNDQ4
-    ZjMxMTYzZTc1YzIyNjMyNTg0Y2MxMjFhOTE1NWJhNGIwZjk0MDE=
+  metadata.gz: c9c703b675f134b84bdcda37d9831fc6628da02b9a77afab434b6ce874adbc752b2263a8ebbcd373f30d683ac5d6a3e2bf362b613232e2628e22b4c82b1595e6
+  data.tar.gz: 5398c70e1ee67fbbde0483a268399548c649427f78178bf3cac58d6ed7c81f68e50a2f0bcbab64f78ab5670971f673c7f8a7278fae057f5a799c456294c7e756

data/lib/sauce/connect.rb

@@ -19,6 +19,8 @@ module Sauce
       @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?
         raise ArgumentError, "Username required to launch Sauce Connect. Please set the environment variable $SAUCE_USERNAME"
@@ -60,48 +62,68 @@ module Sauce
         ensure_connection_is_possible
       end
 
-      puts "[Connecting to Sauce Labs...]"
+      if java_is_present?
+        puts "[Connecting to Sauce Labs...]"
 
-      formatted_cli_options = array_of_formatted_cli_options_from_hash(cli_options)
-      command_args = [@config.username, @config.access_key] + formatted_cli_options
-      command = "exec #{Sauce::Connect.connect_command} #{command_args.join(' ')} 2>&1"
-      @pipe = IO.popen(command)
+        formatted_cli_options = array_of_formatted_cli_options_from_hash(cli_options)
 
-      @process_status = $?
-      at_exit do
-        Process.kill("INT", @pipe.pid)
-        while @ready
-          sleep 1
+        command_args = []
+        if @sc4_executable
+          command_args = ['-u', @config.username, '-k', @config.access_key]
+        else
+          command_args = [@config.username, @config.access_key]
         end
-      end
-      Thread.new {
-        while( (line = @pipe.gets) )
-          if line =~ /Tunnel remote VM is (.*) (\.\.|at)/
-            @status = $1
-          end
-          if line =~/You may start your tests\./
-            @ready = true
-          end
-          if line =~ /- (Problem.*)$/
-            @error = $1
-          end
-          if line =~ /== Missing requirements ==/
-            @error = "Missing requirements"
-            @quiet = false
-          end
-          if line =~/Invalid API_KEY provided/
-            @error = "Invalid API_KEY provided"
-            @quiet = false
+
+        command_args << formatted_cli_options
+        command = "exec #{connect_command} #{command_args.join(' ')} 2>&1"
+
+        unless @quiet
+          string_arguments = formatted_cli_options.join(' ')
+          puts "[Sauce Connect arguments: '#{string_arguments}' ]"
+        end
+
+        @pipe = IO.popen(command)
+
+        @process_status = $?
+        at_exit do
+          Process.kill("INT", @pipe.pid)
+          while @ready
+            sleep 1
           end
-          $stderr.puts line unless @quiet
         end
-        @ready = false
-      }
+
+        Thread.new {
+          while( (line = @pipe.gets) )
+            if line =~ /Tunnel remote VM is (.*) (\.\.|at)/
+              @status = $1
+            end
+            if line =~/You may start your tests\./
+              @ready = true
+            end
+            if line =~ /- (Problem.*)$/
+              @error = $1
+              @quiet = false
+            end
+            if line =~ /== Missing requirements ==/
+              @error = "Missing requirements"
+              @quiet = false
+            end
+            if line =~/Invalid API_KEY provided/
+              @error = "Invalid API_KEY provided"
+              @quiet = false
+            end
+            $stderr.puts line unless @quiet
+          end
+          @ready = false
+        }
+      else
+        raise "Java doesn't seem to be installed.  Sauce Connect requires a working install of Java to proceed."
+      end
     end
 
     def cli_options
       cli_options = { readyfile: "sauce_connect.ready" }
-      cli_options.merge!(@config[:connect_options]) if @config.has_key?(:connect_options)
+      cli_options.merge!(@cli_options) if @cli_options
       cli_options
     end
 
@@ -129,12 +151,42 @@ module Sauce
       end
     end
 
-    def self.find_sauce_connect
-      File.expand_path(File.dirname(__FILE__) + '/../../support/Sauce-Connect.jar')
+    # Check the absolute version of the provided path.
+    # Returns true only if the path exists and is executable by the
+    # effective current user.
+    def find_sauce_connect
+      if @sc4_executable and path_is_connect_executable? @sc4_executable
+        File.absolute_path @sc4_executable
+      else
+        File.expand_path(File.dirname(__FILE__) + '/../../support/Sauce-Connect.jar')
+      end
+    end
+
+    def connect_command
+      command = "#{command_prefix}#{find_sauce_connect}"
+      return command
+    end
+
+    # SC4 doesn't require a prefix
+    def command_prefix
+      unless @sc4_executable
+        "java -jar "
+      end
+
+      ""
     end
 
-    def self.connect_command
-      "java -jar #{Sauce::Connect.find_sauce_connect}"
+    def path_is_connect_executable? path
+      absolute_path = File.absolute_path path
+      if File.exist? absolute_path
+        if File.executable? absolute_path
+          true
+        else
+          raise TunnelNotPossibleException "#{absolute_path} is not executable by #{Process.euid}"
+        end
+      else
+        raise TunnelNotPossibleException "#{absolute_path} does not exist"
+      end
     end
 
     # Global Sauce Connect-ness
@@ -162,10 +214,20 @@ module Sauce
     def array_of_formatted_cli_options_from_hash(hash)
       hash.collect do |key, value|
         opt_name = key.to_s.gsub("_", "-")
-        "--#{opt_name}=#{value}"
+        
+        if !@sc4_executable
+          "--#{opt_name}=#{value}"
+        else
+          "--#{opt_name} #{value}"
+        end
       end
     end
 
+    def java_is_present?
+      # This is nieve;  Can we be better?
+      system 'java -version'
+    end
+
     def self.port_not_open_message
       <<-ENDLINE
         Unable to connect to port 443 on saucelabs.com, which may interfere with

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce-connect
 version: !ruby/object:Gem::Version
-  version: !binary |-
-    My41LjA=
+  version: 3.5.1
 platform: ruby
 authors:
 - R. Tyler Croy
@@ -12,24 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sauce
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My41
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My41
+        version: '3.5'
 description: ''
 email:
 - tyler@monkeypox.org
@@ -49,17 +46,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ''