nonnative 1.85.1 → 1.87.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 370acc5de7d851686a126f10fd1ba96137d3065957fb0073ce34994971721d3d
-  data.tar.gz: 894ab159c74027083e80fc56fc5f63f06057f5584546a658dee0b084df5585b2
+  metadata.gz: d084e050131452576fb0716fa60f9ad641f8d18e50cf99c05d0f3e0c37742f58
+  data.tar.gz: dea87ac4b7b3c1d85bba7b1253d24191654fa3a7a338c54767716a85ff6b1123
 SHA512:
-  metadata.gz: 3e45f3fd1aeb50a89be7f782d942fc0b720596d210d29823a889b35291dcfd3e8ce1e28a69050d56b76e048aa1b1353163bfe9fe92b4ab57a9eeeaa7a07cf6af
-  data.tar.gz: a6ab1ba44dcc594a371316091351c8de38ec05d3f15b73eba254c700742e11037f696978952e09e7b42c99fb0ce6202d08a90c90b2049b666b35d22d2155087d
+  metadata.gz: 38c23a797f43a2193335fbcf50550311a0881de585d27af319935eeba9bb3e07e2f920c06004accd9cc3eada1079e374f5e9ffd6a51fcf238908b57ff04f3e42
+  data.tar.gz: e6e63b0ed16fb218b56d981e04577774128d52e0a281e6937eb5127beee7a180fdd0fc7fbbfa536e75e78570aaa1202b3f21a69b2669f83dc8b1933abe4518bf

data/CHANGELOG.md

@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+## [v1.87.0](https://github.com/alexfalkowski/nonnative/releases/tag/v1.87.0) - 2025-01-26
+
+- [`c370c66`](https://github.com/alexfalkowski/nonnative/commit/c370c664ff1f6f83a8f2afe7075afd1b34bc333a) feat(proxy): add wait to the proxy, not globally (#493)
+- [`39cc986`](https://github.com/alexfalkowski/nonnative/commit/39cc9867157c0d68ac78670e656b0aaa55773cfe) docs(readme): http app is a class not a instance (#492)
+
+## [v1.86.0](https://github.com/alexfalkowski/nonnative/releases/tag/v1.86.0) - 2025-01-25
+
+- [`9f3be69`](https://github.com/alexfalkowski/nonnative/commit/9f3be69130570a6842d6559c929fe6cb480dd1df) feat(http_server): use webrick (#490)
+
 ## [v1.85.1](https://github.com/alexfalkowski/nonnative/releases/tag/v1.85.1) - 2025-01-25
 
 - [`14b648f`](https://github.com/alexfalkowski/nonnative/commit/14b648f96addc49163e14a22ae904f2fafec79ca) fix(socket_pair): handle nil from recv (#488)

data/Gemfile.lock

@@ -1,18 +1,19 @@
 PATH
   remote: .
   specs:
-    nonnative (1.85.1)
+    nonnative (1.87.0)
       concurrent-ruby (>= 1, < 2)
       config (>= 5, < 6)
       cucumber (>= 7, < 10)
       get_process_mem (>= 1, < 2)
       grpc (>= 1, < 2)
-      puma (>= 6, < 7)
+      rackup (>= 2, < 3)
       rest-client (>= 2, < 3)
       rspec-benchmark (>= 0, < 1)
       rspec-expectations (>= 3, < 4)
       rspec-wait (>= 1, < 2)
       sinatra (>= 4, < 5)
+      webrick (>= 1, < 2)
 
 GEM
   remote: https://rubygems.org/
@@ -98,15 +99,12 @@ GEM
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
-    nio4r (2.7.4)
     ostruct (0.6.1)
     parallel (1.26.3)
     parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
     prism (1.3.0)
-    puma (6.5.0)
-      nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.1.8)
     rack-protection (4.1.1)
@@ -116,6 +114,8 @@ GEM
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
+    rackup (2.2.1)
+      rack (>= 3)
     rainbow (3.1.1)
     rake (13.2.1)
     rbs (3.8.1)
@@ -189,6 +189,7 @@ GEM
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
+    webrick (1.9.1)
 
 PLATFORMS
   arm64-darwin-22

data/README.md

@@ -37,7 +37,6 @@ Configure nonnative with the following:
 
 - The version of the configuration (1.0).
 - The URL of the service.
-- The time to wait on proxy changes (fault injection).
 - Process, Server or Service that you want to start.
 - A timeout value.
 - A time to wait.
@@ -65,7 +64,6 @@ require 'nonnative'
 Nonnative.configure do |config|
   config.version = '1.0'
   config.url = 'http://localhost:4567'
-  config.wait = 2.0
 
   config.process do |p|
     p.name = 'start_1'
@@ -96,13 +94,12 @@ Setup it up through configuration:
 ```yaml
 version: "1.0"
 url: http://localhost:4567
-wait: 2.0
 processes:
   -
     name: start_1
     command: features/support/bin/start 12_321
     timeout: 5
-    wait: 0.1
+    wait: 1
     port: 12321
     log: 12_321.log
     signal: INT # Possible values are described in Signal.list.keys.
@@ -112,7 +109,7 @@ processes:
     name: start_2
     command: features/support/bin/start 12_322
     timeout: 5
-    wait: 0.1
+    wait: 1
     port: 12322
     log: 12_322.log
 ```
@@ -141,21 +138,30 @@ Define your server:
 
 ```ruby
 module Nonnative
-  class EchoServer < Nonnative::Server
-    def perform_start
-      @socket_server = TCPServer.new(service.host, service.port)
+  class TCPServer < Nonnative::Server
+    def initialize(service)
+      super
+
+      @socket_server = ::TCPServer.new(proxy.host, proxy.port)
+    end
 
+    def perform_start
       loop do
-        client_socket = @socket_server.accept
+        client_socket = socket_server.accept
         client_socket.puts 'Hello World!'
         client_socket.close
       end
     rescue StandardError
+      socket_server.close
     end
 
     def perform_stop
-      @socket_server.close
+      socket_server.close
     end
+
+    private
+
+    attr_reader :socket_server
   end
 end
 ```
@@ -226,7 +232,7 @@ module Nonnative
   module Features
     class Application < Sinatra::Application
       configure do
-        set :server_settings, log_requests: true
+        set :logging, false
       end
 
       get '/hello' do
@@ -236,7 +242,7 @@ module Nonnative
 
     class HTTPServer < Nonnative::HTTPServer
       def app
-        Application.new
+        Application
       end
     end
   end
@@ -380,6 +386,7 @@ Setup it up through configuration:
 
 ```yaml
 version: "1.0"
+url: http://localhost:4567
 processes:
   -
     name: postgres
@@ -421,6 +428,7 @@ Nonnative.configure do |config|
       kind: 'fault_injection',
       port: 20_000,
       log: 'proxy_server.log',
+      wait: 1,
       options: {
         delay: 5
       }
@@ -440,6 +448,7 @@ processes:
       kind: fault_injection
       port: 20000
       log: proxy_server.log
+      wait: 1
       options:
         delay: 5
 ```
@@ -460,6 +469,7 @@ Nonnative.configure do |config|
       kind: 'fault_injection',
       port: 20_000,
       log: 'proxy_server.log',
+      wait: 1,
       options: {
         delay: 5
       }
@@ -479,6 +489,7 @@ servers:
       kind: fault_injection
       port: 20000
       log: proxy_server.log
+      wait: 1
       options:
         delay: 5
 ```
@@ -493,12 +504,14 @@ require 'nonnative'
 Nonnative.configure do |config|
   config.version = '1.0'
   config.url = 'http://localhost:4567'
+  config.wait = 1
 
   config.service do |s|
     s.proxy = {
       kind: 'fault_injection',
       port: 20_000,
       log: 'proxy_server.log',
+      wait: 1,
       options: {
         delay: 5
       }
@@ -512,12 +525,14 @@ Setup it up through configuration:
 ```yaml
 version: "1.0"
 url: http://localhost:4567
+wait: 1
 services:
   -
     proxy:
       kind: fault_injection
       port: 20000
       log: proxy_server.log
+      wait: 1
       options:
         delay: 5
 ```

data/lib/nonnative/configuration.rb

@@ -8,14 +8,13 @@ module Nonnative
       @services = []
     end
 
-    attr_accessor :version, :url, :wait, :processes, :servers, :services
+    attr_accessor :version, :url, :processes, :servers, :services
 
     def load_file(path)
       cfg = Nonnative.configurations(path)
 
       self.version = cfg.version
       self.url = cfg.url
-      self.wait = cfg.wait
 
       add_processes(cfg)
       add_servers(cfg)
@@ -122,6 +121,7 @@ module Nonnative
       }
 
       p[:host] = proxy.host if proxy.host
+      p[:wait] = proxy.wait if proxy.wait
 
       runner.proxy = p
     end

data/lib/nonnative/configuration_proxy.rb

@@ -2,12 +2,13 @@
 
 module Nonnative
   class ConfigurationProxy
-    attr_accessor :kind, :host, :port, :log, :options
+    attr_accessor :kind, :host, :port, :log, :wait, :options
 
     def initialize
       self.kind = 'none'
       self.host = '0.0.0.0'
       self.port = 0
+      self.wait = 0.1
       self.options = {}
     end
   end

data/lib/nonnative/configuration_runner.rb

@@ -18,6 +18,7 @@ module Nonnative
       proxy.host = value[:host] if value[:host]
       proxy.port = value[:port]
       proxy.log = value[:log]
+      proxy.wait = value[:wait] if value[:wait]
       proxy.options = value[:options]
     end
   end

data/lib/nonnative/cucumber.rb

@@ -23,22 +23,16 @@ end
 Given('I set the proxy for process {string} to {string}') do |name, operation|
   process = Nonnative.pool.process_by_name(name)
   process.proxy.send(operation)
-
-  Nonnative.wait
 end
 
 Given('I set the proxy for server {string} to {string}') do |name, operation|
   server = Nonnative.pool.server_by_name(name)
   server.proxy.send(operation)
-
-  Nonnative.wait
 end
 
 Given('I set the proxy for service {string} to {string}') do |name, operation|
   service = Nonnative.pool.service_by_name(name)
   service.proxy.send(operation)
-
-  Nonnative.wait
 end
 
 Given('I start the system') do

data/lib/nonnative/fault_injection_proxy.rb

@@ -91,6 +91,8 @@ module Nonnative
       mutex.synchronize do
         @state = state
         close_connections
+
+        wait
       end
     end
 

data/lib/nonnative/http_server.rb

@@ -3,12 +3,7 @@
 module Nonnative
   class HTTPServer < Nonnative::Server
     def initialize(service)
-      log = File.open(service.log, 'a')
-      options = {
-        log_writer: Puma::LogWriter.new(log, log),
-        force_shutdown_after: service.timeout
-      }
-      @server = Puma::Server.new(app, Puma::Events.new, options)
+      @server = ::Rackup::Handler.get('webrick')
 
       super
     end
@@ -16,24 +11,18 @@ module Nonnative
     protected
 
     def perform_start
-      server.add_tcp_listener proxy.host, proxy.port
-      server.run(false)
+      file = File.open(service.log, 'a')
+      logs = [
+        [Logger.new(file), WEBrick::AccessLog::COMBINED_LOG_FORMAT]
+      ]
+
+      server.run(app, Host: proxy.host, Port: proxy.port,
+                      Logger: WEBrick::Log.new(file),
+                      AccessLog: logs)
     end
 
     def perform_stop
-      server.graceful_shutdown
-    end
-
-    def wait_start
-      timeout.perform do
-        super while server.running == 0
-      end
-    end
-
-    def wait_stop
-      timeout.perform do
-        super while server.running != 0
-      end
+      server.shutdown
     end
 
     private

data/lib/nonnative/proxy.rb

@@ -9,5 +9,9 @@ module Nonnative
     protected
 
     attr_reader :service
+
+    def wait
+      sleep service.proxy.wait
+    end
   end
 end

data/lib/nonnative/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nonnative
-  VERSION = '1.85.1'
+  VERSION = '1.87.0'
 end

data/lib/nonnative.rb

@@ -8,9 +8,8 @@ require 'securerandom'
 
 require 'grpc'
 require 'sinatra'
+require 'rackup'
 require 'rest-client'
-require 'puma'
-require 'puma/server'
 require 'concurrent'
 require 'config'
 require 'cucumber'
@@ -18,6 +17,7 @@ require 'get_process_mem'
 require 'rspec-benchmark'
 require 'rspec/expectations'
 require 'rspec/wait'
+require 'webrick'
 
 require 'nonnative/version'
 require 'nonnative/error'
@@ -58,12 +58,6 @@ module Nonnative
   class << self
     attr_reader :pool
 
-    def wait
-      wait = Nonnative.configuration.wait
-
-      sleep wait if wait
-    end
-
     def configurations(*files)
       Config.load_files(files)
     end

data/nonnative.gemspec

@@ -29,10 +29,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'cucumber', '>= 7', '< 10'
   spec.add_dependency 'get_process_mem', '>= 1', '< 2'
   spec.add_dependency 'grpc', '>= 1', '< 2'
-  spec.add_dependency 'puma', '>= 6', '< 7'
+  spec.add_dependency 'rackup', '>= 2', '< 3'
   spec.add_dependency 'rest-client', '>= 2', '< 3'
   spec.add_dependency 'rspec-benchmark', '>= 0', '< 1'
   spec.add_dependency 'rspec-expectations', '>= 3', '< 4'
   spec.add_dependency 'rspec-wait', '>= 1', '< 2'
   spec.add_dependency 'sinatra', '>= 4', '< 5'
+  spec.add_dependency 'webrick', '>= 1', '< 2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.85.1
+  version: 1.87.0
 platform: ruby
 authors:
 - Alejandro Falkowski
 bindir: exe
 cert_chain: []
-date: 2025-01-25 00:00:00.000000000 Z
+date: 2025-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -110,25 +110,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: puma
+  name: rackup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +229,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Allows you to keep using the power of ruby to test other systems
 email:
 - alexrfalkowski@gmail.com