nonnative 1.94.0 → 1.95.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15da7c4f98e2bedf2c50ce32f424fa526f21055c3c847ca456f633251bb29ae6
-  data.tar.gz: 85e773d2404e565f1b275573207a1cd0af637e65d42db759b4c7fc815d203b79
+  metadata.gz: 3613ca777546fc006d042c2362ea786703faf50f9c7da1dbb000ee86888576ec
+  data.tar.gz: 9ccf77b2d359cb33bb576e83af6de8747eadd13de2d205a339e12121bb20559b
 SHA512:
-  metadata.gz: ea116957b7a556d79c17427f80fb12cd564fc63c4632dc748179d6d92661864fa2d7acf3b077b171972f003b4bbbeb0dd4d999b8f9a98c17e31253c0bbf96e6c
-  data.tar.gz: 1654c2500e078e214aed4c0970d6384c43bd31876871f069cdfc167a0ee9785cba370bbf19e0841f6543b016cbc5d2af85ba31aa5adc846960b58b6bc544a06d
+  metadata.gz: 81ad331d2b921d218aa07c3c5dde834e3cca80065ec2f62b12bc33e73902fe3cb757d5bfe997261c11f3eb1fd114753df1bba00d5b13a884ad3b87546fd4ec70
+  data.tar.gz: d286638c65e67430acc7f3f262ddd99ba684b6a6eb5235e276b974481925a21eef519d6f2244b475d86183464c842d04300cf4fe0bafde11335b3385d5e6637e

data/CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+## [v1.95.0](https://github.com/alexfalkowski/nonnative/releases/tag/v1.95.0) - 2025-04-30
+
+- [`5146eb7`](https://github.com/alexfalkowski/nonnative/commit/5146eb76cc7fb0dbe8ad5443d189639a7837f5b2) feat(http): use puma (#547)
+- [`4ee710d`](https://github.com/alexfalkowski/nonnative/commit/4ee710dc56de05b7b6b724705aecfd0921a038ec) build(deps): bump bin from `b0fd780` to `926a71b` (#545)
+
 ## [v1.94.0](https://github.com/alexfalkowski/nonnative/releases/tag/v1.94.0) - 2025-04-27
 
 - [`d337a15`](https://github.com/alexfalkowski/nonnative/commit/d337a1586bf8eb39f5ceae18f3dc06b852c7a4fc) feat(logger): add logging (#544)

data/Gemfile.lock

@@ -1,20 +1,19 @@
 PATH
   remote: .
   specs:
-    nonnative (1.94.0)
+    nonnative (1.95.0)
       concurrent-ruby (>= 1, < 2)
       config (>= 5, < 6)
       cucumber (>= 7, < 10)
       get_process_mem (>= 1, < 2)
       grpc (>= 1, < 2)
-      rackup (>= 2, < 3)
+      puma (>= 6, < 7)
       rest-client (>= 2, < 3)
       retriable (>= 3, < 4)
       rspec-benchmark (>= 0, < 1)
       rspec-expectations (>= 3, < 4)
       rspec-wait (>= 1, < 2)
       sinatra (>= 4, < 5)
-      webrick (>= 1, < 2)
 
 GEM
   remote: https://rubygems.org/
@@ -59,32 +58,18 @@ GEM
     diff-lcs (1.6.1)
     docile (1.4.1)
     domain_name (0.6.20240107)
-    ffi (1.17.2-arm64-darwin)
     ffi (1.17.2-x86_64-darwin)
-    ffi (1.17.2-x86_64-linux-gnu)
     get_process_mem (1.0.0)
       bigdecimal (>= 2.0)
       ffi (~> 1.0)
-    google-protobuf (4.30.2-arm64-darwin)
-      bigdecimal
-      rake (>= 13)
     google-protobuf (4.30.2-x86_64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.30.2-x86_64-linux)
-      bigdecimal
-      rake (>= 13)
     googleapis-common-protos-types (1.19.0)
       google-protobuf (>= 3.18, < 5.a)
-    grpc (1.71.0-arm64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
-      googleapis-common-protos-types (~> 1.0)
     grpc (1.71.0-x86_64-darwin)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.71.0-x86_64-linux)
-      google-protobuf (>= 3.25, < 5.0)
-      googleapis-common-protos-types (~> 1.0)
     http-accept (1.7.0)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
@@ -101,12 +86,15 @@ GEM
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
+    nio4r (2.7.4)
     ostruct (0.6.1)
     parallel (1.27.0)
     parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     prism (1.4.0)
+    puma (6.6.0)
+      nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.1.13)
     rack-protection (4.1.1)
@@ -116,8 +104,6 @@ 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.9.2)
@@ -194,15 +180,10 @@ 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
-  arm64-darwin-23
-  arm64-darwin-24
   x86_64-darwin-21
   x86_64-darwin-23
-  x86_64-linux
 
 DEPENDENCIES
   bundler

data/README.md

@@ -264,6 +264,7 @@ require 'nonnative'
 Nonnative.configure do |config|
   config.version = '1.0'
   config.url = 'http://localhost:4567'
+  config.log = 'nonnative.log'
 
   config.server do |s|
     s.name = 'http_server_1'

data/lib/nonnative/http_server.rb

@@ -3,8 +3,12 @@
 module Nonnative
   class HTTPServer < Nonnative::Server
     def initialize(app, service)
-      @server = ::Rackup::Handler.get('webrick')
-      @app = app
+      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)
 
       super(service)
     end
@@ -12,22 +16,16 @@ module Nonnative
     protected
 
     def perform_start
-      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)
+      server.add_tcp_listener proxy.host, proxy.port
+      server.run false
     end
 
     def perform_stop
-      server.shutdown
+      server.graceful_shutdown
     end
 
     private
 
-    attr_reader :queue, :server, :app
+    attr_reader :queue, :server
   end
 end

data/lib/nonnative/version.rb

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

data/lib/nonnative.rb

@@ -8,7 +8,6 @@ require 'securerandom'
 
 require 'grpc'
 require 'sinatra'
-require 'rackup'
 require 'rest-client'
 require 'retriable'
 require 'concurrent'
@@ -18,7 +17,8 @@ require 'get_process_mem'
 require 'rspec-benchmark'
 require 'rspec/expectations'
 require 'rspec/wait'
-require 'webrick'
+require 'puma'
+require 'puma/server'
 
 require 'nonnative/version'
 require 'nonnative/error'

data/nonnative.gemspec

@@ -29,12 +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 'rackup', '>= 2', '< 3'
+  spec.add_dependency 'puma', '>= 6', '< 7'
   spec.add_dependency 'rest-client', '>= 2', '< 3'
   spec.add_dependency 'retriable', '>= 3', '< 4'
   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.94.0
+  version: 1.95.0
 platform: ruby
 authors:
 - Alejandro Falkowski
@@ -110,25 +110,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: rackup
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -249,26 +249,6 @@ 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