foreman_maintain 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4153054fabffdccbe07a9eed2689b4352077c3c4be62b92042dc20c885677a76
-  data.tar.gz: 68d332ebb071f25e585c0e866b0a85fa7efccd3820640452afcd06f5910860cc
+  metadata.gz: ca55a94ef08b62455d53810a1c240a4b7575b4633d91cf7bbcaa1f63c18911a5
+  data.tar.gz: 8d344101f80d7317b1bffecfdd1919f651d011f90b5a06da60cb421d0e9a9775
 SHA512:
-  metadata.gz: e431d1063f9b866d5300cc8de0a07d72c4b6542c8e974c3bec906e77bab465d54b8b68285d2c85ad12453a28fe4a7e20fd9d3ad01cb4493c65f2930418d1c58f
-  data.tar.gz: d39d2fcaaa8b0e90ac9fefd56e66bdc30e695078e853e3006d79c1204d90b08c4a39f41196bbf55888c47a995be9e276e6dd8b84016e85ced883c8d91655ffa8
+  metadata.gz: 59a0b6977fc0888606b0e6d25cfc2c7172c462059e34dc68a0cbef32b13feae33d7a5d77ccac9e1f6adaa469b187fbec83253fd110464e1e8dc0f3133637f7d2
+  data.tar.gz: e36d9de3b3a022e7dfd312ae3b70df24a75ba1fb17b9ad7dee640b89571a1b3a2e1372380e00209671520435c475418c597cbd5443943871d9cb27351341faf7

data/definitions/features/pulpcore.rb

@@ -34,10 +34,22 @@ class Features::Pulpcore < ForemanMaintain::Feature
   end
 
   def self.pulpcore_common_services
-    [
+    common_services = [
       ForemanMaintain::Utils.system_service('pulpcore-api', 10, :socket => 'pulpcore-api'),
-      ForemanMaintain::Utils.system_service('pulpcore-content', 10, :socket => 'pulpcore-content'),
-      ForemanMaintain::Utils.system_service('pulpcore-resource-manager', 10)
+      ForemanMaintain::Utils.system_service('pulpcore-content', 10, :socket => 'pulpcore-content')
     ]
+    common_services + pulpcore_resource_manager_service
+  end
+
+  def pulpcore_resource_manager_service
+    # The pulpcore_resource_manager is only required on 3.14+
+    # if the old tasking system is being used
+    # The foreman-installer does not create unit file for this service,
+    # if the new tasking system is being used
+    if feature(:service).unit_file_available?('pulpcore-resource-manager.service')
+      return [ForemanMaintain::Utils.system_service('pulpcore-resource-manager', 10)]
+    end
+
+    []
   end
 end

data/definitions/features/service.rb

@@ -50,6 +50,13 @@ class Features::Service < ForemanMaintain::Feature
     service_list
   end
 
+  def unit_file_available?(name)
+    cmd = "systemctl --no-legend --no-pager list-unit-files --type=service #{name} |\
+           grep --word-regexp --quiet #{name}"
+    exit_status, = execute_with_status(cmd)
+    exit_status == 0
+  end
+
   private
 
   def use_system_service(action, options, spinner)

data/lib/foreman_maintain/cli/base.rb

@@ -153,7 +153,7 @@ module ForemanMaintain
       end
 
       # rubocop:disable  Metrics/MethodLength
-      def self.interactive_option(opts = %w[assumeyes whitelist force])
+      def self.interactive_option(opts = %w[assumeyes whitelist force plaintext])
         delete_duplicate_assumeyes_if_any
 
         if opts.include?('assumeyes')
@@ -175,6 +175,13 @@ module ForemanMaintain
           option ['-f', '--force'], :flag,
                  'Force steps that would be skipped as they were already run'
         end
+
+        if opts.include?('plaintext')
+          option(['--plaintext'], :flag,
+                 'Print the output in plaintext and disable the spinner') do |plaintext|
+            ForemanMaintain.reporter.plaintext = plaintext
+          end
+        end
       end
       # rubocop:enable  Metrics/MethodLength
 

data/lib/foreman_maintain/reporter.rb

@@ -46,6 +46,10 @@ module ForemanMaintain
       @assumeyes
     end
 
+    def plaintext?
+      @plaintext
+    end
+
     # simple yes/no question, returns :yes, :no or :quit
     # rubocop:disable Metrics/LineLength
     def ask_decision(message, actions_msg: 'y(yes), n(no), q(quit)', assumeyes: assumeyes?, run_strategy: :fail_fast)
@@ -65,6 +69,10 @@ module ForemanMaintain
       @assumeyes = !!assume
     end
 
+    def plaintext=(plaintext)
+      @plaintext = !!plaintext
+    end
+
     private
 
     def single_step_decision(step, run_strategy)

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -30,7 +30,7 @@ module ForemanMaintain
         end
 
         def activate
-          @mutex.synchronize { @active = true }
+          @mutex.synchronize { @active = true } unless @reporter.plaintext?
           spin
         end
 
@@ -62,8 +62,11 @@ module ForemanMaintain
 
         def print_current_line
           @reporter.clear_line
-          line = "#{@spinner_chars[@spinner_index]} #{@current_line}"
-          @reporter.print(line)
+          if @reporter.plaintext?
+            @reporter.print(@current_line.to_s)
+          else
+            @reporter.print("#{@spinner_chars[@spinner_index]} #{@current_line}")
+          end
         end
       end
 
@@ -75,6 +78,7 @@ module ForemanMaintain
         @stdin = stdin
         options.validate_options!(:assumeyes)
         @assumeyes = options.fetch(:assumeyes, false)
+        @plaintext = options.fetch(:plaintext, false)
         @hl = HighLine.new(@stdin, @stdout)
         @max_length = 80
         @line_char = '-'
@@ -162,7 +166,11 @@ module ForemanMaintain
       end
 
       def clear_line
-        print "\r" + ' ' * @max_length + "\r"
+        if plaintext?
+          print "\n"
+        else
+          print "\r" + ' ' * @max_length + "\r"
+        end
       end
 
       def assumeyes?
@@ -271,7 +279,11 @@ module ForemanMaintain
                     :already_run => { :label => '[ALREADY RUN]', :color => :yellow },
                     :warning => { :label => '[WARNING]', :color => :yellow } }
         properties = mapping[status]
-        @hl.color(properties[:label], properties[:color], :bold)
+        if @plaintext
+          properties[:label]
+        else
+          @hl.color(properties[:label], properties[:color], :bold)
+        end
       end
 
       def hline(line_char = @line_char)

data/lib/foreman_maintain/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp