foreman_expire_hosts 8.2.0 → 9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3e5b913f8041ef79d3fdcb5572d9e0f5a04acb96ac6d18622bf2e4c064e7bf9
-  data.tar.gz: 29203939087fc0aa319796c0f5b8cca08cd65b92e3a7f6d2708eb4d6d35fa8f8
+  metadata.gz: 839f503c394a7967c2a50c93f13197c83b4b9a7a304fbff46721f9416936c8f7
+  data.tar.gz: 916041f719b68174a64b3337cfcecbbfd2c0552ae60a5c235cff3701c977331f
 SHA512:
-  metadata.gz: e8ae87316f890b0b9ffbb0d6ed9aaa97394871806a08b6e840b565565da321d5ca89cc7887388d2c4557d96552528146231d0791e476cc069962ed9b41d5bd20
-  data.tar.gz: fceaa7eb6ad7a554c5e3697ebfe69740d28f102313585c818b640a97d5225339c3deac030172722c530ab1e7600ce97900d4e7eea51606a326721c94290a2329
+  metadata.gz: cc344d2888bdc7df2471cbdaba3b9236c40e74ae24b2f96cfa38d49188d574beff34ec25d1028b60607083159d99463c2a7916b3dbc212a5f40b962ccf3ff75b
+  data.tar.gz: ff4a9af4cba0aaee10361997aa5b714240e83da4d1bb6b17bc2a421867615d1562821c6e6508a0212bdf2abb4673c4f430598375cd0252d74ef97170b0c5031a

data/README.md

@@ -20,6 +20,7 @@ This plugin will send two warning notifications before host expiry (see Settings
 | >= 1.18         | ~> 6.0         |
 | >= 1.24         | ~> 7.0         |
 | >= 3.0          | ~> 8.0         |
+| >= 3.13         | ~> 9.0         |
 
 # Screenshots
 ![Expiry date field in host form](https://raw.githubusercontent.com/ingenico-group/screenshots/master/foreman_host_expiry/expiry-date-field-in-host-form.png)

data/{lib → app/lib}/expire_hosts_notifications.rb

@@ -10,11 +10,12 @@ module ExpireHostsNotifications
       ForemanExpireHosts::Action::StopExpiredHosts.new.engage
     end
 
-    def deliver_expiry_warning_notification(num = 1) # notify1_days_before_expiry
+    # notify1_days_before_expiry
+    def deliver_expiry_warning_notification(num = 1)
       return unless [1, 2].include?(num)
 
       days_before_expiry = Setting["notify#{num}_days_before_host_expiry"].to_i
-      expiry_date        = (Date.today + days_before_expiry)
+      expiry_date        = (Time.zone.today + days_before_expiry)
       notifiable_hosts   = Host.with_expire_date(expiry_date).preload(:owner)
 
       ForemanExpireHosts::Notification::ExpiryWarning.new(

data/app/models/host_status/expiration_status.rb

@@ -39,6 +39,7 @@ module HostStatus
     end
 
     def to_label(_options = {})
+      return N_('Does not expire') unless host.expires?
       case to_status
       when OK
         N_('Expires on %s') % I18n.l(host.expired_on.to_date)

data/app/overrides/add_expired_on_field_to_host_show.rb

@@ -2,7 +2,7 @@
 
 Deface::Override.new(
   :virtual_path => 'hosts/show',
-  :name => 'host_expiry_waring_in_show',
+  :name => 'host_expiry_warning_in_show',
   :insert_before => '#host-show',
-  :partial => 'hosts/expired_message.html.erb'
+  :partial => 'hosts/expired_message'
 )

data/lib/foreman_expire_hosts/engine.rb

@@ -6,12 +6,6 @@ module ForemanExpireHosts
   class Engine < ::Rails::Engine
     engine_name 'foreman_expire_hosts'
 
-    config.autoload_paths += Dir["#{config.root}/lib"]
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/services"]
-
     # Add any db migrations
     initializer 'foreman_plugin_template.load_app_instance_data' do |app|
       ForemanExpireHosts::Engine.paths['db/migrate'].existent.each do |path|
@@ -19,67 +13,69 @@ module ForemanExpireHosts
       end
     end
 
-    initializer 'foreman_expire_hosts.register_plugin', :before => :finisher_hook do |_app|
-      Foreman::Plugin.register :foreman_expire_hosts do
-        requires_foreman '>= 3.0.0'
-        register_custom_status HostStatus::ExpirationStatus
+    initializer 'foreman_expire_hosts.register_plugin', :before => :finisher_hook do |app|
+      app.reloader.to_prepare do
+        Foreman::Plugin.register :foreman_expire_hosts do
+          requires_foreman '>= 3.13.0'
+          register_custom_status HostStatus::ExpirationStatus
 
-        # strong parameters
-        parameter_filter Host::Managed, :expired_on
+          # strong parameters
+          parameter_filter Host::Managed, :expired_on
 
-        security_block :foreman_expire_hosts do
-          permission :edit_host_expiry,
-                     {},
-                     :resource_type => 'Host'
-        end
+          security_block :foreman_expire_hosts do
+            permission :edit_host_expiry,
+                       {},
+                       :resource_type => 'Host'
+          end
 
-        # Extend built in permissions
-        Foreman::AccessControl.permission(:edit_hosts).actions.concat [
-          'hosts/select_multiple_expiration',
-          'hosts/update_multiple_expiration'
-        ]
+          # Extend built in permissions
+          Foreman::AccessControl.permission(:edit_hosts).actions.concat [
+            'hosts/select_multiple_expiration',
+            'hosts/update_multiple_expiration'
+          ]
 
-        Setting::BLANK_ATTRS << 'host_expiry_email_recipients'
+          Setting::BLANK_ATTRS << 'host_expiry_email_recipients'
 
-        settings do
-          category(:expire_hosts, N_('Expire Hosts')) do
-            setting('is_host_expiry_date_mandatory',
-                    type: :boolean,
-                    description: N_('Make expiry date field mandatory on host creation/update'),
-                    default: false,
-                    full_name: N_('Require host expiry date'))
-            setting('can_owner_modify_host_expiry_date',
-                    type: :boolean,
-                    description: N_('Allow host owner to modify host expiry date field. If the field is false then admin only can edit expiry field'),
-                    default: false,
-                    full_name: N_('Host owner can modify host expiry date'))
-            setting('notify1_days_before_host_expiry',
-                    type: :integer,
-                    description: N_('Send first notification to owner of hosts about his hosts expiring in given days. Must be integer only'),
-                    default: 7,
-                    full_name: N_('First expiry notification'))
-            setting('notify2_days_before_host_expiry',
-                    type: :integer,
-                    description: N_('Send second notification to owner of hosts about his hosts expiring in given days. Must be integer only'),
-                    default: 1,
-                    full_name: N_('Second expiry notification'))
-            setting('days_to_delete_after_host_expiration',
-                    type: :integer,
-                    description: N_('Delete expired hosts after given days of hosts expiry date. Must be integer only'),
-                    default: 3,
-                    full_name: N_('Expiry grace period in days'))
-            setting('host_expiry_email_recipients',
-                    type: :string,
-                    description: N_('All notifications will be delivered to its owner. If any other users/admins need to receive those expiry warning notifications then those emails can be configured comma separated here.'),
-                    default: nil,
-                    full_name: N_('Expiry e-mail recipients'))
+          settings do
+            category(:expire_hosts, N_('Expire Hosts')) do
+              setting('is_host_expiry_date_mandatory',
+                      type: :boolean,
+                      description: N_('Make expiry date field mandatory on host creation/update'),
+                      default: false,
+                      full_name: N_('Require host expiry date'))
+              setting('can_owner_modify_host_expiry_date',
+                      type: :boolean,
+                      description: N_('Allow host owner to modify host expiry date field. If the field is false then admin only can edit expiry field'),
+                      default: false,
+                      full_name: N_('Host owner can modify host expiry date'))
+              setting('notify1_days_before_host_expiry',
+                      type: :integer,
+                      description: N_('Send first notification to owner of hosts about his hosts expiring in given days. Must be integer only'),
+                      default: 7,
+                      full_name: N_('First expiry notification'))
+              setting('notify2_days_before_host_expiry',
+                      type: :integer,
+                      description: N_('Send second notification to owner of hosts about his hosts expiring in given days. Must be integer only'),
+                      default: 1,
+                      full_name: N_('Second expiry notification'))
+              setting('days_to_delete_after_host_expiration',
+                      type: :integer,
+                      description: N_('Delete expired hosts after given days of hosts expiry date. Must be integer only'),
+                      default: 3,
+                      full_name: N_('Expiry grace period in days'))
+              setting('host_expiry_email_recipients',
+                      type: :string,
+                      description: N_('All notifications will be delivered to its owner. If any other users/admins need to receive those expiry warning notifications then those emails can be configured comma separated here.'), # rubocop:disable Layout/LineLength
+                      default: nil,
+                      full_name: N_('Expiry e-mail recipients'))
+            end
           end
-        end
 
-        extend_rabl_template 'api/v2/hosts/main', 'api/v2/hosts/expiration'
+          extend_rabl_template 'api/v2/hosts/main', 'api/v2/hosts/expiration'
 
-        describe_host do
-          multiple_actions_provider :expire_hosts_host_multiple_actions
+          describe_host do
+            multiple_actions_provider :expire_hosts_host_multiple_actions
+          end
         end
       end
     end

data/lib/foreman_expire_hosts/version.rb

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

data/test/unit/host_status/expiration_status_test.rb

@@ -18,6 +18,9 @@ class ExpirationStatusTest < ActiveSupport::TestCase
 
     @host.expired_on = Date.today
     assert_equal 'Expires today', @status.to_label
+
+    @host.expired_on = nil
+    assert_equal 'Does not expire', @status.to_label
   end
 
   test '#relevant? is only for expiring hosts' do

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 9.0.1
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
 - Timo Goebel
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2025-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -56,6 +55,7 @@ files:
 - app/helpers/concerns/foreman_expire_hosts/audits_helper_extensions.rb
 - app/helpers/expire_hosts_mailer_helper.rb
 - app/helpers/foreman_expire_hosts/hosts_helper.rb
+- app/lib/expire_hosts_notifications.rb
 - app/mailers/expire_hosts_mailer.rb
 - app/models/concerns/foreman_expire_hosts/host_ext.rb
 - app/models/host_status/expiration_status.rb
@@ -92,7 +92,6 @@ files:
 - db/migrate/20230112104438_change_expired_on_type.rb
 - db/seeds.d/80_expire_hosts_ui_notification.rb
 - extra/foreman_expire_hosts.cron
-- lib/expire_hosts_notifications.rb
 - lib/foreman_expire_hosts.rb
 - lib/foreman_expire_hosts/engine.rb
 - lib/foreman_expire_hosts/version.rb
@@ -112,7 +111,6 @@ homepage: https://github.com/theforeman/foreman_expire_hosts
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Foreman plugin for limiting host lifetime
 test_files: