More work on ruby 3 support

Author: alexandermeindl

Diff for: lib/redmine/scm/adapters/xitolite_adapter.rb

@@ -453,7 +453,8 @@ def archive(revision, format)
         def mirror_push(mirror_url, branch = nil, args = [])
           cmd_args = git_mirror_cmd.concat(['push', *args, mirror_url, branch]).compact
           cmd = cmd_args.shift
-          RedmineGitHosting::Utils::Exec.capture(cmd, cmd_args, { merge_output: true })
+
+          RedmineGitHosting::Utils::Exec.capture cmd, cmd_args, merge_output: true
         end
 
         class Revision < Redmine::Scm::Adapters::Revision

Diff for: lib/redmine_git_hosting/plugins/gitolite_plugin.rb

@@ -41,7 +41,7 @@ def directory_exists?(dir)
 
     def sudo_git(*params)
       cmd = RedmineGitHosting::Commands.sudo_git_args_for_repo(gitolite_repo_path, git_args).concat(params)
-      RedmineGitHosting::Commands.capture cmd, git_opts
+      RedmineGitHosting::Commands.capture cmd, **git_opts
     end
 
     # You may override this method to prepend args like environment variables

Diff for: lib/redmine_git_hosting/utils/exec.rb

@@ -12,9 +12,9 @@ module Exec
       #
       # If the operation throws an exception or the operation yields a non-zero exit code
       # we rethrow a +GitoliteCommandException+ with a meaningful error message.
-      def capture(command, args = [], opts = {}, &block)
+      def capture(command, args = [], **opts, &block)
         merge_output = opts.delete(:merge_output) { false }
-        stdout, stderr, code = execute(command, args, opts, &block)
+        stdout, stderr, code = execute(command, args, **opts, &block)
         if code != 0
           error_msg = "Non-zero exit code #{code} for `#{command} #{args.join ' '}`"
           RedmineGitHosting.logger.debug error_msg
@@ -29,8 +29,8 @@ def capture(command, args = [], opts = {}, &block)
       #
       # If the operation throws an exception or the operation we rethrow a
       # +GitoliteCommandException+ with a meaningful error message.
-      def execute(command, args = [], opts = {}, &block)
-        Open3.capture3(command, *args, opts, &block)
+      def execute(command, args = [], **opts, &block)
+        Open3.capture3(command, *args, **opts, &block)
       rescue StandardError => e
         error_msg = "Exception occured executing `#{command} #{args.join ' '}` : #{e.message}"
         RedmineGitHosting.logger.debug error_msg