foreman_expire_hosts 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b84a9475e315085398e8c35d6577d7644583a1063c9b72c5c323c3e59a08edb
-  data.tar.gz: a71f5e3324d8caa9d7572c015331d1fc4b541ab720c14af5bce558bb408f3820
+  metadata.gz: 7a87b2c303a78750274b73d20e3d7113d0431353a699f80b6e86ef7e07ab179f
+  data.tar.gz: 3a93c88e92b00b7348c326546beab99e9d5655b859d72fbed82f250b6ad74f5a
 SHA512:
-  metadata.gz: 712461bc58fb25679244d62258c65a82a844ba2d0366218aeef9551f3d03c8e01cc67c50dae3267bd2f53218550236afcf7b9297440c8b939533fb2892f864fd
-  data.tar.gz: dfc0efce22d729a5389f61befc0b36b14f7b888df1274a6d748b05db5cda572d43b57351d3b47f14687fa0e3b08b9bee42f6f4eb5aefd8d53dd0844236b71c2c
+  metadata.gz: 74d7b446ffaac6353b3b82c29dc3f6474d161e00d2ecbd4231e15257b9589e6f7159a7badc141f97d05f0f035ee7236685faf0ef6c03603c771032edf6c99597
+  data.tar.gz: b6e522f9a6311a5d2abb3547b08625e1666479ed538f3757dd2a2fd50658a86d42914cda9f0d47d53773d3ab8058f80fc84cd8a5aeaf7f67f9bc2842bb920864

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

@@ -1,9 +1,17 @@
 module ForemanExpireHosts
   module HostsHelperExtensions
-    def multiple_actions
-      actions = super
-      actions << [_('Change Expiration'), select_multiple_expiration_hosts_path] if authorized_for(:controller => :hosts, :action => :edit)
-      actions
+    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)
@@ -30,10 +38,10 @@ module ForemanExpireHosts
       end
     end
 
-    def datepicker_f(f, attr, options = {})
-      field(f, attr, options) do
+    def datepicker_f(form, attr, options = {})
+      field(form, attr, options) do
         addClass options, 'form-control'
-        date = f.text_field attr, options
+        date = form.text_field attr, options
         addon = input_group_addon('', :class => 'glyphicon glyphicon-calendar')
         input_group date, addon
       end

data/app/services/foreman_expire_hosts/safe_destroy.rb

@@ -8,7 +8,15 @@ module ForemanExpireHosts
     end
 
     def destroy!
-      subject.destroy!
+      # If Katello is installed, we can't just destroy the host
+      # but have to ask ForemanTasks to do this for us.
+      # See https://community.theforeman.org/t/how-to-properly-destroy-a-content-host/8621
+      # for reasoning.
+      if with_katello?
+        ForemanTasks.sync_task(::Actions::Katello::Host::Destroy, subject)
+      else
+        subject.destroy!
+      end
     rescue ActiveRecord::RecordNotDestroyed => invalid
       message = _('Failed to delete %{class_name} %{subject}: %{message} - Errors: %{errors}') % {
         :class_name => subject.class.name,
@@ -19,5 +27,14 @@ module ForemanExpireHosts
       Foreman::Logging.exception(message, invalid)
       false
     end
+
+    private
+
+    def with_katello?
+      Katello # rubocop:disable Lint/Void
+      true
+    rescue StandardError
+      false
+    end
   end
 end

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

@@ -40,7 +40,7 @@ module ForemanExpireHosts
 
         def update_notification
           find_notification
-            .update_attributes(expired_at: blueprint.expired_at, :message => parsed_message)
+            .update(expired_at: blueprint.expired_at, :message => parsed_message)
         end
 
         def redeliver!

data/foreman_expire_hosts.gemspec

@@ -1,4 +1,4 @@
-require File.expand_path('../lib/foreman_expire_hosts/version', __FILE__)
+require File.expand_path('lib/foreman_expire_hosts/version', __dir__)
 require 'date'
 
 Gem::Specification.new do |s|
@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'deface'
 
   s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'rubocop', '0.52.0'
+  s.add_development_dependency 'rubocop', '0.54.0'
 end

data/lib/foreman_expire_hosts/engine.rb

@@ -19,7 +19,7 @@ module ForemanExpireHosts
     end
 
     initializer 'foreman_expire_hosts.load_default_settings', :before => :load_config_initializers do
-      require_dependency File.expand_path('../../../app/models/setting/expire_hosts.rb', __FILE__) if (Setting.table_exists? rescue(false))
+      require_dependency File.expand_path('../../app/models/setting/expire_hosts.rb', __dir__) if (Setting.table_exists? rescue(false))
     end
 
     initializer 'foreman_expire_hosts.register_plugin', :before => :finisher_hook do |_app|

data/lib/foreman_expire_hosts/version.rb

@@ -1,3 +1,3 @@
 module ForemanExpireHosts
-  VERSION = '5.0.0'.freeze
+  VERSION = '5.1.0'.freeze
 end

data/test/helpers/hosts_helper_test.rb

@@ -0,0 +1,12 @@
+require 'test_plugin_helper'
+
+class HostsHelperTest < ActionView::TestCase
+  include HostsHelper
+  include ApplicationHelper
+
+  describe '#multiple_actions' do
+    test 'includes expire bulk action' do
+      assert_includes multiple_actions.map(&:first), 'Change Expiration'
+    end
+  end
+end

data/test/unit/safe_destroy_test.rb

@@ -22,5 +22,15 @@ module ForemanExpireHosts
         assert_equal 1, HostWithFailingCallbacks.all.count
       end
     end
+
+    describe 'with a host' do
+      let(:host) { FactoryBot.create(:host, :managed) }
+
+      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)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-datepicker-rails
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.54.0
 description: This Plugin will add new column expired_on to hosts to limit the lifetime
   of a host.
 email:
@@ -136,6 +136,7 @@ files:
 - test/factories/foreman_expire_hosts_factories.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/concerns/hosts_controller_extensions_test.rb
+- test/helpers/hosts_helper_test.rb
 - test/lib/expire_hosts_notifications_test.rb
 - test/test_plugin_helper.rb
 - test/unit/concerns/host_extensions_test.rb
@@ -171,6 +172,7 @@ test_files:
 - test/factories/foreman_expire_hosts_factories.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/concerns/hosts_controller_extensions_test.rb
+- test/helpers/hosts_helper_test.rb
 - test/lib/expire_hosts_notifications_test.rb
 - test/test_plugin_helper.rb
 - test/unit/concerns/host_extensions_test.rb