foreman_expire_hosts 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 93ce6b56c3992acaf75ce33279400688b6feb3c6
-  data.tar.gz: c5ebb3c23813c35e438c1e636aaa0f89c265035a
+SHA256:
+  metadata.gz: 6b84a9475e315085398e8c35d6577d7644583a1063c9b72c5c323c3e59a08edb
+  data.tar.gz: a71f5e3324d8caa9d7572c015331d1fc4b541ab720c14af5bce558bb408f3820
 SHA512:
-  metadata.gz: 3c96161b39033fa298be9570693b7f216e8745cd7f615f54055119dcd63c7e2f0c8123e1a40f334bad43f4819233bd8e4c3636daef9c00168ca69bb4986d0044
-  data.tar.gz: 17c238e649d88559d2e7708ae0a35b31604d7a201df5721b4ff231c6fe1d4bfc8cac21170a6e2b63b27685eb633b3958a9931f6c9b4489f81bf8ac0aaa697680
+  metadata.gz: 712461bc58fb25679244d62258c65a82a844ba2d0366218aeef9551f3d03c8e01cc67c50dae3267bd2f53218550236afcf7b9297440c8b939533fb2892f864fd
+  data.tar.gz: dfc0efce22d729a5389f61befc0b36b14f7b888df1274a6d748b05db5cda572d43b57351d3b47f14687fa0e3b08b9bee42f6f4eb5aefd8d53dd0844236b71c2c

data/.rubocop.yml

@@ -2,8 +2,10 @@ inherit_from:
   - .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: 2.2
+  TargetRailsVersion: 5.1
   Exclude:
-    - 'doc/plugins/**'
+    - 'Rakefile'
 
 Rails:
   Enabled: true
@@ -15,10 +17,6 @@ Rails/Date:
 Style/Documentation:
   Enabled: false
 
-# Force before_filter until upgrade to Rails 4
-Rails/ActionFilter:
-  EnforcedStyle: filter
-
 Metrics/MethodLength:
   Max: 40
 
@@ -53,9 +51,6 @@ Style/EachWithObject:
 Metrics/ParameterLists:
   Enabled: false
 
-Rails/HttpPositionalArguments:
-  Enabled: false
-
 Style/SymbolArray:
   Enabled: false
 
@@ -74,7 +69,5 @@ Rails/HasManyOrHasOneDependent:
 Style/CommentedKeyword:
   Enabled: false
 
-
-# May be enabled for Foreman >= 1.16
-Rails/ApplicationRecord:
+Rails/LexicallyScopedActionFilter:
   Enabled: false

data/.rubocop_todo.yml

@@ -6,11 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-    - 'app/models/concerns/foreman_expire_hosts/host_ext.rb'
-
 # Offense count: 12
 Metrics/AbcSize:
   Max: 51

data/README.md

@@ -16,6 +16,7 @@ This plugin will send two warning notifications before host expiry (see Settings
 | >= 1.13         | ~> 2.1         |
 | >= 1.15         | ~> 3.0         |
 | >= 1.16         | ~> 4.0         |
+| >= 1.17         | ~> 5.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/api/v2/hosts_controller_extensions.rb

@@ -0,0 +1,15 @@
+module ForemanExpireHosts
+  module Api
+    module V2
+      module HostsControllerExtensions
+        extend Apipie::DSL::Concern
+
+        update_api(:create, :update) do
+          param :host, Hash do
+            param :expired_on, String, :desc => 'Expiry date'
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/foreman_expire_hosts/host_controller_extensions.rb

@@ -2,8 +2,8 @@ module ForemanExpireHosts
   module HostControllerExtensions
     def self.prepended(base)
       base.class_eval do
-        before_filter :validate_multiple_expiration, :only => :update_multiple_expiration
-        before_filter :find_multiple_with_expire_hosts, :only => [:select_multiple_expiration, :update_multiple_expiration]
+        before_action :validate_multiple_expiration, :only => :update_multiple_expiration
+        before_action :find_multiple_with_expire_hosts, :only => [:select_multiple_expiration, :update_multiple_expiration]
         alias_method :find_multiple_with_expire_hosts, :find_multiple
       end
     end

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

@@ -2,9 +2,7 @@ module ForemanExpireHosts
   module HostsHelperExtensions
     def multiple_actions
       actions = super
-      if authorized_for(:controller => :hosts, :action => :edit)
-        actions << [_('Change Expiration'), select_multiple_expiration_hosts_path]
-      end
+      actions << [_('Change Expiration'), select_multiple_expiration_hosts_path] if authorized_for(:controller => :hosts, :action => :edit)
       actions
     end
 

data/app/models/concerns/foreman_expire_hosts/host_ext.rb

@@ -7,7 +7,7 @@ module ForemanExpireHosts
 
       validates :expired_on, :presence => true, :if => -> { Setting[:is_host_expiry_date_mandatory] }
 
-      has_one :expiration_status_object, :class_name => 'HostStatus::ExpirationStatus', :foreign_key => 'host_id'
+      has_one :expiration_status_object, :class_name => 'HostStatus::ExpirationStatus', :foreign_key => 'host_id', :inverse_of => :host
 
       before_validation :refresh_expiration_status
 
@@ -23,17 +23,13 @@ module ForemanExpireHosts
     def validate_expired_on
       if self.expires?
         begin
-          unless expired_on.to_s.to_date > Date.today
-            errors.add(:expired_on, _('must be in the future'))
-          end
-        rescue StandardError => e
+          errors.add(:expired_on, _('must be in the future')) unless expired_on.to_s.to_date > Date.today
+        rescue StandardError
           errors.add(:expired_on, _('is invalid'))
         end
       end
       if self.changed.include?('expired_on')
-        unless can_modify_expiry_date?
-          errors.add(:expired_on, _('no permission to edit'))
-        end
+        errors.add(:expired_on, _('no permission to edit')) unless can_modify_expiry_date?
       end
       true
     end

data/app/views/api/v2/hosts/expiration.json.rabl

@@ -0,0 +1 @@
+attributes :expired_on

data/db/migrate/20150427101516_add_expiry_on_to_hosts.rb

@@ -1,4 +1,4 @@
-class AddExpiryOnToHosts < ActiveRecord::Migration
+class AddExpiryOnToHosts < ActiveRecord::Migration[4.2]
   def change
     add_column :hosts, :expired_on, :date unless column_exists? :hosts, :expired_on
   end

data/foreman_expire_hosts.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'deface'
 
   s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'rubocop', '0.51.0'
+  s.add_development_dependency 'rubocop', '0.52.0'
 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.16'
+        requires_foreman '>= 1.17'
         register_custom_status HostStatus::ExpirationStatus
 
         # strong parameters
@@ -38,6 +38,8 @@ module ForemanExpireHosts
                      { :hosts => [:select_multiple_expiration, :update_multiple_expiration] },
                      :resource_type => 'Host'
         end
+
+        extend_rabl_template 'api/v2/hosts/main', 'api/v2/hosts/expiration'
       end
     end
 
@@ -47,6 +49,7 @@ module ForemanExpireHosts
         HostsHelper.send :include, ForemanExpireHosts::HostsHelperExtensions
         HostsController.send :prepend, ForemanExpireHosts::HostControllerExtensions
         AuditsHelper.send :include, ForemanExpireHosts::AuditsHelperExtensions
+        ::Api::V2::HostsController.send :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,3 +1,3 @@
 module ForemanExpireHosts
-  VERSION = '4.0.0'.freeze
+  VERSION = '5.0.0'.freeze
 end

data/lib/tasks/expired_hosts.rake

@@ -43,6 +43,4 @@ end
 Rake::Task[:test].enhance ['test:foreman_expire_hosts']
 
 load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task['jenkins:unit'].enhance ['test:foreman_expire_hosts', 'foreman_expire_hosts:rubocop']
-end
+Rake::Task['jenkins:unit'].enhance ['test:foreman_expire_hosts', 'foreman_expire_hosts:rubocop'] if Rake::Task.task_defined?(:'jenkins:unit')

data/test/functional/api/v2/hosts_controller_test.rb

@@ -0,0 +1,17 @@
+require 'test_plugin_helper'
+
+class Api::V2::HostsControllerTest < ActionController::TestCase
+  let(:host) do
+    as_admin do
+      FactoryBot.create(:host, :expires_in_a_year)
+    end
+  end
+
+  test 'should show individual record with expiry data' do
+    get :show, params: { :id => host.to_param }
+    assert_response :success
+    show_response = ActiveSupport::JSON.decode(@response.body)
+    assert !show_response.empty?
+    assert_equal host.expired_on, show_response['expired_on'].to_date
+  end
+end

data/test/functional/concerns/hosts_controller_extensions_test.rb

@@ -11,27 +11,25 @@ class HostsControllerTest < ActionController::TestCase
     test 'new host with expiration date' do
       expiration_date = Date.today + 14
       assert_difference 'Host.count' do
-        post :create, {
-          :host => {
-            :name => 'myotherfullhost',
-            :mac => 'aabbecddee06',
-            :ip => '2.3.4.125',
-            :domain_id => domains(:mydomain).id,
-            :operatingsystem_id => operatingsystems(:redhat).id,
-            :architecture_id => architectures(:x86_64).id,
-            :environment_id => environments(:production).id,
-            :subnet_id => subnets(:one).id,
-            :medium_id => media(:one).id,
-            :pxe_loader => 'Grub2 UEFI',
-            :realm_id => realms(:myrealm).id,
-            :disk => 'empty partition',
-            :puppet_proxy_id => smart_proxies(:puppetmaster).id,
-            :root_pass => 'xybxa6JUkz63w',
-            :location_id => taxonomies(:location1).id,
-            :organization_id => taxonomies(:organization1).id,
-            :expired_on => expiration_date
-          }
-        }, set_session_user
+        post :create, params: { :host => {
+          :name => 'myotherfullhost',
+          :mac => 'aabbecddee06',
+          :ip => '2.3.4.125',
+          :domain_id => domains(:mydomain).id,
+          :operatingsystem_id => operatingsystems(:redhat).id,
+          :architecture_id => architectures(:x86_64).id,
+          :environment_id => environments(:production).id,
+          :subnet_id => subnets(:one).id,
+          :medium_id => media(:one).id,
+          :pxe_loader => 'Grub2 UEFI',
+          :realm_id => realms(:myrealm).id,
+          :disk => 'empty partition',
+          :puppet_proxy_id => smart_proxies(:puppetmaster).id,
+          :root_pass => 'xybxa6JUkz63w',
+          :location_id => taxonomies(:location1).id,
+          :organization_id => taxonomies(:organization1).id,
+          :expired_on => expiration_date
+        } }, session: set_session_user
       end
       h = Host.search_for('myotherfullhost').first
       assert_equal expiration_date, h.expired_on
@@ -44,7 +42,7 @@ class HostsControllerTest < ActionController::TestCase
 
     test 'should add expiration date to host' do
       expiration_date = Date.today + 14
-      put :update, { :id => host.name, :host => { :expired_on => expiration_date } }, set_session_user
+      put :update, params: { :id => host.name, :host => { :expired_on => expiration_date } }, session: set_session_user
       h = Host.find(host.id)
       assert_equal expiration_date, h.expired_on
     end
@@ -60,7 +58,7 @@ class HostsControllerTest < ActionController::TestCase
 
     test 'show a host selection' do
       host_ids = @hosts.map(&:id)
-      xhr :post, :select_multiple_expiration, { :host_ids => host_ids }, set_session_user
+      post :select_multiple_expiration, params: { :host_ids => host_ids }, session: set_session_user, xhr: true
       assert_response :success
       @hosts.each do |host|
         assert response.body =~ /#{host.name}/m
@@ -72,8 +70,7 @@ class HostsControllerTest < ActionController::TestCase
       params = { :host_ids => @hosts.map(&:id),
                  :host => { :expired_on => expiration_date } }
 
-      post :update_multiple_expiration, params,
-           set_session_user.merge(:user => users(:admin).id)
+      post :update_multiple_expiration, params: params, session: set_session_user.merge(:user => users(:admin).id)
 
       assert_empty flash[:error]
 
@@ -86,8 +83,7 @@ class HostsControllerTest < ActionController::TestCase
       params = { :host_ids => @hosts.map(&:id),
                  :host => { :expired_on => '' } }
 
-      post :update_multiple_expiration, params,
-           set_session_user.merge(:user => users(:admin).id)
+      post :update_multiple_expiration, params: params, session: set_session_user.merge(:user => users(:admin).id)
 
       assert_empty flash[:error]
 

data/test/unit/safe_destroy_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 
 module ForemanExpireHosts
   class SafeDestroyTest < ActiveSupport::TestCase
-    class HostWithFailingCallbacks < ActiveRecord::Base
+    class HostWithFailingCallbacks < ApplicationRecord
       self.table_name = 'hosts'
       self.inheritance_column = nil
 
@@ -11,7 +11,7 @@ module ForemanExpireHosts
       private
 
       def cancel
-        false
+        throw(:abort)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2018-01-15 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.51.0
+        version: 0.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.52.0
 description: This Plugin will add new column expired_on to hosts to limit the lifetime
   of a host.
 email:
@@ -87,6 +87,7 @@ files:
 - 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
@@ -113,6 +114,7 @@ files:
 - app/services/foreman_expire_hosts/ui_notifications/hosts/base.rb
 - app/services/foreman_expire_hosts/ui_notifications/hosts/expiry_warning.rb
 - app/services/foreman_expire_hosts/ui_notifications/hosts/stopped_host.rb
+- app/views/api/v2/hosts/expiration.json.rabl
 - app/views/expire_hosts_mailer/_hosts_table.html.erb
 - app/views/expire_hosts_mailer/deleted_hosts_notification.html.erb
 - app/views/expire_hosts_mailer/expiry_warning_notification.html.erb
@@ -132,6 +134,7 @@ files:
 - lib/foreman_expire_hosts/version.rb
 - lib/tasks/expired_hosts.rake
 - test/factories/foreman_expire_hosts_factories.rb
+- test/functional/api/v2/hosts_controller_test.rb
 - test/functional/concerns/hosts_controller_extensions_test.rb
 - test/lib/expire_hosts_notifications_test.rb
 - test/test_plugin_helper.rb
@@ -160,12 +163,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for limiting host lifetime
 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/lib/expire_hosts_notifications_test.rb
 - test/test_plugin_helper.rb