appium_lib_core 4.3.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 025fed7f5fed2f2eb9607a338faf02b0964359a1f4895011c47577b25c7457b3
-  data.tar.gz: 35f1fe8c93fe4b9f0a078c2768826d8b3bcc12fa2870109fb9554ef4b528e56d
+  metadata.gz: 36bc11abad71f0b61f3902570054786eb70d8d0135584828e84ddfa25dc81b4a
+  data.tar.gz: da818427f4f45e73f2ae90f2dacc2fc35379995dd39786756204f8c0cd5fedad
 SHA512:
-  metadata.gz: e8e4b4cb0e6b825ba0f743e2aa85acf59976998f26b1a7ae664fe4e8b27be176b5a864bc5d26511122839362ade125370c20624c10f850a63d1beeda25dcb782
-  data.tar.gz: 212f165f042fe66dbc7db5c216a682bbcc64bcbbaf33884f595d79847bd1de84c12f1a101bfff7d9ae86c59cd3849cf17b116a0c0cca2bb2015128051b7109ae
+  metadata.gz: 560ff8bddf417b69da3640a1aa6a4c31e808bce4a7a3bf98f7e27f0095cab87281cc7749390a195af20d1567b09e158a3ccb8621bf7c957d04232223a8437f0d
+  data.tar.gz: e8320e4b60b28b997540f45702864a3637d5be30fdd414f3f19d4400ecc4e71d2169f70cfe5c06d0bf22f9817a5e43853d599522e42a09e9ffb96e9768f53e43

data/CHANGELOG.md

@@ -10,6 +10,12 @@ Read `release_notes.md` for commit level details.
 
 ### Deprecations
 
+
+## [4.4.0] - 2021-02-13
+
+### Enhancements
+- Returns `{}` any errors in `Core#appium_server_version` to prevent errors in some cases
+
 ## [4.3.1(4.3.0)] - 2021-02-07(2021-02-05)
 
 ### Enhancements

data/lib/appium_lib_core/common/base/bridge/mjsonwp.rb

@@ -42,6 +42,10 @@ module Appium
             execute :get_all_sessions
           end
 
+          def status
+            execute :status
+          end
+
           # For Appium
           def log_event(vendor, event)
             execute :post_log_event, {}, { vendor: vendor, event: event }

data/lib/appium_lib_core/common/base/bridge/w3c.rb

@@ -43,6 +43,10 @@ module Appium
             execute :get_all_sessions
           end
 
+          def status
+            execute :status
+          end
+
           # Perform touch actions for W3C module.
           # Generate +touch+ pointer action here and users can use this via +driver.action+
           # - https://seleniumhq.github.io/selenium/docs/api/rb/Selenium/WebDriver/W3CActionBuilder.html

data/lib/appium_lib_core/common/base/driver.rb

@@ -16,6 +16,7 @@ require 'base64'
 require_relative 'search_context'
 require_relative 'screenshot'
 require_relative 'rotable'
+require_relative 'remote_status'
 
 module Appium
   module Core
@@ -29,6 +30,7 @@ module Appium
         include ::Appium::Core::Base::Rotatable
         include ::Appium::Core::Base::SearchContext
         include ::Appium::Core::Base::TakesScreenshot
+        include ::Appium::Core::Base::HasRemoteStatus
 
         # Private API.
         # Do not use this for general use. Used by flutter driver to get bridge for creating a new element

data/lib/appium_lib_core/common/base/remote_status.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Appium
+  module Core
+    class Base
+      #
+      # @api private
+      #
+
+      module HasRemoteStatus
+        # Selenium binding has this ability only in Remote Binding,
+        # so this library has this method by own for safe.
+        def remote_status
+          bridge.status
+        end
+      end
+    end
+  end
+end

data/lib/appium_lib_core/driver.rb

@@ -437,7 +437,8 @@ module Appium
         nil
       end
 
-      # Returns the server's version info
+      # Returns the server's version info. This method calls +driver.remote_status+ internally
+      #
       # @return [Hash]
       #
       # @example
@@ -451,18 +452,18 @@ module Appium
       #         }
       #     }
       #
-      # Returns blank hash for Selenium Grid since 'remote_status' gets 500 error
+      # Returns blank hash in a case +driver.remote_status+ got an error
+      # such as Selenium Grid. It returns 500 error against 'remote_status'.
       #
       # @example
       #
       #   @core.appium_server_version #=> {}
       #
       def appium_server_version
-        @driver.remote_status
-      rescue Selenium::WebDriver::Error::ServerError => e
-        raise ::Appium::Core::Error::ServerError unless e.message.include?('status code 500')
-
-        # driver.remote_status returns 500 error for using selenium grid
+        @driver&.remote_status
+      rescue StandardError
+        # Ignore error case in a case the target appium server
+        # does not support `/status` API.
         {}
       end
 

data/lib/appium_lib_core/version.rb

@@ -14,7 +14,7 @@
 
 module Appium
   module Core
-    VERSION = '4.3.1' unless defined? ::Appium::Core::VERSION
-    DATE    = '2021-02-07' unless defined? ::Appium::Core::DATE
+    VERSION = '4.4.0' unless defined? ::Appium::Core::VERSION
+    DATE    = '2021-02-13' unless defined? ::Appium::Core::DATE
   end
 end

data/release_notes.md

@@ -1,3 +1,9 @@
+#### v4.4.0 2021-02-13
+
+- [06c68fb](https://github.com/appium/ruby_lib_core/commit/06c68fbe3ffdbb7b068d2f71ad6841c66dbabf8f) Release 4.4.0
+- [3c54ae2](https://github.com/appium/ruby_lib_core/commit/3c54ae25d9a334f3690c94ce8a59a5c6a4bacd20) feat: always return {} in appium_server_version for errors (#311)
+
+
 #### v4.3.1 2021-02-07
 
 - [1f4d52c](https://github.com/appium/ruby_lib_core/commit/1f4d52cc915783cf89cf4b8ca5a21bd1af5403e0) Release 4.3.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib_core
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.4.0
 platform: ruby
 authors:
 - Kazuaki MATSUO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -269,6 +269,7 @@ files:
 - lib/appium_lib_core/common/base/driver.rb
 - lib/appium_lib_core/common/base/http_default.rb
 - lib/appium_lib_core/common/base/platform.rb
+- lib/appium_lib_core/common/base/remote_status.rb
 - lib/appium_lib_core/common/base/rotable.rb
 - lib/appium_lib_core/common/base/screenshot.rb
 - lib/appium_lib_core/common/base/search_context.rb