diff --git a/lib/pdk/cli/exec/command.rb b/lib/pdk/cli/exec/command.rb index b2495bf40..fceca7c46 100644 --- a/lib/pdk/cli/exec/command.rb +++ b/lib/pdk/cli/exec/command.rb @@ -80,7 +80,7 @@ def add_spinner(message, opts = {}) require 'pdk/cli/util/spinner' - @spinner = TTY::Spinner.new("[:spinner] #{message}", opts.merge(PDK::CLI::Util.spinner_opts_for_platform)) + @spinner = TTY::Spinner.new("[:spinner] #{message}") end def update_environment(additional_env) diff --git a/lib/pdk/cli/util.rb b/lib/pdk/cli/util.rb index 34ed3c6b1..b6183a33c 100644 --- a/lib/pdk/cli/util.rb +++ b/lib/pdk/cli/util.rb @@ -28,18 +28,6 @@ def ensure_in_module!(opts = {}) end module_function :ensure_in_module! - def spinner_opts_for_platform - windows_opts = { - success_mark: '*', - error_mark: 'X' - } - - return windows_opts if Gem.win_platform? - - {} - end - module_function :spinner_opts_for_platform - def prompt_for_yes(question_text, opts = {}) require 'tty/prompt' diff --git a/lib/pdk/validate/external_command_validator.rb b/lib/pdk/validate/external_command_validator.rb index 5104f8867..f7d90dbe6 100644 --- a/lib/pdk/validate/external_command_validator.rb +++ b/lib/pdk/validate/external_command_validator.rb @@ -161,9 +161,9 @@ def prepare_invoke! if parent_validator.nil? || parent_validator.spinner.nil? || !parent_validator.spinner.is_a?(TTY::Spinner::Multi) c.add_spinner(spinner_text_for_targets(invokation_targets)) else - spinner = TTY::Spinner.new("[:spinner] #{spinner_text_for_targets(invokation_targets)}", PDK::CLI::Util.spinner_opts_for_platform) + spinner = TTY::Spinner.new("[:spinner] #{spinner_text_for_targets(invokation_targets)}") parent_validator.spinner.register(spinner) - c.register_spinner(spinner, PDK::CLI::Util.spinner_opts_for_platform) + c.register_spinner(spinner) end end end diff --git a/lib/pdk/validate/invokable_validator.rb b/lib/pdk/validate/invokable_validator.rb index bd9f071eb..a4cfed624 100644 --- a/lib/pdk/validate/invokable_validator.rb +++ b/lib/pdk/validate/invokable_validator.rb @@ -138,7 +138,7 @@ def spinner require 'pdk/cli/util/spinner' - @spinner = TTY::Spinner.new("[:spinner] #{spinner_text}", PDK::CLI::Util.spinner_opts_for_platform) + @spinner = TTY::Spinner.new("[:spinner] #{spinner_text}") end # Process any targets that were skipped by the validator and add the events to the validation report diff --git a/lib/pdk/validate/validator_group.rb b/lib/pdk/validate/validator_group.rb index 3dad7065e..e0503de47 100644 --- a/lib/pdk/validate/validator_group.rb +++ b/lib/pdk/validate/validator_group.rb @@ -42,7 +42,7 @@ def spinner require 'pdk/cli/util/spinner' - @spinner = TTY::Spinner::Multi.new("[:spinner] #{spinner_text}", PDK::CLI::Util.spinner_opts_for_platform) + @spinner = TTY::Spinner::Multi.new("[:spinner] #{spinner_text}") # Register the child spinners validator_instances.each do |instance|