feat: bump rubocop (#293)

Author: KazuCocoa

.rubocop.yml

@@ -1,7 +1,15 @@
 AllCops:
   TargetRubyVersion: 2.4
-Metrics/LineLength:
+Layout/LineLength:
   Max: 128
+Layout/RescueEnsureAlignment:
+  Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: false
+Layout/EmptyLineBetweenDefs:
+  Enabled: false
+Layout/HashAlignment:
+  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 Metrics/ModuleLength:
@@ -26,8 +34,6 @@ Style/CommentedKeyword:
   Enabled: false
 Style/PercentLiteralDelimiters:
   Enabled: false
-Style/BracesAroundHashParameters:
-  Enabled: false
 Style/SymbolArray:
   Enabled: false
 Style/UnpackFirst:
@@ -40,5 +46,13 @@ Naming/MemoizedInstanceVariableName:
     - test/**/*
 Naming/RescuedExceptionsVariableName:
   Enabled: false
-Layout/RescueEnsureAlignment:
+Style/CaseLikeIf:
+  Enabled: false
+Style/RedundantRegexpEscape:
+  Enabled: false
+Style/OptionalBooleanParameter:
+  Enabled: false
+Style/ExplicitBlockArgument:
+  Enabled: false
+Style/KeywordParametersOrder:
   Enabled: false

appium_lib_core.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
   spec.add_development_dependency 'webmock', '~> 3.11.0'
-  spec.add_development_dependency 'rubocop', '0.68.1'
+  spec.add_development_dependency 'rubocop', '1.6.1'
   spec.add_development_dependency 'appium_thor', '~> 1.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'

lib/appium_lib_core.rb

@@ -34,11 +34,11 @@ def self.symbolize_keys(hash)
 
     hash.each_with_object({}) do |pair, acc|
       key = begin
-              pair[0].to_sym
-            rescue StandardError => e
-              ::Appium::Logger.warn(e.message)
-              pair[0]
-            end
+        pair[0].to_sym
+      rescue StandardError => e
+        ::Appium::Logger.warn(e.message)
+        pair[0]
+      end
 
       value = pair[1]
       acc[key] = value.is_a?(Hash) ? symbolize_keys(value) : value

lib/appium_lib_core/android/device.rb

@@ -25,7 +25,7 @@ module Android
       module Device
         extend Forwardable
 
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
 
         # @!method open_notifications
         #   Open Android notifications
@@ -307,7 +307,7 @@ module Device
         ## class << self
         ####
 
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
 
         class << self
           def extended(_mod)

lib/appium_lib_core/common/base/http_default.rb

@@ -36,7 +36,8 @@ class Default < Selenium::WebDriver::Remote::Http::Default
 
           attr_reader :additional_headers
 
-          def initialize(open_timeout: nil, read_timeout: nil)
+          # override
+          def initialize(open_timeout: nil, read_timeout: nil) # rubocop:disable Lint/MissingSuper
             @open_timeout = open_timeout
             @read_timeout = read_timeout
             @additional_headers = {}

lib/appium_lib_core/common/base/search_context.rb

@@ -18,7 +18,6 @@ class Base
       module SearchContext
         # referenced: ::Selenium::WebDriver::SearchContext
 
-        # rubocop:disable Layout/AlignHash
         FINDERS = ::Selenium::WebDriver::SearchContext::FINDERS.merge(
           accessibility_id:     'accessibility id',
           image:                '-image',
@@ -37,9 +36,8 @@ module SearchContext
           # Tizen with Tizen prefix
           tizen_uiautomation:   '-tizen uiautomation'
         )
-        # rubocop:enable Layout/AlignHash
 
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         #
         # Find the first element matching the given arguments
         #
@@ -129,7 +127,7 @@ module SearchContext
         #     # For Tizen
         #     @driver.find_elements :tizen_uiautomation, '....'
         #
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
         def find_element(*args)
           how, what = extract_args(args)
           by = _set_by_from_finders(how)

lib/appium_lib_core/common/command/common.rb

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# rubocop:disable Layout/AlignHash
 module Appium
   module Core
     # ref: https://github.com/appium/appium-base-driver/blob/master/lib/mjsonwp/routes.js
@@ -109,4 +108,3 @@ module Commands
     end # module Commands
   end # module Core
 end # module Appium
-# rubocop:enable Layout/AlignHash

lib/appium_lib_core/common/command/mjsonwp.rb

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# rubocop:disable Layout/AlignHash
 module Appium
   module Core
     module Commands
@@ -27,4 +26,3 @@ module MJSONWP
     end # module Commands
   end # module Core
 end # Appium
-# rubocop:enable Layout/AlignHash

lib/appium_lib_core/common/command/w3c.rb

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# rubocop:disable Layout/AlignHash
 module Appium
   module Core
     module Commands
@@ -55,4 +54,3 @@ module W3C
     end # module Commands
   end # module Core
 end # module Appium
-# rubocop:enable Layout/AlignHash

lib/appium_lib_core/common/device/app_management.rb

@@ -34,7 +34,7 @@ def app_strings(language = nil)
             execute :app_strings, {}, opts
           end
 
-          def background_app(duration = 0) # rubocop:disable Lint/UnusedMethodArgument
+          def background_app(duration = 0)
             # Should override in each driver
             raise NotImplementedError
           end

lib/appium_lib_core/common/wait.rb

@@ -53,7 +53,7 @@ def until(timeout: DEFAULT_TIMEOUT, interval: DEFAULT_INTERVAL, message: nil, ig
               return yield(object)
             rescue ::Errno::ECONNREFUSED => e
               raise e
-            rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
+            rescue *ignored => last_error
               # swallowed
             end
             sleep interval
@@ -98,7 +98,7 @@ def until_true(timeout: DEFAULT_TIMEOUT, interval: DEFAULT_INTERVAL, message: ni
               return result if result
             rescue ::Errno::ECONNREFUSED => e
               raise e
-            rescue *ignored => last_error # rubocop:disable Lint/HandleExceptions
+            rescue *ignored => last_error
               # swallowed
             end
             sleep interval

lib/appium_lib_core/ios/xcuitest/device.rb

@@ -23,7 +23,7 @@ module Xcuitest
         module Device
           extend Forwardable
 
-          # rubocop:disable Metrics/LineLength
+          # rubocop:disable Layout/LineLength
 
           # @!method hide_keyboard(close_key = nil, strategy = nil)
           # Hide the onscreen keyboard
@@ -171,7 +171,7 @@ module Device
           #   @driver.battery_info #=> { state: :full, level: 0.7 }
           #
 
-          # rubocop:enable Metrics/LineLength
+          # rubocop:enable Layout/LineLength
 
           ####
           ## class << self

lib/appium_lib_core/windows/device.rb

@@ -20,7 +20,7 @@ module Windows
       module Device
         extend Forwardable
 
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
 
         # @since Appium 1.18.0
         # @!method start_recording_screen(remote_path: nil, user: nil, pass: nil, method: 'PUT', force_restart: nil, time_limit: nil, fps: nil, preset: nil, video_filter: nil, capture_clicks: nil, capture_cursor: nil, audio_input: nil)
@@ -69,7 +69,7 @@ module Device
         #    @driver.start_recording_screen capture_cursor: true, capture_clicks: true, time_limit: '260'
         #
 
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
 
         ####
         ## class << self

script/commands.rb

@@ -17,9 +17,9 @@
 
 module Script
   class CommandsChecker
-    attr_reader :spec_commands
-    attr_reader :implemented_mjsonwp_commands, :implemented_w3c_commands, :implemented_core_commands
-    attr_reader :webdriver_oss_commands, :webdriver_w3c_commands
+    attr_reader :spec_commands,
+                :implemented_mjsonwp_commands, :implemented_w3c_commands, :implemented_core_commands,
+                :webdriver_oss_commands, :webdriver_w3c_commands
 
     # Set commands implemented in this core library.
     #

test/functional/android/android/device_test.rb

@@ -380,7 +380,7 @@ def resource_id(string, on_match)
         unquote = string.match(/"(.+)"/)
         string = unquote[1] if unquote
 
-        resource_id = %r{^[a-zA-Z_][a-zA-Z0-9\._]*:[^\/]+\/[\S]+$}
+        resource_id = %r{^[a-zA-Z_][a-zA-Z0-9._]*:[^\/]+\/\S+$}
         string.match(resource_id) ? on_match : ''
       end
 

test/functional/android/webdriver/w3c_actions_test.rb

@@ -159,7 +159,7 @@ def _uiautomator2_do_actions_with_many_down_up(element, rect)
                 ::Selenium::WebDriver::Error::InvalidArgumentError].include? error.class
       end
 
-      # Note: Works with Espresso Driver
+      # NOTE: Works with Espresso Driver
       def test_multiple_actions
         skip_as_appium_version '1.8.0'
 

test/functional/ios/ios/device_test.rb

@@ -322,10 +322,10 @@ def test_clipbord
 
         @@driver.set_clipboard(content: input)
 
-        # rubocop:disable  Metrics/LineLength,Style/AsciiComments
+        # rubocop:disable  Layout/LineLength,Style/AsciiComments
         # iOS 13??
         # [Xcode] 2019-06-06 10:01:15.029776+0900 WebDriverAgentRunner-Runner[16270:2865385] [claims] Upload preparation for claim 248BF916-16D3-4341-AFC3-653E3A05CAFA completed with error: Error Domain=NSCocoaErrorDomain Code=256 "The file “2c4ee6c5be2695a3c528cde33df5228960042b03” couldn’t be opened." UserInfo={NSURL=file:///Users/kazu/Library/Developer/CoreSimulator/Devices/3D099C88-C162-494E-9260-D0ABCBB434B1/data/Library/Caches/com.apple.Pasteboard/eb77e5f8f043896faf63b5041f0fbd121db984dd/2c4ee6c5be2695a3c528cde33df5228960042b03, NSFilePath=/Users/kazu/Library/Developer/CoreSimulator/Devices/3D099C88-C162-494E-9260-D0ABCBB434B1/data/Library/Caches/com.apple.Pasteboard/eb77e5f8f043896faf63b5041f0fbd121db984dd/2c4ee6c5be2695a3c528cde33df5228960042b03, NSUnderlyingError=0x600003855dd0 {Error Domain=NSPOSIXErrorDomain Code=22 "Invalid argument"}}
-        # rubocop:enable  Metrics/LineLength,Style/AsciiComments
+        # rubocop:enable  Layout/LineLength,Style/AsciiComments
         assert_equal input, @@driver.get_clipboard # does not work
       end
 

test/functional/ios/ios/mjpeg_server_test.rb

@@ -50,7 +50,7 @@ def test_start_recording_screen
         assert File.exist? to_path
       end
 
-      def test_start_recording_screen_2
+      def test_start_recording_screen2
         skip_as_appium_version '1.9.2'
 
         to_path = 'recorded_file_ios_2.mp4'

test/functional/mac2/driver_test.rb

@@ -26,7 +26,7 @@ def teardown
       save_reports(@driver)
     end
 
-    def test_1
+    def test_first
       @driver.page_source
       e = @driver.find_element :name, 'Apple'
       e.click

test/test_helper.rb

@@ -26,7 +26,7 @@
 
 begin
   Minitest::Reporters.use! [Minitest::Reporters::ProgressReporter.new, Minitest::Reporters::JUnitReporter.new]
-rescue Errno::ENOENT # rubocop:disable Lint/HandleExceptions
+rescue Errno::ENOENT
   # Ignore since Minitest::Reporters::JUnitReporter.new fails in deleting files, sometimes
 end
 
@@ -204,7 +204,7 @@ def device_name(os_version, platform_name, wda_local_port)
 
     # for use_xctestrun_file
     def add_xctestrun(real_device, caps, xcode_org_id)
-      xcode_sdk_version = /iPhoneOS([0-9\.]+)\.sdk/.match(`xcodebuild -version -sdk`)[1]
+      xcode_sdk_version = /iPhoneOS([0-9.]+)\.sdk/.match(`xcodebuild -version -sdk`)[1]
 
       derived_data_path = File.expand_path("tmp/#{xcode_org_id}") # Can run in parallel if we set here as a unique path
       FileUtils.mkdir_p(derived_data_path) unless File.exist? derived_data_path

test/unit/driver_test.rb

@@ -25,6 +25,7 @@ def setup
     class ExampleDriver
       # for test
       attr_reader :core
+
       def initialize(opts)
         @core = ::Appium::Core.for(opts)
       end