Fixes for rubocop update; stop using OpenStruct

jeremycole · jeremycole · commit c6ee192acd67 · 2022-02-11T22:17:33.000-08:00
diff --git a/bin/innodb_log b/bin/innodb_log
@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require "getoptlong"
-require "ostruct"
 require "set"
 require "innodb"
 
@@ -96,7 +95,14 @@ END_OF_USAGE
   exit exit_code
 end
 
-@options = OpenStruct.new
+InnodbLogOptions = Struct.new(
+  :log_files,
+  :dump,
+  :lsn,
+  keyword_init: true
+)
+
+@options = InnodbLogOptions.new
 @options.log_files = []
 @options.dump = false
 @options.lsn = nil
diff --git a/bin/innodb_space b/bin/innodb_space
@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require "getoptlong"
-require "ostruct"
 require "histogram/array"
 require "innodb"
 
@@ -606,7 +605,7 @@ def space_lsn_age_illustrate(space)
 
   puts "%12s ╰%-#{width}s╯" % ["", "─" * width]
 
-  _, lsn_freq = page_lsn.reject(&:nil?).histogram(colors.size, min: lsn_min, max: lsn_max)
+  _, lsn_freq = page_lsn.compact.histogram(colors.size, min: lsn_min, max: lsn_max)
   lsn_freq_delta = lsn_freq.max - lsn_freq.min
 
   lsn_age_histogram = "".dup
@@ -1484,7 +1483,26 @@ end
   Signal.trap(name) { exit } if Signal.list.include?(name)
 end
 
-@options = OpenStruct.new
+InnodbSpaceOptions = Struct.new(
+  :trace,
+  :system_space_file,
+  :system_space_tables,
+  :data_directory,
+  :space_file,
+  :table_name,
+  :index_name,
+  :page,
+  :record,
+  :level,
+  :list,
+  :fseg_id,
+  :describer,
+  :illustration_line_width,
+  :illustration_block_size,
+  keyword_init: true
+)
+
+@options = InnodbSpaceOptions.new
 @options.trace                    = 0
 @options.system_space_file        = nil
 @options.system_space_tables      = false
diff --git a/innodb_ruby.gemspec b/innodb_ruby.gemspec
@@ -29,4 +29,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rspec", "~> 3.11.0")
   s.add_development_dependency("rubocop", "~> 1.18")
   s.add_development_dependency("rubocop-rspec", "~> 2.4")
+  s.metadata["rubygems_mfa_required"] = "false"
 end
diff --git a/lib/innodb/inode.rb b/lib/innodb/inode.rb
@@ -99,7 +99,7 @@ def allocated?
 
     # Helper method to return an array of only non-nil fragment pages.
     def frag_array_pages
-      frag_array.reject(&:nil?)
+      frag_array.compact
     end
 
     # Helper method to count non-nil fragment pages.
