appium_lib 11.0.0 → 11.1.0

data/lib/appium_lib/android/common/helper.rb

@@ -27,7 +27,7 @@ module Appium
         @filter = value.to_s.downcase
       end
 
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         reset
         @filter   = false
       end
@@ -217,7 +217,7 @@ module Appium
       # [^\/]+          - type is made up of at least one non-/ characters
       # \\/             - / ends the type and starts the name
       # [\S]+$          - the name contains at least one non-space character and then the line is ended
-      resource_id = /^[a-zA-Z_][a-zA-Z0-9\._]*:[^\/]+\/[\S]+$/
+      resource_id = /^[a-zA-Z_][a-zA-Z0-9._]*:[^\/]+\/\S+$/
       string.match(resource_id) ? on_match : ''
     end
 

data/lib/appium_lib/appium.rb

@@ -77,9 +77,8 @@ module Appium
       Appium::Logger.info "Loading #{toml}" if verbose
 
       data = Tomlrb.load_file(toml, symbolize_keys: true)
-      if verbose
-        Appium::Logger.info data unless data.empty?
-      end
+
+      Appium::Logger.info data if verbose && !data.empty?
 
       if data && data[:caps] && data[:caps][:app] && !data[:caps][:app].empty?
         data[:caps][:app] = Appium::Driver.absolute_app_path data
@@ -200,12 +199,17 @@ module Appium
       raise 'Driver is nil' if driver.nil?
 
       # Wrap single class into an array
-      class_array = [class_array] unless class_array.class == Array
+      class_array = [class_array] unless class_array.instance_of? Array
       # Promote Appium driver methods to class instance methods.
       class_array.each do |klass|
-        driver.public_methods(false).each do |m|
+        driver.public_methods(false).each do |method|
           klass.class_eval do
-            define_method m do |*args, &block|
+            if method_defined? method
+              ::Appium::Logger.warn "'#{method}' is already defined. Skipping to override it."
+              next
+            end
+
+            define_method method do |*args, &block|
               begin
                 # Prefer existing method.
                 # super will invoke method missing on driver
@@ -217,11 +221,11 @@ module Appium
               rescue NoMethodError, ArgumentError
                 if args.size == 1 && args.first.is_a?(Hash)
                   # To prevent warnings by keyword arguments (for Ruby 2.7 and 3)
-                  driver.send m, **args.first, &block if driver.respond_to?(m)
+                  driver.send method, **args.first, &block if driver.respond_to?(method)
                 else
                   ::Appium::Logger.warn "Should fix this '#{args}' for Ruby 2.7 (and 3)" if args.first.is_a?(Hash)
 
-                  driver.send m, *args, &block if driver.respond_to?(m)
+                  driver.send method, *args, &block if driver.respond_to?(method)
                 end
               end
             end

data/lib/appium_lib/common/helper.rb

@@ -29,7 +29,8 @@ module Appium
     # Return yield and ignore any exceptions.
     def ignore
       yield
-    rescue Exception # rubocop:disable Lint/HandleExceptions, Lint/RescueException
+    rescue Exception # rubocop:disable Lint/RescueException
+      # Ignored
     end
 
     # Navigate back.
@@ -73,7 +74,7 @@ module Appium
     class CountElements < Nokogiri::XML::SAX::Document
       attr_reader :result
 
-      def initialize(platform)
+      def initialize(platform) # rubocop:disable Lint/MissingSuper
         reset
         @platform = platform
       end
@@ -213,7 +214,7 @@ module Appium
         @filter = value.to_s.downcase
       end
 
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         reset
         @filter = false
       end
@@ -232,8 +233,9 @@ module Appium
             "#{string}  #{attr[0]}: #{attr1}\n"
           end
 
-          r.concat "\n#{name}\n#{attr_string}" unless attr_string.nil? || attr_string.empty?
-          r
+          return r if attr_string.nil? || attr_string.empty?
+
+          "#{r}\n#{name}\n#{attr_string}"
         end
       end
 

data/lib/appium_lib/common/wait.rb

@@ -45,7 +45,7 @@ module Appium
       opts = opts.is_a?(Numeric) ? { timeout: opts } : opts
 
       if opts.is_a? Hash
-        opts.empty? ? @core.wait_true { yield } : @core.wait_true(opts) { yield }
+        opts.empty? ? @core.wait_true { yield } : @core.wait_true(**opts) { yield }
       else
         ::Appium::Logger.warn('Arguments should be Hash like {timeout: 100}')
       end

data/lib/appium_lib/driver.rb

@@ -276,7 +276,6 @@ module Appium
 
     # Returns a hash of the driver attributes
     def driver_attributes
-      # rubocop:disable Layout/AlignHash
       {
         caps:                @core.caps,
         automation_name:     @core.automation_name,
@@ -294,7 +293,6 @@ module Appium
         wait_timeout:        @core.wait_timeout,
         wait_interval:       @core.wait_interval
       }
