foreman_expire_hosts 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44247c83269ff2759c38b6c8ea6821f2b65bdf2558c4703eb4a89f6ccaa7ab83
-  data.tar.gz: 110282faa293e518d45dca6661137039ea0e8eaa9a5cd038ee7b19536b8715fe
+  metadata.gz: f2f0094dacc9c70e393e1bf88b942e63e03d61ad43f9279dac3bc55dc8796d0f
+  data.tar.gz: f9768b9ad368199ed8b8d8965664788797cf59db5c0888cf4f846c324105d889
 SHA512:
-  metadata.gz: e55938b35afdd0ad71696a0a6ed21b8f489934223edd98aac29820d6fce255a372a1372907b3ff489e70205b367e6569eaa7fbf40c6c3251294bd55d746eddc6
-  data.tar.gz: 61dcac4a506ba4bf9379ce3270286636f0913c46c96c2bb8691b2b98db05494d1fdb1890daade056fa497198d22266482499c49ebdfc2c1f4bf375feace4f8ca
+  metadata.gz: e2093d7a71c66e85f18b2712e0bd9c39397d1f731e8cdd229a1b7e55805d97d7b751694760b2f4912b169e3110a6a9847bdff8a7d43595b6d7904f35100bd1b9
+  data.tar.gz: 6d24cb1a6fe7c1704680a95e06b90ebffeb8636e752e007a5bd8be48d5101fa5b25c169396ed61f7ff2320f77f46083115b78798626d371ed540fcaee632c143

data/.github/workflows/ci.yml

@@ -0,0 +1,78 @@
+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/.rubocop.yml

@@ -2,6 +2,7 @@ inherit_from:
   - .rubocop_todo.yml
 
 require:
+  - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
 

data/.rubocop_todo.yml

@@ -6,6 +6,12 @@
 # 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
 

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

@@ -55,8 +55,13 @@ module ForemanExpireHosts
 
     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?)
+        year = params['host']['expired_on(1i)']
+        month = params['host']['expired_on(2i)']
+        day = params['host']['expired_on(3i)']
+
+        return if year.empty? && month.empty? && day.empty?
+
+        Date.parse("#{year}-#{month}-#{day}")
       end
     end
 

data/foreman_expire_hosts.gemspec

@@ -10,10 +10,10 @@ Gem::Specification.new do |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.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']
 
@@ -27,6 +27,7 @@ DESC
 
   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

data/lib/foreman_expire_hosts/version.rb

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

data/lib/tasks/expired_hosts.rake

@@ -26,7 +26,7 @@ namespace :test do
 end
 
 namespace :foreman_expire_hosts do
-  task :rubocop do
+  task :rubocop => :environment do
     begin
       require 'rubocop/rake_task'
       RuboCop::RakeTask.new(:rubocop_foreman_expire_hosts) do |task|

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
 - Timo Goebel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.80.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +107,7 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -161,7 +176,7 @@ homepage: https://github.com/theforeman/foreman_expire_hosts
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,9 +191,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Foreman plugin for limiting host lifetime
 test_files: