blade-sauce_labs_plugin 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e381b6eff5f2e879de4c37cb3310798c6b62fbdd
-  data.tar.gz: 31539f745916aa6ca7d3501995fbcbec4850ffe6
+  metadata.gz: 397a14f391a37332e45ae9dd8a3e8f0d131d3b13
+  data.tar.gz: d1c7d0c7354eb14d946d79324fae80d627fe404b
 SHA512:
-  metadata.gz: aa7369d1a69b1f4d70de7e9cded70bd04b7afc579c3dd41bb5422b266b1768ec2edaa7b3103f28c56af15024cd177566f655fb16a6a936cc0a471ba6414bca8e
-  data.tar.gz: d22697d3f880bdecdcaff08aa5e1b7d6520dbbd9fa204a247703028d7022002d47c0ecb4244b956896d3cef2bacbf5a592601df318ec5a29cc1fa65c2ae48fef
+  metadata.gz: 3947a1c89e2a0ef6a2630c1da9ded0487f2b3af9e30ab02d253331ab4ee8c3f3ef2ae1ba8bc87887caad932c299b56654bb7c172f916c510f78fc618c2c2423d
+  data.tar.gz: 96409e51d49c3afc38f9cebd6c9afacedd7bfbcb4ee8cbef0ed78a620d6bc72adbb10114180ef6c139ed00cf658e015f0889e2eaaa7719f229ad3b3579e2b81c

data/blade-sauce_labs_plugin.gemspec

@@ -24,4 +24,5 @@ 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

@@ -39,28 +39,83 @@ module Blade::SauceLabsPlugin
     config.access_key || ENV["SAUCE_ACCESS_KEY"]
   end
 
+  def debug(message)
+    if debug?
+      STDERR.puts message
+    end
+  end
+
+  def debug?
+    config.debug == true
+  end
+
   private
     def test_params
-      { url: Blade.url, platforms: Client.platforms, framework: Blade.config.framework, tunnelIdentifier: Tunnel.identifier }.merge(default_test_config).merge(test_config)
+      camelize_keys(combined_test_config)
+    end
+
+    def combined_test_config
+      default_test_config.merge(env_test_config).merge(test_config)
+    end
+
+    def test_config
+      config.test_config || {}
     end
 
     def default_test_config
-      { build: rev, maxDuration: 300 }
+      {
+        url: Blade.url,
+        platforms: Client.platforms,
+        framework: Blade.config.framework,
+        tunnel_identifier: Tunnel.identifier,
+        max_duration: 300,
+        name: "Blade Runner CI",
+        build: default_build
+      }
+    end
+
+    def env_test_config
+      {}.tap do |config|
+        if build = get_env_value(:build_number)
+          config[:build] = build
+        end
+
+        tags = []
+
+        [:commit, :repo_slug, :pull_request].each do |key|
+          if tag = tag_from_env(key)
+            tags << tag
+          end
+        end
+
+        config[:tags] = tags if tags.any?
+      end
+    end
+
+    def tag_from_env(key)
+      if value = get_env_value(key)
+        [key, value].join(":")
+      end
+    end
+
+    def get_env_value(key)
+      key = key.to_s.upcase
+      ENV[key].presence || ENV["TRAVIS_#{key}"].presence
+    end
+
+    def default_build
+      [rev, Time.now.utc.to_i].select(&:present?).join("-")
     end
 
     def rev
-      @rev ||= `git rev-parse HEAD`.chomp
+      @rev ||= `git rev-parse HEAD 2>/dev/null`.chomp
     end
 
-    def test_config
-      if config.test_config
-        {}.tap do |result|
-          config.test_config.each do |key, value|
-            result[key.to_s.camelize(:lower)] = value
-          end
+    def camelize_keys(hash)
+      {}.tap do |result|
+        hash.each do |key, value|
+          result[key.to_s.camelize(:lower)] = value
         end
-      else
-        {}
       end
     end
 end

data/lib/blade/sauce_labs_plugin/client.rb

@@ -10,7 +10,7 @@ module Blade::SauceLabsPlugin::Client
   }
 
   extend Forwardable
-  def_delegators Blade::SauceLabsPlugin, :config, :username, :access_key
+  def_delegators Blade::SauceLabsPlugin, :config, :username, :access_key, :debug?
 
   def request(method, path, params = {})
     connection.send(method) do |req|
@@ -113,7 +113,11 @@ module Blade::SauceLabsPlugin::Client
 
   private
     def connection
-      @connnection ||= Faraday.new("https://#{username}:#{access_key}@saucelabs.com/")
+      @connnection ||= Faraday.new("https://#{username}:#{access_key}@saucelabs.com/") do |faraday|
+        faraday.adapter Faraday.default_adapter
+        faraday.request :url_encoded
+        faraday.response :logger if debug?
+      end
     end
 
     def available_platforms

data/lib/blade/sauce_labs_plugin/tunnel.rb

@@ -1,17 +1,17 @@
+require "childprocess"
 require "securerandom"
-require "shellwords"
 
 module Blade::SauceLabsPlugin::Tunnel
   extend self
 
   extend Forwardable
-  def_delegators Blade::SauceLabsPlugin, :username, :access_key
+  def_delegators Blade::SauceLabsPlugin, :username, :access_key, :config, :debug, :debug?
 
-  attr_reader :identifier, :pid
+  attr_reader :identifier, :process
 
   def start
     @identifier = SecureRandom.hex(10)
-    @pid = EM::DeferrableChildProcess.open(command).get_pid
+    @process = create_child_process
 
     timer = EM::PeriodicTimer.new(1) do
       if ready_file_exists?
@@ -22,14 +22,23 @@ module Blade::SauceLabsPlugin::Tunnel
   end
 
   def stop
-    signal = ready_file_exists? ? "INT" : "KILL"
-    remove_ready_file
-    Process.kill(signal, pid) rescue nil
+    begin
+      process.poll_for_exit(10)
+    rescue ChildProcess::TimeoutError
+      process.stop
+    rescue
+      nil
+    end
   end
 
   private
-    def command
-      [tunnel_command, tunnel_args].join(" ")
+    def create_child_process
+      ChildProcess.build(tunnel_command, *tunnel_args).tap do |process|
+        process.leader = true
+        process.io.inherit! if debug?
+        process.start
+        debug process.inspect
+      end
     end
 
     def tunnel_command
@@ -37,7 +46,7 @@ module Blade::SauceLabsPlugin::Tunnel
     end
 
     def tunnel_args
-      ["--user", username, "--api-key", access_key, "--tunnel-identifier", identifier, "--readyfile", ready_file_path].shelljoin
+      ["--user", username, "--api-key", access_key, "--tunnel-identifier", identifier, "--readyfile", ready_file_path]
     end
 
     def ready_file_path

data/lib/blade/sauce_labs_plugin/version.rb

@@ -1,5 +1,5 @@
 module Blade
   module SauceLabsPlugin
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blade-sauce_labs_plugin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Javan Makhmali
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ 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