blade-sauce_labs_plugin 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b312e1db63e11d119708eacf8c5f2486afff8d5d
-  data.tar.gz: 87cbcd980f4de9aef283c6ca90c961d0042bcfe4
+  metadata.gz: e13a784ec9bda8cf14efc6a5102650249b77ef8a
+  data.tar.gz: 4acbde7b286b404ff8ceb2c3af154e4f3c2836dc
 SHA512:
-  metadata.gz: c5d781465516ef2bbb225c6ba6cd322c074fe9625efe1b24a8fa480be2811c6b5d6780d49708be0d89ee177219de41e9aa5b2b1100217de6d5b75362f766264f
-  data.tar.gz: a1591257f7ebd9db176777f5ee5d2899f25198075d32fc87882d28468b51de66029daf794d2c175a492614549e8a7eb860ab8f3fd8bfd4a4fbda233d2fe09054
+  metadata.gz: 6ae0ebe2054a00738274df8386e83617c2012ae26ca9f480b98264d0d56bab64e2cc12299cc95776d752e051397b84e42e44e8fd6e0a85214331582d11485142
+  data.tar.gz: b17d0ee9c25efaa8da7812798953a8892defd55f6f6d166d8fff40c918cb7fd902f5f4f3864afed22428876bc0230a4ddc512411203256db06b914018ed42915

data/lib/blade/sauce_labs_plugin/client.rb

@@ -4,13 +4,6 @@ require "json"
 module Blade::SauceLabsPlugin::Client
   extend self
 
-  ALIASES = {
-    "ie" => "Internet Explorer",
-    "IE" => "Internet Explorer"
-  }
-
-  MOBILE_PATTERN = /iphone|ipad|android/i
-
   delegate :config, :username, :access_key, :debug?, to: Blade::SauceLabsPlugin
 
   def request(method, path, params = {})
@@ -68,8 +61,7 @@ module Blade::SauceLabsPlugin::Client
   end
 
   def platforms_for_browser(browser)
-    long_name = find_browser_long_name(browser[:name])
-    platforms = available_platforms_by_browser[long_name]
+    platforms = available_platforms_for_browser(browser)
 
     versions_by_os = {}
     platforms.each do |os, details|
@@ -112,19 +104,32 @@ module Blade::SauceLabsPlugin::Client
     end
   end
 
-  def find_browser_long_name(name)
-    if match = ALIASES[name.to_s]
-      match
-    else
-      available_platforms_by_browser.keys.detect do |long_name|
-        long_name =~ Regexp.new(name, Regexp::IGNORECASE)
+  def available_platforms_for_browser(browser)
+    {}.tap do |platforms|
+      find_browser_long_names(browser[:name]).each do |long_name|
+        available_platforms_by_browser[long_name].each do |os, details|
+
+          if platforms[os]
+            platforms[os][:versions] = (platforms[os][:versions] + details[:versions]).compact.uniq
+
+            details[:api].each do |key, values|
+              if platforms[os][:api][key]
+                platforms[os][:api][key] = (platforms[os][:api][key] + values).compact.uniq
+              else
+                platforms[os][:api][key] = values
+              end
+            end
+          else
+            platforms[os] = details
+          end
+        end
       end
     end
   end
 
   def available_platforms_by_browser
     @available_platforms_by_browser ||= {}.tap do |by_browser|
-      available_platforms.group_by { |p| p[:api_name] }.each do |api_name, platforms|
+      available_platforms.group_by { |p| [ p[:device], p[:api_name] ].compact.join(":") }.each do |api_name, platforms|
         long_name = platforms.first[:long_name]
         by_browser[long_name] = {}
 
@@ -158,6 +163,14 @@ module Blade::SauceLabsPlugin::Client
       end
     end
 
+    def find_browser_long_names(name)
+      pattern = Regexp.new(name, Regexp::IGNORECASE)
+      available_platforms_by_browser.keys.select do |long_name|
+        long_name =~ pattern
+      end
+    end
+
+
     def available_platforms
       @available_platforms ||= JSON.parse(connection.get("/rest/v1/info/platforms/webdriver").body).map(&:symbolize_keys)
     end

data/lib/blade/sauce_labs_plugin/version.rb

@@ -1,5 +1,5 @@
 module Blade
   module SauceLabsPlugin
-    VERSION = "0.6.3"
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blade-sauce_labs_plugin
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Javan Makhmali
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Blade Runner plugin for Sauce Labs (saucelabs.com)