Update rubocop

Signed-off-by: Florian Wininger <[email protected]>

Author: fwininger

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-12-21 10:52:38 +0100 using RuboCop version 0.52.0.
+# on 2019-07-03 09:07:58 +0200 using RuboCop version 0.72.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -13,26 +13,27 @@ Lint/DuplicateMethods:
 
 # Offense count: 7
 Metrics/AbcSize:
-  Max: 70
+  Max: 67
 
 # Offense count: 11
 # Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 79
+  Max: 109
 
 # Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 187
+  Max: 189
 
 # Offense count: 2
 Metrics/CyclomaticComplexity:
   Max: 12
 
 # Offense count: 10
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 49
+  Max: 47
 
 # Offense count: 2
 Metrics/PerceivedComplexity:
@@ -51,11 +52,16 @@ Naming/FileName:
     - 'lib/ruby-nessus.rb'
     - 'lib/ruby-nessus/ruby-nessus.rb'
 
-# Offense count: 5
-Style/DateTime:
+# Offense count: 13
+# Configuration parameters: EnforcedStyleForLeadingUnderscores.
+# SupportedStylesForLeadingUnderscores: disallowed, required, optional
+Naming/MemoizedInstanceVariableName:
   Exclude:
     - 'lib/ruby-nessus/version1/host.rb'
     - 'lib/ruby-nessus/version1/scan.rb'
+    - 'lib/ruby-nessus/version2/event.rb'
+    - 'lib/ruby-nessus/version2/host.rb'
+    - 'lib/ruby-nessus/version2/scan.rb'
 
 # Offense count: 12
 Style/Documentation:
@@ -75,11 +81,14 @@ Style/Documentation:
     - 'lib/ruby-nessus/version2/port.rb'
     - 'lib/ruby-nessus/version2/scan.rb'
 
-# Offense count: 14
-# Configuration parameters: .
-# SupportedStyles: annotated, template, unannotated
-Style/FormatStringToken:
-  EnforcedStyle: unannotated
+# Offense count: 3
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: left_coerce, right_coerce, single_coerce, fdiv
+Style/FloatDivision:
+  Exclude:
+    - 'lib/ruby-nessus/version1/scan.rb'
+    - 'lib/ruby-nessus/version2/host.rb'
+    - 'lib/ruby-nessus/version2/scan.rb'
 
 # Offense count: 10
 # Configuration parameters: MinBodyLength.
@@ -92,7 +101,7 @@ Style/GuardClause:
 
 # Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
+# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
@@ -101,24 +110,9 @@ Style/NumericPredicate:
     - 'lib/ruby-nessus/version2/host.rb'
     - 'lib/ruby-nessus/version2/scan.rb'
 
-# Offense count: 1
+# Offense count: 83
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'lib/ruby-nessus/version1/port.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, explicit
-Style/RescueStandardError:
-  Exclude:
-    - 'lib/ruby-nessus/cli.rb'
-
-# Offense count: 75
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 185

lib/ruby-nessus/cli.rb

@@ -115,7 +115,7 @@ def optparse(*args)
           Log.it
           exit(-1)
         end
-      rescue => e
+      rescue StandardError => e
         Log.error e.message
         Log.it opts
         Log.it

lib/ruby-nessus/log.rb

@@ -8,77 +8,77 @@ class Log
     # Formatting
     #
     def self.it(msg = nil)
-      STDERR.puts msg.to_s
+      warn msg.to_s
     end
 
     def self.it!(msg = nil)
-      STDERR.puts "\t#{msg}"
+      warn "\t#{msg}"
     end
 
     def self.break
-      STDERR.puts "\t"
-      STDERR.puts ''
+      warn "\t"
+      warn ''
     end
 
     def self.end
-      STDERR.puts "\n\n"
+      warn "\n\n"
     end
 
     #
     # Headers
     #
     def self.h1(title, msg = nil)
-      STDERR.puts Rainbow("-> #{title}: ").foreground(:green).bright + msg.to_s
+      warn Rainbow("-> #{title}: ").foreground(:green).bright + msg.to_s
     end
 
     def self.h2(title, msg = nil)
-      STDERR.puts Rainbow("\t#{title}: ").foreground(:blue).bright + msg.to_s
+      warn Rainbow("\t#{title}: ").foreground(:blue).bright + msg.to_s
     end
 
     def self.h3(title, msg = nil)
