Refactored out tty-prompt dependency

Author: bert-mccutchen

Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    ruby-nginx (1.0.0.pre.beta.2)
+    ruby-nginx (1.0.0.pre.beta.3)
       erb
       thor
       tty-command (~> 0.10, >= 0.10.1)
-      tty-prompt (>= 0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -77,19 +76,9 @@ GEM
     tty-color (0.6.0)
     tty-command (0.10.1)
       pastel (~> 0.8)
-    tty-cursor (0.7.1)
-    tty-prompt (0.23.1)
-      pastel (~> 0.8)
-      tty-reader (~> 0.8)
-    tty-reader (0.9.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      wisper (~> 2.0)
-    tty-screen (0.8.2)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    wisper (2.0.1)
 
 PLATFORMS
   aarch64-linux

lib/ruby/nginx/commands/helpers/prompt_helper.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Ruby
+  module Nginx
+    module Commands
+      module Helpers
+        module PromptHelper
+          def yes?(question)
+            return true if ENV["SKIP_PROMPT"]
+
+            retry_question = false
+
+            loop do
+              response = ask_question(question)
+
+              if !response.nil?
+                reset_line if retry_question
+                return print_confirm(question, response)
+              end
+
+              print_invalid_input && previous_line && reset_line
+              retry_question = true
+            end
+          rescue Interrupt
+            next_line && print_confirm(question, false)
+            raise Ruby::Nginx::AbortError, "Operation aborted"
+          end
+
+          private
+
+          def ask_question(question)
+            print "[Ruby::Nginx] #{question} \e[90m(Y/n)\e[0m "
+
+            case $stdin.gets.chomp.downcase
+            when "y", "yes"
+              true
+            when "n", "no"
+              false
+            end
+          end
+
+          def print_confirm(question, allowed)
+            previous_line && reset_line
+
+            print "[Ruby::Nginx] #{question} \e[32m#{allowed ? "yes" : "no"}\e[0m\n"
+            allowed
+          end
+
+          def reset_line
+            # 2K = clear line, 1G = move to first column
+            print "\e[2K\e[1G"
+            true
+          end
+
+          def previous_line
+            print "\e[1A"
+            true
+          end
+
+          def next_line
+            print "\n"
+            true
+          end
+
+          def print_invalid_input
+            print "\e[31m>>\e[0m Invalid input."
+            true
+          end
+        end
+      end
+    end
+  end
+end

lib/ruby/nginx/commands/helpers/sudo_helper.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "tty/command"
+require_relative "prompt_helper"
+
+module Ruby
+  module Nginx
+    module Commands
+      module Helpers
+        module SudoHelper
+          include Ruby::Nginx::Commands::Helpers::PromptHelper
+
+          def sudoify(cmd, sudo, reason)
+            return cmd unless sudo
+
+            if sudo_access? || yes?(reason)
+              "sudo #{cmd}"
+            else
+              raise Ruby::Nginx::AbortError, "Operation aborted"
+            end
+          end
+
+          private
+
+          def sudo_access?
+            TerminalCommand.new(cmd: "sudo -n true").run.success?
+          end
+        end
+      end
+    end
+  end
+end

lib/ruby/nginx/commands/install_mkcert.rb

@@ -14,6 +14,8 @@ def initialize
         def run
           return if installed?
 
+          puts "\e[0;33m#{cmd}\e[0m"
+
           if yes?("Would you like to install mkcert?")
             super
           else

lib/ruby/nginx/commands/install_nginx.rb

@@ -14,10 +14,12 @@ def initialize
         def run
           return if installed?
 
-          if yes?("Would you like to install Nginx?")
+          puts "\e[0;33m#{cmd}\e[0m"
+
+          if yes?("Would you like to install NGINX?")
             super
           else
-            raise Ruby::Nginx::AbortError, "Nginx is required to continue. Please install Nginx."
+            raise Ruby::Nginx::AbortError, "NGINX is required to continue. Please install NGINX."
           end
         end
 

lib/ruby/nginx/commands/terminal_command.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 require "tty/command"
-require "tty/prompt"
+require_relative "helpers/prompt_helper"
+require_relative "helpers/sudo_helper"
 
 module Ruby
   module Nginx
     module Commands
       class TerminalCommand
+        include Ruby::Nginx::Commands::Helpers::PromptHelper
+        include Ruby::Nginx::Commands::Helpers::SudoHelper
+
         attr_reader :cmd, :user, :error_type, :printer, :result
 
         def initialize(cmd:, user: nil, raise: nil, printer: :null)
@@ -22,28 +26,8 @@ def run
           raise @error_type, @result.err if error_type && @result.failure?
 
           @result
-        end
-
-        protected
-
-        def yes?(question)
-          ENV["SKIP_PROMPT"] || TTY::Prompt.new.yes?("[Ruby::Nginx] #{question}")
-        end
-
-        def sudoify(cmd, sudo, reason)
-          return cmd unless sudo
-
-          if sudo_access? || yes?(reason)
-            "sudo #{cmd}"
-          else
-            raise Ruby::Nginx::AbortError, "Operation aborted"
-          end
-        end
-
-        private
-
-        def sudo_access?
-          TerminalCommand.new(cmd: "sudo -n true").run.success?
+        rescue Interrupt
+          raise Ruby::Nginx::AbortError, "Operation aborted"
         end
       end
     end

lib/ruby/nginx/version.rb

@@ -2,7 +2,7 @@
 
 module Ruby
   module Nginx
-    VERSION = "1.0.0-beta.2"
+    VERSION = "1.0.0-beta.3"
 
     Version = Gem::Version
   end

ruby-nginx.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "erb"
   spec.add_dependency "thor"
   spec.add_dependency "tty-command", "~> 0.10", ">= 0.10.1"
-  spec.add_dependency "tty-prompt", ">= 0.3.0"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html