saucer 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a2c37e1cabccacc4e978ccea9531be62b2397bf
-  data.tar.gz: 42780591f1c4b0a3a7f6f1972ff6e1f45417db14
+  metadata.gz: 0e168f7731c03d863f52a22e041e176da846368d
+  data.tar.gz: 997a371d47a26c67f401731ff34b4422051bfff0
 SHA512:
-  metadata.gz: bd6dcb38eeb62ec7a203fc3e4725f8fd7e2f8d322637151df0b326fb9510444acf7edd9ad826da6a8f745336326a2294d11b5814a56426b9857d07f31f5c8c6c
-  data.tar.gz: 743b759e3447cba6f4e3b81a8a34f797abd08f527ba79f2f4b954af21508842454577b951815e5eb339ff7ffdf883e5b6d198459d518a9cce7281aebafd68f71
+  metadata.gz: 3991811258564869643e4ba974e4939dbfe49034db9847907f263b849923f601db33b0242186b9f3f68f59f6a70b22b85239b0d44b46b6b654a4bd397e9331c0
+  data.tar.gz: e2380a77094d580b890591d3380317a73abd4697df82a980a545fc152fcbd9762b085f8fbf13305fe6c160a94aba7998c0b9f787647d7db145ef62e2ea478cff

data/Gemfile

@@ -2,3 +2,5 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in saucer.gemspec
 gemspec
+
+gem 'sauce_whisk', git: 'https://github.com/titusfortner/sauce_whisk'

data/lib/saucer/driver.rb

@@ -1,28 +1,23 @@
 module Saucer
-  class Driver < Selenium::WebDriver::Driver
-
-    include Annotations
+  class Driver
 
     attr_reader :driver, :config
 
     def initialize(opt = {})
       caps = opt[:desired_capabilities] || {}
-      @config ||= Config::Selenium.new(caps)
-      listener = opt.delete :listener
+      @config = Config::Selenium.new(caps)
+
       opt[:url] = @config.url
       opt[:desired_capabilities] = @config.capabilities
 
-      bridge = Selenium::WebDriver::Remote::Bridge.new(opt)
-      bridge = Support::EventFiringBridge.new(bridge, listener) if listener
+      @driver = Selenium::WebDriver.for(:remote, opt)
 
-      @driver = super bridge
-
-      @driver.job_name = @config.sauce[:name]
-      @driver.build_name = @config.sauce[:build]
+      sauce.job_name = @config.sauce[:name]
+      sauce.build_name = @config.sauce[:build]
     end
 
     def sauce
-      @api ||= API.new(self, @config)
+      @sauce ||= Sauce.new(driver, @config)
     end
 
     def quit
@@ -35,15 +30,25 @@ module Saucer
       end
 
       if exception
-        @driver.comment = "Error: #{exception.inspect}"
-        @driver.comment = "Error Location: #{exception.backtrace.first}"
+        sauce.comment = "Error: #{exception.inspect}"
+        sauce.comment = "Error Location: #{exception.backtrace.first}"
       end
 
-      @driver.job_result = result unless result.nil?
-      results = @driver.sauce.job.log_url[/(.*)\/.*$/, 1]
+      sauce.job_result = result unless result.nil?
+      results = sauce.api.job.log_url[/(.*)\/.*$/, 1]
       Selenium::WebDriver.logger.warn("Sauce Labs results: #{results}")
 
-      super(*[])
+      driver.quit
+    end
+
+    def method_missing(method_name, *arguments, &block)
+      if driver.respond_to? method_name
+        driver.send(method_name, *arguments, &block)
+      end
+    end
+
+    def respond_to?(method_name, include_private = false)
+      driver.respond_to?(method_name)
     end
 
   end

data/lib/saucer/sauce.rb

@@ -0,0 +1,22 @@
+require 'sauce_whisk'
+
+module Saucer
+  class Sauce
+
+    include Annotations
+
+    def initialize(driver, config)
+      @driver = driver
+      @config = config
+    end
+
+    def api
+      @api ||= API.new(@driver, @config)
+    end
+
+    def driver
+      @driver
+    end
+
+  end
+end

data/lib/saucer/version.rb

@@ -1,3 +1,3 @@
 module Saucer
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/saucer.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'parallel_split_test'
   spec.add_dependency 'require_all'
-  spec.add_dependency 'selenium-webdriver', "~> 3.0", "< 3.4.1"
+  spec.add_dependency 'selenium-webdriver', "~> 3.0", "< 3.4.3"
   spec.add_dependency 'sauce_whisk'
   spec.add_dependency 'sauce_platforms'
   spec.add_dependency 'json'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saucer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.4.3
 - !ruby/object:Gem::Dependency
   name: sauce_whisk
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,7 @@ files:
 - lib/saucer/driver.rb
 - lib/saucer/parallel.rb
 - lib/saucer/platform_configuration.rb
+- lib/saucer/sauce.rb
 - lib/saucer/version.rb
 - saucer.gemspec
 homepage: http://github.com/titusfortner/saucer