foreman_expire_hosts 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66c086d3dc04916321804be89e8d5f027691b5aa5dc10b0cef317b7ac5d4ee9e
-  data.tar.gz: 84e16983231ab5651c03c5d56484c8645bd1c6910bd677aa7bcacefb139b06d2
+  metadata.gz: fa01a7018582689c460e28a5e27dff4e4372ff655399ee622bf45532ece9abc6
+  data.tar.gz: fb08933cd67d1b5b9bf322431e322812a189498407e23b2203322d2bc4072006
 SHA512:
-  metadata.gz: b2990701bc9efa238f25f6a6a7def12d87e9403e4b6cf0f41b477c1d5cc16a467f2edcb211fabd724034b3c149d00d654087a42e4a8e323fd403a2030ac81492
-  data.tar.gz: 60a5e736f9e54223e5c62bcf426514e10aec9569708d3f58b672da60e41667b3537848c8fa6f00c8904c3c36aa87038304cdf44bc7d51e6a087d5c906ff3302d
+  metadata.gz: 02c674e4fd329fe84e740fc752ae0db2ac5e1a0619ef3d2ab4fd4001bba6c94a9c03d5854a206a81a638a3bf1ce27210a123c1e70d32da573124e93d73a7cfeb
+  data.tar.gz: 0c046cf84b6d6b2b6045b941f714f847d1903703d4c8a1f3988b94ffa3363804bf89faf8ffc6c5d63b3a1369ee56f25d3dedeee97f9ec0d7f297b73f9d92b2ca

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_from:
   - .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
   TargetRailsVersion: 5.1
   Exclude:
     - 'Rakefile'

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 
 gemspec

data/app/controllers/concerns/foreman_expire_hosts/api/v2/hosts_controller_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module Api
     module V2

data/app/controllers/concerns/foreman_expire_hosts/host_controller_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module HostControllerExtensions
     def self.prepended(base)
@@ -20,14 +22,14 @@ module ForemanExpireHosts
         begin
           host.expired_on = expiration_date
           host.save!
-        rescue StandardError => error
-          failed_hosts[host.name] = error
+        rescue StandardError => e
+          failed_hosts[host.name] = e
           message = if expiration_date.present?
                       _('Failed to set expiration date for %{host} to %{expiration_date}.') % { :host => host, :expiration_date => l(expiration_date) }
                     else
                       _('Failed to clear expiration date for %s.') % host
                     end
-          Foreman::Logging.exception(message, error)
+          Foreman::Logging.exception(message, e)
         end
       end
 

data/app/helpers/concerns/foreman_expire_hosts/audits_helper_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module AuditsHelperExtensions
     extend ActiveSupport::Concern

data/app/helpers/concerns/foreman_expire_hosts/hosts_helper_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module HostsHelperExtensions
     extend ActiveSupport::Concern

data/app/helpers/expire_hosts_mailer_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ExpireHostsMailerHelper
   def relative_date(date, opts = {})
     return _('N/A') if date.blank?

data/app/mailers/expire_hosts_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ExpireHostsMailer < ApplicationMailer
   default :content_type => 'text/html', :from => Setting[:email_reply_address] || 'noreply@your-foreman.com'
 

data/app/models/concerns/foreman_expire_hosts/host_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module HostExt
     extend ActiveSupport::Concern
@@ -13,7 +15,7 @@ module ForemanExpireHosts
 
       scope :expiring, -> { where('expired_on IS NOT NULL') }
       scope :with_expire_date, ->(date) { expiring.where('expired_on = ?', date) }
-      scope :expired, -> { expiring.where('expired_on < ?', Date.today) }
+      scope :expired, -> { expiring.where('expired_on <= ?', Date.today) }
       scope :expiring_today, -> { expiring.with_expire_date(Date.today) }
       scope :expired_past_grace_period, -> { expiring.where('expired_on <= ?', Date.today - Setting[:days_to_delete_after_host_expiration].to_i) }
 

data/app/models/host_status/expiration_status.rb

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

data/app/models/setting/expire_hosts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Setting::ExpireHosts < Setting
   Setting::BLANK_ATTRS.push('host_expiry_email_recipients')
 

data/app/overrides/add_expired_on_field_to_host_form.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Deface::Override.new(
   :virtual_path => 'hosts/_form',
   :name => 'host_form_expired_on_field',

data/app/overrides/add_expired_on_field_to_host_show.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Deface::Override.new(
   :virtual_path => 'hosts/show',
   :name => 'host_expiry_waring_in_show',

data/app/overrides/add_js_to_host_index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Deface::Override.new(
   :virtual_path => 'hosts/_list',
   :name => 'host_list_expiration_js',

data/app/overrides/deleted_expired_host_comment_in_audits.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Deface::Override.new(
   :virtual_path => 'audits/_list',
   :name => 'deleted_expired_host_audit_comment_in_list',

data/app/services/foreman_expire_hosts/action/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module Action
     class Base

data/app/services/foreman_expire_hosts/action/delete_expired_hosts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module Action
     class DeleteExpiredHosts < Base

data/app/services/foreman_expire_hosts/action/stop_expired_hosts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module Action
     class StopExpiredHosts < Base

data/app/services/foreman_expire_hosts/expiry_edit_authorizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   class ExpiryEditAuthorizer
     attr_accessor :user, :hosts

data/app/services/foreman_expire_hosts/notification/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module Notification
     class Base
@@ -27,12 +29,12 @@ module ForemanExpireHosts
         return true if hosts.empty?
 
         build_mail_notification(recipient, hosts).deliver_now
-      rescue SocketError, Net::SMTPError => error
+      rescue SocketError, Net::SMTPError => e
         message = _('Failed to deliver %{notification_name} for Hosts %{hosts}') % {
           :notification_name => humanized_name,
           :hosts => hosts.map(&:name).to_sentence
         }
-        Foreman::Logging.exception(message, error)
+        Foreman::Logging.exception(message, e)
       end
 
       def deliver_ui_notifications

data/app/services/foreman_expire_hosts/notification/deleted_hosts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module Notification
     class DeletedHosts < Base

data/app/services/foreman_expire_hosts/notification/expiry_warning.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module Notification
     class ExpiryWarning < Base

data/app/services/foreman_expire_hosts/notification/failed_deleted_hosts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module Notification
     class FailedDeletedHosts < Base

data/app/services/foreman_expire_hosts/notification/failed_stopped_hosts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module Notification
     class FailedStoppedHosts < Base

data/app/services/foreman_expire_hosts/notification/stopped_hosts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module Notification
     class StoppedHosts < Base

data/app/services/foreman_expire_hosts/safe_destroy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   class SafeDestroy
     # See http://projects.theforeman.org/issues/14702 for reasoning.
@@ -17,14 +19,14 @@ module ForemanExpireHosts
       else
         subject.destroy!
       end
-    rescue ActiveRecord::RecordNotDestroyed => invalid
+    rescue ActiveRecord::RecordNotDestroyed => e
       message = _('Failed to delete %{class_name} %{subject}: %{message} - Errors: %{errors}') % {
         :class_name => subject.class.name,
         :subject => subject,
-        :message => invalid.message,
-        :errors => invalid.record.errors.full_messages.to_sentence
+        :message => e.message,
+        :errors => e.record.errors.full_messages.to_sentence
       }
-      Foreman::Logging.exception(message, invalid)
+      Foreman::Logging.exception(message, e)
       false
     end
 

data/app/services/foreman_expire_hosts/ui_notifications/hosts/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module UINotifications
     module Hosts

data/app/services/foreman_expire_hosts/ui_notifications/hosts/expiry_warning.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module UINotifications
     module Hosts

data/app/services/foreman_expire_hosts/ui_notifications/hosts/stopped_host.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
   module UINotifications
     module Hosts

data/app/views/api/v2/hosts/expiration.json.rabl

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 attributes :expired_on

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Foreman::Application.routes.draw do
   post 'expired_hosts/select_multiple_expiration' => 'hosts#select_multiple_expiration', as: 'select_multiple_expiration_hosts'
   post 'expired_hosts/update_multiple_expiration' => 'hosts#update_multiple_expiration', as: 'update_multiple_expiration_hosts'

data/db/migrate/20150427101516_add_expiry_on_to_hosts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddExpiryOnToHosts < ActiveRecord::Migration[4.2]
   def change
     add_column :hosts, :expired_on, :date unless column_exists? :hosts, :expired_on

data/db/seeds.d/80_expire_hosts_ui_notification.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 [
   {
     group: _('Hosts'),

data/foreman_expire_hosts.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('lib/foreman_expire_hosts/version', __dir__)
 require 'date'
 
@@ -22,5 +24,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'deface'
 
   s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'rubocop', '0.59.2'
+  s.add_development_dependency 'rubocop', '0.71.0'
 end

data/lib/expire_hosts_notifications.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ExpireHostsNotifications
   class << self
     def delete_expired_hosts

data/lib/foreman_expire_hosts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'foreman_expire_hosts/engine'
 module ForemanExpireHosts
 end

data/lib/foreman_expire_hosts/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'deface'
 require 'bootstrap-datepicker-rails'
 
@@ -34,11 +36,14 @@ module ForemanExpireHosts
           permission :edit_host_expiry,
                      {},
                      :resource_type => 'Host'
-          permission :edit_hosts,
-                     { :hosts => [:select_multiple_expiration, :update_multiple_expiration] },
-                     :resource_type => 'Host'
         end
 
+        # Extend built in permissions
+        Foreman::AccessControl.permission(:edit_hosts).actions.concat [
+          'hosts/select_multiple_expiration',
+          'hosts/update_multiple_expiration'
+        ]
+
         extend_rabl_template 'api/v2/hosts/main', 'api/v2/hosts/expiration'
       end
     end

data/lib/foreman_expire_hosts/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanExpireHosts
-  VERSION = '6.0.1'.freeze
+  VERSION = '6.0.2'
 end

data/lib/tasks/expired_hosts.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Tasks
 namespace :expired_hosts do
   desc 'Delete all expired hosts, send notification email about expiring hosts'

data/test/factories/foreman_expire_hosts_factories.rb

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

data/test/functional/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/functional/concerns/hosts_controller_extensions_test.rb

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

data/test/helpers/hosts_helper_test.rb

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

data/test/lib/expire_hosts_notifications_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 require 'notifications_test_helper'
 
@@ -117,6 +119,23 @@ class ExpireHostsNotificationsTest < ActiveSupport::TestCase
       assert_equal 1, ActionMailer::Base.deliveries.count
       assert_includes ActionMailer::Base.deliveries.first.subject, 'Failed to stop expired hosts'
     end
+
+    context 'with a host expiring today' do
+      let(:host) { FactoryBot.create(:host, :expires_today, :on_compute_resource, :owner => user) }
+      let(:delete_date) { Date.today + Setting[:days_to_delete_after_host_expiration].to_i }
+
+      it 'should stop the host and show the correct delete date' do
+        power_mock.expects(:stop).returns(true)
+        ExpireHostsNotifications.stop_expired_hosts
+        assert_equal 1, ActionMailer::Base.deliveries.count
+        assert_includes ActionMailer::Base.deliveries.first.subject, 'Stopped expired hosts'
+        assert_includes ActionMailer::Base.deliveries.first.body, "These hosts will be destroyed on #{delete_date}."
+
+        travel_to delete_date do
+          assert_includes Host.expired_past_grace_period, host
+        end
+      end
+    end
   end
 
   context '#deliver_expiry_warning_notification' do

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'
 require 'database_cleaner'

data/test/unit/concerns/host_extensions_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class ForemanExpireHostsHostExtTest < ActiveSupport::TestCase
@@ -180,7 +182,7 @@ class ForemanExpireHostsHostExtTest < ActiveSupport::TestCase
     end
 
     test 'should only exist in correct scopes' do
-      exists_only_in_scopes(@host, ['expiring', 'expiring_today'])
+      exists_only_in_scopes(@host, ['expiring', 'expired', 'expiring_today'])
     end
   end
 

data/test/unit/expire_hosts_mailer_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class ExpireHostMailerTest < ActionMailer::TestCase
@@ -35,6 +37,10 @@ class ExpireHostMailerTest < ActionMailer::TestCase
       assert_includes mail.subject, 'Stopped expired hosts in Foreman'
     end
 
+    test 'should include a deletion date' do
+      assert_includes mail.body, "These hosts will be destroyed on #{Date.today}."
+    end
+
     test 'should show mitigation text if authorized' do
       ForemanExpireHosts::ExpiryEditAuthorizer.any_instance.stubs(:authorized?).returns(true)
       assert_includes mail.body.to_s, 'Please change their expiry date'

data/test/unit/expiry_edit_authorizer_test.rb

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

data/test/unit/host_status/expiration_status_test.rb

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

data/test/unit/safe_destroy_test.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-datepicker-rails
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.71.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.71.0
 description: This Plugin will add new column expired_on to hosts to limit the lifetime
   of a host.
 email: