foreman_expire_hosts 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f4ea5566b63be22aff9f760b76e60ca34a5ae6c4b09c5cbf1350095b092599d
-  data.tar.gz: 599502fc7cd748e98c3c5e4caeec46868c1484a7e0c883fddf281ab19e11e76e
+  metadata.gz: 44247c83269ff2759c38b6c8ea6821f2b65bdf2558c4703eb4a89f6ccaa7ab83
+  data.tar.gz: 110282faa293e518d45dca6661137039ea0e8eaa9a5cd038ee7b19536b8715fe
 SHA512:
-  metadata.gz: 81cfb253f0a07dbc56641c6fb194f3cd61b4d0d366d855a71202ca9ae9d686f5ef5d56aeabed31b8905990c30c59527035218541fd3f860855843e2adc0cfddf
-  data.tar.gz: 4b9c1c317f1abc646c04260bc92822833ac743cb018e79b62eaa48fd3ef94a43fd752a04a553c253b7424bd67308e75251002f84b0fe2e7f49706ea714e96e74
+  metadata.gz: e55938b35afdd0ad71696a0a6ed21b8f489934223edd98aac29820d6fce255a372a1372907b3ff489e70205b367e6569eaa7fbf40c6c3251294bd55d746eddc6
+  data.tar.gz: 61dcac4a506ba4bf9379ce3270286636f0913c46c96c2bb8691b2b98db05494d1fdb1890daade056fa497198d22266482499c49ebdfc2c1f4bf375feace4f8ca

data/.rubocop.yml

@@ -34,9 +34,6 @@ Naming/FileName:
 Style/WordArray:
   Enabled: false
 
-Style/BracesAroundHashParameters:
-  Enabled: false
-
 Style/RescueModifier:
   Enabled: false
 
@@ -75,3 +72,6 @@ Rails/SkipsModelValidations:
 
 Metrics:
   Enabled: false
+
+Layout/LineLength:
+  Enabled: false

data/.rubocop_todo.yml

@@ -5,3 +5,12 @@
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
+
+Style/HashEachMethods:
+  Enabled: false
+
+Style/HashTransformKeys:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false

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

@@ -23,12 +23,6 @@ module ForemanExpireHosts
       distance_of_time_in_words(to_time, Time.current, options)
     end
 
-    def input_group_addon(content, options = {})
-      content_tag :span, class: 'input-group-addon' do
-        content_tag :span, content, options
-      end
-    end
-
     def datepicker_f(form, attr, options = {}, html_options = {})
       field(form, attr, options) do
         addClass options, 'form-control'

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

@@ -23,8 +23,10 @@ module ForemanExpireHosts
           next if result.nil?
 
           if result
+            logger.info "Action #{self.class.name} for host #{host.name} was successful."
             self.successful_hosts << host
           else
+            logger.info "Action #{self.class.name} for host #{host.name} failed."
             self.failed_hosts << host
           end
         end
@@ -56,7 +58,7 @@ module ForemanExpireHosts
         }
       end
 
-      delegate :logger, :to => :Rails
+      delegate :logger, :to => :ForemanExpireHosts
     end
   end
 end

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

@@ -10,6 +10,7 @@ module ForemanExpireHosts
       end
 
       def action(host)
+        logger.info "Destroying expired host #{host}."
         SafeDestroy.new(host).destroy!
       end
 

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

@@ -13,7 +13,7 @@ module ForemanExpireHosts
         return false unless host.supports_power?
         return unless host.power.ready?
 
-        logger.info "Powering down expired host in grace period #{host}"
+        logger.info "Powering down expired host in grace period #{host}."
         host.power.stop
       rescue StandardError
         false

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

@@ -28,6 +28,8 @@ module ForemanExpireHosts
       def deliver_mail_notification(recipient, hosts)
         return true if hosts.empty?
 
+        logger.info "Deliving mail notification '#{humanized_name}' for hosts #{hosts.to_sentence} to #{recipient}."
+
         build_mail_notification(recipient, hosts).deliver_now
       rescue SocketError, Net::SMTPError => e
         message = _('Failed to deliver %{notification_name} for Hosts %{hosts}') % {
@@ -39,11 +41,12 @@ module ForemanExpireHosts
 
       def deliver_ui_notifications
         all_hosts.each do |host|
+          logger.info "Deliving UI notification '#{humanized_name}' for host '#{host}'."
           build_ui_notification(host).deliver!
         end
       end
 
-      delegate :logger, :to => :Rails
+      delegate :logger, :to => :ForemanExpireHosts
 
       def humanized_name
         _('Notification')

data/app/views/hosts/_expired_on_field.html.erb

@@ -7,7 +7,7 @@
              :start_year => Date.today.year,
              :help_block => ('<span class="pficon-warning-triangle-o"></span> '.html_safe + _('You are not allowed to change the expiry date of this host.') unless @host.can_modify_expiry_date?),
              :disabled => !@host.can_modify_expiry_date?,
-             :help_inline  => popover('Auto Expiry', _('Host will be deleted automatically on the given expiry date.') + '<br>'.html_safe +
-                                      _('Leave blank to keep the host until deleted manually.'))
+             :help_inline  => popover('Auto Expiry', _('Expired hosts will be deleted automatically after the grace period has passed.') + '<br>'.html_safe +
+                                      _('If you do not want this host to expire and do not want it to be deleted automatically, do not specify an expiry date.'))
            }
 %>

data/extra/foreman_expire_hosts.cron

@@ -0,0 +1,8 @@
+SHELL=/bin/sh
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+RAILS_ENV=production
+FOREMAN_HOME=/usr/share/foreman
+
+# Send out notifications about expired hosts
+45 7 * * *      foreman    /usr/sbin/foreman-rake expired_hosts:deliver_notifications >>/var/log/foreman/expired_hosts.log 2>&1

data/foreman_expire_hosts.gemspec

@@ -10,7 +10,10 @@ Gem::Specification.new do |s|
   s.authors     = ['Nagarjuna Rachaneni', 'Timo Goebel']
   s.email       = ['nn.nagarjuna@gmail.com', 'mail@timogoebel.name']
   s.summary     = 'Foreman plugin for limiting host lifetime'
-  s.description = 'This Plugin will add new column expired_on to hosts to limit the lifetime of a host.'
+  s.description = <<-DESC
+A Foreman plugin that allows hosts to expire at a configurable date.
+Hosts will be shut down and automatically deleted after a grace period.
+DESC
   s.homepage    = 'https://github.com/theforeman/foreman_expire_hosts'
   s.licenses    = ['GPL-3.0']
 
@@ -23,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'deface'
 
   s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'rubocop', '0.75.0'
-  s.add_development_dependency 'rubocop-performance'
-  s.add_development_dependency 'rubocop-rails', '~> 2.3.2'
+  s.add_development_dependency 'rubocop', '~> 0.80.0'
+  s.add_development_dependency 'rubocop-performance', '~> 1.5.2'
+  s.add_development_dependency 'rubocop-rails', '~> 2.4.2'
 end

data/lib/foreman_expire_hosts/engine.rb

@@ -53,10 +53,10 @@ module ForemanExpireHosts
 
     config.to_prepare do
       begin
-        Host::Managed.include ForemanExpireHosts::HostExt
-        HostsHelper.include ForemanExpireHosts::HostsHelperExtensions
-        HostsController.prepend ForemanExpireHosts::HostControllerExtensions
-        AuditsHelper.include ForemanExpireHosts::AuditsHelperExtensions
+        ::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
       rescue StandardError => e
         Rails.logger.warn "ForemanExpireHosts: skipping engine hook (#{e})"
@@ -69,4 +69,8 @@ module ForemanExpireHosts
       end
     end
   end
+
+  def self.logger
+    Foreman::Logging.logger('foreman_expire_hosts')
+  end
 end

data/lib/foreman_expire_hosts/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -43,46 +43,47 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.75.0
+        version: 0.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.75.0
+        version: 0.80.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2
-description: This Plugin will add new column expired_on to hosts to limit the lifetime
-  of a host.
+        version: 2.4.2
+description: |
+  A Foreman plugin that allows hosts to expire at a configurable date.
+  Hosts will be shut down and automatically deleted after a grace period.
 email:
 - nn.nagarjuna@gmail.com
 - mail@timogoebel.name
@@ -138,6 +139,7 @@ files:
 - config/routes.rb
 - db/migrate/20150427101516_add_expiry_on_to_hosts.rb
 - db/seeds.d/80_expire_hosts_ui_notification.rb
+- extra/foreman_expire_hosts.cron
 - foreman_expire_hosts.gemspec
 - lib/expire_hosts_notifications.rb
 - lib/foreman_expire_hosts.rb