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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a6d88117211b772d96bf97915e9ab94227c23fc3b30d01e658eca6d47c9f1fc
-  data.tar.gz: d64a2d5beb1392bfe892bc48f34a3cd36362a8e1022360e5081c37874bedf460
+  metadata.gz: b53325ca5fc64324eaf5204d8192e9366a9564279e615d2e3797ce700c87556e
+  data.tar.gz: 6f29b0ed5033f6e738cef7b6b66a514be2d6aa7d1eae9c965f86dc8526e60c4a
 SHA512:
-  metadata.gz: 3eb09a3ffffa06c21b7e0432c63fd1d1a40ae4d5234003357087ca016091801bdb33e0cfbf22f16e461bde45ec38aa38465590224e8acb2cbfca13f632fc6dc3
-  data.tar.gz: ec68fde1a5e5ebe27383bc6e596533b2ed968d37fab890fbfa3033684a875105ff762441c69ad68c2b1cd9d94ca0833825888c55065bb7014875c9641eaa61d2
+  metadata.gz: 4160c514cc0e5562dce1ec6c567dfaa234ecc555fc999eba2aa0739133c9df6a2af2332b688ae415f6593abe21e82c42f5c850fe54a2d00e692db31c78a95a31
+  data.tar.gz: 04d918dec2962326dbec3e20c02e5c62c4f8e9b5e9268d6416f69a1975895de5ff5c03c092e445b2aba14efdf420211e0d0b66e3e244f854cce9b339263f0304

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

@@ -11,19 +11,35 @@ module Ruby
           @ip = ip
           @sudo = sudo
           sudo_reason = "Allow sudo elevation to add \"#{host}\" to /etc/hosts?"
-          cmd = "echo \"#{ip} #{host}\" | #{sudoify("tee -a /etc/hosts", sudo, sudo_reason)}"
 
-          super(cmd:, raise: Ruby::Nginx::ConfigError)
+          super(
+            cmd: "echo \"#{host_config}\" | #{sudoify("tee -a /etc/hosts", sudo, sudo_reason)}",
+            raise: Ruby::Nginx::ConfigError
+          )
         end
 
         def run
-          super
+          super unless added?
         rescue Ruby::Nginx::ConfigError
           raise if @sudo
 
           # Elevate to sudo and try again.
           self.class.new(@host, @ip, sudo: true).run
         end
+
+        private
+
+        def added?
+          hosts.include?(host_config)
+        end
+
+        def hosts
+          @hosts ||= Ruby::Nginx::System::SafeFile.read("/etc/hosts")
+        end
+
+        def host_config
+          "#{@ip} #{@host}"
+        end
       end
     end
   end

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

@@ -7,8 +7,9 @@ module Ruby
   module Nginx
     module Commands
       class RemoveHostMapping < TerminalCommand
-        def initialize(host, sudo: false)
+        def initialize(host, ignore_ip: nil, sudo: false)
           @host = host
+          @ignore_ip = ignore_ip
           @sudo = sudo
           @sudo_reason = "Allow sudo elevation to remove \"#{host}\" from /etc/hosts?"
 
@@ -16,16 +17,26 @@ module Ruby
         end
 
         def run
-          super
+          super unless removed?
         rescue Ruby::Nginx::ConfigError
           raise if @sudo
 
           # Elevate to sudo and try again.
-          self.class.new(@host, sudo: true).run
+          self.class.new(@host, ignore_ip: @ignore_ip, sudo: true).run
         end
 
         private
 
+        def removed?
+          hosts.each_line.none? do |host_config|
+            host_config.include?(@host) && (@ignore_ip.nil? || !host_config.include?(@ignore_ip))
+          end
+        end
+
+        def hosts
+          @hosts ||= Ruby::Nginx::System::SafeFile.read("/etc/hosts")
+        end
+
         def darwin_command
           sudoify("sed -i '' '/#{@host}/d' /etc/hosts", @sudo, @sudo_reason)
         end

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

@@ -20,9 +20,11 @@ module Ruby
         def initialize(sudo: false)
           @sudo = sudo
           sudo_reason = "Allow sudo elevation to add \"#{INCLUDE_STATEMENT}\" to NGINX configuration file?"
-          cmd = "echo \"#{new_config}\" | #{sudoify("tee #{config_file_path}", sudo, sudo_reason)}"
 
-          super(cmd:, raise: Ruby::Nginx::SetupError)
+          super(
+            cmd: "echo \"#{new_config}\" | #{sudoify("tee #{config_file_path}", sudo, sudo_reason)}",
+            raise: Ruby::Nginx::SetupError
+          )
         end
 
         def run

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

@@ -9,9 +9,8 @@ module Ruby
         def initialize(sudo: false)
           @sudo = sudo
           sudo_reason = "Allow sudo elevation to start NGINX?"
-          cmd = sudoify("nginx", sudo, sudo_reason)
 
-          super(cmd:, raise: Ruby::Nginx::StartError)
+          super(cmd: sudoify("nginx", sudo, sudo_reason), raise: Ruby::Nginx::StartError)
         end
 
         def run

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

@@ -9,9 +9,8 @@ module Ruby
         def initialize(sudo: false)
           @sudo = sudo
           sudo_reason = "Allow sudo elevation to stop NGINX?"
-          cmd = sudoify("nginx -s stop", sudo, sudo_reason)
 
-          super(cmd:, raise: Ruby::Nginx::StopError)
+          super(cmd: sudoify("nginx -s stop", sudo, sudo_reason), raise: Ruby::Nginx::StopError)
         end
 
         def run

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

@@ -9,9 +9,8 @@ module Ruby
         def initialize(sudo: false)
           @sudo = sudo
           sudo_reason = "Allow sudo elevation to validate NGINX config?"
-          cmd = sudoify("nginx -t", sudo, sudo_reason)
 
-          super(cmd:, raise: Ruby::Nginx::ConfigError)
+          super(cmd: sudoify("nginx -t", sudo, sudo_reason), raise: Ruby::Nginx::ConfigError)
         end
 
         def run

data/lib/ruby/nginx/configuration.rb

@@ -33,6 +33,7 @@ module Ruby
         validate!
         apply_dynamic_defaults!
 
+        create_temp_path!
         create_ssl_certs! if options[:ssl]
         create_log_files! if options[:log]
 
@@ -51,6 +52,7 @@ module Ruby
 
       def default_paths
         {
+          temp_path: default_path("tmp"),
           ssl_certificate_path: default_path("certs/_#{options[:domain]}.pem"),
           ssl_certificate_key_path: default_path("certs/_#{options[:domain]}-key.pem"),
           access_log_path: default_path("logs/#{options[:domain]}.access.log"),
@@ -92,6 +94,10 @@ module Ruby
         raise Ruby::Nginx::AbortError, "Failed to read template.", cause: e
       end
 
+      def create_temp_path!
+        options[:temp_path] = System::SafeFile.mkdir(options[:temp_path])
+      end
+
       def create_ssl_certs!
         System::Mkcert.create!(
           options[:domain],

data/lib/ruby/nginx/system/hosts.rb

@@ -9,12 +9,12 @@ module Ruby
       class Hosts
         class << self
           def add(host, ip)
-            remove(host)
-            Commands::AddHostMapping.new(host, ip).run.success?
+            remove(host, ignore_ip: ip)
+            Commands::AddHostMapping.new(host, ip).run&.success?
           end
 
-          def remove(host)
-            Commands::RemoveHostMapping.new(host).run.success?
+          def remove(host, ignore_ip: nil)
+            Commands::RemoveHostMapping.new(host, ignore_ip:).run&.success?
           end
         end
       end

data/lib/ruby/nginx/system/safe_file.rb

@@ -7,6 +7,14 @@ module Ruby
     module System
       class SafeFile
         class << self
+          def mkdir(dir_path)
+            safe_path = File.expand_path(dir_path)
+
+            FileUtils.mkdir_p(dir_path)
+
+            safe_path
+          end
+
           def touch(file_path)
             safe_path = File.expand_path(file_path)
 

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

@@ -54,6 +54,9 @@ server {
   error_log                   <%= options[:error_log_path] %> warn;
   <% end %>
 
+  # Do not use the default proxy_temp_path, this is to avoid directory permissions issues.
+  proxy_temp_path <%= options[:temp_path] %> 1 2;
+
   # reverse proxy
   location @<%= name %> {
     proxy_pass                         http://<%= name %>;

data/lib/ruby/nginx/version.rb

@@ -2,7 +2,7 @@
 
 module Ruby
   module Nginx
-    VERSION = "1.0.0-beta.4"
+    VERSION = "1.0.1"
 
     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.4
+  version: 1.0.1
 platform: ruby
 authors:
 - Bert McCutchen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-15 00:00:00.000000000 Z
+date: 2025-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb