Skip to content
This repository has been archived by the owner on Jul 3, 2024. It is now read-only.

Commit

Permalink
update rubocop to 0.75.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mmoll committed Jan 29, 2020
1 parent 1971d9b commit ce6a30f
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ inherit_from:

AllCops:
TargetRubyVersion: 2.3
TargetRailsVersion: 5.1
TargetRailsVersion: 5.2

Rails:
Enabled: true
Expand Down
2 changes: 1 addition & 1 deletion .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions lib/foreman_xen/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ce6a30f

Please sign in to comment.