blade-sauce_labs_plugin 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 397a14f391a37332e45ae9dd8a3e8f0d131d3b13
-  data.tar.gz: d1c7d0c7354eb14d946d79324fae80d627fe404b
+  metadata.gz: ff2fb3a13a5496da6770ba9bb14ecd45fcb419e7
+  data.tar.gz: 9670b7048dda5d53f37c8bbb11192cd49cd09d23
 SHA512:
-  metadata.gz: 3947a1c89e2a0ef6a2630c1da9ded0487f2b3af9e30ab02d253331ab4ee8c3f3ef2ae1ba8bc87887caad932c299b56654bb7c172f916c510f78fc618c2c2423d
-  data.tar.gz: 96409e51d49c3afc38f9cebd6c9afacedd7bfbcb4ee8cbef0ed78a620d6bc72adbb10114180ef6c139ed00cf658e015f0889e2eaaa7719f229ad3b3579e2b81c
+  metadata.gz: 85c344a1488575ba237517c51ce6128762d905730b6feb2817ec54d06975a535ca95bbceac35ea44bb6da024ec64978b1805148c7282014e1728a610f69f1551
+  data.tar.gz: ce34f8d0aaace9c6e2acbdb62d5b59396cc1eb973356dc8701073498d8fba49513a1c52f7cd8e198d8978e110b3be06713794ea5576ec3ab172730072a4ba9ca

data/blade-sauce_labs_plugin.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "blade", "~> 0.5.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "webmock", "~> 1.21.0"
 
-  spec.add_dependency "blade"
+  spec.add_dependency "selenium-webdriver"
   spec.add_dependency "faraday"
   spec.add_dependency "childprocess"
 end

data/lib/blade/sauce_labs_plugin/client.rb

@@ -9,8 +9,9 @@ module Blade::SauceLabsPlugin::Client
     "IE" => "Internet Explorer"
   }
 
-  extend Forwardable
-  def_delegators Blade::SauceLabsPlugin, :config, :username, :access_key, :debug?
+  MOBILE_PATTERN = /iphone|ipad|android/i
+
+  delegate :config, :username, :access_key, :debug?, to: Blade::SauceLabsPlugin
 
   def request(method, path, params = {})
     connection.send(method) do |req|
@@ -20,6 +21,27 @@ module Blade::SauceLabsPlugin::Client
     end
   end
 
+  def get_jobs(options = {})
+    JSON.parse(request(:get, "/rest/v1/#{username}/jobs?#{options.to_query}").body)
+  end
+
+  def update_job(id, params = {})
+    request(:put, "/rest/v1/#{username}/jobs/#{id}", params)
+  end
+
+  def stop_job(id)
+    request(:put, "/rest/v1/#{username}/jobs/#{id}/stop")
+  end
+
+  def delete_job(id)
+    request(:delete, "/rest/v1/#{username}/jobs/#{id}")
+  end
+
+  def get_available_vm_count
+    data = JSON.parse(request(:get, "/rest/v1/users/#{username}/concurrency").body)
+    data["concurrency"][username]["remaining"]["overall"]
+  end
+
   def platforms
     [].tap do |platforms|
       config.browsers.each do |name, config|
@@ -63,13 +85,15 @@ module Blade::SauceLabsPlugin::Client
       browser[:os].flat_map do |browser_os|
         versions.map do |version|
           os = platforms.keys.detect { |os| os =~ Regexp.new(browser_os, Regexp::IGNORECASE) }
-          platforms[os][:api][version].first
+          platform = platforms[os][:api][version].first
+          { platform: platform[0], browserName: platform[1], version: platform[2] }
         end
       end
     else
       versions.map do |version|
         os = platforms.detect { |os, details| details[:api][version].any? }.first
-        platforms[os][:api][version].first
+        platform = platforms[os][:api][version].first
+        { platform: platform[0], browserName: platform[1], version: platform[2] }
       end
     end
   end

data/lib/blade/sauce_labs_plugin/job.rb

@@ -0,0 +1,100 @@
+class Blade::SauceLabsPlugin::Job < EventMachine::Completion
+  delegate :client, to: Blade::SauceLabsPlugin
+
+  attr_reader :config, :retries, :web_driver, :session_id
+
+  def initialize(config, retries = 0)
+    super()
+    @config = config.symbolize_keys
+    @retries = retries
+    @web_driver = Blade::SauceLabsPlugin::WebDriver.new(config)
+  end
+
+  def start
+    change_state :pending
+    web_driver.callback { start_tests }
+    web_driver.errback { fail }
+    web_driver.start
+  end
+
+  def start_tests
+    web_driver.navigate_to(Blade.url) do |success|
+      if success
+        @id = web_driver.session_id
+        @session_id = web_driver.get_cookie(:blade_session)
+
+        if @id.present? && @session_id.present?
+          succeed
+        else
+          fail
+        end
+      else
+        fail
+      end
+    end
+  end
+
+  def stop
+    return unless completed?
+
+    web_driver.stop do |success|
+      if success
+        change_state :stopped
+      else
+        if client.stop_job(id).success?
+          change_state :stopped
+        end
+      end
+    end
+  end
+
+  def update(params)
+    client.update_job(id, params)
+  end
+
+  def stop_and_delete
+    job_id = id
+    stop
+
+    tries = 0
+    timer = EM.add_periodic_timer(8) do
+      if client.delete_job(job_id).success?
+        timer.cancel
+        yield true
+      else
+        tries += 1
+        if tries == 10
+          timer.cancel
+          yield false
+        end
+      end
+    end
+  end
+
+  def id
+    if @id.present?
+      @id
+    else
+      @found_id ||= find_id
+    end
+  end
+
+  private
+    def find_id
+      match = {
+        browser_short_version: config[:version],
+        browser: config[:browserName],
+        os: config[:platform],
+        status: "in progress"
+      }
+
+      client.get_jobs(full: true).each do |job|
+        job.symbolize_keys!
+        if match.all? { |key, value| job[key] == value }
+          return job[:id]
+        end
+      end
+
+      nil
+    end
+end

data/lib/blade/sauce_labs_plugin/job_manager.rb

@@ -0,0 +1,145 @@
+module Blade::SauceLabsPlugin::JobManager
+  extend self
+
+  Job = Blade::SauceLabsPlugin::Job
+
+  delegate :config, :client, to: Blade::SauceLabsPlugin
+
+  cattr_accessor(:job_queue) { EM::Queue.new }
+  cattr_accessor(:jobs) { [] }
+
+  def start
+    enqueue_jobs
+    process_queue
+    handle_completed_jobs
+  end
+
+  def stop
+    jobs.each(&:stop)
+  end
+
+  private
+    def enqueue_jobs
+      client.platforms.each do |platform|
+        job_queue << Job.new(platform.merge(test_params))
+      end
+    end
+
+    def process_queue
+      return if job_queue.empty?
+      vm_count = client.get_available_vm_count
+
+      if vm_count.zero?
+        wait_for_available_vm
+      else
+        vm_count.times do
+          job_queue.pop do |job|
+            job.callback do
+              jobs << job
+            end
+
+            job.errback do
+              if job.retries == 3
+                exit 1
+              else
+                job.stop_and_delete do
+                  job_queue << Job.new(job.config, job.retries + 1)
+                  EM.next_tick { process_queue }
+                end
+              end
+            end
+
+            job.start
+          end
+        end
+      end
+    end
+
+    def wait_for_available_vm
+      @vm_timer ||= EM.add_periodic_timer 3 do
+        unless client.get_available_vm_count.zero?
+          @vm_timer.cancel
+          @vm_timer = nil
+          process_queue
+        end
+      end
+    end
+
+    def handle_completed_jobs
+      Blade.subscribe("/results") do |details|
+        if details["completed"]
+          if job = jobs.detect { |job| job.session_id == details["session_id"] }
+            job.stop
+            job.update(passed: (details["state"] != "failed"))
+            EM.add_timer(1) { process_queue }
+          end
+        end
+      end
+    end
+
+    def test_params
+      camelize_keys(combined_test_config)
+    end
+
+    def combined_test_config
+      default_test_config.merge(env_test_config).merge(test_config).select { |k, v| v.present? }
+    end
+
+    def test_config
+      config.test_config || {}
+    end
+
+    def default_test_config
+      {
+        tunnel_identifier: Blade::SauceLabsPlugin::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) || get_env_value(:job_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] || ENV["TRAVIS_#{key}"]
+    end
+
+    def default_build
+      [rev, Time.now.utc.to_i].select(&:present?).join("-")
+    end
+
+    def rev
+      @rev ||= `git rev-parse HEAD 2>/dev/null`.chomp
+    end
+
+    def camelize_keys(hash)
+      {}.tap do |result|
+        hash.each do |key, value|
+          result[key.to_s.camelize(:lower)] = value
+        end
+      end
+    end
+end

data/lib/blade/sauce_labs_plugin/version.rb

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

data/lib/blade/sauce_labs_plugin/web_driver.rb

@@ -0,0 +1,86 @@
+require "selenium/webdriver"
+
+class Blade::SauceLabsPlugin::WebDriver < EventMachine::Completion
+  class << self
+    delegate :username, :access_key, to: Blade::SauceLabsPlugin
+  end
+
+  cattr_accessor(:url ) { "http://#{username}:#{access_key}@ondemand.saucelabs.com:80/wd/hub" }
+
+  attr_reader :capabilities
+  attr_reader :driver
+
+  def initialize(capabilities)
+    super()
+    @capabilities = capabilities
+  end
+
+  def start
+    EM.defer do
+      if @driver = get_driver
+        succeed
+      else
+        fail
+      end
+    end
+  end
+
+  def stop
+    EM.defer do
+      yield(quit_driver)
+    end
+  end
+
+  def active?
+    completed?
+  end
+
+  def navigate_to(url)
+    EM.defer do
+      begin
+        driver.navigate.to url
+        sleep 0.5
+        yield driver.current_url == url
+      rescue
+        yield false
+      end
+    end
+  end
+
+  def session_id
+    if active?
+      driver.session_id
+    end
+  end
+
+  def get_cookie(name)
+    if active? && cookie = driver.manage.cookie_named(name.to_s)
+      cookie[:value]
+    end
+  end
+
+  private
+    def get_driver
+      driver = Selenium::WebDriver.for(:remote, url: url, http_client: http_client, desired_capabilities: capabilities)
+      driver.manage.timeouts.implicit_wait = 10
+      driver
+    rescue
+      nil
+    end
+
+    def quit_driver
+      return unless active?
+      driver.quit
+      true
+    rescue
+      false
+    end
+
+    def http_client
+      @http_client ||= begin
+        client = Selenium::WebDriver::Remote::Http::Default.new
+        client.timeout = 260
+        client
+      end
+    end
+end

data/lib/blade/sauce_labs_plugin.rb

@@ -10,25 +10,41 @@ module Blade::SauceLabsPlugin
 
   autoload :Client, "blade/sauce_labs_plugin/client"
   autoload :Tunnel, "blade/sauce_labs_plugin/tunnel"
+  autoload :WebDriver, "blade/sauce_labs_plugin/web_driver"
+  autoload :Job, "blade/sauce_labs_plugin/job"
+  autoload :JobManager, "blade/sauce_labs_plugin/job_manager"
 
   def start
     if Blade.config.interface == :ci
-      Tunnel.start do
-        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
+        job_manager.start
       end
     end
   end
 
   def stop
-    Tunnel.stop
+    tunnel.stop
+    job_manager.stop
   end
 
   # Ensure the tunnel is closed
-  at_exit { stop }
+  at_exit { tunnel.stop }
+
+  def tunnel
+    Tunnel
+  end
+
+  def client
+    Client
+  end
+
+  def job_manager
+    JobManager
+  end
 
   def config
-    Blade.plugins.sauce_labs.config
+    Blade.config.plugins.sauce_labs
   end
 
   def username
@@ -48,74 +64,4 @@ module Blade::SauceLabsPlugin
   def debug?
     config.debug == true
   end
-
-  private
-    def test_params
-      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
-      {
-        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 2>/dev/null`.chomp
-    end
-
-    def camelize_keys(hash)
-      {}.tap do |result|
-        hash.each do |key, value|
-          result[key.to_s.camelize(:lower)] = value
-        end
-      end
-    end
 end

data/support/sc-linux/include/sauceconnect.h

@@ -63,6 +63,7 @@ int sc_stop(struct sc_ctx *ctx);
  */
 #define SC_STATUS_RUNNING 0x01
 #define SC_STATUS_EXITING 0x02
+#define SC_STATUS_STOPPED 0x03
 int sc_status(struct sc_ctx *ctx);
 
 /*

data/support/sc-linux/lib/libsauceconnect.la

@@ -17,7 +17,7 @@ old_library='libsauceconnect.a'
 inherited_linker_flags=' -pthread'
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/build/build/Linux/openssl/lib -L/build/curl/ares /build/build/sc-build-1757/lib/libevent.la /build/build/sc-build-1757/lib/libevent_openssl.la /build/build/sc-build-1757/lib/libcares.la /build/build/sc-build-1757/lib/libcurl.la /build/build/sc-build-1757/lib/libcares.la -lz -lrt /build/build/sc-build-1757/lib/libunwind.la -lc -lgcc -lssl -lcrypto -ldl'
+dependency_libs=' -L/build/build/Linux/openssl/lib -L/build/curl/ares /build/build/sc-build-1877/lib/libevent.la /build/build/sc-build-1877/lib/libevent_openssl.la /build/build/sc-build-1877/lib/libcares.la /build/build/sc-build-1877/lib/libcurl.la /build/build/sc-build-1877/lib/libcares.la -lz -lrt /build/build/sc-build-1877/lib/libunwind.la -lc -lgcc -lssl -lcrypto -ldl'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/build/build/sc-build-1757/lib'
+libdir='/build/build/sc-build-1877/lib'

data/support/sc-osx/include/sauceconnect.h

@@ -63,6 +63,7 @@ int sc_stop(struct sc_ctx *ctx);
  */
 #define SC_STATUS_RUNNING 0x01
 #define SC_STATUS_EXITING 0x02
+#define SC_STATUS_STOPPED 0x03
 int sc_status(struct sc_ctx *ctx);
 
 /*

data/support/sc-osx/lib/libsauceconnect.la

@@ -17,7 +17,7 @@ old_library='libsauceconnect.a'
 inherited_linker_flags='  -framework CoreFoundation -framework Security'
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/Users/travis/build/saucelabs/libsauceconnect/build/Darwin/openssl/lib -L/Users/travis/build/saucelabs/libsauceconnect/curl/ares /Users/travis/build/saucelabs/libsauceconnect/build/sc-build-1760/lib/libevent.la /Users/travis/build/saucelabs/libsauceconnect/build/sc-build-1760/lib/libevent_openssl.la /Users/travis/build/saucelabs/libsauceconnect/build/sc-build-1760/lib/libcares.la /Users/travis/build/saucelabs/libsauceconnect/build/sc-build-1760/lib/libcurl.la /Users/travis/build/saucelabs/libsauceconnect/build/sc-build-1760/lib/libcares.la -lz -lssl -lcrypto -ldl'
+dependency_libs=' -L/Users/travis/build/saucelabs/libsauceconnect/build/Darwin/openssl/lib -L/Users/travis/build/saucelabs/libsauceconnect/curl/ares /Users/travis/build/saucelabs/libsauceconnect/build/sc-build-1879/lib/libevent.la /Users/travis/build/saucelabs/libsauceconnect/build/sc-build-1879/lib/libevent_openssl.la /Users/travis/build/saucelabs/libsauceconnect/build/sc-build-1879/lib/libcares.la /Users/travis/build/saucelabs/libsauceconnect/build/sc-build-1879/lib/libcurl.la /Users/travis/build/saucelabs/libsauceconnect/build/sc-build-1879/lib/libcares.la -lz -lssl -lcrypto -ldl'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/Users/travis/build/saucelabs/libsauceconnect/build/sc-build-1760/lib'
+libdir='/Users/travis/build/saucelabs/libsauceconnect/build/sc-build-1879/lib'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blade-sauce_labs_plugin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Javan Makhmali
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: blade
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.21.0
 - !ruby/object:Gem::Dependency
-  name: blade
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -113,8 +127,11 @@ files:
 - lib/blade/sauce_labs_plugin.rb
 - lib/blade/sauce_labs_plugin/cli.rb
 - lib/blade/sauce_labs_plugin/client.rb
+- lib/blade/sauce_labs_plugin/job.rb
+- lib/blade/sauce_labs_plugin/job_manager.rb
 - lib/blade/sauce_labs_plugin/tunnel.rb
 - lib/blade/sauce_labs_plugin/version.rb
+- lib/blade/sauce_labs_plugin/web_driver.rb
 - support/sc-linux/bin/sc
 - support/sc-linux/include/sauceconnect.h
 - support/sc-linux/lib/libsauceconnect.a