nonnative 1.86.0 → 1.87.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81b070f7067278bcc745ef685d26cb856196efcaff35255baa850ac41448f0dc
-  data.tar.gz: bf16cd6415717885eb38d3b60fd9e5da08a981571e9f67e7928fcda8e9e35ffb
+  metadata.gz: d084e050131452576fb0716fa60f9ad641f8d18e50cf99c05d0f3e0c37742f58
+  data.tar.gz: dea87ac4b7b3c1d85bba7b1253d24191654fa3a7a338c54767716a85ff6b1123
 SHA512:
-  metadata.gz: aa19604dfec804d43a98f23f54020c35eef9fc6f1633b01437703ccec275df4ddedf8710737fd6f2edc69cfc1e28fdfc6da0499d8856686c7cd1c43def45982d
-  data.tar.gz: 8521adce4f1ac505d2ab958fa9359f7fd459e78a674bc4008b11ce682275ac9f47a9578988fae484137d4ce6a8621dbd7ee8940bdad19da5ed4980c5154baa0a
+  metadata.gz: 38c23a797f43a2193335fbcf50550311a0881de585d27af319935eeba9bb3e07e2f920c06004accd9cc3eada1079e374f5e9ffd6a51fcf238908b57ff04f3e42
+  data.tar.gz: e6e63b0ed16fb218b56d981e04577774128d52e0a281e6937eb5127beee7a180fdd0fc7fbbfa536e75e78570aaa1202b3f21a69b2669f83dc8b1933abe4518bf

data/CHANGELOG.md

@@ -6,6 +6,11 @@ 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)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.86.0)
+    nonnative (1.87.0)
       concurrent-ruby (>= 1, < 2)
       config (>= 5, < 6)
       cucumber (>= 7, < 10)

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/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.86.0'
+  VERSION = '1.87.0'
 end

data/lib/nonnative.rb

@@ -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

metadata

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