foreman_expire_hosts 7.0.2 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2f0094dacc9c70e393e1bf88b942e63e03d61ad43f9279dac3bc55dc8796d0f
-  data.tar.gz: f9768b9ad368199ed8b8d8965664788797cf59db5c0888cf4f846c324105d889
+  metadata.gz: 7c1855fd3586ff4abdc25e11e58c006a503c83acc12628890ce4d307ebf113b9
+  data.tar.gz: c5ce62b9345649f1fd7365b0181ef83e53a93086f3b31435498b12eb6af0ce5c
 SHA512:
-  metadata.gz: e2093d7a71c66e85f18b2712e0bd9c39397d1f731e8cdd229a1b7e55805d97d7b751694760b2f4912b169e3110a6a9847bdff8a7d43595b6d7904f35100bd1b9
-  data.tar.gz: 6d24cb1a6fe7c1704680a95e06b90ebffeb8636e752e007a5bd8be48d5101fa5b25c169396ed61f7ff2320f77f46083115b78798626d371ed540fcaee632c143
+  metadata.gz: 15394668d731ba9c01b54e09ef5d13c1f6c3550938fd8fb4ee2188b696da77ad759a3df33ad80285aa378a2e463d496a92d80eb914b56a2af97655889060e23c
+  data.tar.gz: bf2fca5f36c7eee30374e413d1c80f482a6fcf13d833a19e57fe4de61f7a14b731742d3064cd870bbd86533d5a5377c8ebe2217c1a70c94a6ade8dafd5bb9a2e

data/db/migrate/20220923181700_fix_settings_category_to_dsl.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FixSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
+  def up
+    Setting.where(category: 'Setting::ExpireHost').update_all(category: 'Setting')
+  end
+end

data/lib/foreman_expire_hosts/engine.rb

@@ -19,13 +19,9 @@ module ForemanExpireHosts
       end
     end
 
-    initializer 'foreman_expire_hosts.load_default_settings', :before => :load_config_initializers do
-      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|
       Foreman::Plugin.register :foreman_expire_hosts do
-        requires_foreman '>= 1.24'
+        requires_foreman '>= 3.0.0'
         register_custom_status HostStatus::ExpirationStatus
 
         # strong parameters
@@ -43,6 +39,41 @@ module ForemanExpireHosts
           'hosts/update_multiple_expiration'
         ]
 
+        settings do
+          category(:expire_hosts, N_('Expire Hosts')) do
+            setting('is_host_expiry_date_mandatory',
+                    type: :boolean,
+                    description: N_('Make expiry date field mandatory on host creation/update'),
+                    default: false,
+                    full_name: N_('Require host expiry date'))
+            setting('can_owner_modify_host_expiry_date',
+                    type: :boolean,
+                    description: N_('Allow host owner to modify host expiry date field. If the field is false then admin only can edit expiry field'),
+                    default: false,
+                    full_name: N_('Host owner can modify host expiry date'))
+            setting('notify1_days_before_host_expiry',
+                    type: :integer,
+                    description: N_('Send first notification to owner of hosts about his hosts expiring in given days. Must be integer only'),
+                    default: 7,
+                    full_name: N_('First expiry notification'))
+            setting('notify2_days_before_host_expiry',
+                    type: :integer,
+                    description: N_('Send second notification to owner of hosts about his hosts expiring in given days. Must be integer only'),
+                    default: 1,
+                    full_name: N_('Second expiry notification'))
+            setting('days_to_delete_after_host_expiration',
+                    type: :integer,
+                    description: N_('Delete expired hosts after given days of hosts expiry date. Must be integer only'),
+                    default: 3,
+                    full_name: N_('Expiry grace period in days'))
+            setting('host_expiry_email_recipients',
+                    type: :string,
+                    description: N_('All notifications will be delivered to its owner. If any other users/admins need to receive those expiry warning notifications then those emails can be configured comma separated here.'),
+                    default: nil,
+                    full_name: N_('Expiry e-mail recipients'))
+          end
+        end
+
         extend_rabl_template 'api/v2/hosts/main', 'api/v2/hosts/expiration'
 
         describe_host do

data/lib/foreman_expire_hosts/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 8.0.0
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -103,15 +103,8 @@ email:
 - mail@timogoebel.name
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
-- LICENSE
+extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- Gemfile
 - LICENSE
 - README.md
 - app/controllers/concerns/foreman_expire_hosts/api/v2/hosts_controller_extensions.rb
@@ -123,7 +116,6 @@ files:
 - 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/deleted_expired_host_comment_in_audits.rb
@@ -153,9 +145,9 @@ files:
 - app/views/hosts/select_multiple_expiration.html.erb
 - config/routes.rb
 - db/migrate/20150427101516_add_expiry_on_to_hosts.rb
+- db/migrate/20220923181700_fix_settings_category_to_dsl.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
 - lib/foreman_expire_hosts/engine.rb
@@ -191,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Foreman plugin for limiting host lifetime

data/.github/workflows/ci.yml

@@ -1,78 +0,0 @@
-name: CI
-on: [push, pull_request]
-env:
-  RAILS_ENV: test
-  DATABASE_URL: postgresql://postgres:@localhost/test
-  DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true
-jobs:
-  rubocop:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.3
-      - name: Setup
-        run: |
-          gem install bundler
-          bundle install --jobs=3 --retry=3
-      - name: Run rubocop
-        run: bundle exec rubocop
-  test:
-    runs-on: ubuntu-latest
-    needs: rubocop
-    services:
-      postgres:
-        image: postgres:12.1
-        ports: ['5432:5432']
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-    strategy:
-      fail-fast: false
-      matrix:
-        foreman-core-branch: [1.24-stable, 2.0-stable, 2.1-stable, develop]
-        ruby-version: [2.3, 2.5, 2.6]
-        node-version: [10]
-        exclude:
-          - foreman-core-branch: 2.0-stable
-            ruby-version: 2.3
-          - foreman-core-branch: 2.1-stable
-            ruby-version: 2.3
-          - foreman-core-branch: develop
-            ruby-version: 2.3
-    steps:
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install build-essential libcurl4-openssl-dev libvirt-dev ruby-libvirt zlib1g-dev libpq-dev
-      - uses: actions/checkout@v2
-        with:
-          repository: theforeman/foreman
-          ref: ${{ matrix.foreman-core-branch }}
-      - uses: actions/checkout@v2
-        with:
-          path: foreman_expire_hosts
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-      - name: Setup Node
-        uses: actions/setup-node@v1
-        with:
-          node-version:  ${{ matrix.node-version }}
-      - name: Setup Plugin
-        run: |
-          echo "gem 'foreman_expire_hosts', path: './foreman_expire_hosts'" > bundler.d/foreman_expire_hosts.local.rb
-          gem install bundler
-          bundle config set without journald development console mysql2 sqlite
-          bundle install --jobs=3 --retry=3
-          bundle exec rake db:create
-          bundle exec rake db:migrate
-          npm install
-          bundle exec rake webpack:compile
-      - name: Run plugin tests
-        run: bundle exec rake test:foreman_expire_hosts
-      - name: Precompile plugin assets
-        run: bundle exec rake 'plugin:assets:precompile[foreman_expire_hosts]'
-        env:
-          RAILS_ENV: production

data/.gitignore

@@ -1,15 +0,0 @@
-*.sw?
-.idea
-.bundle/
-log/*.log
-pkg/
-test/dummy/db/*.sqlite3
-test/dummy/log/*.log
-test/dummy/tmp/
-test/dummy/.sass-cache
-locale/*.mo
-locale/*/*.pox
-locale/*/*.edit.po
-locale/*/*.po.time_stamp
-Gemfile.lock
-*.gem

data/.rubocop.yml

@@ -1,78 +0,0 @@
-inherit_from:
-  - .rubocop_todo.yml
-
-require:
-  - rubocop-minitest
-  - rubocop-performance
-  - rubocop-rails
-
-AllCops:
-  TargetRubyVersion: 2.3
-  TargetRailsVersion: 5.1
-  Exclude:
-    - 'Rakefile'
-
-Rails:
-  Enabled: true
-
-Rails/Date:
-  Enabled: false
-
-# Don't enforce documentation
-Style/Documentation:
-  Enabled: false
-
-Naming/AccessorMethodName:
-  Enabled: false
-
-Style/RedundantSelf:
-  Enabled: false
-
-Naming/FileName:
-  Exclude:
-      - 'db/seeds.d/*'
-
-Style/WordArray:
-  Enabled: false
-
-Style/RescueModifier:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/EachWithObject:
-  Enabled: false
-
-Style/SymbolArray:
-  Enabled: false
-
-Style/FormatString:
-  Enabled: false
-
-Style/FormatStringToken:
-  Enabled: false
-
-Style/HashSyntax:
-  Enabled: false
-
-Rails/HasManyOrHasOneDependent:
-  Enabled: false
-
-Style/CommentedKeyword:
-  Enabled: false
-
-Rails/LexicallyScopedActionFilter:
-  Enabled: false
-
-Rails/OutputSafety:
-  Enabled: false
-
-Rails/SkipsModelValidations:
-  Enabled: false
-
-Metrics:
-  Enabled: false
-
-Layout/LineLength:
-  Enabled: false

data/.rubocop_todo.yml

@@ -1,22 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# 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.
-
-Minitest/RefuteFalse:
-  Enabled: false
-
-Minitest/AssertTruthy:
-  Enabled: false
-
-Style/HashEachMethods:
-  Enabled: false
-
-Style/HashTransformKeys:
-  Enabled: false
-
-Style/HashTransformValues:
-  Enabled: false

data/Gemfile

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source 'http://rubygems.org'
-
-gemspec

data/app/models/setting/expire_hosts.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class Setting::ExpireHosts < Setting
-  Setting::BLANK_ATTRS.push('host_expiry_email_recipients')
-
-  def self.load_defaults
-    # Check the table exists
-    return unless super
-
-    self.transaction do
-      [
-        self.set('is_host_expiry_date_mandatory', N_('Make expiry date field mandatory on host creation/update'), false, N_('Require host expiry date')),
-        self.set('can_owner_modify_host_expiry_date', N_('Allow host owner to modify host expiry date field. If the field is false then admin only can edit expiry field'), false, N_('Host owner can modify host expiry date')),
-        self.set('notify1_days_before_host_expiry', N_('Send first notification to owner of hosts about his hosts expiring in given days. Must be integer only'), 7, N_('First expiry notification')),
-        self.set('notify2_days_before_host_expiry', N_('Send second notification to owner of hosts about his hosts expiring in given days. Must be integer only'), 1, N_('Second expiry notification')),
-        self.set('days_to_delete_after_host_expiration', N_('Delete expired hosts after given days of hosts expiry date. Must be integer only'), 3, N_('Expiry grace period in days')),
-        self.set('host_expiry_email_recipients', N_('All notifications will be delivered to its owner. If any other users/admins need to receive those expiry warning notifications then those emails can be configured comma separated here.'), nil, N_('Expiry e-mail recipients'))
-      ].each { |s| self.create! s.update(:category => 'Setting::ExpireHosts') }
-    end
-
-    true
-  end
-end

data/foreman_expire_hosts.gemspec

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require File.expand_path('lib/foreman_expire_hosts/version', __dir__)
-require 'date'
-
-Gem::Specification.new do |s|
-  s.name        = 'foreman_expire_hosts'
-  s.version     = ForemanExpireHosts::VERSION
-  s.date        = Date.today.to_s
-  s.authors     = ['Nagarjuna Rachaneni', 'Timo Goebel']
-  s.email       = ['nn.nagarjuna@gmail.com', 'mail@timogoebel.name']
-  s.summary     = 'Foreman plugin for limiting host lifetime'
-  s.description = <<~DESC
-    A Foreman plugin that allows hosts to expire at a configurable date.
-    Hosts will be shut down and automatically deleted after a grace period.
-  DESC
-  s.homepage    = 'https://github.com/theforeman/foreman_expire_hosts'
-  s.licenses    = ['GPL-3.0']
-
-  s.files =            `git ls-files`.split("\n")
-  s.test_files =       `git ls-files test`.split("\n")
-  s.extra_rdoc_files = `git ls-files doc`.split("\n") + Dir['README*', 'LICENSE']
-
-  s.require_paths = ['lib']
-
-  s.add_dependency 'deface'
-
-  s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'rubocop', '~> 0.80.0'
-  s.add_development_dependency 'rubocop-minitest', '~> 0.7.0'
-  s.add_development_dependency 'rubocop-performance', '~> 1.5.2'
-  s.add_development_dependency 'rubocop-rails', '~> 2.4.2'
-end