ruby-nginx 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e053789e61b0bf22afb92ea549a0ecb68bc4615761ae7342ff246e095100932
-  data.tar.gz: de3c4bd02f4745cca14cbf15f034a5187c10d3cddd083b1948ab63d9d958a6d2
+  metadata.gz: f05254d3fb1670cd6c832b3d0cff71f7f4d04483c004de96b6ee94917a0bfc8f
+  data.tar.gz: 4b22e857122735828aea9ab8a506dc2c4d60d8a65caa8893b1810fba70cb3dd4
 SHA512:
-  metadata.gz: 154b601c107623263d962fdcb5832d8143a579e2725dfe8788f7f764aa6fed22d7bf955ed248227385e484e9183008fb5231eae078c39febe7491f4e309a9bfa
-  data.tar.gz: 128c4ff6ae5b29351872953e7597ed900219178855ea4f53f9953ce3b31973b71dfb4e429710fac82339072811d4c8b9286994ae575d67d6eba1d4571865c8a2
+  metadata.gz: 18ddfaf53cce1326a30c8741ba22773ac0ecc78a336ae4c3418c388345dbea7ff9c62255954a63a336383a55fbdee061a2781995debd90b05b2d4707c8b32851
+  data.tar.gz: f42671b12a2ad714dfd698e14cb43738b880903cdaf5cc730131bac5d973e93a81012d2b8334c231e151d0b687f04cdf36cf7b7ea695e4c7e88e3c4fc391029e

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

@@ -9,8 +9,30 @@ module Ruby
       class AddNginxConfig
         include Ruby::Nginx::Constants
 
-        def run(name, config)
-          Ruby::Nginx::System::SafeFile.write("#{SERVERS_PATH}/#{name}.conf", config)
+        def initialize(name, config)
+          @name = name
+          @config = config
+        end
+
+        def run
+          return false unless changed?
+
+          Ruby::Nginx::System::SafeFile.write(config_path, @config)
+          true
+        end
+
+        private
+
+        def changed?
+          !Ruby::Nginx::System::SafeFile.exist?(config_path) || (nginx_config != @config)
+        end
+
+        def config_path
+          @config_path ||= "#{SERVERS_PATH}/#{@name}.conf"
+        end
+
+        def nginx_config
+          @nginx_config ||= Ruby::Nginx::System::SafeFile.read(config_path)
         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/remove_nginx_config.rb

@@ -9,8 +9,25 @@ module Ruby
       class RemoveNginxConfig
         include Ruby::Nginx::Constants
 
-        def run(name)
-          Ruby::Nginx::System::SafeFile.rm("#{SERVERS_PATH}/#{name}.conf")
+        def initialize(name)
+          @name = name
+        end
+
+        def run
+          return false unless exists?
+
+          Ruby::Nginx::System::SafeFile.rm(config_path)
+          true
+        end
+
+        private
+
+        def exists?
+          Ruby::Nginx::System::SafeFile.exist?(config_path)
+        end
+
+        def config_path
+          @config_path ||= "#{SERVERS_PATH}/#{@name}.conf"
         end
       end
     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/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/nginx.rb

@@ -32,11 +32,11 @@ module Ruby
           end
 
           def add_server_config(name, config)
-            Commands::AddNginxConfig.new.run(name, config)
+            Commands::AddNginxConfig.new(name, config).run
           end
 
           def remove_server_config(name)
-            Commands::RemoveNginxConfig.new.run(name)
+            Commands::RemoveNginxConfig.new(name).run
           end
 
           def validate_config!

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

@@ -10,11 +10,15 @@ module Ruby
           def mkdir(dir_path)
             safe_path = File.expand_path(dir_path)
 
-            FileUtils.mkdir_p(dir_path)
+            FileUtils.mkdir_p(safe_path)
 
             safe_path
           end
 
+          def exist?(file_path)
+            File.exist?(File.expand_path(file_path))
+          end
+
           def touch(file_path)
             safe_path = File.expand_path(file_path)
 
@@ -25,9 +29,7 @@ module Ruby
           end
 
           def read(file_path)
-            safe_path = File.expand_path(file_path)
-
-            File.read(safe_path)
+            File.read(File.expand_path(file_path))
           end
 
           def write(file_path, content)
@@ -39,9 +41,7 @@ module Ruby
           end
 
           def rm(file_path)
-            safe_path = File.expand_path(file_path)
-
-            FileUtils.rm_f(safe_path)
+            FileUtils.rm_f(File.expand_path(file_path))
           end
         end
       end

data/lib/ruby/nginx/version.rb

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

data/lib/ruby/nginx.rb

@@ -14,9 +14,11 @@ module Ruby
       setup!
       conf = config(options, &block)
 
-      System::Nginx.add_server_config(conf.name, conf.generate!)
-      System::Nginx.validate_config!
-      System::Nginx.restart!
+      if System::Nginx.add_server_config(conf.name, conf.generate!)
+        System::Nginx.validate_config!
+        System::Nginx.restart!
+      end
+
       System::Hosts.add(conf.domain, conf.host)
 
       conf
@@ -30,8 +32,7 @@ module Ruby
     def self.remove!(options = {}, &block)
       conf = config(options, &block)
 
-      System::Nginx.remove_server_config(conf.name)
-      System::Nginx.restart!
+      System::Nginx.restart! if System::Nginx.remove_server_config(conf.name)
       System::Hosts.remove(conf.domain)
 
       conf

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-nginx
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Bert McCutchen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 2025-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb