blade-sauce_labs_plugin 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3977ba73eab86543539631e96c9dc25a55eb4f12
-  data.tar.gz: af389e81192ba197558b643af01e3deb1e4f1e5d
+  metadata.gz: 4b6c919462742f38659c797c6057783c1f3a3539
+  data.tar.gz: d4f780931cef4790313e74596092f40e5f94fd02
 SHA512:
-  metadata.gz: 5ea529d7521022b7465531ee078613637814d28467420afcb3c85d8b1fc3306078822c68cb8b3d07151d01108caac502890b91268e7aff54eab512c641ee7667
-  data.tar.gz: 17d01ba5bbd1322443e0787d3c6d7c05287c233ef1cfea754be9011719f69e1068dacb5c773ccfba54aa8ea5af0e3a8024893e36afe6fb4607954d271124dadc
+  metadata.gz: 366f8244f22c1e448c4ea077a47b6687f9295689d001cddcbf2d9ee23931166ad3bff0ac8449ce644fe5bf14860e0ac9c8387c880e2a13d3dee15cba340e91c0
+  data.tar.gz: 657bb9ecc532d0c534b000a524e7bf0b8fafdcb1687fef1b2d572f62db28634e7ba47b5ade00f47bcfdd55a2e72f61760e4cf337c2b3c77134f58be6054ee8d0

data/lib/blade/sauce_labs_plugin/tunnel.rb

@@ -22,7 +22,7 @@ module Blade::SauceLabsPlugin::Tunnel
         elapsed = Time.now - started_at
         if elapsed > tunnel_timeout
           timer.cancel
-          STDERR.puts "Failed to establish tunnel connection after #{elapsed}s:\n#{logs}"
+          STDERR.puts "Failed to establish tunnel connection after #{elapsed}s:"
           STDERR.puts tunnel_io.tap(&:rewind).read
           exit(1)
         end

data/lib/blade/sauce_labs_plugin/version.rb

@@ -1,5 +1,5 @@
 module Blade
   module SauceLabsPlugin
-    VERSION = "0.5.3"
+    VERSION = "0.6.0"
   end
 end

data/lib/blade/sauce_labs_plugin/web_driver.rb

@@ -5,7 +5,7 @@ class Blade::SauceLabsPlugin::WebDriver < EventMachine::Completion
     delegate :username, :access_key, to: Blade::SauceLabsPlugin
   end
 
-  cattr_accessor(:url ) { "http://#{username}:#{access_key}@ondemand.saucelabs.com:80/wd/hub" }
+  cattr_accessor(:url ) { "https://#{username}:#{access_key}@ondemand.saucelabs.com:443/wd/hub" }
 
   attr_reader :capabilities
   attr_reader :driver

data/support/sc-osx/config/systemd/README.md

@@ -20,6 +20,13 @@ port 8000 & 8001:
     $ sudo ln -s /etc/systemd/system/sc@.service ./sc.service.wants/sc@8000.service
     $ sudo ln -s /etc/systemd/system/sc@.service ./sc.service.wants/sc@8001.service
 ```
+3. Add your Saucelabs credentials to `/etc/systemd/system/sc@.service` in the
+   service section like this:
+```
+    Environment=SAUCE_USERNAME=myusername
+    Environment=SAUCE_ACCESS_KEY=fd69b0a8-337c-3303-b1bd-xxxxxxxxxxx
+```
+
 Starting and Stopping the Service
 ---------------------
 After you have configured the instances, you can start up the new service:

data/support/sc-osx/config/systemd/sc@.service

@@ -9,17 +9,20 @@ ReloadPropagatedFrom=sc.service
   Group=nogroup
   WorkingDirectory=/tmp
   LimitNOFILE=8192
+  Restart=always
+
+  # Set those to match your Saucelabs credentials
+  Environment=SAUCE_USERNAME=username
+  Environment=SAUCE_ACCESS_KEY=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
 
-  EnvironmentFile=/etc/default/sc
   ExecStart = /usr/local/bin/sc \
                 --logfile - \
-                --user "$SAUCE_USERNAME" \
-                --api-key "$SAUCE_ACCESS_KEY" \
-                --pidfile "/tmp/.sauceconnect_%i.pid" \
+                --pidfile "/tmp/sauceconnect_%i.pid" \
                 --se-port "%i" \
                 --no-remove-colliding-tunnels \
                 --wait-tunnel-shutdown
-  # ExecStartPost = /bin/rm -f /tmp/.sauceconnect_%i.pid
+  # Not needed with systemd
+  ExecStartPost = /bin/rm -f /tmp/sauceconnect_%i.pid
 
 [Install]
 WantedBy=multi-user.target

data/support/sc-osx/config/upstart/sc_worker.conf

@@ -33,7 +33,7 @@ limit nofile 8192 8192
 
 # Sauce Connect will be killed if doesn't stop within 2 minutes. SC usually
 # exits much faster than 2 minutes but it can occasionally get stuck if the
-# connectivity between SC & Saucelabs' is degraded/interupted.
+# connectivity between SC & Saucelabs is interupted.
 kill timeout 120
 
 script
@@ -43,10 +43,12 @@ script
 
         # Temporary PID file since it's a required option for SauceConnect
         pidfile="/tmp/.sauceconnect_$SE_PORT.pid"
-        exec /usr/local/bin/sc \
+        exec \
+        env \
+           SAUCE_USERNAME="$SAUCE_USERNAME" \
+           SAUCE_ACCESS_KEY="$SAUCE_ACCESS_KEY" \
+        /usr/local/bin/sc \
                 --logfile - \
-                --user "$SAUCE_USERNAME" \
-                --api-key "$SAUCE_ACCESS_KEY" \
                 --pidfile "$pidfile" \
                 --se-port "$SE_PORT" \
                 --no-remove-colliding-tunnels \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blade-sauce_labs_plugin
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Javan Makhmali
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler