foreman_dlm 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46b88d4ab255520440c5a8aeb4222e8ab62e167027ca0a833eaa03bf4ee32885
-  data.tar.gz: 9b953cde9907b2e7be6282aedbf44fad05d447f13d97e420c62ffd47a3ccf685
+  metadata.gz: cbea781adcb410612c6d6fde4e13f116f31f50f393ac518c55cdf8ff0bc0ab22
+  data.tar.gz: 201b1a484408da1971ebd7b33285d5738a1a707bd84ec06a04ed05510c85d065
 SHA512:
-  metadata.gz: 3f07de80a511db25bbfdc37d01726a611678b8be5c360c1020ad6ff3e69fdac0d269fe2312fbed24770d8ebec21f05148eb5d629ea69e8b6f2298597adfdea1f
-  data.tar.gz: 9ced134c94780300383e6096e968fdadf1035ac6323f053a0ffcffa8027c660447ce1fd49c830a9d9c103389c7412021e96243fe63e8581fbe743f314b8a605d
+  metadata.gz: 961720c5a51b86f720e61f1463bc9b413419be9876d93d36070053d14961db07b9f42f0a82c99c0b917f621296b401da1caf49f123882402e943d8994228f734
+  data.tar.gz: c9cab6e1b37b3321ce4d862dc8599f9af2d8b9b5ce911eaa4141f28816364cfed1d29e372cbe5a1583df2876d47681b7c4c66c70c11dc5ef3164611965ccd99b

data/README.md

@@ -15,6 +15,7 @@ With this plugin servers can acquire a lock in Foreman to ensure only one server
 | >= 1.15         | ~> 0.1         |
 | >= 1.17         | ~> 1.0         |
 | >= 3.0          | ~> 2.0         |
+| >= 3.9          | ~> 3.0         |
 
 ## Installation
 

data/Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -20,7 +22,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 
 Bundler::GemHelper.install_tasks
 
@@ -38,7 +40,7 @@ task default: :test
 begin
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new
-rescue => _
+rescue StandardError
   puts 'Rubocop not loaded.'
 end
 

data/app/controllers/api/v2/dlmlock_events_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V2
     class DlmlockEventsController < V2::BaseController

data/app/controllers/api/v2/dlmlocks_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
   module V2
     class DlmlocksController < V2::BaseController
@@ -37,7 +39,8 @@ module Api
       error 404, 'Lock could not be found.'
       param :id, String, :required => true, :desc => N_('Id or name of the DLM lock')
 
-      def show; end
+      def show
+      end
 
       api :POST, '/dlmlocks', N_('Create a DLM lock')
       param_group :dlmlock, :as => :create
@@ -52,7 +55,7 @@ module Api
       param_group :dlmlock
 
       def update
-        process_response @dlmlock.update_attributes(dlmlocks_params)
+        process_response @dlmlock.update(dlmlocks_params)
       end
 
       api :DELETE, '/dlmlocks/:id/', N_('Delete a DLM lock')
@@ -133,16 +136,16 @@ module Api
           logger.info 'Denying access because no host could be detected.'
           if User.current
             render_error 'access_denied',
-                         :status => :forbidden,
-                         :locals => {
-                           :details => 'You need to authenticate with a valid client cert. The DN has to match a known host.'
-                         }
+              :status => :forbidden,
+              :locals => {
+                :details => 'You need to authenticate with a valid client cert. The DN has to match a known host.',
+              }
           else
             render_error 'unauthorized',
-                         :status => :unauthorized,
-                         :locals => {
-                           :user_login => get_client_cert_hostname
-                         }
+              :status => :unauthorized,
+              :locals => {
+                :user_login => get_client_cert_hostname,
+              }
           end
         end
         true
@@ -163,7 +166,7 @@ module Api
           deny_access
         else
           render_error 'precondition_failed', :status => :precondition_failed, :locals => {
-            :message => 'Precondition failed. Lock is in invalid state for this operation.'
+            :message => 'Precondition failed. Lock is in invalid state for this operation.',
           }
         end
       end

data/app/controllers/concerns/foreman/controller/parameters/dlmlocks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Foreman::Controller::Parameters::Dlmlocks
   extend ActiveSupport::Concern
 

data/app/controllers/concerns/foreman_dlm/find_host_by_client_cert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   module FindHostByClientCert
     extend ActiveSupport::Concern

data/app/controllers/concerns/foreman_dlm/find_host_by_ip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   module FindHostByIp
     extend ActiveSupport::Concern

data/app/controllers/concerns/foreman_dlm/update_checkin_time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   module UpdateCheckinTime
     extend ActiveSupport::Concern

data/app/controllers/foreman_dlm/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   class ApplicationController < ::ApplicationController
     def resource_class

data/app/controllers/foreman_dlm/dlmlocks_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   class DlmlocksController < ::ForemanDlm::ApplicationController
     include ::Foreman::Controller::AutoCompleteSearch
@@ -9,7 +11,8 @@ module ForemanDlm
       @dlmlocks = resource_base_search_and_page(:host)
     end
 
-    def show; end
+    def show
+    end
 
     def destroy
       if @dlmlock.destroy
@@ -59,15 +62,6 @@ module ForemanDlm
       ForemanDlm::Dlmlock
     end
 
-    # see https://projects.theforeman.org/issues/25976
-    # can be removed for Foreman 1.22+
-    def auto_complete_controller_name
-      current_version = Gem::Version.new(Foreman::Version.new.notag)
-      return '/foreman_dlm/dlmlocks' if current_version >= Gem::Version.new('1.20') && current_version < Gem::Version.new('1.22')
-
-      controller_name
-    end
-
     private
 
     def action_permission

data/app/helpers/foreman_dlm/dlmlock_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   module DlmlockHelper
     def dlmlock_status_icon_class(lock)

data/app/jobs/foreman_dlm/refresh_dlmlock_status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   class RefreshDlmlockStatus < ApplicationJob
     queue_as :refresh_dlmlock_status_queue

data/app/models/concerns/foreman_dlm/dlm_facet_host_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   module DlmFacetHostExtensions
     extend ActiveSupport::Concern

data/app/models/concerns/foreman_dlm/expirable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   module Expirable
     extend ActiveSupport::Concern

data/app/models/concerns/foreman_dlm/host_extensions.rb

@@ -1,19 +1,21 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   module HostExtensions
     extend ActiveSupport::Concern
 
     included do
       has_many :dlmlocks,
-               class_name: 'ForemanDlm::Dlmlock',
-               foreign_key: 'host_id',
-               dependent: :nullify,
-               inverse_of: :host
+        class_name: 'ForemanDlm::Dlmlock',
+        foreign_key: 'host_id',
+        dependent: :nullify,
+        inverse_of: :host
 
       has_many :dlmlock_events,
-               class_name: 'ForemanDlm::DlmlockEvent',
-               foreign_key: 'host_id',
-               dependent: :destroy,
-               inverse_of: :host
+        class_name: 'ForemanDlm::DlmlockEvent',
+        foreign_key: 'host_id',
+        dependent: :destroy,
+        inverse_of: :host
 
       define_model_callbacks :lock, :only => :after
       define_model_callbacks :unlock, :only => :after

data/app/models/concerns/foreman_dlm/host_monitoring_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   module HostMonitoringExtensions
     extend ActiveSupport::Concern
@@ -31,7 +33,7 @@ module ForemanDlm
       {
         comment: _('Host acquired lock.'),
         start_time: Time.current.to_i,
-        end_time: Time.current.advance(:minutes => 180).to_i
+        end_time: Time.current.advance(:minutes => 180).to_i,
       }
     end
   end

data/app/models/concerns/foreman_dlm/user_extensions.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   module UserExtensions
     extend ActiveSupport::Concern
 
     included do
       has_many :dlmlock_events,
-               class_name: 'ForemanDlm::DlmlockEvent',
-               foreign_key: 'user_id',
-               dependent: :nullify,
-               inverse_of: :user
+        class_name: 'ForemanDlm::DlmlockEvent',
+        foreign_key: 'user_id',
+        dependent: :nullify,
+        inverse_of: :user
     end
   end
 end

data/app/models/foreman_dlm/dlm_facet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   class DlmFacet < ApplicationRecord
     include Facets::Base

data/app/models/foreman_dlm/dlmlock/update.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   class Dlmlock
     class Update < Dlmlock

data/app/models/foreman_dlm/dlmlock.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   class Dlmlock < ApplicationRecord
     include Authorizable
@@ -13,9 +15,9 @@ module ForemanDlm
     belongs_to_host
 
     has_many :dlmlock_events,
-             class_name: '::ForemanDlm::DlmlockEvent',
-             dependent: :destroy,
-             inverse_of: :dlmlock
+      class_name: '::ForemanDlm::DlmlockEvent',
+      dependent: :destroy,
+      inverse_of: :dlmlock
 
     validates :name, presence: true, uniqueness: true
 
@@ -67,7 +69,7 @@ module ForemanDlm
     def locked_by?(host)
       self.host == host
     end
-    alias acquired_by? locked_by?
+    alias_method :acquired_by?, :locked_by?
 
     def disabled?
       !enabled?
@@ -76,7 +78,7 @@ module ForemanDlm
     def locked?
       host.present?
     end
-    alias taken? locked?
+    alias_method :taken?, :locked?
 
     def humanized_type
       _('Generic Lock')
@@ -91,7 +93,7 @@ module ForemanDlm
       query = {
         id: id,
         host_id: [new_host.try(:id), old_host.try(:id)],
-        enabled: true
+        enabled: true,
       }
 
       updated = self.class.where(query).update(changes.merge(updated_at: Time.now.utc))
@@ -127,9 +129,9 @@ module ForemanDlm
       )
     end
 
-    def run_callback(h, callback)
-      h.run_callbacks callback do
-        logger.debug { "custom hook after_#{callback} on #{h} will be executed if defined." }
+    def run_callback(host, callback)
+      host.run_callbacks callback do
+        logger.debug { "custom hook after_#{callback} on #{host} will be executed if defined." }
         true
       end
     end

data/app/models/foreman_dlm/dlmlock_event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   class DlmlockEvent < ApplicationRecord
     include Authorizable

data/app/models/host_status/dlmlock_status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HostStatus
   class DlmlockStatus < Status
     OK = 0

data/app/views/api/v2/dlmlock_events/index.json.rabl

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 collection @events
 attributes :id, :event_type, :created_at, :updated_at

data/app/views/api/v2/dlmlocks/acquire.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @dlmlock
 
 extends 'api/v2/dlmlocks/main'

data/app/views/api/v2/dlmlocks/base.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @dlmlock
 
 attributes :id, :host_id, :name, :enabled, :type

data/app/views/api/v2/dlmlocks/create.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @dlmlock
 
 extends 'api/v2/dlmlocks/show'

data/app/views/api/v2/dlmlocks/index.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @dlmlocks
 
 extends 'api/v2/dlmlocks/main'

data/app/views/api/v2/dlmlocks/main.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @dlmlock
 
 extends 'api/v2/dlmlocks/base'

data/app/views/api/v2/dlmlocks/release.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @dlmlock
 
 extends 'api/v2/dlmlocks/main'

data/app/views/api/v2/dlmlocks/show.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @dlmlock
 
 extends 'api/v2/dlmlocks/main'

data/app/views/api/v2/dlmlocks/update.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @dlmlock
 
 extends 'api/v2/dlmlocks/show'

data/app/views/api/v2/errors/precondition_failed.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object controller.get_resource
 
 attributes :id

data/app/views/foreman_dlm/api/v2/dlm_facets/base.json.rabl

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 attributes :id, :last_checkin_at

data/app/views/foreman_dlm/api/v2/dlm_facets/base_with_root.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 child :dlm_facet => :dlm_facet_attributes do |_dlm_facet|
   extends 'foreman_dlm/api/v2/dlm_facets/base'
 end

data/app/views/foreman_dlm/api/v2/dlm_facets/show.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 child :dlm_facet => :dlm_facet_attributes do
   extends 'foreman_dlm/api/v2/dlm_facets/base'
 end

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   namespace :api, :defaults => { :format => 'json' } do
     scope '(:apiv)', :module => :v2,

data/db/migrate/20170824084100_add_dlmlock.foreman_dlm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddDlmlock < ActiveRecord::Migration[4.2]
   def change
     create_table :dlmlocks do |t|

data/db/migrate/20180627150003_rename_dlmlock_sti_models.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RenameDlmlockStiModels < ActiveRecord::Migration[5.1]
   def up
     execute "UPDATE dlmlocks set type='ForemanDlm::Dlmlock::Update' where type='Dlmlock::Update';"

data/db/migrate/20180704162345_add_dlmlock_events.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddDlmlockEvents < ActiveRecord::Migration[5.1]
   def change
     create_table :dlmlock_events do |t|

data/db/migrate/20180711090022_add_hosts_fk_to_dlmlocks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddHostsFkToDlmlocks < ActiveRecord::Migration[5.1]
   def change
     add_foreign_key :dlmlocks, :hosts

data/db/migrate/20180711111903_create_dlm_facets.foreman_dlm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateDlmFacets < ActiveRecord::Migration[5.1]
   def change
     create_table :dlm_facets do |t|

data/db/migrate/20180713113208_update_permissions_for_scoped_models.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UpdatePermissionsForScopedModels < ActiveRecord::Migration[5.1]
   class FakePermission < ApplicationRecord
     self.table_name = 'permissions'

data/lib/foreman_dlm/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
   class Engine < ::Rails::Engine
     engine_name 'foreman_dlm'
@@ -22,11 +24,11 @@ module ForemanDlm
         settings do
           category(:general) do
             setting('dlm_stale_time',
-                    type: :integer,
-                    default: 4,
-                    description: N_('Number of hours after which locked Distributed Lock is stale'),
-                    full_name: N_('Distributed Lock stale time'),
-                    validate: { numericality: { greater_than: 0 } })
+              type: :integer,
+              default: 4,
+              description: N_('Number of hours after which locked Distributed Lock is stale'),
+              full_name: N_('Distributed Lock stale time'),
+              validate: { numericality: { greater_than: 0 } })
           end
         end
 
@@ -34,25 +36,25 @@ module ForemanDlm
         security_block :foreman_dlm do
           permission :view_dlmlocks, {
             :'foreman_dlm/dlmlocks' => [:index, :show, :auto_complete_search],
-            :'api/v2/dlmlocks' => [:index, :show]
+            :'api/v2/dlmlocks' => [:index, :show],
           }, :resource_type => 'ForemanDlm::Dlmlock'
 
           permission :create_dlmlocks, {
-            :'api/v2/dlmlocks' => [:create]
+            :'api/v2/dlmlocks' => [:create],
           }, :resource_type => 'ForemanDlm::Dlmlock'
 
           permission :edit_dlmlocks, {
             :'foreman_dlm/dlmlocks' => [:release, :enable, :disable],
-            :'api/v2/dlmlocks' => [:update, :acquire, :release]
+            :'api/v2/dlmlocks' => [:update, :acquire, :release],
           }, :resource_type => 'ForemanDlm::Dlmlock'
 
           permission :destroy_dlmlocks, {
             :'foreman_dlm/dlmlocks' => [:destroy],
-            :'api/v2/dlmlocks' => [:destroy]
+            :'api/v2/dlmlocks' => [:destroy],
           }, :resource_type => 'ForemanDlm::Dlmlock'
 
           permission :view_dlmlock_events, {
-            :'api/v2/dlmlock_events' => [:index]
+            :'api/v2/dlmlock_events' => [:index],
           }, :resource_type => 'ForemanDlm::DlmlockEvent'
         end
 
@@ -62,14 +64,14 @@ module ForemanDlm
                                           :edit_dlmlocks,
                                           :destroy_dlmlocks,
                                           :view_dlmlock_events],
-             'Role granting full access permissions to distributed locks'
+          'Role granting full access permissions to distributed locks'
 
         # add menu entry
         menu :top_menu, :foreman_dlm_dlmlocks,
-             url_hash: { controller: :'foreman_dlm/dlmlocks', action: :index },
-             caption: N_('Distributed Locks'),
-             parent: :monitor_menu,
-             after: :audits
+          url_hash: { controller: :'foreman_dlm/dlmlocks', action: :index },
+          caption: N_('Distributed Locks'),
+          parent: :monitor_menu,
+          after: :audits
 
         # Dlm Facet
         register_facet(ForemanDlm::DlmFacet, :dlm_facet) do
@@ -81,9 +83,9 @@ module ForemanDlm
         # extend host show page
         extend_page('hosts/show') do |context|
           context.add_pagelet :main_tabs,
-                              :name => N_('Locks'),
-                              :partial => 'hosts/dlmlocks_tab',
-                              :onlyif => proc { |host| host.dlm_facet }
+            :name => N_('Locks'),
+            :partial => 'hosts/dlmlocks_tab',
+            :onlyif => proc { |host| host.dlm_facet }
         end
       end
     end

data/lib/foreman_dlm/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanDlm
-  VERSION = '2.0.0'.freeze
+  VERSION = '3.0.0'
 end

data/lib/foreman_dlm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'foreman_dlm/engine'
 
 module ForemanDlm

data/lib/tasks/dlmlock_events.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 desc <<-TASK_DESCRIPTION
  Expire lock events automatically
 

data/lib/tasks/foreman_dlm_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/testtask'
 
 # Tests
@@ -12,24 +14,4 @@ namespace :test do
   end
 end
 
-namespace :foreman_dlm do
-  task :rubocop do
-    begin
-      require 'rubocop/rake_task'
-      RuboCop::RakeTask.new(:rubocop_foreman_dlm) do |task|
-        task.patterns = ["#{ForemanDlm::Engine.root}/app/**/*.rb",
-                         "#{ForemanDlm::Engine.root}/lib/**/*.rb",
-                         "#{ForemanDlm::Engine.root}/test/**/*.rb"]
-      end
-    rescue StandardError
-      puts 'Rubocop not loaded.'
-    end
-
-    Rake::Task['rubocop_foreman_dlm'].invoke
-  end
-end
-
 Rake::Task[:test].enhance ['test:foreman_dlm']
-
-load 'tasks/jenkins.rake'
-Rake::Task['jenkins:unit'].enhance ['test:foreman_dlm', 'foreman_dlm:rubocop'] if Rake::Task.task_defined?(:'jenkins:unit')

data/locale/gemspec.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 # Matches foreman_dlm.gemspec
-_('TODO: Description of ForemanDlm.')
+_('Adds a Distributed Lock Manager to Foreman. This enables painless system updates for clusters.')

data/test/controllers/api/v2/dlmlocks_controller_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class Api::V2::DlmlocksControllerTest < ActionController::TestCase
@@ -33,7 +35,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         assert dlmlock
         assert_equal valid_attrs['name'], dlmlock.name
         assert_equal valid_attrs['type'], dlmlock.type
-        assert_equal true, dlmlock.enabled
+        assert dlmlock.enabled
         assert_nil dlmlock.host
       end
     end
@@ -47,7 +49,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         assert_not_empty body
         assert_equal dlmlock.name, body['name']
         assert_equal dlmlock.type, body['type']
-        assert_equal true, body['enabled']
+        assert body['enabled']
         assert_equal host1.id, body['host_id']
       end
 
@@ -59,7 +61,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         assert_not_empty body
         assert_equal dlmlock.name, body['name']
         assert_equal dlmlock.type, body['type']
-        assert_equal false, body['enabled']
+        assert_not body['enabled']
         assert_nil body['host_id']
       end
 
@@ -91,7 +93,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         dlmlock.reload
         assert_equal valid_attrs['name'], dlmlock.name
         assert_equal valid_attrs['type'], dlmlock.type
-        assert_equal false, dlmlock.enabled
+        assert_not dlmlock.enabled
         assert_equal host1.id, dlmlock.host_id
       end
     end
@@ -181,7 +183,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         assert_not_empty body
         assert_equal dlmlock.name, body['name']
         assert_equal dlmlock.type, body['type']
-        assert_equal true, body['enabled']
+        assert body['enabled']
         assert_nil body['host_id']
         assert_nil body['host']
       end
@@ -194,12 +196,12 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         assert_not_empty body
         assert_equal dlmlock.name, body['name']
         assert_equal dlmlock.type, body['type']
-        assert_equal true, body['enabled']
+        assert body['enabled']
         assert_equal host1.id, body['host_id']
         host = body['host']
         assert host
         assert_equal host1.name, host['name']
-        assert_equal true, host['self']
+        assert host['self']
       end
 
       test 'should show individual acquired lock by other' do
@@ -210,12 +212,12 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         assert_not_empty body
         assert_equal dlmlock.name, body['name']
         assert_equal dlmlock.type, body['type']
-        assert_equal true, body['enabled']
+        assert body['enabled']
         assert_equal host2.id, body['host_id']
         host = body['host']
         assert host
         assert_equal host2.name, host['name']
-        assert_equal false, host['self']
+        assert_not host['self']
       end
 
       test 'should update checkin time' do
@@ -378,7 +380,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
   def valid_attrs
     {
       'name' => 'testlock',
-      'type' => 'ForemanDlm::Dlmlock::Update'
+      'type' => 'ForemanDlm::Dlmlock::Update',
     }
   end
 

data/test/controllers/api/v2/dlmlocks_dlmlock_events_controller_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class Api::V2::DlmlockEventsControllerTest < ActionController::TestCase

data/test/controllers/api/v2/hosts_controller_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class Api::V2::HostsControllerTest < ActionController::TestCase

data/test/controllers/find_host_by_client_cert_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class FindHostByClientCertTest < ActionController::TestCase
@@ -62,7 +64,7 @@ class FindHostByClientCertTest < ActionController::TestCase
 
         get :index
 
-        assert_equal false, @controller.send(:require_client_cert_or_login)
+        assert_not @controller.send(:require_client_cert_or_login)
         assert_nil @controller.detected_host
       end
 
@@ -73,7 +75,7 @@ class FindHostByClientCertTest < ActionController::TestCase
 
         get :index
 
-        assert_equal false, @controller.send(:require_client_cert_or_login)
+        assert_not @controller.send(:require_client_cert_or_login)
         assert_nil @controller.detected_host
       end
 
@@ -83,7 +85,7 @@ class FindHostByClientCertTest < ActionController::TestCase
 
         get :index
 
-        assert_equal false, @controller.send(:require_client_cert_or_login)
+        assert_not @controller.send(:require_client_cert_or_login)
         assert_nil @controller.detected_host
       end
     end

data/test/controllers/foreman_dlm/dlmlocks_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 module ForemanDlm

data/test/controllers/hosts_controller_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class HostsControllerTest < ActionController::TestCase
@@ -7,6 +9,6 @@ class HostsControllerTest < ActionController::TestCase
     FactoryBot.create_list(:dlmlock, 2, host: host)
     get :show, params: { :id => host.to_param }, session: set_session_user
     assert_response :success
-    assert @response.body.match(/id='pagelet-id-locks'/)
+    assert_match(/id='pagelet-id-locks'/, @response.body)
   end
 end

data/test/factories/dlm_facets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :dlm_facet, class: 'ForemanDlm::DlmFacet' do
     sequence(:last_checkin_at) { |n| n.minutes.ago }

data/test/factories/dlmlock.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :dlmlock, class: ::ForemanDlm::Dlmlock::Update do
     sequence(:name) { |n| "Lock #{n}" }

data/test/factories/dlmlock_events.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :dlmlock_event, class: ::ForemanDlm::DlmlockEvent do
     dlmlock

data/test/factories/host.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.modify do
   factory :host do
     trait :with_dlm_facet do

data/test/integration/foreman_dlm/dlmlocks_test.rb

@@ -14,15 +14,16 @@ class DlmlocksTest < IntegrationTestWithJavascript
   end
 
   test 'the search bar has autocomplete' do
-    skip if Gem::Version.new(Foreman::Version.new.notag) < Gem::Version.new('1.20')
     FactoryBot.create_list(:dlmlock, 10)
 
     visit foreman_dlm_dlmlocks_path
 
-    search_bar = page.first('#search-bar')
+    search_bar = page.first('.foreman-search-bar')
     search_bar.first('input').set('ho')
 
-    list = search_bar.find_all('a.dropdown-item').map(&:text)
+    autocomplete_list = page.first('div[data-ouia-component-id="search-autocomplete-menu"]')
+    list = autocomplete_list.find_all('span.pf-c-menu__item-text').map(&:text)
+
     assert_includes list, 'host'
   end
 end

data/test/jobs/refresh_dlmlock_status_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class RefreshDlmlockStatusTest < ActiveJob::TestCase

data/test/models/foreman_dlm/dlm_facet_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 module ForemanDlm

data/test/models/foreman_dlm/dlmlock_event_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 module ForemanDlm

data/test/models/foreman_dlm/dlmlock_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 module ForemanDlm
@@ -45,10 +47,10 @@ module ForemanDlm
       let(:dlmlock) { FactoryBot.create(:dlmlock) }
 
       test 'should be enabled and unlocked' do
-        assert_equal true, dlmlock.enabled?
-        assert_equal false, dlmlock.disabled?
-        assert_equal false, dlmlock.locked?
-        assert_equal false, dlmlock.taken?
+        assert dlmlock.enabled?
+        assert_not dlmlock.disabled?
+        assert_not dlmlock.locked?
+        assert_not dlmlock.taken?
       end
 
       test 'can be acquired' do
@@ -100,21 +102,21 @@ module ForemanDlm
       let(:dlmlock) { FactoryBot.create(:dlmlock, :enabled => false) }
 
       test 'should be disabled and unlocked' do
-        assert_equal false, dlmlock.enabled?
-        assert_equal true, dlmlock.disabled?
-        assert_equal false, dlmlock.locked?
-        assert_equal false, dlmlock.taken?
+        assert_not dlmlock.enabled?
+        assert dlmlock.disabled?
+        assert_not dlmlock.locked?
+        assert_not dlmlock.taken?
       end
 
       test 'can not be acquired' do
         assert_nil dlmlock.host
-        assert_equal false, dlmlock.acquire!(host1)
+        assert_not dlmlock.acquire!(host1)
         assert_nil dlmlock.reload.host
       end
 
       test 'can not be released' do
         assert_nil dlmlock.host
-        assert_equal false, dlmlock.release!(host1)
+        assert_not dlmlock.release!(host1)
         assert_nil dlmlock.reload.host
       end
 
@@ -122,8 +124,8 @@ module ForemanDlm
         host = HostWithCallbacks.new
         host.name = 'test.example.com'
         host.save
-        assert_equal false, dlmlock.release!(host)
-        assert_equal [], host.callbacks
+        assert_not dlmlock.release!(host)
+        assert_empty host.callbacks
       end
     end
 
@@ -131,12 +133,12 @@ module ForemanDlm
       let(:dlmlock) { FactoryBot.create(:dlmlock, :host => host1) }
 
       test 'should be enabled and locked' do
-        assert_equal true, dlmlock.enabled?
-        assert_equal false, dlmlock.disabled?
-        assert_equal true, dlmlock.locked?
-        assert_equal true, dlmlock.taken?
-        assert_equal true, dlmlock.locked_by?(host1)
-        assert_equal true, dlmlock.acquired_by?(host1)
+        assert dlmlock.enabled?
+        assert_not dlmlock.disabled?
+        assert dlmlock.locked?
+        assert dlmlock.taken?
+        assert dlmlock.locked_by?(host1)
+        assert dlmlock.acquired_by?(host1)
       end
 
       test 'can be acquired by owner' do
@@ -147,7 +149,7 @@ module ForemanDlm
 
       test 'can not be acquired by other host' do
         assert_equal host1, dlmlock.host
-        assert_equal false, dlmlock.acquire!(host2)
+        assert_not dlmlock.acquire!(host2)
         assert_equal host1, dlmlock.reload.host
       end
 
@@ -159,7 +161,7 @@ module ForemanDlm
 
       test 'can not be released by other host' do
         assert_equal host1, dlmlock.host
-        assert_equal false, dlmlock.release!(host2)
+        assert_not dlmlock.release!(host2)
         assert_equal host1, dlmlock.reload.host
       end
 
@@ -196,16 +198,16 @@ module ForemanDlm
         assert host1_with_callbacks
         assert host2_with_callbacks
         dlmlock.update(:host => host1_with_callbacks)
-        assert_equal false, dlmlock.release!(host2_with_callbacks)
-        assert_equal [], host1_with_callbacks.callbacks
-        assert_equal [], host2_with_callbacks.callbacks
+        assert_not dlmlock.release!(host2_with_callbacks)
+        assert_empty host1_with_callbacks.callbacks
+        assert_empty host2_with_callbacks.callbacks
       end
 
       test 'triggers no callbacks on acquiry attempt by owner' do
         assert host1_with_callbacks
         dlmlock.update(:host => host1_with_callbacks)
         assert dlmlock.acquire!(host1_with_callbacks)
-        assert_equal [], host1_with_callbacks.callbacks
+        assert_empty host1_with_callbacks.callbacks
       end
     end
 

data/test/models/host_managed_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 module Host

data/test/models/host_monitoring_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class HostMonitoringTest < ActiveSupport::TestCase

data/test/models/host_status/dlmlock_status_test.rb

@@ -32,14 +32,14 @@ class DlmlockStatusTest < ActiveSupport::TestCase
       status = host.get_status(HostStatus::DlmlockStatus)
 
       assert_not_empty host.dlmlocks
-      assert_equal true, status.relevant?
+      assert status.relevant?
     end
 
     test 'should return false if host has no dlmlocks' do
       status = host.get_status(HostStatus::DlmlockStatus)
 
       assert_empty host.dlmlocks
-      assert_equal false, status.relevant?
+      assert_not status.relevant?
     end
   end
 end

data/test/models/user_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class UserTest < ActiveSupport::TestCase

data/test/test_plugin_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This calls the main test_helper in Foreman-core
 require 'test_helper'
 

data/test/unit/foreman_dlm/access_permissions_test.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+require 'unit/shared/access_permissions_test_base'
+
+# Permissions are added in AccessPermissions with lists of controllers and
+# actions that they enable access to.  For non-admin users, we need to test
+# that there are permissions available that cover every controller action, else
+# it can't be delegated and this will lead to parts of the application that
+# aren't functional for non-admin users.
+#
+# In particular, it's important that actions for AJAX requests are added to
+# an appropriate permission so views using those requests function.
+class AccessPermissionsTest < ActiveSupport::TestCase
+  include AccessPermissionsTestBase
+
+  check_routes(ForemanDlm::Engine.routes, [])
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_dlm
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -25,47 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: theforeman-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 0.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.13.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.9.1
+        version: 0.1.2
 description: Adds a Distributed Lock Manager to Foreman. This enables painless system
   updates for clusters.
 email:
@@ -154,6 +126,7 @@ files:
 - test/models/host_status/dlmlock_status_test.rb
 - test/models/user_test.rb
 - test/test_plugin_helper.rb
+- test/unit/foreman_dlm/access_permissions_test.rb
 homepage: https://github.com/dm-drogeriemarkt/foreman_dlm
 licenses:
 - GPL-3.0
@@ -168,14 +141,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Distributed Lock Manager for Foreman.
@@ -200,3 +176,4 @@ test_files:
 - test/models/host_status/dlmlock_status_test.rb
 - test/models/user_test.rb
 - test/test_plugin_helper.rb
+- test/unit/foreman_dlm/access_permissions_test.rb