ruby-nginx 1.0.0.pre.beta.2 → 1.0.0.pre.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b156b35e8d3f70164e365712dc0fd152c18ea08c0f3daed48032c81487014a48
-  data.tar.gz: 8203893515a76640d100fa0b622229d0fda10f5f22a42902417771687f5e14ac
+  metadata.gz: 23ed81e982f332b222ea6f29a2e223ad1e114e5fb57953277defad3a164ca383
+  data.tar.gz: b68c5854801f99463f05401990c434d6dbe8de74f401c03a6b2edd5a6fb13019
 SHA512:
-  metadata.gz: '0239941b73ea3e6eb95e7c12804c8f88e7426773a30505069352045784362b3498c0a7519f9f1f7761a490979dcbda8578aad034aebff699c4f0fc90ddc1065f'
-  data.tar.gz: ad7e3f5e297e2482c8c49487840d66c566ca036b4dc6dd3b57428316c4a87ac0b4784f1788e211f39845df9034ec29caae0da3790b6d1f94a32d7c3899cf5bc3
+  metadata.gz: 7446042ae6a1a49eb49f034a455497d3a7eb4032800e124520db8ba74ef0a937a394de8b24cd58bb7cc12340b1d569574e5ef4e9fae0d25eeb3131d499979833
+  data.tar.gz: d3b9bc26b024f25b1925f7f18a51bd0a13f0753434458b6fc6ce4d9c59cfed661b534522b84851220bc16327f5654ad7dd00d85878b5dd3c3088ed2c21a452a1

data/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

data/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

data/lib/ruby/nginx/commands/install_mkcert.rb

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

data/lib/ruby/nginx/commands/install_nginx.rb

@@ -14,10 +14,12 @@ module Ruby
         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
 

data/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 @@ module Ruby
           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

data/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-nginx
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.2
+  version: 1.0.0.pre.beta.3
 platform: ruby
 authors:
 - Bert McCutchen
@@ -58,20 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.1
-- !ruby/object:Gem::Dependency
-  name: tty-prompt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 description: Utility gem with an added CLI for configuring NGINX with SSL.
 email:
 - mail@bertm.dev
@@ -89,6 +75,8 @@ files:
 - lib/ruby/nginx/commands/add_host_mapping.rb
 - lib/ruby/nginx/commands/add_nginx_config.rb
 - lib/ruby/nginx/commands/create_mkcert_certificate.rb
+- lib/ruby/nginx/commands/helpers/prompt_helper.rb
+- lib/ruby/nginx/commands/helpers/sudo_helper.rb
 - lib/ruby/nginx/commands/install_mkcert.rb
 - lib/ruby/nginx/commands/install_nginx.rb
 - lib/ruby/nginx/commands/nginx_options.rb