foreman_maintain 0.5.6 → 0.6.0

data/lib/foreman_maintain/cli/packages_command.rb

@@ -38,7 +38,7 @@ module ForemanMaintain
 
       subcommand 'update', 'Update packages in an unlocked session' do
         interactive_option
-        parameter '[PACKAGES ...]', 'packages to update', :attribute_name => :packages
+        parameter 'PACKAGES ...', 'packages to update', :attribute_name => :packages
 
         def execute
           run_scenarios_and_exit(

data/lib/foreman_maintain/concerns/downstream.rb

@@ -87,7 +87,8 @@ module ForemanMaintain
                  else
                    "rhel-#{rh_version_major}-server-#{package_name}-#{full_version}-rpms"
                  end
-        if current_minor_version == '6.3' && full_version.to_s != '6.4' && (
+
+        if current_minor_version == '6.3' && server_version.to_s != '6.4' && (
           feature(:puppet_server) && feature(:puppet_server).puppet_version.major == 4)
           # TODO: confirm repo for capsule. It might be same repo
           repos << "rhel-#{rh_version_major}-server-satellite-tools-6.3-puppet4-rpms"

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -53,10 +53,15 @@ module ForemanMaintain
         execute?("command -v #{command_name}")
       end
 
-      def execute!(command, options = {})
+      def execute_runner(command, options = {})
         command_runner = Utils::CommandRunner.new(logger, command, options)
         execution.puts '' if command_runner.interactive? && respond_to?(:execution)
         command_runner.run
+        command_runner
+      end
+
+      def execute!(command, options = {})
+        command_runner = execute_runner(command, options)
         if command_runner.success?
           command_runner.output
         else
@@ -65,15 +70,12 @@ module ForemanMaintain
       end
 
       def execute(command, options = {})
-        command_runner = Utils::CommandRunner.new(logger, command, options)
-        execution.puts '' if command_runner.interactive? && respond_to?(:execution)
-        command_runner.run
-        command_runner.output
+        execute_runner(command, options).output
       end
 
       def execute_with_status(command, options = {})
-        result_msg = execute(command, options)
-        [$CHILD_STATUS.to_i, result_msg]
+        command_runner = execute_runner(command, options)
+        [command_runner.exit_status, command_runner.output]
       end
 
       def file_exists?(filename)

data/lib/foreman_maintain/feature.rb

@@ -41,9 +41,5 @@ module ForemanMaintain
     def config_files_to_exclude
       []
     end
-
-    def config_files_exclude_for_online
-      []
-    end
   end
 end

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -184,9 +184,9 @@ module ForemanMaintain
         ask_to_select('Select step to continue', steps, &:runtime_message)
       end
 
-      def ask_decision(message, options = 'y(yes), n(no), q(quit)', ignore_assumeyes: false)
-        if !ignore_assumeyes && assumeyes?
-          print("#{message} (assuming yes)\n")
+      def ask_decision(message, options = 'y(yes), n(no), q(quit)')
+        if assumeyes?
+          print("#{message} (assuming yes)")
           return :yes
         end
         until_valid_decision do

data/lib/foreman_maintain/utils/disk/io_device.rb

@@ -27,7 +27,7 @@ module ForemanMaintain
         # In fio command, --direct option bypass the cache page
         def fio
           cmd = "fio --name=job1 --rw=read --size=1g --output-format=json\
-                  --directory=#{dir} --direct=1 --unlink=1"
+                  --directory=#{dir} --direct=1"
           stdout = execute(cmd)
           output = JSON.parse(stdout)
           @fio ||= output['jobs'].first['read']['bw'].to_i

data/lib/foreman_maintain/utils/facter.rb

@@ -5,7 +5,7 @@ module ForemanMaintain::Utils
     FACTER_FILES = %w[/usr/bin/facter /opt/puppetlabs/bin/facter].freeze
 
     def self.package
-      puppet_version = version(execute!('/opt/puppetlabs/bin/puppet --version'))
+      puppet_version = version(execute!('puppet --version'))
 
       puppet_version.major >= 4 ? 'puppet-agent' : 'facter'
     end

data/lib/foreman_maintain/utils/service/abstract.rb

@@ -4,9 +4,10 @@ module ForemanMaintain::Utils
       include Comparable
       attr_reader :name, :priority
 
-      def initialize(name, priority, _options = {})
+      def initialize(name, priority, options = {})
         @name = name
         @priority = priority
+        @options = options
       end
 
       def <=>(other)

data/lib/foreman_maintain/utils/service/systemd.rb

@@ -1,17 +1,26 @@
 module ForemanMaintain::Utils
   module Service
     class Systemd < Abstract
-      def initialize(name, priority, _options = {})
+      def initialize(name, priority, options = {})
         super
         @sys = SystemHelpers.new
       end
 
       def command(action, options = {})
         do_wait = options.fetch(:wait, true) # wait for service to start
+        all = @options.fetch(:all, false)
+        skip_enablement = @options.fetch(:skip_enablement, false)
+
+        if skip_enablement && %w[enable disable].include?(action)
+          return skip_enablement_message(action, @name)
+        end
+
         if do_wait && File.exist?('/usr/sbin/service-wait')
           "service-wait #{@name} #{action}"
         else
-          "systemctl #{action} #{@name}"
+          cmd = "systemctl #{action} #{@name}"
+          cmd += ' --all' if all
+          cmd
         end
       end
 
@@ -53,6 +62,21 @@ module ForemanMaintain::Utils
       def execute(action, options = {})
         @sys.execute_with_status(command(action, options))
       end
+
+      def skip_enablement_message(action, name)
+        # Enable and disable does not work well with globs since they treat them literally.
+        # We are skipping the pulpcore-workers@* for these actions until they are configured in
+        # a more managable way with systemd
+        # rubocop:disable Layout/IndentAssignment
+        msg =
+"
+\nWARNING: Skipping #{action} for #{name} as there are a variable amount of services to manage
+and this command will not respond to glob operators. These services have been configured by
+the installer and it is recommended to keep them enabled to prevent misconfiguration.\n
+"
+        # rubocop:enable Layout/IndentAssignment
+        puts msg
+      end
     end
   end
 end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.5.6'.freeze
+  VERSION = '0.6.0'.freeze
 end