From ce6a30fba2e43edb0175ced8aff8f1149e83715c Mon Sep 17 00:00:00 2001 From: Michael Moll Date: Wed, 29 Jan 2020 19:49:40 +0100 Subject: [PATCH] update rubocop to 0.75.1 --- .rubocop.yml | 2 +- .rubocop_todo.yml | 2 +- .travis.yml | 3 ++- Gemfile | 6 +++--- lib/foreman_xen/engine.rb | 12 ++++++------ 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index b61f7cc..ad5e169 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,7 +7,7 @@ inherit_from: AllCops: TargetRubyVersion: 2.3 - TargetRailsVersion: 5.1 + TargetRailsVersion: 5.2 Rails: Enabled: true diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index baae034..dc3413e 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2019-06-30 14:26:46 +0200 using RuboCop version 0.72.0. +# on 2020-01-29 19:47:51 +0100 using RuboCop version 0.75.1. # 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 diff --git a/.travis.yml b/.travis.yml index 02b4545..357c86d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,8 @@ language: ruby rvm: - 2.3.5 - 2.5.1 -# - 2.6.3 + - 2.6.3 + - 2.7.0 before_install: - gem update --remote bundler install: diff --git a/Gemfile b/Gemfile index b44ba5d..51db253 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,6 @@ source 'https://rubygems.org' gemspec -gem 'rubocop', '~> 0.72.0', require: false -gem 'rubocop-performance', '~> 1.4.0', require: false -gem 'rubocop-rails', '~> 2.1.0', require: false +gem 'rubocop', '~> 0.75.1', require: false +gem 'rubocop-performance', '~> 1.5.2', require: false +gem 'rubocop-rails', '~> 2.3.2', require: false diff --git a/lib/foreman_xen/engine.rb b/lib/foreman_xen/engine.rb index 9e870e9..ec68bcc 100644 --- a/lib/foreman_xen/engine.rb +++ b/lib/foreman_xen/engine.rb @@ -53,12 +53,12 @@ class Engine < ::Rails::Engine require File.expand_path('../../app/models/concerns/foreman_xen/host_helper_extensions', __dir__) require File.expand_path('../../app/models/concerns/foreman_xen/host_extensions', __dir__) - Fog::XenServer::Compute::Models::Server.send(:include, ::FogExtensions::Xenserver::Server) - Fog::XenServer::Compute::Models::Host.send(:include, ::FogExtensions::Xenserver::Host) - Fog::XenServer::Compute::Models::Vdi.send(:include, ::FogExtensions::Xenserver::Vdi) - Fog::XenServer::Compute::Models::StorageRepository.send(:include, ::FogExtensions::Xenserver::StorageRepository) - ::HostsHelper.send(:include, ForemanXen::HostHelperExtensions) - ::Host::Managed.send(:prepend, ForemanXen::HostExtensions) + Fog::XenServer::Compute::Models::Server.include ::FogExtensions::Xenserver::Server + Fog::XenServer::Compute::Models::Host.include ::FogExtensions::Xenserver::Host + Fog::XenServer::Compute::Models::Vdi.include ::FogExtensions::Xenserver::Vdi + Fog::XenServer::Compute::Models::StorageRepository.include ::FogExtensions::Xenserver::StorageRepository + ::HostsHelper.include ForemanXen::HostHelperExtensions + ::Host::Managed.prepend ForemanXen::HostExtensions rescue => e Rails.logger.warn "Foreman-Xen: skipping engine hook (#{e})" end