foreman_dlm 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d01a9afd6f4e70cd4d05bc1691faa86144c463cb69a46a20af4ce7365f7df66
-  data.tar.gz: 6d1a4884600efc752622be4452aa9ac694f57eaa70c3cbb27d6d6dd16d2c03fa
+  metadata.gz: a0b972d0b154b81592615546f153d32893af3647364ea66f1e0ab5826884f02e
+  data.tar.gz: 38ee0b23847863b293adaed2e15c9dcdb6883eec9b512d3c308ae0f7dee88615
 SHA512:
-  metadata.gz: 834f7277d2779b95cef01c64a15a146f3c5c2ead8f2d808914d2b9b248d4f7b6702581a4b460994b9df0c46cc80b5a62d30f62969d3d91a7cb8cf407d963bec0
-  data.tar.gz: 384039584a5bb43567a14ec986db25a7295df791f5293b2809485063f096ba92bfc894350becfa5c1dc18022e29b3036b455ad295a07f82979b87e98d848403b
+  metadata.gz: 15549c3c5366a7217fb5ed65f87528f711527698e2a6ecdcefe7330a9e3a02d34a2f4c04fb5400632ab4a79ffab503d75dfbdc9d364d351b8d68e1e443c6dc81
+  data.tar.gz: 5f5036aa09ed8ff7e72313352c1bc83a3e8eba76448524305cb4bfda5a49c05c119a080b0168a16a296bbe9ddc1d49b9397c08b0e124ca397ad3ecf4a79fe9b1

data/README.md

@@ -10,7 +10,8 @@ With this plugin servers can acquire a lock in Foreman to ensure only one server
 
 | Foreman Version | Plugin Version |
 | --------------- | -------------- |
-| >= 1.15         | any            |
+| >= 1.15         | ~> 0.1         |
+| >= 1.17         | ~> 1.0         |
 
 ## Installation
 

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

@@ -45,7 +45,7 @@ module Api
         process_response @dlmlock.save
       end
 
-      api :PUT, "/dlmlocks/:id/", N_("Update a DLM lock")
+      api :PUT, '/dlmlocks/:id/', N_('Update a DLM lock')
       param :id, String, :required => true, :desc => N_('Id or name of the DLM lock')
       param_group :dlmlock
 
@@ -64,14 +64,14 @@ module Api
       param :id, String, :required => true, :desc => N_('Id or name of the DLM lock')
       error 200, 'Lock acquired successfully.'
       error 412, 'Lock could not be acquired.'
-      description <<-EOS
+      description <<-DOCS
         == Acquire a lock
         This action acquires a lock.
         It fails, if the lock is currently taken by another host.
 
         == Authentication & Host Identification
         The host is authenticated via a client certificate and identified via the CN of that certificate.
-        EOS
+        DOCS
 
       def acquire
         process_lock_response @dlmlock.acquire!(@host)
@@ -82,14 +82,14 @@ module Api
       error 200, 'Lock released successfully.'
       error 412, 'Lock could not be released.'
 
-      description <<-EOS
+      description <<-DOCS
         == Release a lock
          This action releases a lock.
          It fails, if the lock is currently taken by another host.
 
         == Authentication & Host Identification
          The host is authenticated via a client certificate and identified via the CN of that certificate.
-        EOS
+        DOCS
 
       def release
         process_lock_response @dlmlock.release!(@host)
@@ -113,10 +113,10 @@ module Api
 
       def action_permission
         case params[:action]
-          when 'release', 'acquire'
-            :edit
-          else
-            super
+        when 'release', 'acquire'
+          :edit
+        else
+          super
         end
       end
 
@@ -125,9 +125,17 @@ module Api
         unless @host
           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.' }
+            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.'
+                         }
           else
-            render_error 'unauthorized', :status => :unauthorized, :locals => { :user_login => get_client_cert_hostname }
+            render_error 'unauthorized',
+                         :status => :unauthorized,
+                         :locals => {
+                           :user_login => get_client_cert_hostname
+                         }
           end
         end
         true
@@ -148,7 +156,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_dlm/find_host_by_client_cert.rb

@@ -3,7 +3,7 @@ module ForemanDlm
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def authorize_host_by_client_cert(actions, options = {})
+      def authorize_host_by_client_cert(actions, _options = {})
         skip_before_action :require_login, :only => actions, :raise => false
         skip_before_action :authorize, :only => actions
         skip_before_action :verify_authenticity_token, :only => actions
@@ -39,8 +39,8 @@ module ForemanDlm
 
       return unless hostname
 
-      host ||= Host::Base.find_by_certname(hostname) ||
-      Host::Base.find_by_name(hostname)
+      host ||= Host::Base.find_by(certname: hostname) ||
+               Host::Base.find_by(name: hostname)
       logger.info { "Found Host #{host} by client cert #{hostname}" } if host
       host
     end
@@ -53,9 +53,9 @@ module ForemanDlm
       end
 
       dn = request.env[Setting[:ssl_client_dn_env]]
-      return unless (dn && dn =~ /CN=([^\s\/,]+)/i)
+      return unless dn && dn =~ /CN=([^\s\/,]+)/i
 
-      hostname = $1.downcase
+      hostname = Regexp.last_match(1).downcase
       logger.debug "Extracted hostname '#{hostname}' from client certificate."
       hostname
     end

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

@@ -3,7 +3,7 @@ module ForemanDlm
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def authorize_host_by_ip(actions, options = {})
+      def authorize_host_by_ip(actions, _options = {})
         skip_before_action :require_login, :only => actions, :raise => false
         skip_before_action :authorize, :only => actions
         skip_before_action :verify_authenticity_token, :only => actions

data/app/controllers/dlmlocks_controller.rb

@@ -8,6 +8,5 @@ class DlmlocksController < ::ApplicationController
     @dlmlocks = resource_base_search_and_page(:host)
   end
 
-  def show
-  end
+  def show; end
 end

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

@@ -4,8 +4,9 @@ module ForemanDlm
 
     included do
       has_many :dlmlocks,
-        foreign_key: 'host_id',
-        dependent: :nullify
+               foreign_key: 'host_id',
+               dependent: :nullify,
+               inverse_of: :host
 
       define_model_callbacks :lock, :only => :after
       define_model_callbacks :unlock, :only => :after

data/app/models/dlmlock.rb

@@ -1,4 +1,4 @@
-class Dlmlock < ActiveRecord::Base
+class Dlmlock < ApplicationRecord
   include Authorizable
 
   def self.humanize_class_name
@@ -28,7 +28,7 @@ class Dlmlock < ActiveRecord::Base
   def locked_by?(host)
     self.host == host
   end
-  alias_method :acquired_by?, :locked_by?
+  alias acquired_by? locked_by?
 
   def disabled?
     !enabled?
@@ -37,7 +37,7 @@ class Dlmlock < ActiveRecord::Base
   def locked?
     host.present?
   end
-  alias_method :taken?, :locked?
+  alias taken? locked?
 
   def humanized_type
     _('Generic Lock')
@@ -54,7 +54,7 @@ class Dlmlock < ActiveRecord::Base
       id: id,
       host_id: [new_host.try(:id), old_host.try(:id)],
       enabled: true
-    ).update_all(changes.merge(updated_at: DateTime.now))
+    ).update_all(changes.merge(updated_at: Time.now.utc))
     if num_updated > 0
       reload
       process_host_change(old_host, new_host, changes)

data/app/models/dlmlock/update.rb

@@ -1,5 +1,7 @@
-class Dlmlock::Update < Dlmlock
-  def humanized_type
-    _('Update Lock')
+class Dlmlock
+  class Update < Dlmlock
+    def humanized_type
+      _('Update Lock')
+    end
   end
 end

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

@@ -3,6 +3,6 @@ object @dlmlock
 extends 'api/v2/dlmlocks/main'
 
 child :host do
-  node(:name) { |host| host.name }
+  node(:name, &:name)
   node(:self) { |host| host == @detected_host } if @detected_host
 end

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

@@ -1,4 +1,4 @@
-object resource = controller.get_resource
+object controller.get_resource
 
 attributes :id
 

data/config/routes.rb

@@ -1,18 +1,18 @@
 Rails.application.routes.draw do
   namespace :api, :defaults => { :format => 'json' } do
     scope '(:apiv)', :module => :v2,
-      :defaults => { :apiv => 'v2' },
-      :apiv => /v1|v2/,
-      :constraints => ApiConstraints.new(:version => 2, :default => true) do
-        constraints(id: /[^\/]+/) do
-          resources :dlmlocks, only: [:index, :show, :update, :destroy] do
-            get :lock, on: :member, action: :show, controller: 'dlmlocks'
-            put :lock, on: :member, action: :acquire, controller: 'dlmlocks'
-            delete :lock, on: :member, action: :release, controller: 'dlmlocks'
-          end
+                     :defaults => { :apiv => 'v2' },
+                     :apiv => /v1|v2/,
+                     :constraints => ApiConstraints.new(:version => 2, :default => true) do
+      constraints(id: /[^\/]+/) do
+        resources :dlmlocks, only: [:index, :show, :update, :destroy] do
+          get :lock, on: :member, action: :show, controller: 'dlmlocks'
+          put :lock, on: :member, action: :acquire, controller: 'dlmlocks'
+          delete :lock, on: :member, action: :release, controller: 'dlmlocks'
         end
-        resources :dlmlocks, only: [:create]
       end
+      resources :dlmlocks, only: [:create]
+    end
   end
 
   scope '/foreman_dlm' do

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

@@ -1,4 +1,4 @@
-class AddDlmlock < ActiveRecord::Migration
+class AddDlmlock < ActiveRecord::Migration[4.2]
   def change
     create_table :dlmlocks do |t|
       t.string :name, null: false, unique: true

data/lib/foreman_dlm/engine.rb

@@ -14,7 +14,7 @@ module ForemanDlm
 
     initializer 'foreman_dlm.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_dlm do
-        requires_foreman '>= 1.15'
+        requires_foreman '>= 1.17'
 
         apipie_documented_controllers ["#{ForemanDlm::Engine.root}/app/controllers/api/v2/*.rb"]
 
@@ -43,7 +43,7 @@ module ForemanDlm
 
         # add menu entry
         menu :top_menu, :distributed_locks,
-             url_hash: { controller: :'dlmlocks', action: :index },
+             url_hash: { controller: :dlmlocks, action: :index },
              caption: N_('Distributed Locks'),
              parent: :monitor_menu,
              after: :audits
@@ -55,10 +55,8 @@ module ForemanDlm
       begin
         Host::Managed.send(:include, ForemanDlm::HostExtensions)
 
-        if ForemanDlm.with_monitoring?
-          Host::Managed.send(:include, ForemanDlm::HostMonitoringExtensions)
-        end
-      rescue => e
+        Host::Managed.send(:include, ForemanDlm::HostMonitoringExtensions) if ForemanDlm.with_monitoring?
+      rescue StandardError => e
         Rails.logger.warn "ForemanDlm: skipping engine hook (#{e})"
       end
     end
@@ -71,6 +69,9 @@ module ForemanDlm
   end
 
   def self.with_monitoring?
-    (ForemanMonitoring rescue false) ? true : false
+    ForemanMonitoring # rubocop:disable Lint/Void
+    true
+  rescue StandardError
+    false
   end
 end

data/lib/foreman_dlm/version.rb

@@ -1,3 +1,3 @@
 module ForemanDlm
-  VERSION = '0.1.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/tasks/foreman_dlm_tasks.rake

@@ -21,7 +21,7 @@ namespace :foreman_dlm do
                          "#{ForemanDlm::Engine.root}/lib/**/*.rb",
                          "#{ForemanDlm::Engine.root}/test/**/*.rb"]
       end
-    rescue
+    rescue StandardError
       puts 'Rubocop not loaded.'
     end
 
@@ -32,6 +32,4 @@ end
 Rake::Task[:test].enhance ['test:foreman_dlm']
 
 load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task['jenkins:unit'].enhance ['test:foreman_dlm', 'foreman_dlm:rubocop']
-end
+Rake::Task['jenkins:unit'].enhance ['test:foreman_dlm', 'foreman_dlm:rubocop'] if Rake::Task.task_defined?(:'jenkins:unit')

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

@@ -13,7 +13,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         body = ActiveSupport::JSON.decode(@response.body)
         results = body['results']
         assert results
-        entry = results.detect { |entry| entry['id'] == dlmlock.id }
+        entry = results.detect { |e| e['id'] == dlmlock.id }
         assert entry
         assert_equal dlmlock.name, entry['name']
         assert_equal dlmlock.type, entry['type']
@@ -25,7 +25,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#create' do
       test 'should create dlmlock' do
         assert_difference('Dlmlock.unscoped.count') do
-          post :create, valid_attrs_with_root
+          post :create, params: valid_attrs_with_root
         end
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
@@ -41,7 +41,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#show' do
       test 'should show individual record with host' do
         dlmlock = FactoryBot.create(:dlmlock, :host => host1)
-        get :show, { :id => dlmlock.to_param }
+        get :show, params: { :id => dlmlock.to_param }
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
         refute_empty body
@@ -53,7 +53,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
 
       test 'should show individual record that is disabled' do
         dlmlock = FactoryBot.create(:dlmlock, :enabled => false)
-        get :show, { :id => dlmlock.to_param }
+        get :show, params: { :id => dlmlock.to_param }
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
         refute_empty body
@@ -65,7 +65,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
 
       test 'should show individual record by name' do
         dlmlock = FactoryBot.create(:dlmlock, :host => host1)
-        get :show, { :id => dlmlock.name }
+        get :show, params: { :id => dlmlock.name }
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
         refute_empty body
@@ -74,11 +74,11 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         host = body['host']
         assert host
         assert_equal host1.name, host['name']
-        refute host.has_key?('self')
+        refute host.key?('self')
       end
 
       test 'should not find dlmlock with invalid id' do
-        get :show, { :id => 9999999 }
+        get :show, params: { :id => 9_999_999 }
         assert_response :not_found
       end
     end
@@ -86,7 +86,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#update' do
       test 'should update dlmlock' do
         dlmlock = FactoryBot.create(:dlmlock)
-        put :update, { :id => dlmlock.to_param, :dlmlock => valid_attrs.merge(:host_id => host1.id, :enabled => false) }
+        put :update, params: { :id => dlmlock.to_param, :dlmlock => valid_attrs.merge(:host_id => host1.id, :enabled => false) }
         assert_response :success
         dlmlock.reload
         assert_equal valid_attrs['name'], dlmlock.name
@@ -100,7 +100,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
       test 'should destroy dlmlock' do
         dlmlock = FactoryBot.create(:dlmlock)
         assert_difference('Dlmlock.unscoped.count', -1) do
-          delete :destroy, { :id => dlmlock.to_param }
+          delete :destroy, params: { :id => dlmlock.to_param }
         end
         assert_response :success
         assert_equal 0, Dlmlock.where(:id => dlmlock.id).count
@@ -110,7 +110,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#acquire' do
       test 'should deny access' do
         dlmlock = FactoryBot.create(:dlmlock)
-        put :acquire, { :id => dlmlock.to_param }
+        put :acquire, params: { :id => dlmlock.to_param }
         assert_response :forbidden
         assert_nil dlmlock.reload.host
       end
@@ -119,7 +119,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#release' do
       test 'should deny access' do
         dlmlock = FactoryBot.create(:dlmlock, :host => host2)
-        delete :release, { :id => dlmlock.to_param }
+        delete :release, params: { :id => dlmlock.to_param }
         assert_response :forbidden
         assert_equal host2, dlmlock.reload.host
       end
@@ -142,15 +142,15 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#index' do
       test 'should deny access' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        get :index, { :id => dlmlock.to_param }
+        get :index, params: { :id => dlmlock.to_param }
         assert_response :unauthorized
       end
     end
 
     context '#create' do
       test 'should deny access' do
-        dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        post :create, valid_attrs_with_root
+        as_admin { FactoryBot.create(:dlmlock) }
+        post :create, params: valid_attrs_with_root
         assert_response :unauthorized
       end
     end
@@ -158,7 +158,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#update' do
       test 'should deny access' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        put :update, { :id => dlmlock.to_param, :dlmlock => valid_attrs }
+        put :update, params: { :id => dlmlock.to_param, :dlmlock => valid_attrs }
         assert_response :unauthorized
       end
     end
@@ -166,7 +166,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#destroy' do
       test 'should deny access' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        delete :destroy, { :id => dlmlock.to_param }
+        delete :destroy, params: { :id => dlmlock.to_param }
         assert_response :unauthorized
         assert_equal 1, as_admin { Dlmlock.where(:id => dlmlock.id).count }
       end
@@ -175,7 +175,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#show' do
       test 'should show individual free lock' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        get :show, { :id => dlmlock.to_param }
+        get :show, params: { :id => dlmlock.to_param }
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
         refute_empty body
@@ -188,7 +188,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
 
       test 'should show individual acquired lock by me' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock, :host => host1) }
-        get :show, { :id => dlmlock.to_param }
+        get :show, params: { :id => dlmlock.to_param }
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
         refute_empty body
@@ -204,7 +204,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
 
       test 'should show individual acquired lock by other' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock, :host => host2) }
-        get :show, { :id => dlmlock.to_param }
+        get :show, params: { :id => dlmlock.to_param }
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
         refute_empty body
@@ -222,21 +222,21 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#acquire' do
       test 'should acquire empty dlmlock' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        put :acquire, { :id => dlmlock.to_param }
+        put :acquire, params: { :id => dlmlock.to_param }
         assert_response :success
         assert_equal host1, as_admin { dlmlock.reload.host }
       end
 
       test 'should acquire own dlmlock' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock, :host => host1) }
-        put :acquire, { :id => dlmlock.to_param }
+        put :acquire, params: { :id => dlmlock.to_param }
         assert_response :success
         assert_equal host1, as_admin { dlmlock.reload.host }
       end
 
       test 'should not acquire foreign dlmlock' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock, :host => host2) }
-        put :acquire, { :id => dlmlock.to_param }
+        put :acquire, params: { :id => dlmlock.to_param }
         assert_response :precondition_failed
         assert_equal host2, as_admin { dlmlock.reload.host }
       end
@@ -244,7 +244,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
       test 'should transparently create non-existing dlmlock' do
         lockname = 'Test Lock'
         assert_equal 0, as_admin { Dlmlock.where(:name => lockname).count }
-        put :acquire, { :id => lockname }
+        put :acquire, params: { :id => lockname }
         assert_response :success
         dlmlock = as_admin { Dlmlock.find_by(:name => lockname) }
         assert_equal lockname, dlmlock.name
@@ -255,21 +255,21 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#release' do
       test 'should release empty dlmlock' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        delete :release, { :id => dlmlock.to_param }
+        delete :release, params: { :id => dlmlock.to_param }
         assert_response :success
         assert_nil as_admin { dlmlock.reload.host }
       end
 
       test 'should release own dlmlock' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock, :host => host1) }
-        delete :release, { :id => dlmlock.to_param }
+        delete :release, params: { :id => dlmlock.to_param }
         assert_response :success
         assert_nil as_admin { dlmlock.reload.host }
       end
 
       test 'should not acquire foreign dlmlock' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock, :host => host2) }
-        delete :release, { :id => dlmlock.to_param }
+        delete :release, params: { :id => dlmlock.to_param }
         assert_response :precondition_failed
         assert_equal host2, as_admin { dlmlock.reload.host }
       end
@@ -277,7 +277,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
       test 'should transparently create non-existing dlmlock' do
         lockname = 'Test Lock'
         assert_equal 0, as_admin { Dlmlock.where(:name => lockname).count }
-        delete :release, { :id => lockname }
+        delete :release, params: { :id => lockname }
         assert_response :success
         dlmlock = as_admin { Dlmlock.find_by(:name => lockname) }
         assert_equal lockname, dlmlock.name
@@ -295,7 +295,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#index' do
       test 'should deny access' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        get :index, { :id => dlmlock.to_param }
+        get :index, params: { :id => dlmlock.to_param }
         assert_response :unauthorized
       end
     end
@@ -303,15 +303,15 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#show' do
       test 'should deny access' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        get :show, { :id => dlmlock.to_param }
+        get :show, params: { :id => dlmlock.to_param }
         assert_response :unauthorized
       end
     end
 
     context '#create' do
       test 'should deny access' do
-        dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        post :create, valid_attrs_with_root
+        as_admin { FactoryBot.create(:dlmlock) }
+        post :create, params: valid_attrs_with_root
         assert_response :unauthorized
       end
     end
@@ -319,7 +319,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#update' do
       test 'should deny access' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        put :update, { :id => dlmlock.to_param, :dlmlock => valid_attrs }
+        put :update, params: { :id => dlmlock.to_param, :dlmlock => valid_attrs }
         assert_response :unauthorized
       end
     end
@@ -327,7 +327,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#destroy' do
       test 'should deny access' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        delete :destroy, { :id => dlmlock.to_param }
+        delete :destroy, params: { :id => dlmlock.to_param }
         assert_response :unauthorized
         assert_equal 1, as_admin { Dlmlock.where(:id => dlmlock.id).count }
       end
@@ -336,7 +336,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#acquire' do
       test 'should deny access' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        put :acquire, { :id => dlmlock.to_param }
+        put :acquire, params: { :id => dlmlock.to_param }
         assert_response :unauthorized
         assert_nil as_admin { dlmlock.reload.host }
       end
@@ -345,7 +345,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
     context '#release' do
       test 'should deny access' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock, :host => host2) }
-        delete :release, { :id => dlmlock.to_param }
+        delete :release, params: { :id => dlmlock.to_param }
         assert_response :unauthorized
         assert_equal host2, as_admin { dlmlock.reload.host }
       end

data/test/controllers/dlmlocks_test.rb

@@ -3,21 +3,21 @@ require 'test_plugin_helper'
 class DlmlocksControllerTest < ActionController::TestCase
   test '#index' do
     FactoryBot.create(:dlmlock)
-    get :index, {}, set_session_user
+    get :index, session: set_session_user
     assert_response :success
     assert_not_nil assigns('dlmlocks')
     assert_template 'index'
   end
 
   test '#index with no lock shows welcome page' do
-    get :index, {}, set_session_user
+    get :index, session: set_session_user
     assert_response :success
     assert_template 'welcome'
   end
 
   test '#show' do
     dlmlock = FactoryBot.create(:dlmlock)
-    get :show, { :id => dlmlock.id }, set_session_user
+    get :show, params: { :id => dlmlock.id }, session: set_session_user
     assert_response :success
     assert_template 'show'
   end

data/test/controllers/find_host_by_client_cert_test.rb

@@ -1,7 +1,7 @@
 require 'test_plugin_helper'
 
 class FindHostByClientCertTest < ActionController::TestCase
-  tests "api/v2/dlmlocks"
+  tests 'api/v2/dlmlocks'
 
   def described_class
     Api::V2::DlmlocksController
@@ -57,7 +57,7 @@ class FindHostByClientCertTest < ActionController::TestCase
 
       test 'certificate with unknown dn denies access' do
         @request.env['HTTPS'] = 'on'
-        @request.env['SSL_CLIENT_S_DN'] = "CN=doesnotexist.example.com,DN=example,DN=com"
+        @request.env['SSL_CLIENT_S_DN'] = 'CN=doesnotexist.example.com,DN=example,DN=com'
         @request.env['SSL_CLIENT_VERIFY'] = 'SUCCESS'
 
         get :index

data/test/models/dlmlock_test.rb

@@ -60,16 +60,16 @@ class DlmlockTest < ActiveSupport::TestCase
     end
 
     test 'records audit change on acquisition by owner' do
-      assert_difference "Audit.where(auditable_type: 'Dlmlock').count" do
+      assert_difference "Audit.where(auditable_type: 'Dlmlock', action: 'update').count" do
         assert dlmlock.acquire!(host1)
       end
       audit_record = dlmlock.audits.last
       assert_equal 'update', audit_record.action
-      assert_equal({:host_id => host1.id}, audit_record.audited_changes)
+      assert_equal({ :host_id => host1.id }, audit_record.audited_changes)
     end
 
     test 'records no audit change on release' do
-      assert_no_difference "Audit.where(auditable_type: 'Dlmlock').count" do
+      assert_no_difference "Audit.where(auditable_type: 'Dlmlock', action: 'update').count" do
         assert dlmlock.release!(host1)
       end
     end
@@ -115,7 +115,7 @@ class DlmlockTest < ActiveSupport::TestCase
   end
 
   context 'an acquired DLM lock' do
-   let(:dlmlock) { FactoryBot.create(:dlmlock, :host => host1) }
+    let(:dlmlock) { FactoryBot.create(:dlmlock, :host => host1) }
 
     test 'should be enabled and locked' do
       assert_equal true, dlmlock.enabled?
@@ -151,16 +151,16 @@ class DlmlockTest < ActiveSupport::TestCase
     end
 
     test 'records audit change on release by owner' do
-      assert_difference "Audit.where(auditable_type: 'Dlmlock').count" do
+      assert_difference "Audit.where(auditable_type: 'Dlmlock', action: 'update').count" do
         assert dlmlock.release!(host1)
       end
       audit_record = dlmlock.audits.last
       assert_equal 'update', audit_record.action
-      assert_equal({:host_id => nil}, audit_record.audited_changes)
+      assert_equal({ :host_id => nil }, audit_record.audited_changes)
     end
 
     test 'records no audit change on acquisition by owner' do
-      assert_no_difference "Audit.where(auditable_type: 'Dlmlock').count" do
+      assert_no_difference "Audit.where(auditable_type: 'Dlmlock', action: 'update').count" do
         assert dlmlock.acquire!(host1)
       end
     end

data/test/models/host_monitoring_test.rb

@@ -27,7 +27,7 @@ class HostMonitoringTest < ActiveSupport::TestCase
   end
 
   context 'an acquired DLM lock' do
-   let(:dlmlock) { FactoryBot.create(:dlmlock, :host => host) }
+    let(:dlmlock) { FactoryBot.create(:dlmlock, :host => host) }
 
     test 'removes monitoring dowmtine' do
       monitoring_mock.expects(:del_downtime_host).once

data/test/test_plugin_helper.rb

@@ -3,7 +3,5 @@ require 'test_helper'
 
 # Add plugin to FactoryBot's paths
 FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-if ForemanDlm.with_monitoring?
-  FactoryBot.definition_file_paths << "#{ForemanMonitoring::Engine.root}/test/factories"
-end
+FactoryBot.definition_file_paths << "#{ForemanMonitoring::Engine.root}/test/factories" if ForemanDlm.with_monitoring?
 FactoryBot.reload

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: foreman_dlm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1
 description: Adds a Distributed Lock Manager to Foreman. This enables painless system
   updates for clusters.
 email: