L #-: Linting for new rubocop version

share/misc/update_rubygems_setup

@@ -27,7 +27,7 @@ RG_SETUP_END   = '%%RUBYGEMS_SETUP_END%%'
 # Bundled Ruby gems loader code.
 # IMPORTANT: Update here and commit into Git as well!
 # rubocop:disable Layout/HeredocIndentation
-RG_SETUP = <<-'EOT'
+RG_SETUP = <<-EOT
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]

src/datastore_mad/remotes/rsync/restore

@@ -152,7 +152,7 @@ one_client = OpenNebula::Client.new(token)
 # Create backup object templates for VM and associated disk images
 # Monkey patch REXML::DOCUMENT to respond to []
 # ------------------------------------------------------------------------------
-rds.define_singleton_method('[]'){|xpath| self.elements[xpath].text }
+rds.define_singleton_method('[]') {|xpath| elements[xpath].text }
 
 restorer = TransferManager::BackupRestore.new(
     :vm_xml64  => vm_xml,

src/onecfg/lib/config/type/base.rb

@@ -388,7 +388,7 @@ module OneCfg::Config::Type
         def self.run_shell_command((*cmd), stdin = nil)
             rtn = nil
 
-            if Hash == cmd.last
+            if cmd.last == Hash
                 opts = cmd.pop.dup
             else
                 opts = {}

src/onedb/onedb

@@ -576,7 +576,9 @@ CommandParser::CmdParser.new(ARGV) do
             end
         rescue StandardError => e
             puts e.message
+            # rubocop:disable Lint/Debugger
             pp e.backtrace
+            # rubocop:enable Lint/Debugger
             [-1, e.message]
         end
 
@@ -604,7 +606,9 @@ CommandParser::CmdParser.new(ARGV) do
             end
         rescue StandardError => e
             puts e.name
+            # rubocop:disable Lint/Debugger
             pp e.backtrace
+            # rubocop:enable Lint/Debugger
             [-1, e.message]
         end
 

src/oneprovision/lib/provision/driver.rb

@@ -110,7 +110,7 @@ module OneProvision
                 rtn = nil
 
                 begin
-                    if Hash == cmd.last
+                    if cmd.last == Hash
                         opts = cmd.pop.dup
                     else
                         opts = {}

src/tm_mad/lib/backup.rb

@@ -197,10 +197,10 @@ module TransferManager
 
             @base_url = "#{opts[:proto]}://#{opts[:ds_id]}/#{chain}"
 
-            if no_ip
-                NIC_LIST << %w[IP IP6 IP6_ULA IP6_GLOBAL]
-                NIC_LIST.flatten!
-            end
+            return unless no_ip
+
+            NIC_LIST << ['IP', 'IP6', 'IP6_ULA', 'IP6_GLOBAL']
+            NIC_LIST.flatten!
         end
 
         # Creates Image templates for the backup disks.

src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb

@@ -1126,7 +1126,7 @@ end
                 when OPAQUE_CARD.to_s
                     # Select only Opaque Networks
                     opaque_networks = @item.network.select do |net|
-                        RbVmomi::VIM::OpaqueNetwork == net.class
+                        net.class == RbVmomi::VIM::OpaqueNetwork
                     end
                     opaque_network = opaque_networks.find do |opn|
                         backing.opaqueNetworkId == opn.summary.opaqueNetworkId
@@ -1296,7 +1296,7 @@ end
                             when OPAQUE_CARD.to_s
                                 # Select only Opaque Networks
                                 opaque_networks = @item.network.select do |net|
-                                    RbVmomi::VIM::OpaqueNetwork == net.class
+                                    net.class == RbVmomi::VIM::OpaqueNetwork
                                 end
                                 opaque_network = opaque_networks.find do |opn|
                                     nic.backing.opaqueNetworkId ==