sauce-connect 3.5.3 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7e6f85db52f14d80e95c3aa2d517afef5dead4c
-  data.tar.gz: 3dccc6b9b194df819b31069bbddf8b6a445ccfd1
+  metadata.gz: 339e50f0444a31f173d2ed8128d59fa8e0bdd3f5
+  data.tar.gz: 39aaac5a74ab6c607f6b130581f7b6072d3de6fa
 SHA512:
-  metadata.gz: cb2449e09c1b007ccb47ae1d235590f7bb09484c157ad31c989065320dab4932b7827b13a3c2590ba890909c15bf31d1a653935f6662df0f9b8561da7692fa12
-  data.tar.gz: d68cf386f77e5afe569cf925e6a5aad61f406d1dd60ba7c881edb215d0c0c5f2ba11285748b19118820c492beffcf31b7ed8606e4b5e33456ace71df5441a8de
+  metadata.gz: fc2a7ca12fb914304a8bdeb24230621de703be394a173d7fa01da638e03adbc035d5d69e00b6a9f2d51876f838a0761c30a80a1950a09e1ae53099958e76410b
+  data.tar.gz: 0e2d09f5a9c45d550d7a0e9c15ea8012e8cad464bd4a1d9d7e1dc7c7f50751f8911d4622dc785e3bf8895e3b848b2f00e3c867f3708a76ebe4437ca68071e51b

data/lib/sauce/connect.rb

@@ -29,6 +29,10 @@ module Sauce
       if @config.access_key.nil?
         raise ArgumentError, "Access key required to launch Sauce Connect. Please set the environment variable $SAUCE_ACCESS_KEY"
       end
+
+      if @sc4_executable.nil?
+        raise TunnelNotPossibleException, Sauce::Connect.plzGetSC4
+      end
     end
 
     def ensure_connection_is_possible
@@ -54,7 +58,6 @@ module Sauce
         $stderr.puts Sauce::Connect.port_not_open_message
         raise TunnelNotPossibleException, "Couldn't use port 443"
       end
-
     end
 
     def connect
@@ -62,63 +65,54 @@ module Sauce
         ensure_connection_is_possible
       end
 
-      if java_is_present?
-        puts "[Sauce Connect is connecting to Sauce Labs...]"
+      puts "[Sauce Connect is connecting to Sauce Labs...]"
 
-        formatted_cli_options = array_of_formatted_cli_options_from_hash(cli_options)
+      formatted_cli_options = array_of_formatted_cli_options_from_hash(cli_options)
 
-        command_args = []
-        if @sc4_executable
-          command_args = ['-u', @config.username, '-k', @config.access_key]
-        else
-          command_args = [@config.username, @config.access_key]
-        end
+      command_args = ['-u', @config.username, '-k', @config.access_key]
+      command_args << formatted_cli_options
 
-        command_args << formatted_cli_options
-        command = "exec #{connect_command} #{command_args.join(' ')} 2>&1"
+      command = "exec #{find_sauce_connect} #{command_args.join(' ')} 2>&1"
 
-        unless @quiet
-          string_arguments = formatted_cli_options.join(' ')
-          puts "[Sauce Connect arguments: '#{string_arguments}' ]"
-        end
+      unless @quiet
+        string_arguments = formatted_cli_options.join(' ')
+        puts "[Sauce Connect arguments: '#{string_arguments}' ]"
+      end
 
-        @pipe = IO.popen(command)
+      @pipe = IO.popen(command)
 
-        @process_status = $?
-        at_exit do
-          Process.kill("INT", @pipe.pid)
-          while @ready
-            sleep 1
-          end
+      @process_status = $?
+      at_exit do
+        Process.kill("INT", @pipe.pid)
+        while @ready
+          sleep 1
         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\./i
-              @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
+      Thread.new {
+        while( (line = @pipe.gets) )
+          if line =~ /Tunnel remote VM is (.*) (\.\.|at)/
+            @status = $1
+          end
+          if line =~/You may start your tests\./i
+            @ready = true
+          end
+          if line =~ /- (Problem.*)$/
+            @error = $1
+            @quiet = false
           end
-          @ready = false
+          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
@@ -139,7 +133,7 @@ module Sauce
 
       if !@ready
         error_message = "Sauce Connect failed to connect after #{@timeout} seconds"
-        error_message << "\n(Using Sauce Connect at #{@sc4_executable}" if @sc4_executable
+        error_message << "\n(Using Sauce Connect at #{@sc4_executable}"
         raise error_message
       end
     end
@@ -153,42 +147,24 @@ module Sauce
       end
     end
 
-    # Check the absolute version of the provided path.
-    # Returns true only if the path exists and is executable by the
-    # effective current user.
+    # Check whether the path, or it's bin/sc descendant, exists and is executable
     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
+      paths = [@sc4_executable, File.join("#{@sc4_executable}", "bin", "sc")]
 
-    def connect_command
-      command = "#{command_prefix}#{find_sauce_connect}"
-      return command
-    end
+      sc_path = paths.find do |path|
+        path_is_connect_executable? path
+      end
 
-    # SC4 doesn't require a prefix
-    def command_prefix
-      unless @sc4_executable
-        "java -jar "
+      if sc_path.nil?
+        raise TunnelNotPossibleException, "No executable found at #{sc_path}, or it can't be executed by #{Process.euid}"
       end
 
-      ""
+      return File.absolute_path sc_path
     end
 
     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
+      return (File.exist? absolute_path) && (File.executable? absolute_path) && !(Dir.exist? absolute_path)
     end
 
     # Global Sauce Connect-ness
@@ -216,20 +192,10 @@ module Sauce
     def array_of_formatted_cli_options_from_hash(hash)
       hash.collect do |key, value|
         opt_name = key.to_s.gsub("_", "-")
-        
-        if !@sc4_executable
-          "--#{opt_name}=#{value}"
-        else
-          "--#{opt_name} #{value}"
-        end
+        return "--#{opt_name} #{value}"
       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
@@ -261,5 +227,16 @@ module Sauce
         your Sauce.config block.
       ENDLINE
     end
+
+    def self.plzGetSC4
+      <<-ENDLINE
+        Using Sauce Connect 3 has been deprecated.  Please set the :sauce_connect_4_executable
+        option in your Sauce.config block to the path of an installation of
+        Sauce Connect 4.
+
+        You can download Sauce Connect 4 for free at
+        http://docs.saucelabs.com/sauce_connect
+      ENDLINE
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce-connect
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.6.0
 platform: ruby
 authors:
 - R. Tyler Croy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sauce
@@ -27,7 +27,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-description: ''
+description: A wrapper to start and stop a Sauce Connect tunnel programatically.
 email:
 - tyler@monkeypox.org
 executables: []
@@ -35,12 +35,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/sauce/connect.rb
-- support/Sauce-Connect.jar
-homepage: ''
+homepage: https://docs.saucelabs.com/reference/sauce-connect
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message: |2
+    To use the Sauce Connect gem, you'll need to download the appropriate
+    Sauce Connect binary from https://docs.saucelabs.com/reference/sauce-connect
+
+    Then, set the 'sauce_connect_4_executable' key in your Sauce.config block, to
+    the path of the unzipped file's /bin/sc.
 rdoc_options: []
 require_paths:
 - lib
@@ -54,11 +58,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- An account at http://www.saucelabs.com
+- A working copy of Sauce Connect from https://docs.saucelabs.com/reference/sauce-connect
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: ''
+summary: Manage Sauce Connect from within your tests
 test_files: []
 has_rdoc: