Merge pull request #784 from rtib/fix_prompt

tty-prompt usage
puppetlabs · Oct 22, 2019 · a60f378 · a60f378
2 parents 25ad912 + 43f2155
commit a60f378
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/lib/pdk/cli.rb b/lib/pdk/cli.rb
@@ -3,6 +3,11 @@
 require 'pdk'
 require 'pdk/cli/errors'
 
+module TTY
+  autoload :Prompt, 'tty/prompt'
+  autoload :TestPrompt, 'tty/test_prompt'
+end
+
 class Cri::Command::CriExitException
   def initialize(is_error:)
     @is_error = is_error

diff --git a/lib/pdk/cli/module/generate.rb b/lib/pdk/cli/module/generate.rb
@@ -10,7 +10,7 @@ module PDK::CLI
 
     run do |opts, args, _cmd|
       require 'pdk/generate/module'
-      require 'tty-prompt'
+      require 'tty/prompt'
 
       module_name = args[0]
 

diff --git a/lib/pdk/cli/util.rb b/lib/pdk/cli/util.rb
@@ -6,6 +6,8 @@ module Util
       autoload :CommandRedirector, 'pdk/cli/util/command_redirector'
       autoload :OptionNormalizer, 'pdk/cli/util/option_normalizer'
       autoload :OptionValidator, 'pdk/cli/util/option_validator'
+      autoload :Interview, 'pdk/cli/util/interview'
+      autoload :Spinner, 'pdk/cli/util/spinner'
 
       # Ensures the calling code is being run from inside a module directory.
       #
@@ -37,6 +39,8 @@ def spinner_opts_for_platform
       module_function :spinner_opts_for_platform
 
       def prompt_for_yes(question_text, opts = {})
+        require 'tty/prompt'
+
         prompt = opts[:prompt] || TTY::Prompt.new(help_color: :cyan)
         validator = proc { |value| [true, false].include?(value) || value =~ %r{\A(?:yes|y|no|n)\Z}i }
         response = nil
@@ -46,7 +50,7 @@ def prompt_for_yes(question_text, opts = {})
             q.default opts[:default] unless opts[:default].nil?
             q.validate(validator, _('Answer "Y" to continue or "n" to cancel.'))
           end
-        rescue TTY::Prompt::Reader::InputInterrupt
+        rescue PDK::CLI::Util::Interview::READER::InputInterrupt
           PDK.logger.info opts[:cancel_message] if opts[:cancel_message]
         end
 

diff --git a/lib/pdk/cli/util/command_redirector.rb b/lib/pdk/cli/util/command_redirector.rb
@@ -1,5 +1,5 @@
 require 'pdk'
-require 'tty-prompt'
+require 'tty/prompt'
 
 module PDK
   module CLI
@@ -18,7 +18,7 @@ def target_command(cmd)
         def run
           @prompt.puts _('Did you mean \'%{command}\'?') % { command: pastel.bold(@command) }
           @prompt.yes?('-->')
-        rescue TTY::Prompt::Reader::InputInterrupt
+        rescue PDK::CLI::Util::Interview::READER::InputInterrupt
           nil
         end
       end

diff --git a/lib/pdk/cli/util/interview.rb b/lib/pdk/cli/util/interview.rb
@@ -1,4 +1,4 @@
-require 'tty-prompt'
+require 'tty/prompt'
 require 'pdk'
 
 module PDK