modernize hash and array style

Author: isimluk

.rubocop.yml

@@ -27,12 +27,6 @@ Metrics/MethodLength:
   Exclude:
    - 'test/**/*'
 
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
-Style/SymbolArray:
-  EnforcedStyle: brackets
-
 Naming/MethodParameterName:
   Enabled: false
 

Rakefile

@@ -2,7 +2,7 @@
 
 require 'bundler'
 
-Bundler::GemHelper.install_tasks :name => 'openscap'
+Bundler::GemHelper.install_tasks name: 'openscap'
 
 task :test do
   $LOAD_PATH.unshift('lib')

lib/openscap/ds/arf.rb

@@ -58,8 +58,8 @@ def html
 
   attach_function :ds_rds_session_new_from_source, [:pointer], :pointer
   attach_function :ds_rds_session_free, [:pointer], :void
-  attach_function :ds_rds_session_select_report, [:pointer, :string], :pointer
-  attach_function :ds_rds_session_replace_report_with_source, [:pointer, :pointer], :int
-  attach_function :ds_rds_session_select_report_request, [:pointer, :string], :pointer
+  attach_function :ds_rds_session_select_report, %i[pointer string], :pointer
+  attach_function :ds_rds_session_replace_report_with_source, %i[pointer pointer], :int
+  attach_function :ds_rds_session_select_report_request, %i[pointer string], :pointer
   attach_function :ds_rds_session_get_html_report, [:pointer], :pointer
 end

lib/openscap/ds/sds.rb

@@ -43,6 +43,6 @@ def destroy
 
   attach_function :ds_sds_session_new_from_source, [:pointer], :pointer
   attach_function :ds_sds_session_free, [:pointer], :void
-  attach_function :ds_sds_session_select_checklist, [:pointer, :string, :string, :string], :pointer
-  attach_function :ds_sds_session_get_html_guide, [:pointer, :string], :string
+  attach_function :ds_sds_session_select_checklist, %i[pointer string string string], :pointer
+  attach_function :ds_sds_session_get_html_guide, %i[pointer string], :string
 end

lib/openscap/source.rb

@@ -51,13 +51,13 @@ def create_from_memory(param)
   end
 
   attach_function :oscap_source_new_from_file, [:string], :pointer
-  attach_function :oscap_source_new_from_memory, [:pointer, :int, :string], :pointer
+  attach_function :oscap_source_new_from_memory, %i[pointer int string], :pointer
   attach_function :oscap_source_get_scap_type, [:pointer], :int
   attach_function :oscap_source_free, [:pointer], :void
-  attach_function :oscap_source_save_as, [:pointer, :string], :int
+  attach_function :oscap_source_save_as, %i[pointer string], :int
 
-  callback :xml_reporter, [:string, :int, :string, :pointer], :int
-  attach_function :oscap_source_validate, [:pointer, :xml_reporter, :pointer], :int
+  callback :xml_reporter, %i[string int string pointer], :int
+  attach_function :oscap_source_validate, %i[pointer xml_reporter pointer], :int
   XmlReporterCallback = proc do |filename, line_number, error_message, e|
     offset = e.get_string(0).length
     msg = "#{filename}:#{line_number}: #{error_message}"

lib/openscap/text.rb

@@ -37,10 +37,10 @@ def destroy
   end
 
   attach_function :oscap_text_new, [], :pointer
-  attach_function :oscap_text_set_text, [:pointer, :string], :bool
+  attach_function :oscap_text_set_text, %i[pointer string], :bool
   attach_function :oscap_text_get_text, [:pointer], :string
   attach_function :oscap_text_free, [:pointer], :void
 
-  attach_function :oscap_textlist_get_preferred_plaintext, [:pointer, :string], :string
+  attach_function :oscap_textlist_get_preferred_plaintext, %i[pointer string], :string
   attach_function :oscap_text_iterator_free, [:pointer], :void
 end

lib/openscap/xccdf/fix.rb

@@ -29,10 +29,10 @@ def content
 
       def to_hash
         {
-          :id => id,
-          :platform => platform,
-          :system => fix_system,
-          :content => content
+          id:,
+          platform:,
+          system: fix_system,
+          content:
         }
       end
     end

lib/openscap/xccdf/reference.rb

@@ -24,9 +24,9 @@ def html_link
 
       def to_hash
         {
-          :title => title,
-          :href => href,
-          :html_link => html_link
+          title:,
+          href:,
+          html_link:
         }
       end
     end

lib/openscap/xccdf/rule.rb

@@ -11,12 +11,12 @@ class Rule < Item
       def severity
         severity = OpenSCAP.xccdf_rule_get_severity(@raw)
         severity_mapping = {
-          :xccdf_level_not_defined => 'Not defined',
-          :xccdf_unknown => 'Unknown',
-          :xccdf_info => 'Info',
-          :xccdf_low => 'Low',
-          :xccdf_medium => 'Medium',
-          :xccdf_high => 'High'
+          xccdf_level_not_defined: 'Not defined',
+          xccdf_unknown: 'Unknown',
+          xccdf_info: 'Info',
+          xccdf_low: 'Low',
+          xccdf_medium: 'Medium',
+          xccdf_high: 'High'
         }
         severity_mapping[severity] || severity_mapping[:xccdf_unknown]
       end

lib/openscap/xccdf/session.rb

@@ -17,8 +17,8 @@ def sds?
 
       def load(opts = {})
         o = {
-          :datastream_id => nil,
-          :component_id => nil
+          datastream_id: nil,
+          component_id: nil
         }.merge(opts)
         if sds?
           OpenSCAP.xccdf_session_set_datastream_id(@s, o[:datastream_id])
@@ -45,12 +45,12 @@ def remediate
 
       def export_results(opts = {})
         o = {
-          :rds_file => nil,
-          :xccdf_file => nil,
-          :report_file => nil,
-          :oval_results => false,
-          :oval_variables => false,
-          :engines_results => false
+          rds_file: nil,
+          xccdf_file: nil,
+          report_file: nil,
+          oval_results: false,
+          oval_variables: false,
+          engines_results: false
         }.merge!(opts)
         export_targets o
         export
@@ -94,13 +94,13 @@ def export_targets(opts = {})
 
   attach_function :xccdf_session_is_sds, [:pointer], :bool
 
-  attach_function :xccdf_session_set_profile_id, [:pointer, :string], :bool
-  attach_function :xccdf_session_set_datastream_id, [:pointer, :string], :void
-  attach_function :xccdf_session_set_component_id, [:pointer, :string], :void
-  attach_function :xccdf_session_set_arf_export, [:pointer, :string], :bool
-  attach_function :xccdf_session_set_xccdf_export, [:pointer, :string], :bool
-  attach_function :xccdf_session_set_report_export, [:pointer, :string], :bool
-  attach_function :xccdf_session_set_oval_variables_export, [:pointer, :bool], :void
-  attach_function :xccdf_session_set_oval_results_export, [:pointer, :bool], :void
-  attach_function :xccdf_session_set_check_engine_plugins_results_export, [:pointer, :bool], :void
+  attach_function :xccdf_session_set_profile_id, %i[pointer string], :bool
+  attach_function :xccdf_session_set_datastream_id, %i[pointer string], :void
+  attach_function :xccdf_session_set_component_id, %i[pointer string], :void
+  attach_function :xccdf_session_set_arf_export, %i[pointer string], :bool
+  attach_function :xccdf_session_set_xccdf_export, %i[pointer string], :bool
+  attach_function :xccdf_session_set_report_export, %i[pointer string], :bool
+  attach_function :xccdf_session_set_oval_variables_export, %i[pointer bool], :void
+  attach_function :xccdf_session_set_oval_results_export, %i[pointer bool], :void
+  attach_function :xccdf_session_set_check_engine_plugins_results_export, %i[pointer bool], :void
 end