nonnative 1.85.1 → 1.86.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 370acc5de7d851686a126f10fd1ba96137d3065957fb0073ce34994971721d3d
-  data.tar.gz: 894ab159c74027083e80fc56fc5f63f06057f5584546a658dee0b084df5585b2
+  metadata.gz: 81b070f7067278bcc745ef685d26cb856196efcaff35255baa850ac41448f0dc
+  data.tar.gz: bf16cd6415717885eb38d3b60fd9e5da08a981571e9f67e7928fcda8e9e35ffb
 SHA512:
-  metadata.gz: 3e45f3fd1aeb50a89be7f782d942fc0b720596d210d29823a889b35291dcfd3e8ce1e28a69050d56b76e048aa1b1353163bfe9fe92b4ab57a9eeeaa7a07cf6af
-  data.tar.gz: a6ab1ba44dcc594a371316091351c8de38ec05d3f15b73eba254c700742e11037f696978952e09e7b42c99fb0ce6202d08a90c90b2049b666b35d22d2155087d
+  metadata.gz: aa19604dfec804d43a98f23f54020c35eef9fc6f1633b01437703ccec275df4ddedf8710737fd6f2edc69cfc1e28fdfc6da0499d8856686c7cd1c43def45982d
+  data.tar.gz: 8521adce4f1ac505d2ab958fa9359f7fd459e78a674bc4008b11ce682275ac9f47a9578988fae484137d4ce6a8621dbd7ee8940bdad19da5ed4980c5154baa0a

data/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+## [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.86.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/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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nonnative
-  VERSION = '1.85.1'
+  VERSION = '1.86.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'

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.85.1
+  version: 1.86.0
 platform: ruby
 authors:
 - Alejandro Falkowski
@@ -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