[WIP] Rubocop all the things

Gemfile

@@ -32,8 +32,8 @@ gem "bootsnap",                         ">= 1.8.1",          :require => false #
 gem "bundler",                          "~> 2.1", ">= 2.1.4", "!= 2.2.10", :require => false
 gem "byebug",                                                :require => false
 gem "color",                            "~>1.8"
-gem "connection_pool",                                       :require => false # For Dalli
 gem "config",                           "~>2.2", ">=2.2.3",  :require => false
+gem "connection_pool",                                       :require => false # For Dalli
 gem "dalli",                            "~>3.2.3",           :require => false
 gem "default_value_for",                "~>3.3"
 gem "docker-api",                       "~>1.33.6",          :require => false
@@ -61,9 +61,9 @@ gem "net-ldap",                         "~>0.16.1",          :require => false
 gem "net-ping",                         "~>1.7.4",           :require => false
 gem "openscap",                         "~>0.4.8",           :require => false
 gem "optimist",                         "~>3.0",             :require => false
-gem "psych",                            ">=3.1",             :require => false # 3.1 safe_load changed positional to kwargs like aliases: true: https://github.com/ruby/psych/commit/4d4439d6d0adfcbd211ea295779315f1baa7dadd
 gem "pg",                               ">=1.4.1",           :require => false
 gem "pg-dsn_parser",                    "~>0.1.1",           :require => false
+gem "psych",                            ">=3.1",             :require => false # 3.1 safe_load changed positional to kwargs like aliases: true: https://github.com/ruby/psych/commit/4d4439d6d0adfcbd211ea295779315f1baa7dadd
 gem "query_relation",                   "~>0.1.0",           :require => false
 gem "rack",                             ">=2.2.6.4",         :require => false
 gem "rack-attack",                      "~>6.5.0",           :require => false

Rakefile

@@ -2,8 +2,8 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
-require File.expand_path('../lib/tasks/evm_rake_helper', __FILE__)
+require File.expand_path('config/application', __dir__)
+require File.expand_path('lib/tasks/evm_rake_helper', __dir__)
 
 include Rake::DSL
 Vmdb::Application.load_tasks

app/channels/application_cable/connection.rb

@@ -10,6 +10,7 @@ def connect
 
     def find_verified_user
       return reject_unauthorized_connection unless cookies[:ws_token]
+
       userid = TokenManager.new('ws').token_get_info(cookies[:ws_token], :userid)
       User.find_by(:userid => userid.presence) || reject_unauthorized_connection
     end

app/mailers/generic_mailer.rb

@@ -20,7 +20,7 @@ def self.deliver(method, options = {})
       rcpts.each do |rcpt|
         rcpt.split(',').each do |to|
           options[:to] = to
-          individual =  send(method, options)
+          individual = send(method, options)
           begin
             individual.deliver_now
           rescue Net::SMTPError
@@ -41,21 +41,21 @@ def self.deliver(method, options = {})
       rescue => e
         _log.error("method: #{method} options: #{options} delivery-error #{e}")
       end
-
     end
 
     msg
   end
 
   def self.deliver_queue(method, options = {})
     return unless MiqRegion.my_region.role_assigned?('notifier')
+
     _log.info("starting: method: #{method} args: #{options} ")
     options[:attachment] &&= attachment_to_blob(options[:attachment])
     MiqQueue.submit_job(
       :service     => "notifier",
       :class_name  => name,
       :method_name => 'deliver',
-      :args        => [method, options],
+      :args        => [method, options]
     )
   end
 
@@ -95,12 +95,14 @@ def self.blob_to_attachment(attachment)
     when String   # Actual Body
       blob_to_attachment(:attachment => attachment)
     when Hash
-      attachment[:body] ||= begin
-        blob = BinaryBlob.find(attachment.delete(:attachment_id))
-        body = blob.binary unless blob.nil?
-        blob.destroy unless blob.nil?
-        body
-      end if attachment[:attachment_id].kind_of?(Numeric)
+      if attachment[:attachment_id].kind_of?(Numeric)
+        attachment[:body] ||= begin
+          blob = BinaryBlob.find(attachment.delete(:attachment_id))
+          body = blob.binary unless blob.nil?
+          blob.destroy unless blob.nil?
+          body
+        end
+      end
       attachment[:filename] ||= "evm_attachment"
       attachment
     else
@@ -162,6 +164,7 @@ def prepare_generic_email(options)
     options[:attachment].each do |a|
       name = a[:filename]
       next if name.nil?
+
       attachments[name] = {:mime_type => a[:content_type], :content => a[:body]}
     end
     mail(:subject => options[:subject], :to => options[:to], :from => options[:from], :cc => options[:cc], :bcc => options[:bcc], :date => options[:sent_on])
@@ -172,7 +175,7 @@ def prepare_generic_email(options)
   OPTIONAL_SMTP_KEYS = [:enable_starttls_auto, :openssl_verify_mode]
   def set_mailer_smtp(evm_settings = nil)
     evm_settings ||= ::Settings.smtp
-    am_settings =  {}
+    am_settings = {}
 
     DESTINATION_SMTP_KEYS.each { |key| am_settings[key] = evm_settings[key] }
     am_settings[:address] ||= evm_settings[:host] # vmdb.yml has key :host, ActionMailer expects :address
@@ -181,7 +184,7 @@ def set_mailer_smtp(evm_settings = nil)
     case evm_settings[:authentication].to_s.to_sym
     when :none then           AUTHENTICATION_SMTP_KEYS.each { |key| am_settings[key] = nil }
     when :plain, :login then  AUTHENTICATION_SMTP_KEYS.each { |key| am_settings[key] = evm_settings[key] }
-    else                  raise ArgumentError, "authentication value #{evm_settings[:authentication].inspect} must be one of: 'none', 'plain', 'login'"
+    else raise ArgumentError, "authentication value #{evm_settings[:authentication].inspect} must be one of: 'none', 'plain', 'login'"
     end
 
     OPTIONAL_SMTP_KEYS.each { |key| am_settings[key] = evm_settings[key] if evm_settings.key?(key) }

app/models/account.rb

@@ -67,7 +67,7 @@ def self.xml_to_hashes(xmlNode, findPath, typeName)
       nh[:acctid] = nh.delete("#{typeName}id".to_sym)
       nh[:acctid] = nil unless nh[:acctid].respond_to?(:to_int) || nh[:acctid].to_s =~ /^-?[0-9]+$/
       # Convert to signed integer values for acctid
-      nh[:acctid] = [nh[:acctid].to_i].pack("I").unpack("i")[0] unless nh[:acctid].nil?
+      nh[:acctid] = [nh[:acctid].to_i].pack("I").unpack1("i") unless nh[:acctid].nil?
 
       # Find the users for this group / groups for this user
       nh[:members] = []
@@ -93,7 +93,7 @@ def with_valid_account_type(valid_account_type)
     if accttype == valid_account_type
       yield
     else
