blade-sauce_labs_plugin 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5befcf6015449c3de00d447ac348673ca4664d91
-  data.tar.gz: ead65f990ffbef9d70bc08fd43f8311ce597ce48
+  metadata.gz: 7019507ca64d76eb63254b7815ff95898f3898cf
+  data.tar.gz: ac458f0a4b05b834aa3385fb450a59ff00d863b1
 SHA512:
-  metadata.gz: bf9179f4b1b9cca0ef8b370baed82018e5714627a8725410b4292df86e3d6b4041b48316eda120a3190fa7736c5d270250c3364b27d4ab4e1484c63f07101bec
-  data.tar.gz: c56794d5d9f565dea324dd208ac8a477aff498d647530cd7eab92c7337f3b1c98a4bbfffbc9dc4225e2cc532441e0810950297198d6b87062dbd94a74365b4db
+  metadata.gz: 895a2fd9fefc3e40e638a0c0628afe0fb6b9bea2fcd21d814c8fe49a9b5e85bf2fad86b81502c843313ea9893dec2ad58fc578f174e5bb54abcb87ad0cf779cc
+  data.tar.gz: 2955c25d211c78e40a430f340cc68db21a2f2ccf7496f0edc70ac9b6f14da68e0c48f76fea4448f84131a9699bb66c963147c67d594f0937a037545b6a256281

data/blade-sauce_labs_plugin.gemspec

@@ -24,5 +24,4 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "blade"
   spec.add_dependency "faraday"
-  spec.add_dependency "childprocess"
 end

data/lib/blade/sauce_labs_plugin.rb

@@ -13,9 +13,10 @@ module Blade::SauceLabsPlugin
 
   def start
     if Blade.config.interface == :ci
-      Tunnel.start
-      Blade.config.expected_sessions = Client.platforms.size
-      Client.request(:post, "rest/v1/#{username}/js-tests", test_params)
+      Tunnel.start do
+        Blade.config.expected_sessions = Client.platforms.size
+        Client.request(:post, "rest/v1/#{username}/js-tests", test_params)
+      end
     end
   end
 
@@ -37,7 +38,7 @@ module Blade::SauceLabsPlugin
 
   private
     def test_params
-      { url: Blade.url, platforms: Client.platforms, framework: Blade.config.framework }.merge(default_test_config).merge(test_config)
+      { url: Blade.url, platforms: Client.platforms, framework: Blade.config.framework, tunnelIdentifier: Tunnel.identifier }.merge(default_test_config).merge(test_config)
     end
 
     def default_test_config

data/lib/blade/sauce_labs_plugin/tunnel.rb

@@ -1,4 +1,5 @@
-require "childprocess"
+require "securerandom"
+require "shellwords"
 
 module Blade::SauceLabsPlugin::Tunnel
   extend self
@@ -6,37 +7,51 @@ module Blade::SauceLabsPlugin::Tunnel
   extend Forwardable
   def_delegators Blade::SauceLabsPlugin, :username, :access_key
 
+  attr_reader :identifier, :pid
+
   def start
-    return if @process
-    cmd = Pathname.new(File.dirname(__FILE__)).join("../../../support/sc-#{os}/bin/sc").to_s
-    @process = ChildProcess.build(cmd, "--user", username, "--api-key", access_key)
-    reader, writer = IO.pipe
-    @process.io.stdout = @process.io.stderr = writer
-    @process.start
-
-    output = ""
-    while line = reader.gets
-      output << line
-      case line
-      when /Sauce Connect is up, you may start your tests/
-        break
-      when /Goodbye/
-        STDERR.puts output
-        raise "Sauce Connect tunnel connection error"
+    @identifier = SecureRandom.hex(10)
+    @pid = EM::DeferrableChildProcess.open(command).get_pid
+
+    timer = EM::PeriodicTimer.new(1) do
+      if ready_file_exists?
+        timer.cancel
+        yield
       end
     end
-
-  ensure
-    writer.close if writer
-    reader.close if reader
   end
 
   def stop
-    return unless @process
-    @process.stop
+    signal = ready_file_exists? ? "INT" : "KILL"
+    remove_ready_file
+    Process.kill(signal, pid) rescue nil
   end
 
   private
+    def command
+      [tunnel_command, tunnel_args].join(" ")
+    end
+
+    def tunnel_command
+      Pathname.new(File.dirname(__FILE__)).join("../../../support/sc-#{os}/bin/sc").to_s
+    end
+
+    def tunnel_args
+      ["--user", username, "--api-key", access_key, "--tunnel-identifier", identifier, "--readyfile", ready_file_path].shelljoin
+    end
+
+    def ready_file_path
+      Blade.tmp_path.join("sauce_tunnel_#{identifier}_ready").to_s
+    end
+
+    def ready_file_exists?
+      File.exists?(ready_file_path)
+    end
+
+    def remove_ready_file
+      File.unlink(ready_file_path) if ready_file_exists?
+    end
+
     def os
       @os ||=
         case RUBY_PLATFORM.downcase

data/lib/blade/sauce_labs_plugin/version.rb

@@ -1,5 +1,5 @@
 module Blade
   module SauceLabsPlugin
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blade-sauce_labs_plugin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Javan Makhmali
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: childprocess
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - javan@javan.us
@@ -147,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Blade Runner plugin for Sauce Labs (saucelabs.com)