foreman_maintain 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7e6e1bff90945614408bb1ae3e73b9a12fd43d75d7d164da74c9292e87f7d56
-  data.tar.gz: 8f7d7d509bd2e88738a9025bd53c2a09f21933a65c4d1ce617ade128a2473542
+  metadata.gz: 4153054fabffdccbe07a9eed2689b4352077c3c4be62b92042dc20c885677a76
+  data.tar.gz: 68d332ebb071f25e585c0e866b0a85fa7efccd3820640452afcd06f5910860cc
 SHA512:
-  metadata.gz: 69b30ba9d0f4aa6bd74ac5ec609c8e6baaa26954aee7b50291c244dd90571546381ba7f929ec36466eae92a745e62f9ce5855a5f671c851b87a8cb5ecc69f82f
-  data.tar.gz: 76f1d2b051c4b062e1719303b0b87c450847702b4dd2c784f7afa31195886e46e6fe44a342fad9d3d3d130ac514dc4addbb9bdff32cd03fb75a165024cc9f295
+  metadata.gz: e431d1063f9b866d5300cc8de0a07d72c4b6542c8e974c3bec906e77bab465d54b8b68285d2c85ad12453a28fe4a7e20fd9d3ad01cb4493c65f2930418d1c58f
+  data.tar.gz: d39d2fcaaa8b0e90ac9fefd56e66bdc30e695078e853e3006d79c1204d90b08c4a39f41196bbf55888c47a995be9e276e6dd8b84016e85ced883c8d91655ffa8

data/definitions/procedures/refresh_features.rb

@@ -0,0 +1,9 @@
+class Procedures::RefreshFeatures < ForemanMaintain::Procedure
+  metadata do
+    description 'Refresh detected features'
+  end
+
+  def run
+    ForemanMaintain.refresh_features
+  end
+end

data/definitions/scenarios/upgrade_to_capsule_6_10.rb

@@ -68,6 +68,7 @@ module Scenarios::Capsule_6_10
     end
 
     def compose
+      add_step(Procedures::RefreshFeatures)
       add_step(Procedures::Service::Start.new)
       add_steps(find_procedures(:post_migrations))
     end

data/definitions/scenarios/upgrade_to_satellite_6_10.rb

@@ -70,6 +70,7 @@ module Scenarios::Satellite_6_10
     end
 
     def compose
+      add_step(Procedures::RefreshFeatures)
       add_step(Procedures::Service::Start.new)
       add_steps(find_procedures(:post_migrations))
     end

data/lib/foreman_maintain.rb

@@ -101,6 +101,10 @@ module ForemanMaintain
       @detector ||= Detector.new
     end
 
+    def refresh_features
+      @detector = Detector.new
+    end
+
     def reporter
       @reporter ||= ForemanMaintain::Reporter::CLIReporter.new
     end

data/lib/foreman_maintain/cli/base.rb

@@ -152,23 +152,31 @@ module ForemanMaintain
         end
       end
 
-      def self.interactive_option
+      # rubocop:disable  Metrics/MethodLength
+      def self.interactive_option(opts = %w[assumeyes whitelist force])
         delete_duplicate_assumeyes_if_any
 
-        option ['-y', '--assumeyes'], :flag,
-               'Automatically answer yes for all questions' do |assume|
-          ForemanMaintain.reporter.assumeyes = assume
+        if opts.include?('assumeyes')
+          option ['-y', '--assumeyes'], :flag,
+                 'Automatically answer yes for all questions' do |assume|
+            ForemanMaintain.reporter.assumeyes = assume
+          end
         end
 
-        option(['-w', '--whitelist'], 'whitelist',
-               'Comma-separated list of labels of steps to be skipped') do |whitelist|
-          raise ArgumentError, 'value not specified' if whitelist.nil? || whitelist.empty?
-          whitelist.split(',').map(&:strip)
+        if opts.include?('whitelist')
+          option(['-w', '--whitelist'], 'whitelist',
+                 'Comma-separated list of labels of steps to be skipped') do |whitelist|
+            raise ArgumentError, 'value not specified' if whitelist.nil? || whitelist.empty?
+            whitelist.split(',').map(&:strip)
+          end
         end
 
-        option ['-f', '--force'], :flag,
-               'Force steps that would be skipped as they were already run'
+        if opts.include?('force')
+          option ['-f', '--force'], :flag,
+                 'Force steps that would be skipped as they were already run'
+        end
       end
+      # rubocop:enable  Metrics/MethodLength
 
       def self.service_options
         option '--exclude', 'EXCLUDE', 'A comma-separated list of services to skip'

data/lib/foreman_maintain/cli/packages_command.rb

@@ -2,28 +2,28 @@ module ForemanMaintain
   module Cli
     class PackagesCommand < Base
       subcommand 'lock', 'Prevent packages from automatic update' do
-        interactive_option
+        interactive_option(['assumeyes'])
         def execute
           run_scenarios_and_exit(Scenarios::Packages::Lock.new)
         end
       end
 
       subcommand 'unlock', 'Enable packages for automatic update' do
-        interactive_option
+        interactive_option(['assumeyes'])
         def execute
           run_scenarios_and_exit(Scenarios::Packages::Unlock.new)
         end
       end
 
       subcommand 'status', 'Check if packages are protected against update' do
-        interactive_option
+        interactive_option(['assumeyes'])
         def execute
           run_scenarios_and_exit(Scenarios::Packages::Status.new)
         end
       end
 
       subcommand 'install', 'Install packages in an unlocked session' do
-        interactive_option
+        interactive_option(['assumeyes'])
         parameter 'PACKAGES ...', 'packages to install', :attribute_name => :packages
 
         def execute
@@ -37,7 +37,7 @@ module ForemanMaintain
       end
 
       subcommand 'update', 'Update packages in an unlocked session' do
-        interactive_option
+        interactive_option(['assumeyes'])
         parameter '[PACKAGES] ...', 'packages to update', :attribute_name => :packages
 
         def execute
@@ -51,7 +51,7 @@ module ForemanMaintain
       end
 
       subcommand 'is-locked', 'Check if update of packages is allowed' do
-        interactive_option
+        interactive_option([])
         def execute
           locked = ForemanMaintain.package_manager.versions_locked?
           puts "Packages are#{locked ? '' : ' not'} locked"

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.2'.freeze
+  VERSION = '0.8.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -265,6 +265,7 @@ files:
 - definitions/procedures/pulp/remove.rb
 - definitions/procedures/pulpcore/migrate.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
+- definitions/procedures/refresh_features.rb
 - definitions/procedures/remote_execution/remove_existing_settingsd.rb
 - definitions/procedures/repositories/disable.rb
 - definitions/procedures/repositories/setup.rb