bump rubocop

Author: ianfixes

.rubocop.yml

@@ -7,6 +7,14 @@ AllCops:
 
 # inherit_from: .rubocop_todo.yml
 
+# TODO: stuff I actually want to fix
+Style/RescueStandardError:
+  Enabled: false
+
+Security/Open:
+  Enabled: false
+
+
 # Extra lines for readability
 Layout/EmptyLinesAroundClassBody:
   Enabled: false
@@ -79,7 +87,10 @@ Style/RedundantSelf:
 Style/StringLiterals:
   Enabled: false
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
   Enabled: false
 
 Style/SymbolArray:

arduino_ci.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency 'rubocop', '~>0.49.0'
+  spec.add_development_dependency 'rubocop', '~>0.59.0'
   spec.add_development_dependency 'yard', '~>0.9.11'
 end

exe/arduino_ci_remote.rb

@@ -84,6 +84,7 @@ def assured_platform(purpose, name, config)
   attempt_multiline("Checking #{gcc_binary} version") do
     version = cpp_library.gcc_version(gcc_binary)
     next nil unless version
+
     puts version.split("\n").map { |l| "    #{l}" }.join("\n")
     version
   end

lib/arduino_ci/arduino_cmd.rb

@@ -14,7 +14,7 @@ class ArduinoCmd
     #   @return [String] the text of the command line flag (`$2` in this case)
     def self.flag(name, text = nil)
       text = "(flag #{name} not defined)" if text.nil?
-      self.class_eval("def flag_#{name};\"#{text}\";end")
+      self.class_eval("def flag_#{name};\"#{text}\";end", __FILE__, __LINE__)
     end
 
     # the path to the Arduino executable
@@ -75,6 +75,7 @@ def lib_dir
     def _prefs_raw
       resp = run_and_capture(flag_get_pref)
       return nil unless resp[:success]
+
       resp[:out]
     end
 
@@ -83,6 +84,7 @@ def _prefs_raw
     def prefs
       prefs_raw = _prefs_raw unless @prefs_fetched
       return nil if prefs_raw.nil?
+
       @prefs_cache = parse_pref_string(prefs_raw)
       @prefs_cache.clone
     end
@@ -224,9 +226,11 @@ def use_board(boardname)
     # @return [bool] whether the command succeeded
     def use_board!(boardname)
       return true if use_board(boardname)
+
       boardfamily = boardname.split(":")[0..1].join(":")
       puts "Board '#{boardname}' not found; attempting to install '#{boardfamily}'"
       return false unless install_boards(boardfamily) # guess board family from first 2 :-separated fields
+
       use_board(boardname)
     end
 
@@ -264,6 +268,7 @@ def install_local_library(path)
         # maybe it's a symlink? that would be OK
         if File.symlink?(destination_path)
           return destination_path if File.readlink(destination_path) == realpath
+
           @last_msg = "#{uhoh} and it's not symlinked to #{realpath}"
           return nil
         end
@@ -282,6 +287,7 @@ def install_local_library(path)
     def library_examples(installed_library_path)
       example_path = File.join(installed_library_path, "examples")
       return [] unless File.exist?(example_path)
+
       examples = Pathname.new(example_path).children.select(&:directory?).map(&:to_path).map(&File.method(:basename))
       files = examples.map do |e|
         proj_file = File.join(example_path, e, "#{e}.ino")

lib/arduino_ci/arduino_cmd_linux.rb

@@ -28,6 +28,7 @@ def _prefs_raw
       resp = run_and_capture(flag_get_pref)
       @prefs_response_time = Time.now - start
       return nil unless resp[:success]
+
       resp[:out]
     end
 

lib/arduino_ci/arduino_downloader.rb

@@ -35,6 +35,7 @@ def self.autolocated_executable
       locations.each do |loc|
         next if loc.nil?
         next unless File.exist? loc
+
         return loc
       end
       nil
@@ -51,6 +52,7 @@ def self.autolocated_installation
       locations.each do |loc|
         next if loc.nil?
         next unless File.exist? loc
+
         return loc
       end
       nil
@@ -132,7 +134,7 @@ def download
       open(package_url, ssl_verify_mode: 0, progress_proc: dot_printer) do |url|
         File.open(package_file, 'wb') { |file| file.write(url.read) }
       end
-    rescue Net::OpenTimeout => e, Net::ReadTimeout => e
+    rescue Net::OpenTimeout, Net::ReadTimeout => e
       puts "Arduino force-install failed to download #{package_url}: #{e}"
     end
 

lib/arduino_ci/arduino_downloader_linux.rb

@@ -47,6 +47,7 @@ def extracted_file
     def self.existing_installation
       exe = self.existing_executable
       return nil if exe.nil?
+
       File.dirname(exe) # it's not really this
       # but for this platform it doesn't really matter
     end
@@ -79,6 +80,7 @@ def self.force_installed_executable
       end
       forced_arduino = File.join(self.force_install_location, "arduino")
       return forced_arduino if File.exist? forced_arduino
+
       nil
     end
 

lib/arduino_ci/arduino_downloader_windows.rb

@@ -73,6 +73,7 @@ def extracted_file
     def self.existing_installation
       exe = self.existing_executable
       return nil if exe.nil?
+
       File.dirname(exe)
     end
 
@@ -94,6 +95,7 @@ def self.existing_executable
     def self.force_installed_executable
       exe = File.join(self.force_install_location, "arduino_debug.exe")
       return nil if exe.nil?
+
       exe
     end
 

lib/arduino_ci/arduino_installation.rb

@@ -29,11 +29,13 @@ def autolocate
         when :linux then
           loc = ArduinoDownloaderLinux.autolocated_executable
           return nil if loc.nil?
+
           ret = ArduinoCmdLinux.new
           ret.base_cmd = [loc]
         when :windows then
           loc = ArduinoDownloaderWindows.autolocated_executable
           return nil if loc.nil?
+
           ret = ArduinoCmdWindows.new
           ret.base_cmd = [loc]
         end

lib/arduino_ci/ci_config.rb

@@ -54,7 +54,7 @@ class << self
       # @return [ArudinoCI::CIConfig] The configuration with defaults filled in
       def default
         ret = new
-        ret.load_yaml(File.expand_path("../../../misc/default.yml", __FILE__))
+        ret.load_yaml(File.expand_path("../../misc/default.yml", __dir__))
         ret
       end
     end
@@ -85,6 +85,7 @@ def deep_clone(hash)
     # @return [Hash] a copy, containing only expected & valid data
     def validate_data(rootname, source, schema)
       return nil if source.nil?
+
       good_data = {}
       source.each do |key, value|
         ksym = key.to_sym
@@ -186,6 +187,7 @@ def from_example(example_path)
     def platform_definition(platform_name)
       defn = @platform_info[platform_name]
       return nil if defn.nil?
+
       deep_clone(defn)
     end
 
@@ -195,39 +197,45 @@ def platform_definition(platform_name)
     # @return [String] the URL defined for this package
     def package_url(package)
       return nil if @package_info[package].nil?
+
       @package_info[package][:url]
     end
 
     # compilers to build (unit tests) with
     # @return [Array<String>] The compiler binary names (e.g. g++) to build with
     def compilers_to_use
       return [] if @unittest_info[:compilers].nil?
+
       @unittest_info[:compilers]
     end
 
     # platforms to build [the examples on]
     # @return [Array<String>] The platforms to build
     def platforms_to_build
       return [] if @compile_info[:platforms].nil?
+
       @compile_info[:platforms]
     end
 
     # platforms to unit test [the tests on]
     # @return [Array<String>] The platforms to unit test on
     def platforms_to_unittest
       return [] if @unittest_info[:platforms].nil?
+
       @unittest_info[:platforms]
     end
 
     # @return [Array<String>] The aux libraries required for building/verifying
     def aux_libraries_for_build
       return [] if @compile_info[:libraries].nil?
+
       @compile_info[:libraries]
     end
 
     # @return [Array<String>] The aux libraries required for unit testing
     def aux_libraries_for_unittest
       return [] if @unittest_info[:libraries].nil?
+
       @unittest_info[:libraries]
     end
 
@@ -236,6 +244,7 @@ def aux_libraries_for_unittest
     # @return [Array<String>] files that match the select/reject criteria
     def allowable_unittest_files(paths)
       return paths if @unittest_info[:testfiles].nil?
+
       ret = paths
       unless @unittest_info[:testfiles][:select].nil? || @unittest_info[:testfiles][:select].empty?
         ret = ret.select { |p| unittest_info[:testfiles][:select].any? { |glob| File.fnmatch(glob, File.basename(p)) } }
@@ -253,6 +262,7 @@ def gcc_config(platform_name)
       plat = @platform_info[platform_name]
       return {} if plat.nil?
       return {} if plat[:gcc].nil?
+
       plat[:gcc]
     end
   end

lib/arduino_ci/cpp_library.rb

@@ -3,8 +3,8 @@
 
 HPP_EXTENSIONS = [".hpp", ".hh", ".h", ".hxx", ".h++"].freeze
 CPP_EXTENSIONS = [".cpp", ".cc", ".c", ".cxx", ".c++"].freeze
-ARDUINO_HEADER_DIR = File.expand_path("../../../cpp/arduino", __FILE__)
-UNITTEST_HEADER_DIR = File.expand_path("../../../cpp/unittest", __FILE__)
+ARDUINO_HEADER_DIR = File.expand_path("../../cpp/arduino", __dir__)
+UNITTEST_HEADER_DIR = File.expand_path("../../cpp/unittest", __dir__)
 
 module ArduinoCI
 
@@ -50,6 +50,7 @@ def vendor_bundle?(path)
       real = File.join(File.realpath(@base_dir), "vendor")
       return true if path.start_with?(base)
       return true if path.start_with?(real)
+
       false
     end
 
@@ -58,6 +59,7 @@ def vendor_bundle?(path)
     # @return [Array<String>] The paths of the found files
     def cpp_files_in(some_dir)
       return [] unless File.exist?(some_dir)
+
       real = File.realpath(some_dir)
       files = Find.find(real).reject { |path| File.directory?(path) }
       cpp = files.select { |path| CPP_EXTENSIONS.include?(File.extname(path)) }
@@ -130,6 +132,7 @@ def run_gcc(gcc_binary, *args, **kwargs)
     # @return [String] the version reported by `gcc -v`
     def gcc_version(gcc_binary)
       return nil unless run_gcc(gcc_binary, "-v")
+
       @last_err
     end
 
@@ -159,6 +162,7 @@ def include_args(aux_libraries)
     # @return [Array<String>] GCC command-line flags
     def feature_args(ci_gcc_config)
       return [] if ci_gcc_config[:features].nil?
+
       ci_gcc_config[:features].map { |f| "-f#{f}" }
     end
 
@@ -167,6 +171,7 @@ def feature_args(ci_gcc_config)
     # @return [Array<String>] GCC command-line flags
     def warning_args(ci_gcc_config)
       return [] if ci_gcc_config[:warnings].nil?
+
       ci_gcc_config[:features].map { |w| "-W#{w}" }
     end
 
@@ -175,6 +180,7 @@ def warning_args(ci_gcc_config)
     # @return [Array<String>] GCC command-line flags
     def define_args(ci_gcc_config)
       return [] if ci_gcc_config[:defines].nil?
+
       ci_gcc_config[:defines].map { |d| "-D#{d}" }
     end
 
@@ -183,6 +189,7 @@ def define_args(ci_gcc_config)
     # @return [Array<String>] GCC command-line flags
     def flag_args(ci_gcc_config)
       return [] if ci_gcc_config[:flags].nil?
+
       ci_gcc_config[:flags]
     end
 
@@ -222,6 +229,7 @@ def build_for_test_with_configuration(test_file, aux_libraries, gcc_binary, ci_g
         [test_file],
       ].flatten(1)
       return nil unless run_gcc(gcc_binary, *args)
+
       artifacts << executable
       executable
     end