lib/pdk/cli/exec/interactive_command.rb in pdk-2.7.1 vs lib/pdk/cli/exec/interactive_command.rb in pdk-3.0.0
- old
+ new
@@ -2,19 +2,21 @@
module PDK
module CLI
module Exec
class InteractiveCommand < Command
+ # rubocop :disable Lint/MissingSuper
def initialize(*argv)
@argv = argv
# Default to running things in the system context.
@context = :system
# Extra environment vars to add to base set.
@environment = {}
end
+ # rubocop :enable Lint/MissingSuper
def register_spinner(_spinner, _opts = {})
raise 'This method is not implemented for PDK::CLI::Exec::InteractiveCommand'
end
@@ -40,13 +42,11 @@
@resolved_env = resolved_env_for_command
if [:module, :pwd].include?(context)
mod_root = PDK::Util.module_root
- unless mod_root
- raise PDK::CLI::FatalError, 'Current working directory is not part of a module. (No metadata.json was found.)'
- end
+ raise PDK::CLI::FatalError, 'Current working directory is not part of a module. (No metadata.json was found.)' unless mod_root
unless context == :pwd || Dir.pwd == mod_root
orig_workdir = Dir.pwd
Dir.chdir(mod_root)
end
@@ -59,22 +59,22 @@
{
interactive: true,
stdout: nil,
stderr: nil,
exit_code: result[:exit_code],
- duration: result[:duration],
+ duration: result[:duration]
}
ensure
Dir.chdir(orig_workdir) if orig_workdir
end
protected
# TODO: debug logging
def run_process!
command_string = argv.join(' ')
- PDK.logger.debug("Executing '%{command}' interactively" % { command: command_string })
+ PDK.logger.debug(format("Executing '%{command}' interactively", command: command_string))
if context == :module
PDK.logger.debug('Command environment:')
@resolved_env.each do |var, val|
PDK.logger.debug(" #{var}: #{val}")
@@ -86,16 +86,11 @@
system(@resolved_env, *argv)
exit_code = child_status.exitstatus
duration = Time.now - start_time
- PDK.logger.debug("Execution of '%{command}' complete (duration: \
- %{duration_in_seconds}s; exit code: %{exit_code})" %
- {
- command: command_string,
- exit_code: exit_code,
- duration_in_seconds: duration,
- })
+ PDK.logger.debug(format("Execution of '%{command}' complete (duration: \
+ %{duration_in_seconds}s; exit code: %{exit_code})", command: command_string, exit_code: exit_code, duration_in_seconds: duration))
{ exit_code: exit_code, duration: duration }
end
def child_status