Upgrade rubocop

Author: ianfixes

.rubocop.yml

@@ -1,4 +1,7 @@
 AllCops:
+  TargetRubyVersion: 2.6
+  NewCops: enable
+  SuggestExtensions: false
   Exclude:
     - '*.gemspec'
     - 'spec/*.rb'
@@ -13,6 +16,24 @@ Style/RescueStandardError:
 Security/Open:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# broken :( https://github.com/rubocop-hq/rubocop/issues/9144
+Style/StringConcatenation:
+  Enabled: false
+
+# Ruins git diffs
+Style/AccessorGrouping:
+  Enabled: false
+
+# Ruins keeping the upper half of the conditional smaller
+Style/NegatedIfElseCondition:
+  Enabled: false
+
+# affects calling style?
+Style/OptionalBooleanParameter:
+  Enabled: false
 
 # Extra lines for readability
 Layout/EmptyLinesAroundClassBody:
@@ -37,9 +58,7 @@ Layout/EndAlignment:
 Layout/CaseIndentation:
   EnforcedStyle: end
 
-Metrics/LineLength:
-  Description: Limit lines to 80 characters.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#80-character-limits
+Layout/LineLength:
   Enabled: true
   Max: 130
 

Gemfile

@@ -8,6 +8,6 @@ gemspec
 gem "bundler", "> 1.15", require: false, group: :test
 gem "keepachangelog_manager", "~> 0.0.2", require: false, group: :test
 gem "rspec", "~> 3.0", require: false, group: :test
-gem 'rubocop', '~>0.59.0', require: false, group: :test
+gem 'rubocop', '~>1.5.0', require: false, group: :test
 gem 'simplecov', require: false, group: :test
 gem 'yard', '~>0.9.11', require: false, group: :test

exe/arduino_ci_remote.rb

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 puts "arduino_ci_remote.rb is deprecated in favor of arduino_ci.rb."
-require_relative "arduino_ci.rb"
+require_relative "arduino_ci"

lib/arduino_ci/arduino_backend.rb

@@ -50,9 +50,9 @@ def initialize(binary_path)
 
     def _wrap_run(work_fn, *args, **kwargs)
       # do some work to extract & merge environment variables if they exist
-      has_env = !args.empty? && args[0].class == Hash
+      has_env = !args.empty? && args[0].instance_of?(Hash)
       env_vars = has_env ? args[0] : {}
-      actual_args = has_env ? args[1..-1] : args  # need to shift over if we extracted args
+      actual_args = has_env ? args[1..] : args  # need to shift over if we extracted args
       custom_config = @config_dir.nil? ? [] : ["--config-file", @config_dir.to_s]
       full_args = [binary_path.to_s, "--format", "json"] + custom_config + actual_args
       full_cmd = env_vars.empty? ? full_args : [env_vars] + full_args

lib/arduino_ci/arduino_downloader.rb

@@ -104,7 +104,7 @@ def download
         total_size += size
         needed_dots = (total_size / chunk_size).to_i
         unprinted_dots = needed_dots - dots
-        @output.print("." * unprinted_dots) if unprinted_dots > 0
+        @output.print("." * unprinted_dots) if unprinted_dots.positive?
         dots = needed_dots
       end
 

lib/arduino_ci/ci_config.rb

@@ -66,6 +66,7 @@ def default
     attr_accessor :platform_info
     attr_accessor :compile_info
     attr_accessor :unittest_info
+
     def initialize
       @package_info = {}
       @platform_info = {}
@@ -107,15 +108,15 @@ def validate_data(rootname, source, schema)
       good_data = {}
       source.each do |key, value|
         ksym = key.to_sym
-        expected_type = schema[ksym].class == Class ? schema[ksym] : Hash
+        expected_type = schema[ksym].instance_of?(Class) ? schema[ksym] : Hash
         if !schema.include?(ksym)
           puts "Warning: unknown field '#{ksym}' under definition for #{rootname}"
         elsif value.nil?
           good_data[ksym] = nil
         elsif value.class != expected_type
           puts "Warning: expected field '#{ksym}' of #{rootname} to be '#{expected_type}', got '#{value.class}'"
         else
-          good_data[ksym] = value.class == Hash ? validate_data(key, value, schema[ksym]) : value
+          good_data[ksym] = value.instance_of?(Hash) ? validate_data(key, value, schema[ksym]) : value
         end
       end
       good_data

lib/arduino_ci/cpp_library.rb

@@ -407,8 +407,7 @@ def all_arduino_library_dependencies!(additional_libraries = [])
         other_lib.install unless other_lib.installed?
         other_lib.all_arduino_library_dependencies!
       end.flatten
-      ret = (additional_libraries + recursive).uniq
-      ret
+      (additional_libraries + recursive).uniq
     end
 
     # Arduino library directories containing sources -- only those of the dependencies
@@ -522,7 +521,7 @@ def build_for_test_with_configuration(test_file, aux_libraries, gcc_binary, ci_g
     # @param executable [Pathname] the path to the test file
     def print_stack_dump(executable)
       possible_dumpfiles = [
-        executable.sub_ext(executable.extname + ".stackdump")
+        executable.sub_ext("#{executable.extname}.stackdump")
       ]
       possible_dumpfiles.select(&:exist?).each do |dump|
         puts "========== Stack dump from #{dump}:"

lib/arduino_ci/host.rb

@@ -8,10 +8,10 @@ module ArduinoCI
   class Host
     # TODO: this came from https://stackoverflow.com/a/22716582/2063546
     #       and I'm not sure if it can be replaced by self.os == :windows
-    WINDOWS_VARIANT_REGEX = /mswin32|cygwin|mingw|bccwin/
+    WINDOWS_VARIANT_REGEX = /mswin32|cygwin|mingw|bccwin/.freeze
 
     # e.g. 11/27/2020  01:02 AM    <SYMLINKD>     ExcludeSomething [C:\projects\arduino-ci\SampleProjects\ExcludeSomething]
-    DIR_SYMLINK_REGEX = %r{\d+/\d+/\d+\s+[^<]+<SYMLINKD?>\s+(.*) \[([^\]]+)\]}
+    DIR_SYMLINK_REGEX = %r{\d+/\d+/\d+\s+[^<]+<SYMLINKD?>\s+(.*) \[([^\]]+)\]}.freeze
 
     # Cross-platform way of finding an executable in the $PATH.
     # via https://stackoverflow.com/a/5471032/2063546