foreman_expire_hosts 6.0.2 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa01a7018582689c460e28a5e27dff4e4372ff655399ee622bf45532ece9abc6
-  data.tar.gz: fb08933cd67d1b5b9bf322431e322812a189498407e23b2203322d2bc4072006
+  metadata.gz: 1f4ea5566b63be22aff9f760b76e60ca34a5ae6c4b09c5cbf1350095b092599d
+  data.tar.gz: 599502fc7cd748e98c3c5e4caeec46868c1484a7e0c883fddf281ab19e11e76e
 SHA512:
-  metadata.gz: 02c674e4fd329fe84e740fc752ae0db2ac5e1a0619ef3d2ab4fd4001bba6c94a9c03d5854a206a81a638a3bf1ce27210a123c1e70d32da573124e93d73a7cfeb
-  data.tar.gz: 0c046cf84b6d6b2b6045b941f714f847d1903703d4c8a1f3988b94ffa3363804bf89faf8ffc6c5d63b3a1369ee56f25d3dedeee97f9ec0d7f297b73f9d92b2ca
+  metadata.gz: 81cfb253f0a07dbc56641c6fb194f3cd61b4d0d366d855a71202ca9ae9d686f5ef5d56aeabed31b8905990c30c59527035218541fd3f860855843e2adc0cfddf
+  data.tar.gz: 4b9c1c317f1abc646c04260bc92822833ac743cb018e79b62eaa48fd3ef94a43fd752a04a553c253b7424bd67308e75251002f84b0fe2e7f49706ea714e96e74

data/.rubocop.yml

@@ -1,6 +1,10 @@
 inherit_from:
   - .rubocop_todo.yml
 
+require:
+  - rubocop-performance
+  - rubocop-rails
+
 AllCops:
   TargetRubyVersion: 2.3
   TargetRailsVersion: 5.1
@@ -17,18 +21,12 @@ Rails/Date:
 Style/Documentation:
   Enabled: false
 
-Metrics/MethodLength:
-  Max: 40
-
 Naming/AccessorMethodName:
   Enabled: false
 
 Style/RedundantSelf:
   Enabled: false
 
-Metrics/ClassLength:
-  Max: 500
-
 Naming/FileName:
   Exclude:
       - 'db/seeds.d/*'
@@ -48,9 +46,6 @@ Style/ClassAndModuleChildren:
 Style/EachWithObject:
   Enabled: false
 
-Metrics/ParameterLists:
-  Enabled: false
-
 Style/SymbolArray:
   Enabled: false
 
@@ -71,3 +66,12 @@ Style/CommentedKeyword:
 
 Rails/LexicallyScopedActionFilter:
   Enabled: false
+
+Rails/OutputSafety:
+  Enabled: false
+
+Rails/SkipsModelValidations:
+  Enabled: false
+
+Metrics:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,42 +1,7 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-08-01 16:36:14 +0200 using RuboCop version 0.49.1.
+# on 2019-12-04 09:30:58 +0100 using RuboCop version 0.75.0.
 # The point is for the user to remove these configuration records
 # 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.
-
-# Offense count: 12
-Metrics/AbcSize:
-  Max: 51
-
-# Offense count: 4
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 35
-  Exclude:
-    - 'test/**/*.rb'
-
-# Offense count: 3
-Metrics/CyclomaticComplexity:
-  Max: 11
-
-# Offense count: 89
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 362
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 110
-
-# Offense count: 3
-Metrics/PerceivedComplexity:
-  Max: 11
-
-# Offense count: 2
-Rails/OutputSafety:
-  Exclude:
-    - 'app/helpers/concerns/foreman_expire_hosts/audits_helper_extensions.rb'

data/README.md

@@ -18,6 +18,7 @@ This plugin will send two warning notifications before host expiry (see Settings
 | >= 1.16         | ~> 4.0         |
 | >= 1.17         | ~> 5.0         |
 | >= 1.18         | ~> 6.0         |
+| >= 1.24         | ~> 7.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/app/controllers/concerns/foreman_expire_hosts/host_controller_extensions.rb

@@ -13,9 +13,6 @@ module ForemanExpireHosts
     def select_multiple_expiration; end
 
     def update_multiple_expiration
-      expiration_date = params[:host][:expired_on]
-      expiration_date = Date.parse(expiration_date) if expiration_date.present?
-
       failed_hosts = {}
 
       @hosts.each do |host|
@@ -50,15 +47,16 @@ module ForemanExpireHosts
     private
 
     def validate_multiple_expiration
-      if params[:host].nil? || (expiration_date = params[:host][:expired_on]).nil?
-        error _('No expiration date selected!')
-        redirect_to(select_multiple_expiration_hosts_path) && (return false)
-      end
-      begin
-        Date.parse(expiration_date) if expiration_date.present?
-      rescue ArgumentError
-        error _('Invalid expiration date!')
-        redirect_to(select_multiple_expiration_hosts_path) && (return false)
+      expiration_date
+    rescue ArgumentError
+      error _('Invalid expiration date!')
+      redirect_to(hosts_path) && (return false)
+    end
+
+    def expiration_date
+      @expiration_date ||= begin
+        expiration_date_arr = params[:host].select { |k| k.start_with?('expired_on') }.values.map(&:to_i)
+        Date.new(*expiration_date_arr.reverse) unless expiration_date_arr.all?(&:zero?)
       end
     end
 

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

@@ -4,18 +4,6 @@ module ForemanExpireHosts
   module HostsHelperExtensions
     extend ActiveSupport::Concern
 
-    module Overrides
-      def multiple_actions
-        actions = super
-        actions << [_('Change Expiration'), select_multiple_expiration_hosts_path] if authorized_for(:controller => :hosts, :action => :select_multiple_expiration)
-        actions
-      end
-    end
-
-    included do
-      prepend Overrides
-    end
-
     def host_expiry_warning_message(host)
       return nil unless host.expires?
 
@@ -41,12 +29,10 @@ module ForemanExpireHosts
       end
     end
 
-    def datepicker_f(form, attr, options = {})
+    def datepicker_f(form, attr, options = {}, html_options = {})
       field(form, attr, options) do
         addClass options, 'form-control'
-        date = form.text_field attr, options
-        addon = input_group_addon('', :class => 'glyphicon glyphicon-calendar')
-        input_group date, addon
+        form.date_select(attr, options, html_options)
       end
     end
   end

data/app/helpers/foreman_expire_hosts/hosts_helper.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module ForemanExpireHosts
+  module HostsHelper
+    def expire_hosts_host_multiple_actions
+      actions = []
+      if authorized_for(:controller => :hosts, :action => :select_multiple_expiration)
+        actions << {
+          action: [_('Change Expiration'), select_multiple_expiration_hosts_path],
+          priority: 200
+        }
+      end
+      actions
+    end
+  end
+end

data/app/services/foreman_expire_hosts/safe_destroy.rb

@@ -15,7 +15,7 @@ module ForemanExpireHosts
       # See https://community.theforeman.org/t/how-to-properly-destroy-a-content-host/8621
       # for reasoning.
       if subject.is_a?(Host::Base) && with_katello?
-        Katello::RegistrationManager.unregister_host(host)
+        Katello::RegistrationManager.unregister_host(subject)
       else
         subject.destroy!
       end

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

@@ -48,7 +48,7 @@ module ForemanExpireHosts
 
         def redeliver!
           recipients = find_notification.notification_recipients
-          recipients.update_all(seen: false) # rubocop:disable Rails/SkipsModelValidations
+          recipients.update_all(seen: false)
           recipients.pluck(:user_id).each do |user_id|
             ::UINotifications::CacheHandler.new(user_id).clear
           end

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

@@ -1,22 +1,13 @@
-<% if @host.can_modify_expiry_date? %>
-  <%= stylesheet 'foreman_expire_hosts/application' %>
-  <%= javascript 'foreman_expire_hosts/application' %>
-<% end %>
 <%= datepicker_f f, :expired_on,
-           :value        => @host.expired_on.try(:strftime, '%d/%m/%Y'),
-           :data         => { provide:              @host.can_modify_expiry_date? ? 'datepicker' : 'readonly',
-                              orientation:          'top left',
-                              date_autoclose:       true,
-                              date_clear_btn:       true,
-                              date_format:          'dd/mm/yyyy',
-                              date_start_date:      Date.tomorrow.strftime('%d/%m/%Y'),
-                              date_today_highlight: true
-           },
-           :autocomplete => false,
-           :placeholder  => 'dd/mm/yyyy',
-           :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?),
-           :readonly => !@host.can_modify_expiry_date?,
-           :help_inline  => popover('Auto Expiry', _('Host will be deleted automatically on given expiry date.') + '<br>'.html_safe +
-                                    _('Leave blank to keep the host until deleted manually')),
-           :onfocus      => 'append_shortcuts()'
+           {
+             :label => _('Expires on'),
+             :autocomplete => false,
+             :include_blank => true,
+             :use_month_numbers => false,
+             :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.'))
+           }
 %>

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

@@ -1,23 +1,18 @@
-<%= stylesheet 'foreman_expire_hosts/application' %>
-<%= javascript 'foreman_expire_hosts/application' %>
 <%= render 'selected_hosts', :hosts => @hosts %>
 
 <%= form_for :host, :url => update_multiple_expiration_hosts_path(:host_ids => params[:host_ids]) do |f| %>
 
-<%= _('Host will be deleted automatically on given expired date. Leave blank to clear expiration date.') %>
+<%= _('Hosts will be deleted automatically on the given expiry date. Leave blank to clear expiration date.') %>
 
 <%= datepicker_f f, :expired_on,
-     :value        => (Date.today + 14).strftime('%d/%m/%Y'),
-     :data         => { provide:              'datepicker',
-                        orientation:          'top left',
-                        date_autoclose:       true,
-                        date_clear_btn:       true,
-                        date_format:          'dd/mm/yyyy',
-                        date_start_date:      Date.tomorrow.strftime('%d/%m/%Y'),
-                        date_today_highlight: true
-     },
-     :autocomplete => false,
-     :placeholder  => 'dd/mm/yyyy',
-     :onfocus      => 'append_shortcuts()'
+  {
+    :autocomplete => false,
+    :include_blank => true,
+    :use_month_numbers => false,
+    :start_year => Date.today.year
+  },
+  {
+    :onchange => 'tfm.hosts.table.toggleMultipleOkButton(this);'
+  }
 %>
 <% end %>

data/foreman_expire_hosts.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |s|
 
   s.require_paths = ['lib']
 
-  s.add_dependency 'bootstrap-datepicker-rails'
   s.add_dependency 'deface'
 
   s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'rubocop', '0.71.0'
+  s.add_development_dependency 'rubocop', '0.75.0'
+  s.add_development_dependency 'rubocop-performance'
+  s.add_development_dependency 'rubocop-rails', '~> 2.3.2'
 end

data/lib/foreman_expire_hosts/engine.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'deface'
-require 'bootstrap-datepicker-rails'
 
 module ForemanExpireHosts
   class Engine < ::Rails::Engine
@@ -26,7 +25,7 @@ module ForemanExpireHosts
 
     initializer 'foreman_expire_hosts.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_expire_hosts do
-        requires_foreman '>= 1.18'
+        requires_foreman '>= 1.24'
         register_custom_status HostStatus::ExpirationStatus
 
         # strong parameters
@@ -45,16 +44,20 @@ module ForemanExpireHosts
         ]
 
         extend_rabl_template 'api/v2/hosts/main', 'api/v2/hosts/expiration'
+
+        describe_host do
+          multiple_actions_provider :expire_hosts_host_multiple_actions
+        end
       end
     end
 
     config.to_prepare do
       begin
-        Host::Managed.send :include, ForemanExpireHosts::HostExt
-        HostsHelper.send :include, ForemanExpireHosts::HostsHelperExtensions
-        HostsController.send :prepend, ForemanExpireHosts::HostControllerExtensions
-        AuditsHelper.send :include, ForemanExpireHosts::AuditsHelperExtensions
-        ::Api::V2::HostsController.send :include, ForemanExpireHosts::Api::V2::HostsControllerExtensions
+        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})"
       end

data/lib/foreman_expire_hosts/version.rb

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

data/test/functional/concerns/hosts_controller_extensions_test.rb

@@ -70,7 +70,7 @@ class HostsControllerTest < ActionController::TestCase
     test 'should set expiration date' do
       expiration_date = Date.today + 14
       params = { :host_ids => @hosts.map(&:id),
-                 :host => { :expired_on => expiration_date } }
+                 :host => { 'expired_on(1i)' => expiration_date.day.to_s, 'expired_on(2i)' => expiration_date.month.to_s, 'expired_on(3i)' => expiration_date.year.to_s } }
 
       post :update_multiple_expiration, params: params, session: set_session_user.merge(:user => users(:admin).id)
 

data/test/helpers/hosts_helper_test.rb

@@ -4,6 +4,9 @@ require 'test_plugin_helper'
 
 class HostsHelperTest < ActionView::TestCase
   include HostsHelper
+  include HostDescriptionHelper
+  include PuppetRelatedHelper
+  include ForemanExpireHosts::HostsHelper
   include ApplicationHelper
 
   describe '#multiple_actions' do

data/test/lib/expire_hosts_notifications_test.rb

@@ -169,7 +169,7 @@ class ExpireHostsNotificationsTest < ActiveSupport::TestCase
         ExpireHostsNotifications.deliver_expiry_warning_notification
         notification = Notification.find_by(notification_blueprint_id: blueprint.id, subject_id: hosts.first.id)
         assert_not_nil notification
-        assert_equal 1, NotificationRecipient.where(notification_id: notification.id).update_all(seen: true) # rubocop:disable Rails/SkipsModelValidations
+        assert_equal 1, NotificationRecipient.where(notification_id: notification.id).update_all(seen: true)
         ExpireHostsNotifications.deliver_expiry_warning_notification
         assert_equal 1, NotificationRecipient.where(notification_id: notification.id, seen: false).count
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 7.0.0
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-12-10 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,7 +40,21 @@ 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.75.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.75.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,19 +68,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 2.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 2.3.2
 description: This Plugin will add new column expired_on to hosts to limit the lifetime
   of a host.
 email:
@@ -84,21 +98,18 @@ files:
 - 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

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,8 +0,0 @@
-# frozen_string_literal: true
-
-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' %>"
-)