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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b156b35e8d3f70164e365712dc0fd152c18ea08c0f3daed48032c81487014a48
-  data.tar.gz: 8203893515a76640d100fa0b622229d0fda10f5f22a42902417771687f5e14ac
+  metadata.gz: 9a6d88117211b772d96bf97915e9ab94227c23fc3b30d01e658eca6d47c9f1fc
+  data.tar.gz: d64a2d5beb1392bfe892bc48f34a3cd36362a8e1022360e5081c37874bedf460
 SHA512:
-  metadata.gz: '0239941b73ea3e6eb95e7c12804c8f88e7426773a30505069352045784362b3498c0a7519f9f1f7761a490979dcbda8578aad034aebff699c4f0fc90ddc1065f'
-  data.tar.gz: ad7e3f5e297e2482c8c49487840d66c566ca036b4dc6dd3b57428316c4a87ac0b4784f1788e211f39845df9034ec29caae0da3790b6d1f94a32d7c3899cf5bc3
+  metadata.gz: 3eb09a3ffffa06c21b7e0432c63fd1d1a40ae4d5234003357087ca016091801bdb33e0cfbf22f16e461bde45ec38aa38465590224e8acb2cbfca13f632fc6dc3
+  data.tar.gz: ec68fde1a5e5ebe27383bc6e596533b2ed968d37fab890fbfa3033684a875105ff762441c69ad68c2b1cd9d94ca0833825888c55065bb7014875c9641eaa61d2

data/README.md

@@ -156,6 +156,7 @@ Options:
   -r,          [--root-path=ROOT_PATH]                                # default: $PWD
   -s,          [--ssl], [--no-ssl], [--skip-ssl]                      # default: false
   -l,          [--log], [--no-log], [--skip-log]                      # default: false
+  -t,          [--template-path=TEMPLATE_PATH]                        # default: [GEM_PATH]/nginx/templates/nginx.conf
   -cert-file,  [--ssl-certificate-path=SSL_CERTIFICATE_PATH]          # default: ~/.ruby-nginx/certs/_[DOMAIN].pem
   -key-file,   [--ssl-certificate-key-path=SSL_CERTIFICATE_KEY_PATH]  # default: ~/.ruby-nginx/certs/_[DOMAIN]-key.pem
   -access-log, [--access-log-path=ACCESS_LOG_PATH]                    # default: ~/.ruby-nginx/logs/[DOMAIN].access.log

data/lib/ruby/nginx/cli.rb

@@ -25,6 +25,7 @@ module Ruby
       method_option :root_path, aliases: "-r", type: :string, desc: "default: $PWD"
       method_option :ssl, aliases: "-s", type: :boolean, desc: defaults(:ssl)
       method_option :log, aliases: "-l", type: :boolean, desc: defaults(:log)
+      method_option :template_path, aliases: "-t", type: :string, desc: "default: [GEM_PATH]/nginx/templates/nginx.conf"
       method_option :ssl_certificate_path, aliases: "-cert-file", type: :string, desc: default_paths(:ssl_certificate_path)
       method_option :ssl_certificate_key_path, aliases: "-key-file", type: :string, desc: default_paths(:ssl_certificate_key_path)
       method_option :access_log_path, aliases: "-access-log", type: :string, desc: default_paths(:access_log_path)
@@ -35,6 +36,7 @@ module Ruby
           port: options.port,
           host: options.host,
           root_path: options.root_path,
+          template_path: options.template_path,
           ssl: options.ssl,
           log: options.log,
           ssl_certificate_path: options.ssl_certificate_path,

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/configuration.rb

@@ -36,7 +36,7 @@ module Ruby
         create_ssl_certs! if options[:ssl]
         create_log_files! if options[:log]
 
-        ERB.new(File.read(options[:template_path])).result(binding)
+        ERB.new(load_template).result(binding)
       end
 
       def defaults
@@ -82,6 +82,16 @@ module Ruby
         self.options = default_paths.merge(options)
       end
 
+      def load_template
+        File.read(options[:template_path])
+      rescue Errno::EISDIR
+        raise Ruby::Nginx::AbortError, "Template is a directory: #{options[:template_path]}"
+      rescue Errno::ENOENT
+        raise Ruby::Nginx::AbortError, "Template does not exist at: #{options[:template_path]}"
+      rescue => e
+        raise Ruby::Nginx::AbortError, "Failed to read template.", cause: e
+      end
+
       def create_ssl_certs!
         System::Mkcert.create!(
           options[:domain],

data/lib/ruby/nginx/templates/nginx.conf.erb

@@ -58,7 +58,8 @@ server {
   location @<%= name %> {
     proxy_pass                         http://<%= name %>;
     proxy_http_version                 1.1;
-    proxy_cache_bypass                 $http_upgrade;
+    proxy_no_cache                     1;
+    proxy_cache_bypass                 1;
 
     <% if options[:ssl] %>
     # proxy SSL

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.4"
 
     Version = Gem::Version
   end

metadata

@@ -1,14 +1,14 @@
 --- !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.4
 platform: ruby
 authors:
 - Bert McCutchen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb
@@ -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