foreman_expire_hosts 5.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a87b2c303a78750274b73d20e3d7113d0431353a699f80b6e86ef7e07ab179f
-  data.tar.gz: 3a93c88e92b00b7348c326546beab99e9d5655b859d72fbed82f250b6ad74f5a
+  metadata.gz: 8d016e02f798e790c84d0ff29badd0fbfbaf122b941787842dce237f19fcb0d9
+  data.tar.gz: 361195ee1b65ac38de1bad8e9ff7ecd6172202f52d524c3729bfbff022fe0a85
 SHA512:
-  metadata.gz: 74d7b446ffaac6353b3b82c29dc3f6474d161e00d2ecbd4231e15257b9589e6f7159a7badc141f97d05f0f035ee7236685faf0ef6c03603c771032edf6c99597
-  data.tar.gz: b6e522f9a6311a5d2abb3547b08625e1666479ed538f3757dd2a2fd50658a86d42914cda9f0d47d53773d3ab8058f80fc84cd8a5aeaf7f67f9bc2842bb920864
+  metadata.gz: 55d8ac2d1ddb0b96effb841ce5b897ef3c583b3b5bd619b337015c35a0f4744f7db57e70919ec8c946ad0a2d3a424263d1fad0e01ded37e540ca220d258158c7
+  data.tar.gz: 94c8f531186c1c55b70297e8c3905f17fb823326e3cf06c94c221aa7daa675deefc9f017161d8b0070d48164b58c8a6f8031eebf951d839990da24beeb656676

data/README.md

@@ -17,6 +17,7 @@ This plugin will send two warning notifications before host expiry (see Settings
 | >= 1.15         | ~> 3.0         |
 | >= 1.16         | ~> 4.0         |
 | >= 1.17         | ~> 5.0         |
+| >= 1.18         | ~> 6.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

@@ -33,9 +33,9 @@ module ForemanExpireHosts
 
       if failed_hosts.empty?
         if expiration_date.present?
-          notice _('The expiration date of the selected hosts was set to %s.') % l(expiration_date)
+          success _('The expiration date of the selected hosts was set to %s.') % l(expiration_date)
         else
-          notice _('The expiration date of the selected hosts was cleared.')
+          success _('The expiration date of the selected hosts was cleared.')
         end
       else
         error n_('The expiration date could not be set for host: %s.',

data/app/services/foreman_expire_hosts/safe_destroy.rb

@@ -9,11 +9,11 @@ module ForemanExpireHosts
 
     def destroy!
       # If Katello is installed, we can't just destroy the host
-      # but have to ask ForemanTasks to do this for us.
+      # but have to delete it the Katello way.
       # 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)
+      if subject.is_a?(Host::Base) && with_katello?
+        Katello::RegistrationManager.unregister_host(host)
       else
         subject.destroy!
       end

data/lib/foreman_expire_hosts/engine.rb

@@ -24,7 +24,7 @@ module ForemanExpireHosts
 
     initializer 'foreman_expire_hosts.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_expire_hosts do
-        requires_foreman '>= 1.17'
+        requires_foreman '>= 1.18'
         register_custom_status HostStatus::ExpirationStatus
 
         # strong parameters
@@ -60,21 +60,5 @@ module ForemanExpireHosts
         ForemanExpireHosts::Engine.load_seed
       end
     end
-
-    # Precompile any JS or CSS files under app/assets/
-    # If requiring files from each other, list them explicitly here to avoid precompiling the same
-    # content twice.
-    assets_to_precompile =
-      Dir.chdir(root) do
-        Dir['app/assets/javascripts/**/*', 'app/assets/stylesheets/**/*'].map do |f|
-          f.split(File::SEPARATOR, 4).last
-        end
-      end
-    initializer 'foreman_expire_hosts.assets.precompile' do |app|
-      app.config.assets.precompile += assets_to_precompile
-    end
-    initializer 'foreman_expire_hosts.configure_assets', group: :assets do
-      SETTINGS[:foreman_expire_hosts] = { assets: { precompile: assets_to_precompile } }
-    end
   end
 end

data/lib/foreman_expire_hosts/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-datepicker-rails