foreman_maintain 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0e6da9a83b7060020dd78da8a1fd8887e4b76708471b3ee80802335e5252224
-  data.tar.gz: 4fdb27b3583aa2665bd76e725d748408c19e956c9959ed2513d17eb234ae4e7b
+  metadata.gz: 4bb62d8f6b441155dfbdbc8bad79f1ec79b620dcee19e5cb37229d77634552a2
+  data.tar.gz: d87d6b6149373f2e0be0cacfeaff2c83b675c9b92c9d5efad94cc8ccf6bba15d
 SHA512:
-  metadata.gz: 8cd917d7a19d07c9674b8c7a31ffd45378d936b27fa8442ad18ebf004d1b9084fba86b9e67747c66f4dc91a23b0426c7e1fb9442f501678ece2b950eb45efe7d
-  data.tar.gz: 965c7051bc9623d274d7c38b0a13fb4919f9e84d5651e22cb8b7faf827e9fc0b1f883c9154fae72f56b33c0fa5fe4cae6fd5b4432ebc44d0cc943c8b44982926
+  metadata.gz: 1a5897ac90ff9a5a9801bd456b7fc6cb4f186c6e582ca92895c449a06bd9d99480aed848a58ab2281dd65a3ea1e6a9b5fbcb4e85c7f4cea5180826bccb383e4b
+  data.tar.gz: d34018e15a798fb66efde83a56fd5a979d153a658ffa085f456ad6ea53b46544a0bd3d41b4a3e966f8fbae09e81bcfd049c5ac864ab803d1b03db3eae2acd89b

data/definitions/features/pulpcore.rb

@@ -21,7 +21,7 @@ class Features::Pulpcore < ForemanMaintain::Feature
   end
 
   def cli(args)
-    parse_json(execute!("pulp --format json #{args}"))
+    parse_json(execute!("pulp --format json #{args}", merge_stderr: false))
   end
 
   def running_tasks

data/definitions/features/pulpcore_database.rb

@@ -31,7 +31,7 @@ class Features::PulpcoreDatabase < ForemanMaintain::Feature
       from django.conf import settings; import json; print(json.dumps(settings.DATABASES["default"]))
     PYTHON
     manager_command = pulpcore_manager("shell --command '#{python_command}'")
-    manager_result = execute!(manager_command)
+    manager_result = execute!(manager_command, merge_stderr: false)
     db_config = JSON.parse(manager_result)
 
     @configuration = {}

data/definitions/scenarios/backup.rb

@@ -94,6 +94,8 @@ module ForemanMaintain::Scenarios
         :online_backup => true)
       add_step_with_context(Procedures::Backup::Pulp, :ensure_unchanged => true)
       add_database_backup_steps
+
+      add_step(Procedures::Service::Start.new(:only => online_workers)) unless online_workers.empty?
     end
 
     def add_database_backup_steps
@@ -102,8 +104,6 @@ module ForemanMaintain::Scenarios
         Procedures::Backup::Online::ForemanDB,
         Procedures::Backup::Online::PulpcoreDB
       )
-
-      add_step(Procedures::Service::Start.new(:only => online_workers)) unless online_workers.empty?
     end
 
     def strategy

data/lib/foreman_maintain/utils/command_runner.rb

@@ -1,4 +1,4 @@
-require 'English'
+require 'open3'
 require 'tempfile'
 
 module ForemanMaintain
@@ -8,7 +8,7 @@ module ForemanMaintain
       attr_reader :logger, :command
 
       def initialize(logger, command, options)
-        options.validate_options!(:stdin, :interactive, :valid_exit_statuses, :env)
+        options.validate_options!(:stdin, :interactive, :valid_exit_statuses, :env, :merge_stderr)
         options[:valid_exit_statuses] ||= [0]
         options[:env] ||= {}
         @logger = logger
@@ -18,6 +18,7 @@ module ForemanMaintain
         @options = options
         @valid_exit_statuses = options[:valid_exit_statuses]
         @env = options[:env]
+        @merge_stderr = options.fetch(:merge_stderr, true)
         raise ArgumentError, 'Can not pass stdin for interactive command' if @interactive && @stdin
       end
 
@@ -45,6 +46,11 @@ module ForemanMaintain
         @exit_status
       end
 
+      def stderr
+        raise 'Command not yet executed' unless defined? @stderr
+        @stderr
+      end
+
       def success?
         @valid_exit_statuses.include? exit_status
       end
@@ -82,18 +88,16 @@ module ForemanMaintain
       end
 
       def run_non_interactively
-        IO.popen(@env, full_command, 'r+') do |f|
-          if @stdin
-            f.puts(@stdin)
-            f.close_write
-          end
-          @output = f.read.strip
-        end
-        @exit_status = $CHILD_STATUS.exitstatus
+        @output, @stderr, status = Open3.capture3(@env, full_command, :stdin_data => @stdin)
+        @exit_status = status.exitstatus
       end
 
       def full_command
-        "#{@command} 2>&1"
+        if @merge_stderr
+          "#{@command} 2>&1"
+        else
+          @command
+        end
       end
     end
   end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.10.0'.freeze
+  VERSION = '1.10.1'.freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -430,7 +429,6 @@ homepage: https://github.com/theforeman/foreman_maintain
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -448,8 +446,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []