foreman_expire_hosts 6.0.0 → 7.0.2

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
@@ -23,6 +25,6 @@ class ExpirationStatusTest < ActiveSupport::TestCase
     assert @status.relevant?
 
     @host.expired_on = nil
-    refute @status.relevant?
+    assert_not @status.relevant?
   end
 end

data/test/unit/safe_destroy_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 module ForemanExpireHosts
@@ -29,7 +31,7 @@ module ForemanExpireHosts
       test 'deletes a host' do
         assert Host::Managed.find_by(id: host.id)
         assert SafeDestroy.new(host).destroy!
-        refute Host::Managed.find_by(id: host.id)
+        assert_not Host::Managed.find_by(id: host.id)
       end
     end
   end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.2
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
 - Timo Goebel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bootstrap-datepicker-rails
+  name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,13 +26,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: deface
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -40,35 +40,64 @@ 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.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.80.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 2.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
-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
@@ -78,27 +107,25 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - Gemfile
 - LICENSE
 - README.md
-- app/assets/javascripts/foreman_expire_hosts/application.js
-- app/assets/javascripts/foreman_expire_hosts/datepicker_for_host_expired_on_field.js
-- app/assets/stylesheets/foreman_expire_hosts/application.scss
 - 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
 - app/models/concerns/foreman_expire_hosts/host_ext.rb
 - app/models/host_status/expiration_status.rb
 - app/models/setting/expire_hosts.rb
 - app/overrides/add_expired_on_field_to_host_form.rb
 - app/overrides/add_expired_on_field_to_host_show.rb
-- app/overrides/add_js_to_host_index.rb
 - app/overrides/deleted_expired_host_comment_in_audits.rb
 - app/services/foreman_expire_hosts/action/base.rb
 - app/services/foreman_expire_hosts/action/delete_expired_hosts.rb
@@ -127,6 +154,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
@@ -148,7 +176,7 @@ homepage: https://github.com/theforeman/foreman_expire_hosts
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,9 +191,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Foreman plugin for limiting host lifetime
 test_files:

data/app/assets/javascripts/foreman_expire_hosts/application.js

@@ -1,3 +0,0 @@
-//= require bootstrap-datepicker
-//= require foreman_expire_hosts/datepicker_for_host_expired_on_field
-

data/app/assets/javascripts/foreman_expire_hosts/datepicker_for_host_expired_on_field.js

@@ -1,27 +0,0 @@
-var shortcuts = {"1 day": 1, "1 week": 7, "1 month": 30, "1 year": 365, "3 days": 3, "3 weeks": 21, "3 months": 90};
-function append_shortcuts() {
-  if ($(".datepicker-days #datepicker_shortcuts").length == 0) {
-    var shortcuts_html = "<div id='datepicker_shortcuts'><div>";
-    var shortcut_item = 1;
-    $.each(shortcuts, function (lable, days) {
-      var today = new Date();
-      today.setDate(today.getDate() + days);
-      if (shortcut_item == 5) {
-        shortcuts_html += "</div><div style='padding-top: 3px'>"
-      }
-      shortcuts_html += "<a style='width: 65px;' class='btn btn-default btn-xs' role='button' title='" + $.fn.datepicker.dates.en.monthsShort[today.getMonth()] + " " + today.getDate() + " " + today.getFullYear() + "' onclick='populate_date_from_days(" + days + ")'>" + lable + "</a>&nbsp;";
-      shortcut_item += 1
-    });
-    shortcuts_html += "</div></div>";
-    $(".datepicker-days table").before(shortcuts_html)
-  }
-}
-
-function populate_date_from_days(shortcut_days) {
-  var today = new Date();
-  today.setDate(today.getDate() + shortcut_days);
-  $('#host_expired_on').datepicker('setDate', today);
-  $('#host_expired_on').datepicker('remove');
-  //$('#host_expired_on').val(today.getDate()+'/'+(today.getMonth()+1)+'/'+today.getFullYear())
-  //$('#host_expired_on').datepicker('hide')
-}

data/app/assets/stylesheets/foreman_expire_hosts/application.scss

@@ -1,4 +0,0 @@
-/*
- *= require_self
- *= require bootstrap-datepicker3
- */

data/app/overrides/add_js_to_host_index.rb

@@ -1,6 +0,0 @@
-Deface::Override.new(
-  :virtual_path  => 'hosts/_list',
-  :name          => 'host_list_expiration_js',
-  :insert_before => '#confirmation-modal',
-  :text          => "<%= stylesheet 'foreman_expire_hosts/application' %><%= javascript 'foreman_expire_hosts/application' %>"
-)