foreman_rescue 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4b36eae38108425515c2cd0edec9e271e47e64d63218e1fec50e3a8647874f0
-  data.tar.gz: 3ca946dec5e74624ae8305ded907c5b5e902eb35cb97e97a44bbb327eb9daf3c
+  metadata.gz: fed912b0085c3e6ab01cca79cc2e8df1986b71b8be95449caefa27a461d0ae50
+  data.tar.gz: 4f9c97ca7d406a58492bc8ac00f4b813dd009faddd857940abdda9275cce0942
 SHA512:
-  metadata.gz: 8122c629af1c8cf6a2a3f413b452ac1250eba7ed67cc0e76c026698efc41a3a8cce2cd98c30b3a769063662346b23f77bc5c1431ac4e0c92aa2f0d6e26f9a968
-  data.tar.gz: fb6aa2ed0a71b8d369d410c34d5f0d20c029c269b0cb9a97356e011b4a629be74dc389b5366c18625ef46cc591f12ad295cb05d8969849df83c898317d9772c3
+  metadata.gz: 589d947221c47ccca4d6d5ff1e7ad2f9beba1472a597c91017512ea3b82f97b7ba59e15e45eb6cf4aea3c884ff0df01510cd822ec1ed7fde423e5c6861b34ce6
+  data.tar.gz: 74308ab3113c2586326fac9e818c2f5a8871e1d0ad1354a21e8ecb88e2aa4c012360ce4c8b1645dac4ec86d9a59d771763c741b1eaecaee39f2f396663a43d78

data/README.md

@@ -2,6 +2,13 @@
 
 This plugin allows a user to boot a Foreman host into a rescue system via PXE.
 
+## Compatibility
+
+| Foreman Version | Plugin Version |
+| --------------- | -------------- |
+| >= 1.15         | ~> 0.1         |
+| >= 1.17         | ~> 1.0         |
+
 ## Installation
 
 See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)

data/app/controllers/foreman_rescue/hosts_controller.rb

@@ -16,7 +16,7 @@ module ForemanRescue
                         _('Enabled %s for boot into rescue system on next boot, but failed to power cycle the host.')
                       end
             process_success :success_msg => message % @host, :success_redirect => :back
-          rescue => error
+          rescue StandardError => error
             message = _('Failed to reboot %s.') % @host
             warning(message)
             Foreman::Logging.exception(message, error)

data/app/models/concerns/foreman_rescue/orchestration/tftp.rb

@@ -35,10 +35,10 @@ module ForemanRescue
 
       def rescue_mode_pxe_render(kind)
         template_name = Setting["rescue_#{kind.downcase}_tftp_template"]
-        template = ::ProvisioningTemplate.find_by_name(template_name)
-        return unless template.present?
+        template = ::ProvisioningTemplate.find_by(name: template_name)
+        return if template.blank?
         unattended_render template
-      rescue => e
+      rescue StandardError => e
         failure _("Unable to render %{kind} rescue template '%{name}' for TFTP: %{e}") % { :kind => kind, :name => template.try(:name), :e => e }, e
       end
 

data/app/models/setting/rescue.rb

@@ -5,15 +5,15 @@ class Setting
         set('rescue_pxelinux_tftp_template',
             N_('PXELinux template used when booting rescue system'),
             'create', N_('PXELinux rescue template'), nil,
-            { :collection => proc { Setting::Rescue.templates('PXELinux') } }),
+            :collection => proc { Setting::Rescue.templates('PXELinux') }),
         set('rescue_pxegrub_tftp_template',
             N_('PXEGrub template used when booting rescue system'),
             'create', N_('PXEGrub rescue template'), nil,
-            { :collection => proc { Setting::Rescue.templates('PXEGrub') } }),
+            :collection => proc { Setting::Rescue.templates('PXEGrub') }),
         set('rescue_pxegrub2_tftp_template',
             N_('PXEGrub2 template used when booting rescue system'),
             'create', N_('PXEGrub2 rescue template'), nil,
-            { :collection => proc { Setting::Rescue.templates('PXEGrub 2') } })
+            :collection => proc { Setting::Rescue.templates('PXEGrub 2') })
       ]
     end
 
@@ -21,15 +21,15 @@ class Setting
       # Check the table exists
       return unless super
 
-      self.transaction do
-        default_settings.each { |s| self.create! s.update(:category => 'Setting::Rescue') }
+      transaction do
+        default_settings.each { |s| create! s.update(:category => 'Setting::Rescue') }
       end
 
       true
     end
 
     def self.templates(kind)
-      template_kind = TemplateKind.find_by_name(kind)
+      template_kind = TemplateKind.find_by(name: kind)
       templates = ProvisioningTemplate.where(:template_kind => template_kind)
       templates.each_with_object({}) do |template, hsh|
         hsh[template.name] = template.name

data/db/migrate/20170901131321_add_rescue_mode_to_host.foreman_rescue.rb

@@ -1,4 +1,4 @@
-class AddRescueModeToHost < ActiveRecord::Migration
+class AddRescueModeToHost < ActiveRecord::Migration[4.2]
   def change
     add_column :hosts, :rescue_mode, :boolean, default: false, index: true
   end

data/lib/foreman_rescue/engine.rb

@@ -16,7 +16,7 @@ module ForemanRescue
                 :before => :load_config_initializers do |_app|
       if begin
         Setting.table_exists?
-      rescue
+      rescue StandardError
         false
       end
         require_dependency File.expand_path('../../../app/models/setting/rescue.rb', __FILE__)
@@ -25,7 +25,7 @@ module ForemanRescue
 
     initializer 'foreman_rescue.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_rescue do
-        requires_foreman '>= 1.15'
+        requires_foreman '>= 1.17'
 
         # Add permissions
         security_block :foreman_rescue do
@@ -39,7 +39,7 @@ module ForemanRescue
         Host::Managed.send(:prepend, ForemanRescue::HostExtensions)
         HostsHelper.send(:prepend, ForemanRescue::HostsHelperExtensions)
         Nic::Managed.send(:prepend, ForemanRescue::Orchestration::TFTP)
-      rescue => e
+      rescue StandardError => e
         Rails.logger.warn "ForemanRescue: skipping engine hook (#{e})"
       end
     end

data/lib/foreman_rescue/version.rb

@@ -1,3 +1,3 @@
 module ForemanRescue
-  VERSION = '0.1.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/tasks/foreman_rescue_tasks.rake

@@ -21,7 +21,7 @@ namespace :foreman_rescue do
                          "#{ForemanRescue::Engine.root}/lib/**/*.rb",
                          "#{ForemanRescue::Engine.root}/test/**/*.rb"]
       end
-    rescue
+    rescue StandardError
       puts 'Rubocop not loaded.'
     end
 
@@ -32,6 +32,4 @@ end
 Rake::Task[:test].enhance ['test:foreman_rescue']
 
 load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task['jenkins:unit'].enhance ['test:foreman_rescue', 'foreman_rescue:rubocop']
-end
+Rake::Task['jenkins:unit'].enhance ['test:foreman_rescue', 'foreman_rescue:rubocop'] if Rake::Task.task_defined?(:'jenkins:unit')

data/test/{functional → controllers}/hosts_controller_test.rb

@@ -3,10 +3,10 @@ require 'test_plugin_helper'
 module ForemanRescue
   class HostsControllerTest < ::ActionController::TestCase
     setup do
-      User.current = FactoryGirl.create(:user, :admin)
+      User.current = FactoryBot.create(:user, :admin)
     end
 
-    let(:host) { FactoryGirl.create(:host, :managed) }
+    let(:host) { FactoryBot.create(:host, :managed) }
 
     describe '#set_rescue' do
       setup do
@@ -20,7 +20,7 @@ module ForemanRescue
       context 'when host is not saved' do
         test 'the flash should inform it' do
           Host::Managed.any_instance.expects(:set_rescue).returns(false)
-          put :set_rescue, { :id => host.name }, set_session_user
+          put :set_rescue, params: { :id => host.name }, session: set_session_user
           assert_response :found
           assert_redirected_to hosts_path
           assert flash[:error] =~ /Failed to enable #{host} for rescue system/
@@ -33,7 +33,7 @@ module ForemanRescue
         end
 
         test 'the flash should inform it' do
-          put :set_rescue, { :id => host.name }, set_session_user
+          put :set_rescue, params: { :id => host.name }, session: set_session_user
           assert_response :found
           assert_redirected_to hosts_path
           assert_equal "Enabled #{host} for rescue system on next boot.", flash[:notice]
@@ -48,7 +48,7 @@ module ForemanRescue
 
           test 'the flash should inform it' do
             power_mock.stubs(:reset).returns(true)
-            put :set_rescue, { :id => host.name, :host => { :rescue_mode => '1' } }, set_session_user
+            put :set_rescue, params: { :id => host.name, :host => { :rescue_mode => '1' } }, session: set_session_user
             assert_response :found
             assert_redirected_to hosts_path
             assert_equal "Enabled #{host} for reboot into rescue system.", flash[:notice]
@@ -56,7 +56,7 @@ module ForemanRescue
 
           test 'with failed reboot, the flash should inform it' do
             power_mock.stubs(:reset).returns(false)
-            put :set_rescue, { :id => host.name, :host => { :rescue_mode => '1' } }, set_session_user
+            put :set_rescue, params: { :id => host.name, :host => { :rescue_mode => '1' } }, session: set_session_user
             host.power.reset
             assert_response :found
             assert_redirected_to hosts_path
@@ -65,7 +65,7 @@ module ForemanRescue
 
           test 'reboot raised exception, the flash should inform it' do
             power_mock.stubs(:reset).raises(Foreman::Exception)
-            put :set_rescue, { :id => host.name, :host => { :rescue_mode => '1' } }, set_session_user
+            put :set_rescue, params: { :id => host.name, :host => { :rescue_mode => '1' } }, session: set_session_user
             assert_response :found
             assert_redirected_to hosts_path
             assert_equal "Enabled #{host} for rescue system on next boot.", flash[:notice]
@@ -89,7 +89,7 @@ module ForemanRescue
         end
 
         test 'the flash should inform it' do
-          put :cancel_rescue, { :id => host.name }, set_session_user
+          put :cancel_rescue, params: { :id => host.name }, session: set_session_user
           assert_response :found
           assert_redirected_to hosts_path
           assert_equal "Canceled booting into rescue system for #{host}.", flash[:notice]
@@ -102,7 +102,7 @@ module ForemanRescue
         end
 
         test 'the flash should inform it' do
-          put :cancel_rescue, { :id => host.name }, set_session_user
+          put :cancel_rescue, params: { :id => host.name }, session: set_session_user
           assert_response :found
           assert_redirected_to hosts_path
           assert_includes flash[:error], "Failed to cancel booting into rescue system for #{host}"
@@ -112,7 +112,7 @@ module ForemanRescue
 
     describe '#rescue' do
       test 'renders page' do
-        get :rescue, { :id => host.name }, set_session_user
+        get :rescue, params: { :id => host.name }, session: set_session_user
         assert_response :success
         assert_template 'foreman_rescue/hosts/rescue'
       end

data/test/factories/host.rb

@@ -1,4 +1,4 @@
-FactoryGirl.modify do
+FactoryBot.modify do
   factory :host do
     trait :rescue_mode do
       rescue_mode true

data/test/{unit → models}/host_test.rb

@@ -2,24 +2,24 @@ require 'test_plugin_helper'
 
 class HostTest < ActiveSupport::TestCase
   setup do
-    User.current = FactoryGirl.build(:user, :admin)
+    User.current = FactoryBot.build(:user, :admin)
     setup_settings
     disable_orchestration
   end
 
   context 'a host with tftp orchestration' do
-    let(:organization) { FactoryGirl.create(:organization) }
-    let(:tax_location) { FactoryGirl.create(:location) }
+    let(:organization) { FactoryBot.create(:organization) }
+    let(:tax_location) { FactoryBot.create(:location) }
     let(:template) do
-      FactoryGirl.create(
+      FactoryBot.create(
         :provisioning_template,
-        :template_kind => TemplateKind.find_by_name('PXELinux'),
+        :template_kind => TemplateKind.find_by(name: 'PXELinux'),
         :locations => [tax_location],
         :organizations => [organization]
       )
     end
     let(:os) do
-      FactoryGirl.create(
+      FactoryBot.create(
         :operatingsystem,
         :with_os_defaults,
         :with_associations,
@@ -28,7 +28,7 @@ class HostTest < ActiveSupport::TestCase
       )
     end
     let(:host) do
-      FactoryGirl.create(
+      FactoryBot.create(
         :host,
         :managed,
         :with_tftp_orchestration,
@@ -64,11 +64,11 @@ class HostTest < ActiveSupport::TestCase
   end
 
   context 'rescue mode tftp remplate rendering' do
-    let(:host) { FactoryGirl.build(:host, :managed, :rescue_mode) }
+    let(:host) { FactoryBot.build(:host, :managed, :rescue_mode) }
     let(:template) do
-      FactoryGirl.create(:provisioning_template, :name => 'my template',
-                                                 :template => 'test content',
-                                                 :template_kind => template_kinds(:pxelinux))
+      FactoryBot.create(:provisioning_template, :name => 'my template',
+                                                :template => 'test content',
+                                                :template_kind => template_kinds(:pxelinux))
     end
 
     test 'renders tftp template' do

data/test/test_plugin_helper.rb

@@ -2,9 +2,9 @@
 require 'test_helper'
 require 'database_cleaner'
 
-# Add plugin to FactoryGirl's paths
-FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-FactoryGirl.reload
+# Add plugin to FactoryBot's paths
+FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+FactoryBot.reload
 
 # Foreman's setup doesn't handle cleaning up for Minitest::Spec
 DatabaseCleaner.strategy = :transaction
@@ -13,12 +13,14 @@ def setup_settings
   Setting::Rescue.load_defaults
 end
 
-class Minitest::Spec
-  before :each do
-    DatabaseCleaner.start
-  end
+module Minitest
+  class Spec
+    before :each do
+      DatabaseCleaner.start
+    end
 
-  after :each do
-    DatabaseCleaner.clean
+    after :each do
+      DatabaseCleaner.clean
+    end
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rescue
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.0
 description: Foreman Plugin to provide the ability to boot a host into a rescue system.
 email:
 - timo.goebel@dm.de
@@ -64,10 +64,10 @@ files:
 - locale/en/foreman_rescue.po
 - locale/foreman_rescue.pot
 - locale/gemspec.rb
+- test/controllers/hosts_controller_test.rb
 - test/factories/host.rb
-- test/functional/hosts_controller_test.rb
+- test/models/host_test.rb
 - test/test_plugin_helper.rb
-- test/unit/host_test.rb
 homepage: https://github.com/dm-drogeriemarkt/foreman_rescue
 licenses:
 - GPL-3.0
@@ -93,7 +93,7 @@ signing_key:
 specification_version: 4
 summary: Provides the ability to boot a host into a rescue system.
 test_files:
-- test/unit/host_test.rb
+- test/models/host_test.rb
 - test/factories/host.rb
 - test/test_plugin_helper.rb
-- test/functional/hosts_controller_test.rb
+- test/controllers/hosts_controller_test.rb