-      raise _("Cannot call method '%{caller}' on an Account of type '%{type}'") % {:caller => caller[0][/`.*'/][1..-2],
+      raise _("Cannot call method '%{caller}' on an Account of type '%{type}'") % {:caller => caller(1..1).first[/`.*'/][1..-2],
                                                                                    :type   => accttype}
     end
   end
@@ -136,18 +136,18 @@ def remove_all_groups
   # FIXME: Why not use .pluralize?
   #
   def members
-    send("#{accttype_opposite}s")
+    send(:"#{accttype_opposite}s")
   end
 
   def add_member(member)
-    send("add_#{accttype_opposite}", member)
+    send(:"add_#{accttype_opposite}", member)
   end
 
   def remove_member(member)
-    send("remove_#{accttype_opposite}", member)
+    send(:"remove_#{accttype_opposite}", member)
   end
 
   def remove_all_members
-    send("remove_all_#{accttype_opposite}s")
+    send(:"remove_all_#{accttype_opposite}s")
   end
 end

app/models/advanced_setting.rb

@@ -20,6 +20,7 @@ def self.xml_to_hashes(xml_node, find_path)
 
       el.each_element { |e| result << e.attributes.to_h }
     end
+
     result
   end
 end

app/models/aliases/automation_manager_configured_system.rb

@@ -1 +1 @@
-::AutomationManagerConfiguredSystem = ::ManageIQ::Providers::AnsibleTower::AutomationManager::ConfiguredSystem
+AutomationManagerConfiguredSystem = ManageIQ::Providers::AnsibleTower::AutomationManager::ConfiguredSystem

app/models/aliases/ems_automation.rb

@@ -1 +1 @@
-::EmsAutomation = ::ManageIQ::Providers::ExternalAutomationManager
+EmsAutomation = ManageIQ::Providers::ExternalAutomationManager

app/models/aliases/ems_cloud.rb

@@ -1 +1 @@
-::EmsCloud = ::ManageIQ::Providers::CloudManager
+EmsCloud = ManageIQ::Providers::CloudManager

app/models/aliases/ems_configuration.rb

@@ -1 +1 @@
-::EmsConfiguration = ::ManageIQ::Providers::ConfigurationManager
+EmsConfiguration = ManageIQ::Providers::ConfigurationManager

app/models/aliases/ems_infra.rb

@@ -1 +1 @@
-::EmsInfra = ::ManageIQ::Providers::InfraManager
+EmsInfra = ManageIQ::Providers::InfraManager

app/models/aliases/ems_network.rb

@@ -1 +1 @@
-::EmsNetwork = ::ManageIQ::Providers::NetworkManager
+EmsNetwork = ManageIQ::Providers::NetworkManager

app/models/aliases/ems_physical_infra.rb

@@ -1 +1 @@
-::EmsPhysicalInfra = ::ManageIQ::Providers::PhysicalInfraManager
+EmsPhysicalInfra = ManageIQ::Providers::PhysicalInfraManager

app/models/aliases/ems_refresh/refreshers/base_refresher.rb

@@ -1 +1 @@
-::EmsRefresh::Refreshers::BaseRefresher = ManageIQ::Providers::BaseManager::Refresher
+EmsRefresh::Refreshers::BaseRefresher = ManageIQ::Providers::BaseManager::Refresher

app/models/aliases/ems_storage.rb

@@ -1 +1 @@
-::EmsStorage = ::ManageIQ::Providers::StorageManager
+EmsStorage = ManageIQ::Providers::StorageManager

app/models/aliases/miq_ems_metrics_collector_worker.rb

@@ -1 +1 @@
-::MiqEmsMetricsCollectorWorker = ManageIQ::Providers::BaseManager::MetricsCollectorWorker
+MiqEmsMetricsCollectorWorker = ManageIQ::Providers::BaseManager::MetricsCollectorWorker

app/models/aliases/miq_ems_operations_worker.rb

@@ -1 +1 @@
-::MiqEmsOperationsWorker = ManageIQ::Providers::BaseManager::OperationsWorker
+MiqEmsOperationsWorker = ManageIQ::Providers::BaseManager::OperationsWorker

app/models/aliases/miq_ems_refresh_worker.rb

@@ -1 +1 @@
-::MiqEmsRefreshWorker = ManageIQ::Providers::BaseManager::RefreshWorker
+MiqEmsRefreshWorker = ManageIQ::Providers::BaseManager::RefreshWorker

app/models/aliases/miq_event_catcher.rb

@@ -1 +1 @@
-::MiqEventCatcher = ManageIQ::Providers::BaseManager::EventCatcher
+MiqEventCatcher = ManageIQ::Providers::BaseManager::EventCatcher

app/models/aliases/miq_provision_cloud.rb

@@ -1 +1 @@
-::MiqProvisionCloud = ::ManageIQ::Providers::CloudManager::Provision
+MiqProvisionCloud = ManageIQ::Providers::CloudManager::Provision

app/models/aliases/miq_provision_cloud_workflow.rb

@@ -1 +1 @@
-::MiqProvisionCloudWorkflow = ::ManageIQ::Providers::CloudManager::ProvisionWorkflow
+MiqProvisionCloudWorkflow = ManageIQ::Providers::CloudManager::ProvisionWorkflow

app/models/aliases/miq_provision_infra_workflow.rb

@@ -1 +1 @@
-::MiqProvisionInfraWorkflow = ::ManageIQ::Providers::InfraManager::ProvisionWorkflow
+MiqProvisionInfraWorkflow = ManageIQ::Providers::InfraManager::ProvisionWorkflow

app/models/aliases/template_cloud.rb

@@ -1 +1 @@
-::TemplateCloud = ManageIQ::Providers::CloudManager::Template
+TemplateCloud = ManageIQ::Providers::CloudManager::Template

app/models/aliases/template_infra.rb

@@ -1,2 +1,2 @@
 require 'manageiq/providers/infra_manager/template'
-::TemplateInfra = ManageIQ::Providers::InfraManager::Template
+TemplateInfra = ManageIQ::Providers::InfraManager::Template

app/models/aliases/vm_cloud.rb

@@ -1 +1 @@
-::VmCloud = ManageIQ::Providers::CloudManager::Vm
+VmCloud = ManageIQ::Providers::CloudManager::Vm

app/models/aliases/vm_infra.rb

@@ -1 +1 @@
-::VmInfra = ManageIQ::Providers::InfraManager::Vm
+VmInfra = ManageIQ::Providers::InfraManager::Vm

app/models/aliases/workers/ems_refresh_worker.rb

@@ -1 +1 @@
-::EmsRefreshWorker = ManageIQ::Providers::BaseManager::RefreshWorker::Runner
+EmsRefreshWorker = ManageIQ::Providers::BaseManager::RefreshWorker::Runner

app/models/aliases/workers/event_catcher.rb

@@ -1,2 +1,2 @@
-::EventCatcher = ManageIQ::Providers::BaseManager::EventCatcher::Runner
-::EventCatcherHandledException = ::EventCatcher::EventCatcherHandledException
+EventCatcher = ManageIQ::Providers::BaseManager::EventCatcher::Runner
+EventCatcherHandledException = EventCatcher::EventCatcherHandledException

app/models/application_record.rb

@@ -32,6 +32,7 @@ def self.display_name(number = 1)
 
   def self.human_attribute_name(attribute, options = {})
     return super if options.delete(:ui) == true
+
     "#{name}: #{super}"
   end
 end

app/models/asset_tag_import.rb

@@ -1,8 +1,7 @@
 class AssetTagImport
   include Vmdb::Logging
 
-  attr_accessor :errors
-  attr_accessor :stats
+  attr_accessor :errors, :stats
 
   # The required fields list is not limited anymore, so pass nil.
   REQUIRED_COLS = {VmOrTemplate => nil, Host => nil}
@@ -24,6 +23,7 @@ def self.upload(klass, fd)
     klass = Object.const_get(klass.to_s)
     raise _("%{name} not supported for upload!") % {:name => klass} unless REQUIRED_COLS.key?(klass)
     raise _("%{name} not supported for upload!") % {:name => klass} unless MATCH_KEYS.key?(klass)
+
     data, keys, tags = MiqBulkImport.upload(fd, REQUIRED_COLS[klass], MATCH_KEYS[klass].dup)
 
     import = new(:data => data, :keys => keys, :tags => tags, :klass => klass)
@@ -69,13 +69,13 @@ def verify
     end
 
     @verified_data.each do |id, data|
-      if data.length > 1
-        obj = @klass.find_by(:id => id)
-        while data.length > 1
-          data.shift
-          _log.warn("#{@klass.name} #{obj.name}, Multiple lines for the same object, the last line is applied")
-          @errors.add(:singlevaluedassettag, "#{@klass.name}: #{obj.name}, Multiple lines for the same object, the last line is applied")
-        end
+      next unless data.length > 1
+
+      obj = @klass.find_by(:id => id)
+      while data.length > 1
+        data.shift
+        _log.warn("#{@klass.name} #{obj.name}, Multiple lines for the same object, the last line is applied")
+        @errors.add(:singlevaluedassettag, "#{@klass.name}: #{obj.name}, Multiple lines for the same object, the last line is applied")
       end
     end
 
@@ -87,31 +87,29 @@ def verify
   def apply
     @verified_data.each do |id, data|
       obj = @klass.find_by(:id => id)
-      if obj
-        attrs = obj.miq_custom_attributes
-        new_attrs = []
-        data[0].each do |key, value|
-          # Add custom attribute here.
-          attr = attrs.detect { |ca| ca.name == key }
-          if attr.nil?
-            if value.blank?
-              _log.info("#{@klass.name}: #{obj.name}, Skipping tag <#{key}> due to blank value")
-            else
-              _log.info("#{@klass.name}: #{obj.name}, Adding tag <#{key}>, value <#{value}>")
-              new_attrs << {:name => key, :value => value, :source => 'EVM'}
-            end
+      next unless obj
+
+      attrs = obj.miq_custom_attributes
+      new_attrs = []
+      data[0].each do |key, value|
+        # Add custom attribute here.
+        attr = attrs.detect { |ca| ca.name == key }
+        if attr.nil?
+          if value.blank?
+            _log.info("#{@klass.name}: #{obj.name}, Skipping tag <#{key}> due to blank value")
           else
-            if value.blank?
-              _log.info("#{@klass.name}: #{obj.name}, Deleting tag <#{key}> due to blank value")
-              attr.delete
-            else
-              _log.info("#{@klass.name}: #{obj.name}, Updating tag <#{key}>, value <#{value}>")
-              attr.update_attribute(:value, value)
-            end
+            _log.info("#{@klass.name}: #{obj.name}, Adding tag <#{key}>, value <#{value}>")
+            new_attrs << {:name => key, :value => value, :source => 'EVM'}
           end
+        elsif value.blank?
+          _log.info("#{@klass.name}: #{obj.name}, Deleting tag <#{key}> due to blank value")
+          attr.delete
+        else
+          _log.info("#{@klass.name}: #{obj.name}, Updating tag <#{key}>, value <#{value}>")
+            attr.update_attribute(:value, value)
         end
-        obj.custom_attributes.create(new_attrs)
       end
+      obj.custom_attributes.create(new_attrs)
     end
   end