-      # rubocop:enable Layout/AlignHash
     end
 
     def device_is_android?
@@ -425,14 +423,12 @@ module Appium
       return app_path if app_path =~ URI::DEFAULT_PARSER.make_regexp # public URL for Sauce
 
       absolute_app_path = File.expand_path app_path
-      app_path = if File.exist? absolute_app_path
-                   absolute_app_path
-                 else
-                   ::Appium::Logger.info("Use #{app_path}")
-                   app_path
-                 end
-
-      app_path
+      if File.exist? absolute_app_path
+        absolute_app_path
+      else
+        ::Appium::Logger.info("Use #{app_path}")
+        app_path
+      end
     end
 
     # Get the server url

data/lib/appium_lib/ios/common/helper.rb

@@ -49,6 +49,7 @@ module Appium
         puts "   visible: #{visible}" if visible
       end
     end
+
     # iOS only. On Android uiautomator always returns an empty string for EditText password.
     #
     # Password character returned from value of UIASecureTextField
@@ -470,7 +471,7 @@ module Appium
       # will be present.
       _validate_object opts[:name], opts[:label], opts[:value]
 
-      # note that mainWindow is sometimes nil so it's passed as a param
+      # NOTE: that mainWindow is sometimes nil so it's passed as a param
       # $._elementOrElementsByType will validate that the window isn't nil
       element_or_elements_by_type = <<-JS
         (function() {

data/lib/appium_lib/ios/xcuitest.rb

@@ -15,7 +15,6 @@
 require_relative 'xcuitest/element'
 require_relative 'xcuitest/command'
 require_relative 'xcuitest/helper'
-require_relative 'xcuitest/element'
 require_relative 'xcuitest/bridge'
 
 module Appium

data/lib/appium_lib/ios/xcuitest/command/gestures.rb

@@ -79,7 +79,7 @@ module Appium
         #   double_tap x: 100, y: 100
         #   double_tap element: find_element(:accessibility_id, "some item")
         #   ```
-        def double_tap(x: nil, y: nil, element: nil) # rubocop:disable Naming/UncommunicativeMethodParamName
+        def double_tap(x: nil, y: nil, element: nil)
           return 'Set x, y or element' if (x.nil? || y.nil?) && element.nil?
 
           args = element.nil? ? { x: x, y: y } : { element: element.ref }
@@ -96,7 +96,7 @@ module Appium
         #   touch_and_hold x: 100, y: 100, duration: 2.0
         #   touch_and_hold element: find_element(:accessibility_id, "some item")
         #   ```
-        def touch_and_hold(x: nil, y: nil, element: nil, duration: 1.0) # rubocop:disable Naming/UncommunicativeMethodParamName
+        def touch_and_hold(x: nil, y: nil, element: nil, duration: 1.0)
           return 'Set x, y or element' if (x.nil? || y.nil?) && element.nil?
 
           args = element.nil? ? { x: x, y: y } : { element: element.ref }
@@ -121,10 +121,10 @@ module Appium
         #   Otherwise they should be calculated relatively to screen borders.
         #
         #   ```ruby
-        #   tap x: 100, y: 100
-        #   tap x: 100, y: 100, element: find_element(:accessibility_id, "some item")
+        #   one_finger_tap x: 100, y: 100
+        #   one_finger_tap x: 100, y: 100, element: find_element(:accessibility_id, "some item")
         #   ```
-        def tap(x:, y:, element: nil) # rubocop:disable Naming/UncommunicativeMethodParamName
+        def one_finger_tap(x:, y:, element: nil)
           args = { x: x, y: y }
           args[:element] = element.ref if element
           @driver.execute_script 'mobile: tap', args

data/lib/appium_lib/ios/xcuitest/command/multi_app_handler.rb

@@ -33,8 +33,7 @@ module Appium
         #     xcuitest_install_app(app: "path/to/app.app")
         #
         def xcuitest_install_app(app:)
-          args = { app: app }
-          @driver.execute_script 'mobile: installApp', args
+          @driver.install_app app
         end
 
         # Verifies whether the application with given bundle identifier is installed on the device.
@@ -47,8 +46,7 @@ module Appium
         #     xcuitest_app_installed?(bundle_id: "io.appium.bundle") #=> true or false
         #
         def xcuitest_app_installed?(bundle_id:)
-          args = { bundleId: bundle_id }
-          @driver.execute_script 'mobile: isAppInstalled', args
+          @driver.app_installed? bundle_id
         end
 
         # Uninstalls an existing application from the device under test. This endpoint does not verify
@@ -62,8 +60,7 @@ module Appium
         #     xcuitest_remove_app(bundle_id: "io.appium.bundle") #=> 1
         #
         def xcuitest_remove_app(bundle_id:)
-          args = { bundleId: bundle_id }
-          @driver.execute_script 'mobile: removeApp', args
+          @driver.remove_app bundle_id
         end
 
         # Executes an existing application on the device. If the application is already running then
@@ -92,8 +89,7 @@ module Appium
         #     xcuitest_terminate_app(bundle_id: "io.appium.bundle") #=> 1
         #
         def xcuitest_terminate_app(bundle_id:)
-          args = { bundleId: bundle_id }
-          @driver.execute_script 'mobile: terminateApp', args
+          @driver.terminate_app bundle_id
         end
 
         # Get the status of an existing application on the device.
@@ -114,8 +110,7 @@ module Appium
         #     xcuitest_query_app_status(bundle_id: "io.appium.bundle") #=> 1
         #
         def xcuitest_query_app_status(bundle_id:)
-          args = { bundleId: bundle_id }
-          @driver.execute_script 'mobile: queryAppState', args
+          @driver.app_state bundle_id
         end
 
         # Activates an existing application on the device under test and moves it to the foreground.
@@ -130,8 +125,7 @@ module Appium
         #     xcuitest_activate_app(bundle_id: "io.appium.bundle") #=> 1
         #
         def xcuitest_activate_app(bundle_id:)
-          args = { bundleId: bundle_id }
-          @driver.execute_script 'mobile: activateApp', args
+          @driver.activate_app bundle_id
         end
       end
     end # module Xcuitest

data/lib/appium_lib/ios/xcuitest/helper.rb

@@ -74,7 +74,7 @@ module Appium
           c_names = class_names.map { |class_name| %(type == "#{class_name}") }.join(' || ')
 
           predicate = if value
-                        %((#{c_names}) && (name contains[c] "#{value}" || label contains[c] "#{value}" || value contains[c] "#{value}")) # rubocop:disable Metrics/LineLength
+                        %((#{c_names}) && (name contains[c] "#{value}" || label contains[c] "#{value}" || value contains[c] "#{value}")) # rubocop:disable Layout/LineLength
                       else
                         c_names
                       end

data/lib/appium_lib/version.rb

@@ -14,6 +14,6 @@
 
 module Appium
   # Version and Date are defined on the 'Appium' module, not 'Appium::Common'
-  VERSION = '11.0.0' unless defined? ::Appium::VERSION
-  DATE    = '2020-12-19' unless defined? ::Appium::DATE
+  VERSION = '11.1.0' unless defined? ::Appium::VERSION
+  DATE    = '2020-12-29' unless defined? ::Appium::DATE
 end

data/release_notes.md

@@ -1,3 +1,14 @@
+#### v11.1.0 2020-12-29
+
+- [bc3da9b](https://github.com/appium/ruby_lib/commit/bc3da9bc1ee58d5e96811b72f3ed737ed0e9c401) Release 11.1.0
+- [3c33cd6](https://github.com/appium/ruby_lib/commit/3c33cd639f8ce55fb81c5ae2116a863407529599) ci: Set up CI with Azure Pipelines (#895)
+- [ecee089](https://github.com/appium/ruby_lib/commit/ecee08981f935295e6413cd98dea4366cbc7bc69) feat: work with Ruby 3 (#893)
+- [bb3d715](https://github.com/appium/ruby_lib/commit/bb3d715e39509ac091b8f493cca42eb4fe8fd5bf) feat: work with Ruby 3 (#892)
+- [eb5cee7](https://github.com/appium/ruby_lib/commit/eb5cee7a926b90bbedd6aa28f013a0b3c5f38510) chore: Update rubocop requirement from = 1.6.1 to = 1.7.0 (#891)
+- [219181d](https://github.com/appium/ruby_lib/commit/219181d80f3b86999706f90a68996945fdc7b1d0) fix: rubocop (#890)
+- [334b791](https://github.com/appium/ruby_lib/commit/334b791a3c4420598e3e832023aa1a16af92492f) chore: Update fakefs requirement from ~> 0.13.0 to ~> 1.3.0 (#888)
+
+
 #### v11.0.0 2020-12-19
 
 - [b4313b0](https://github.com/appium/ruby_lib/commit/b4313b09e62dd22bb95c2e0bc6edd296c7ece7b4) Release 11.0.0

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 11.1.0
 platform: ruby
 authors:
 - code@bootstraponline.com
 - Kazuaki Matsuo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-19 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib_core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -153,16 +153,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.68.1
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.68.1
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: spec
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +205,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".azure-pipelines.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/rubocop.yml"
@@ -289,7 +290,7 @@ homepage: https://github.com/appium/ruby_lib
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -304,8 +305,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.0
+signing_key:
 specification_version: 4
 summary: Ruby library for Appium
 test_files: []