-      STDERR.puts "\t#{title}: " + Rainbow(msg.to_s).foreground(:blue).underline
+      warn "\t#{title}: " + Rainbow(msg.to_s).foreground(:blue).underline
     end
 
     def self.h4(msg = nil)
-      STDERR.puts "\t\t- #{msg}"
+      warn "\t\t- #{msg}"
     end
 
     def self.h5(title, msg = nil)
-      STDERR.puts "\t\t- #{title}: #{msg}"
+      warn "\t\t- #{title}: #{msg}"
     end
 
     #
     # Errors
     #
     def self.error(msg = nil)
-      STDERR.puts Rainbow('ERROR: ').foreground(:red).bright + msg.to_s
+      warn Rainbow('ERROR: ').foreground(:red).bright + msg.to_s
     end
 
     def self.warn(msg = nil)
-      STDERR.puts Rainbow('WARNING: ').foreground(:yellow).bright + msg.to_s
+      warn Rainbow('WARNING: ').foreground(:yellow).bright + msg.to_s
     end
 
     def self.info(msg = nil)
-      STDERR.puts Rainbow('INFO: ').foreground(:green).bright + msg.to_s
+      warn Rainbow('INFO: ').foreground(:green).bright + msg.to_s
     end
 
     #
     # Event Severities
     #
     def self.informational(title, msg = nil)
-      STDERR.puts Rainbow("\t#{title}: ").foreground(:magenta).bright + msg.to_s
+      warn Rainbow("\t#{title}: ").foreground(:magenta).bright + msg.to_s
     end
 
     def self.low(title, msg = nil)
-      STDERR.puts Rainbow("\t#{title}: ").foreground(:green) + msg.to_s
+      warn Rainbow("\t#{title}: ").foreground(:green) + msg.to_s
     end
 
     def self.medium(title, msg = nil)
-      STDERR.puts Rainbow("\t#{title}: ").foreground(:yellow).bright + msg.to_s
+      warn Rainbow("\t#{title}: ").foreground(:yellow).bright + msg.to_s
     end
 
     def self.high(title, msg = nil)
-      STDERR.puts Rainbow("\t#{title}: ").foreground(:red).bright + msg.to_s
+      warn Rainbow("\t#{title}: ").foreground(:red).bright + msg.to_s
     end
   end
 end

lib/ruby-nessus/version1/host.rb

@@ -128,6 +128,7 @@ def informational_events(&block)
 
           @host.xpath('ReportItem').each do |event|
             next if event.at('severity').inner_text.to_i != 0
+
             @informational_events << Event.new(event)
             @informational_event_count += 1
           end
@@ -156,6 +157,7 @@ def low_severity_events(&block)
 
           @host.xpath('ReportItem').each do |event|
             next if event.at('severity').inner_text.to_i != 1
+
             @low_severity_events << Event.new(event)
           end
 
@@ -183,6 +185,7 @@ def medium_severity_events(&block)
 
           @host.xpath('ReportItem').each do |event|
             next if event.at('severity').inner_text.to_i != 2
+
             @medium_severity_events << Event.new(event)
           end
 
@@ -210,6 +213,7 @@ def high_severity_events(&block)
 
           @host.xpath('ReportItem').each do |event|
             next if event.at('severity').inner_text.to_i != 3
+
             @high_severity_events << Event.new(event)
           end
 

lib/ruby-nessus/version1/port.rb

@@ -33,7 +33,7 @@ def initialize(service, number, protocol, raw_string)
       #   Port.parse(port)
       def self.parse(str)
         @full_port = str
-        components = str.match(/^([^\(]+)\((\d+)\/([^\)]+)\)/)
+        components = str.match(%r{^([^\(]+)\((\d+)/([^\)]+)\)})
 
         if components
           return Port.new(components[1].strip, components[2].strip, components[3].strip, str)
@@ -73,11 +73,7 @@ def to_s
       # @return [Boolean]
       #   Return false if the port object number is nil
       def number
-        if @number
-          @number
-        else
-          false
-        end
+        @number || false
       end
     end
   end

lib/ruby-nessus/version1/scan.rb

@@ -361,8 +361,10 @@ def event_percentage_for(type, round_percentage = false)
       #
       def find_by_hostname(hostname, &block)
         raise "Error: hostname can't be blank." if hostname.nil? || hostname.empty?
+
         @xml.xpath('//ReportHost[HostName]').each do |host|
           next unless host.inner_text.match(hostname)
+
           yield(Host.new(host)) if block
         end
       end

lib/ruby-nessus/version2/event.rb

@@ -353,7 +353,7 @@ def exploitability_ease
       #    Return the event exploit available.
       #
       def exploit_available
-        @exploit_available ||= @event.at('exploit_available')&.inner_text == "true"
+        @exploit_available ||= @event.at('exploit_available')&.inner_text == 'true'
       end
 
       #
@@ -363,7 +363,7 @@ def exploit_available
       #    Return the event exploit framework canvas.
       #
       def exploit_framework_canvas
-        @exploit_framework_canvas ||= @event.at('exploit_framework_canvas')&.inner_text == "true"
+        @exploit_framework_canvas ||= @event.at('exploit_framework_canvas')&.inner_text == 'true'
       end
 
       #
@@ -383,7 +383,7 @@ def canvas_package
       #    Return the event exploit framework metasploit.
       #
       def exploit_framework_metasploit
-        @exploit_framework_metasploit ||= @event.at('exploit_framework_metasploit')&.inner_text == "true"
+        @exploit_framework_metasploit ||= @event.at('exploit_framework_metasploit')&.inner_text == 'true'
       end
 
       #
@@ -403,7 +403,7 @@ def metasploit_name
       #    Return the event exploit framework core.
       #
       def exploit_framework_core
-        @exploit_framework_core ||= @event.at('exploit_framework_core')&.inner_text == "true"
+        @exploit_framework_core ||= @event.at('exploit_framework_core')&.inner_text == 'true'
       end
     end
   end

lib/ruby-nessus/version2/host.rb

@@ -22,7 +22,7 @@ def to_s
       end
 
       def name
-        @host["name"]
+        @host['name']
       end
 
       #
@@ -94,6 +94,7 @@ def stop_time
       #
       def runtime
         return unless stop_time && start_time
+
         Time.at(stop_time - start_time).utc.strftime('%H hours %M minutes and %S seconds')
       end
       alias scan_runtime runtime
@@ -169,6 +170,7 @@ def open_ports
       #
       def informational_severity_events
         return if @informational_events
+
         @informational_events = @host.xpath('ReportItem').select { |event| event['severity'].to_i.zero? }.map do |event|
           Event.new(event)
         end
@@ -190,6 +192,7 @@ def informational_severity_events
       #
       def low_severity_events
         return if @low_severity_events
+
         @low_severity_events = @host.xpath('ReportItem').select { |event| (event['severity'].to_i == 1) }.map do |event|
           Event.new(event)
         end
@@ -211,6 +214,7 @@ def low_severity_events
       #
       def medium_severity_events
         return if @medium_severity_events
+
         @medium_severity_events = @host.xpath('ReportItem').select { |event| (event['severity'].to_i == 2) }.map do |event|
           Event.new(event)
         end
@@ -232,6 +236,7 @@ def medium_severity_events
       #
       def high_severity_events
         return if @high_severity_events
+
         @high_severity_events = @host.xpath('ReportItem').select { |event| (event['severity'].to_i == 3) }.map do |event|
           Event.new(event)
         end
@@ -253,6 +258,7 @@ def high_severity_events
       #
       def critical_severity_events
         return if @critical_events
+
         @critical_events = @host.xpath('ReportItem').select { |event| (event['severity'].to_i == 4) }.map do |event|
           Event.new(event)
         end
@@ -312,6 +318,7 @@ def events
       #
       def ports
         return if @ports
+
         @ports = @host.xpath('ReportItem').map { |port| port['port'] }.uniq.sort
       end
 

lib/ruby-nessus/version2/scan.rb

@@ -324,8 +324,10 @@ def event_percentage_for(type, round_percentage = nil)
       #
       def find_by_hostname(hostname, &block)
         raise "Error: hostname can't be blank." if hostname.nil? || hostname.empty?
+
         @xml.xpath('//ReportHost').each do |host|
           next unless host['name'].match(hostname)
+
           yield(Host.new(host)) if block
         end
       end