Set minimum tty versions, removed open3, refactored tests

Author: bert-mccutchen

Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    ruby-nginx (1.0.0.pre.beta)
+    ruby-nginx (1.0.0.pre.beta.1)
       erb
-      open3
       thor
-      tty-command
-      tty-prompt
+      tty-command (~> 0.10, >= 0.10.1)
+      tty-prompt (~> 0.23, >= 0.23.1)
 
 GEM
   remote: https://rubygems.org/
@@ -16,11 +15,10 @@ GEM
     diff-lcs (1.5.1)
     erb (4.0.4)
       cgi (>= 0.3.3)
-    json (2.9.1)
+    json (2.10.1)
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
     nio4r (2.7.4)
-    open3 (0.2.1)
     parallel (1.26.3)
     parser (3.3.7.1)
       ast (~> 2.4.1)

lib/ruby/nginx/version.rb

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

ruby-nginx.gemspec

@@ -26,10 +26,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "erb"
-  spec.add_dependency "open3"
   spec.add_dependency "thor"
-  spec.add_dependency "tty-command"
-  spec.add_dependency "tty-prompt"
+  spec.add_dependency "tty-command", "~> 0.10", ">= 0.10.1"
+  spec.add_dependency "tty-prompt", "~> 0.23", ">= 0.23.1"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

spec/ruby/nginx_add_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "puma"
 require "puma/configuration"
 
 RSpec.describe Ruby::Nginx do
@@ -14,21 +15,21 @@
   end
 
   it "adds the hosts mapping" do
-    RetryExpectation.new(limit: 30, delay: 1).attempt do
+    retry_expectation(limit: 30, delay: 1) do
       hosts = File.read("/etc/hosts")
       expect(hosts).to include("example.test")
     end
   end
 
   it "creates the NGINX configuration" do
-    RetryExpectation.new(limit: 30, delay: 1).attempt do
+    retry_expectation(limit: 30, delay: 1) do
       path = File.expand_path("~/.ruby-nginx/servers/ruby_nginx_example_test.conf")
       expect(File.exist?(path)).to be_truthy
     end
   end
 
   it "creates the SSL certificate" do
-    RetryExpectation.new(limit: 30, delay: 1).attempt do
+    retry_expectation(limit: 30, delay: 1) do
       path = File.expand_path("~/.ruby-nginx/certs/_example.test.pem")
       expect(File.exist?(path)).to be_truthy
 
@@ -38,7 +39,7 @@
   end
 
   it "creates the log files" do
-    RetryExpectation.new(limit: 30, delay: 1).attempt do
+    retry_expectation(limit: 30, delay: 1) do
       path = File.expand_path("~/.ruby-nginx/logs/example.test.access.log")
       expect(File.exist?(path)).to be_truthy
 
@@ -48,7 +49,7 @@
   end
 
   it "successfully builds up a NGINX site" do
-    RetryExpectation.new(limit: 30, delay: 1).attempt do
+    retry_expectation(limit: 30, delay: 1) do
       html = `curl -s http://example.test`
       expect(html).to include("Hello, from Ruby NGINX!")
 

spec/ruby/nginx_remove_spec.rb

@@ -6,21 +6,21 @@
   end
 
   it "removes the hosts mapping" do
-    RetryExpectation.new(limit: 30, delay: 1).attempt do
+    retry_expectation(limit: 30, delay: 1) do
       hosts = File.read("/etc/hosts")
       expect(hosts).not_to include("example.test")
     end
   end
 
   it "deletes the NGINX configuration" do
-    RetryExpectation.new(limit: 30, delay: 1).attempt do
+    retry_expectation(limit: 30, delay: 1) do
       path = File.expand_path("~/.ruby-nginx/servers/ruby_nginx_example_test.conf")
       expect(File.exist?(path)).to be_falsey
     end
   end
 
   it "successfully tears down a NGINX site" do
-    RetryExpectation.new(limit: 30, delay: 1).attempt do
+    retry_expectation(limit: 30, delay: 1) do
       html = `curl -s http://example.test`
       expect(html).to eq("")
 

spec/spec_helper.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+ENV["SKIP_PROMPT"] = "true"
+
 require "ruby/nginx"
 
 Dir[File.expand_path("support/**/*.rb", __dir__)].each { |file| require file }
 
 RSpec.configure do |config|
+  config.include(RetryHelpers)
+
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = ".rspec_status"
 

spec/support/dummy_server.rb

@@ -1,29 +1,30 @@
-require "puma"
-require "puma/cli"
 require "singleton"
 
-ENV["SKIP_PROMPT"] = "true"
-DUMMY_PATH = File.expand_path("../dummy", __dir__)
-
 class DummyServer
   include Singleton
 
   def initialize
     @semaphore = Mutex.new
-    @server = nil
+    @pid = nil
   end
 
   def start
     @semaphore.synchronize do
-      @server = Thread.new do # standard:disable Style/GlobalVars
-        Puma::CLI.new(["-s", "--dir=#{DUMMY_PATH}"]).run
+      @pid = Process.fork do
+        require "puma"
+        require "puma/cli"
+
+        dummy_path = File.expand_path("../dummy", __dir__)
+
+        Puma::CLI.new(["-s", "--dir=#{dummy_path}"]).run
       end
     end
   end
 
   def stop
     @semaphore.synchronize do
-      @server.exit if @server.alive?
+      Process.kill(:TERM, @pid)
+      Process.wait
     end
   end
 end

spec/support/retry_expectation.rb

@@ -1,16 +1,22 @@
-class RetryExpectation
-  def initialize(limit:, delay:)
-    @limit = limit
-    @delay = delay
-    @count = 0
+module RetryHelpers
+  class RetryExpectation
+    def initialize(limit:, delay:)
+      @limit = limit
+      @delay = delay
+      @count = 0
+    end
+
+    def attempt
+      yield
+    rescue RSpec::Expectations::ExpectationNotMetError
+      raise if @count >= @limit
+      sleep(@delay) if @delay
+      @count += 1
+      retry
+    end
   end
 
-  def attempt
-    yield
-  rescue RSpec::Expectations::ExpectationNotMetError
-    raise if @count >= @limit
-    sleep(@delay) if @delay
-    @count += 1
-    retry
+  def retry_expectation(limit: 3, delay: 0.1, &block)
+    RetryExpectation.new(limit: limit, delay: delay).attempt(&block)
   end
 end