foreman_expire_hosts 8.1.0 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74607c8b578a2549b16b8858c186dec33519fbec2f21c946e30d3b01b8c8ee13
-  data.tar.gz: d07c8068f7a85eb297d95c461abf65c1951409ba483c6bc5329c8abee318def5
+  metadata.gz: b3e5b913f8041ef79d3fdcb5572d9e0f5a04acb96ac6d18622bf2e4c064e7bf9
+  data.tar.gz: 29203939087fc0aa319796c0f5b8cca08cd65b92e3a7f6d2708eb4d6d35fa8f8
 SHA512:
-  metadata.gz: 2c214dc0b884be13b4195ef443079db7a524839279aee288addace26dbd61e3d170e984f3468377dfba59cb89bb8521f4c18fa8667ad133bbb6b364e4514f1ab
-  data.tar.gz: 1e68621e1fb15baa5a94d40f080daecc55ad2fcbec4aedfd97b70fc5ec750c3198a3ff4e227743fe03e5cb95c603189dee628de2b265da8cb4d8ac7627643b07
+  metadata.gz: e8ae87316f890b0b9ffbb0d6ed9aaa97394871806a08b6e840b565565da321d5ca89cc7887388d2c4557d96552528146231d0791e476cc069962ed9b41d5bd20
+  data.tar.gz: fceaa7eb6ad7a554c5e3697ebfe69740d28f102313585c818b640a97d5225339c3deac030172722c530ab1e7600ce97900d4e7eea51606a326721c94290a2329

data/app/helpers/foreman_expire_hosts/hosts_helper.rb

@@ -12,5 +12,24 @@ module ForemanExpireHosts
       end
       actions
     end
+
+    def host_expiry_warning_message(host)
+      return nil unless host.expires?
+
+      if host.expired_past_grace_period?
+        message = _('This host has expired %s ago and needs to be deleted manually.') % time_ago_in_words(host.expired_on)
+      elsif host.expired?
+        message = _('This host has expired %{time_ago} ago and will be deleted on %{delete_date}.') % { :delete_date => l(host.expiration_grace_period_end_date), :time_ago => time_ago_in_words(host.expired_on) }
+      elsif host.expires_today?
+        message = _('This host will expire today.')
+      elsif host.pending_expiration?
+        message = _('This host will expire in %{distance_of_time} (on %{expire_date}).') % { :expire_date => l(host.expired_on), :distance_of_time => future_time_in_words(host.expired_on) }
+      end
+      message
+    end
+
+    def future_time_in_words(to_time, options = {})
+      distance_of_time_in_words(to_time, Time.current, options)
+    end
   end
 end

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

@@ -55,20 +55,20 @@ module ForemanExpireHosts
     def expiration_grace_period_end_date
       return nil unless expires?
 
-      expired_on.to_date + Setting[:days_to_delete_after_host_expiration].to_i
+      expired_on.to_date + Setting[:days_to_delete_after_host_expiration].to_i.days
     end
 
     def expired_past_grace_period?
       return false unless expires?
 
-      expiration_grace_period_end_date <= Date.today
+      expiration_grace_period_end_date.to_date <= Date.today
     end
 
     def pending_expiration?
       return false unless expires?
       return false if expired?
 
-      expired_on - Setting['notify1_days_before_host_expiry'].to_i <= Date.today
+      expired_on.to_date - Setting['notify1_days_before_host_expiry'].to_i.days <= Date.today
     end
 
     def can_modify_expiry_date?

data/lib/foreman_expire_hosts/engine.rb

@@ -87,7 +87,6 @@ module ForemanExpireHosts
     config.to_prepare do
       begin
         ::Host::Managed.include ForemanExpireHosts::HostExt
-        ::HostsHelper.include ForemanExpireHosts::HostsHelperExtensions
         ::HostsController.prepend ForemanExpireHosts::HostControllerExtensions
         ::AuditsHelper.include ForemanExpireHosts::AuditsHelperExtensions
         ::Api::V2::HostsController.include ForemanExpireHosts::Api::V2::HostsControllerExtensions

data/lib/foreman_expire_hosts/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanExpireHosts
-  VERSION = '8.1.0'
+  VERSION = '8.2.0'
 end

data/test/helpers/hosts_helper_test.rb

@@ -5,7 +5,11 @@ require 'test_plugin_helper'
 class HostsHelperTest < ActionView::TestCase
   include HostsHelper
   include HostDescriptionHelper
-  include PuppetRelatedHelper
+  # Foreman 3.7 dropped this via
+  # https://github.com/theforeman/foreman/commit/6cdb8c7a9ebd790537510213e43537a4a87189d6
+  # Foreman 3.9 bought it back via
+  # https://github.com/theforeman/foreman/commit/37a99c70ebd9e4d6f03af546dfe36e7678e2bcf3
+  include PuppetRelatedHelper if defined?(PuppetRelatedHelper)
   include ForemanExpireHosts::HostsHelper
   include ApplicationHelper
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.2.0
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -54,7 +54,6 @@ files:
 - app/controllers/concerns/foreman_expire_hosts/api/v2/hosts_controller_extensions.rb
 - app/controllers/concerns/foreman_expire_hosts/host_controller_extensions.rb
 - app/helpers/concerns/foreman_expire_hosts/audits_helper_extensions.rb
-- app/helpers/concerns/foreman_expire_hosts/hosts_helper_extensions.rb
 - app/helpers/expire_hosts_mailer_helper.rb
 - app/helpers/foreman_expire_hosts/hosts_helper.rb
 - app/mailers/expire_hosts_mailer.rb
@@ -128,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Foreman plugin for limiting host lifetime

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

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module ForemanExpireHosts
-  module HostsHelperExtensions
-    extend ActiveSupport::Concern
-
-    def host_expiry_warning_message(host)
-      return nil unless host.expires?
-
-      if host.expired_past_grace_period?
-        message = _('This host has expired %s ago and needs to be deleted manually.') % time_ago_in_words(host.expired_on)
-      elsif host.expired?
-        message = _('This host has expired %{time_ago} ago and will be deleted on %{delete_date}.') % { :delete_date => l(host.expiration_grace_period_end_date), :time_ago => time_ago_in_words(host.expired_on) }
-      elsif host.expires_today?
-        message = _('This host will expire today.')
-      elsif host.pending_expiration?
-        message = _('This host will expire in %{distance_of_time} (on %{expire_date}).') % { :expire_date => l(host.expired_on), :distance_of_time => future_time_in_words(host.expired_on) }
-      end
-      message
-    end
-
-    def future_time_in_words(to_time, options = {})
-      distance_of_time_in_words(to_time, Time.current, options)
-    end
-  end
-end