nonnative 1.24.0 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39dfda3ff344a41e06816d7f7cbc152a53d8b5bc98090113e1c79109ea2faf95
-  data.tar.gz: b1fbf5078dfa16d8fb89fc0699af0bebdc2a47473b455d71f3b7cd7bab390b8c
+  metadata.gz: 02a90943c6dc7f21344409f9ee8be6f2a885fdf93a349ec89d3d0e690f040727
+  data.tar.gz: '029e6c5d065db3e63a757d54fa163b9523c8dce1114341c43416709aa0fb3407'
 SHA512:
-  metadata.gz: a797cf86fe77a38f9ebb5fa78f0dd20f24ce9e91f5666ae0c264ce1a37c9e91bba4ff19389da82c5de6fa48099d0187b6789fa1abb296383a8a186280b3b8ab0
-  data.tar.gz: 7a559c54037a22f2b01c995787cac36a076b5afbd8c68a3f1c72ed9f50f4543ff73d060514ea747c4db6964348d568d0a38c222476a33fa8886919e10b8ca093
+  metadata.gz: 8274f8202cd8b5b4a9bf81872ef9d25944b58171451469ef16c2ca9040cceda0ed41ab3e28b69c780b33260c4bfee5c231e5947738bf12413d3324e0f00a9d3e
+  data.tar.gz: bdedecceaf8a08ca7bd8b52e69fdbb8e5cc4336ca28677d0bce5f17a9db735a08d59a7180e2cd4e65c6819be704155ac6aac8a07db48d3ba293de2839ba69d84

data/.rubocop.yml

@@ -9,7 +9,7 @@ Metrics/MethodLength:
   Max: 20
 
 Metrics/BlockLength:
-  Max: 70
+  Max: 80
 
 Metrics/AbcSize:
   Max: 20

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.24.0)
+    nonnative (1.25.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       cucumber (>= 4, < 5)
       grpc (>= 1, < 2)

data/README.md

@@ -57,7 +57,7 @@ Nonnative.configure do |config|
     d.command = 'features/support/bin/start 12_321'
     d.timeout = 0.5
     d.port = 12_321
-    d.file = 'features/logs/12_321.log'
+    d.log = 'features/logs/12_321.log'
     d.signal = 'INT' # Possible values are described in Signal.list.keys
   end
 
@@ -66,7 +66,7 @@ Nonnative.configure do |config|
     d.command = 'features/support/bin/start 12_322'
     d.timeout = 0.5
     d.port = 12_322
-    d.file = 'features/logs/12_322.log'
+    d.log = 'features/logs/12_322.log'
   end
 end
 ```
@@ -82,14 +82,14 @@ processes:
     command: features/support/bin/start 12_321
     timeout: 5
     port: 12321
-    file: features/logs/12_321.log
+    log: features/logs/12_321.log
     signal: INT # Possible values are described in Signal.list.keys
   -
     name: start_2
     command: features/support/bin/start 12_322
     timeout: 5
     port: 12322
-    file: features/logs/12_322.log
+    log: features/logs/12_322.log
 ```
 
 Then load the file with
@@ -133,18 +133,20 @@ require 'nonnative'
 Nonnative.configure do |config|
   config.strategy = :manual
 
-  config.server do |d|
-    d.name = 'server_1'
-    d.klass = Nonnative::EchoServer
-    d.timeout = 1
-    d.port = 12_323
+  config.server do |s|
+    s.name = 'server_1'
+    s.klass = Nonnative::EchoServer
+    s.timeout = 1
+    s.port = 12_323
+    s.log = 'features/logs/server_1.log'
   end
 
-  config.server do |d|
-    d.name = 'server_2'
-    d.klass = Nonnative::EchoServer
-    d.timeout = 1
-    d.port = 12_324
+  config.server do |s|
+    s.name = 'server_2'
+    s.klass = Nonnative::EchoServer
+    s.timeout = 1
+    s.port = 12_324
+    s.log = 'features/logs/server_2.log'
   end
 end
 ```
@@ -160,11 +162,13 @@ servers:
     klass: Nonnative::EchoServer
     timeout: 1
     port: 12323
+    log: features/logs/server_1.log
   -
     name: server_2
     klass: Nonnative::EchoServer
     timeout: 1
     port: 12324
+    log: features/logs/server_2.log
 ```
 
 Then load the file with:
@@ -182,7 +186,11 @@ Define your server:
 ```ruby
 module Nonnative
   module Features
-    class Application < Sinatra::Base
+    class Application < Sinatra::Application
+      configure do
+        set :server_settings, log_requests: true
+      end
+
       get '/hello' do
         'Hello World!'
       end
@@ -205,11 +213,12 @@ require 'nonnative'
 Nonnative.configure do |config|
   config.strategy = :manual
 
-  config.server do |d|
-    d.name = 'http_server_1'
-    d.klass = Nonnative::Features::HTTPServer
-    d.timeout = 1
-    d.port = 4567
+  config.server do |s|
+    s.name = 'http_server_1'
+    s.klass = Nonnative::Features::HTTPServer
+    s.timeout = 1
+    s.port = 4567
+    s.log = 'features/logs/http_server_1.log'
   end
 end
 ```
@@ -225,6 +234,7 @@ servers:
     klass: Nonnative::Features::HTTPServer
     timeout: 1
     port: 4567
+    log: features/logs/http_server_1.log
 ```
 
 Then load the file with:
@@ -265,11 +275,12 @@ require 'nonnative'
 Nonnative.configure do |config|
   config.strategy = :manual
 
-  config.server do |d|
-    d.name = 'grpc_server_1'
-    d.klass = Nonnative::Features::GRPCServer
-    d.timeout = 1
-    d.port = 9002
+  config.server do |s|
+    s.name = 'grpc_server_1'
+    s.klass = Nonnative::Features::GRPCServer
+    s.timeout = 1
+    s.port = 9002
+    s.log = 'features/logs/grpc_server_1.log'
   end
 end
 ```
@@ -285,6 +296,7 @@ servers:
     klass: Nonnative::Features::GRPCServer
     timeout: 1
     port: 9002
+    log: features/logs/grpc_server_1.log
 ```
 
 Then load the file with:

data/lib/nonnative/command.rb

@@ -38,7 +38,7 @@ module Nonnative
     end
 
     def command_spawn
-      spawn(service.command, %i[out err] => [service.file, 'a'])
+      spawn(service.command, %i[out err] => [service.log, 'a'])
     end
 
     def command_exists?

data/lib/nonnative/configuration.rb

@@ -24,7 +24,7 @@ module Nonnative
             d.command = fd['command']
             d.timeout = fd['timeout']
             d.port = fd['port']
-            d.file = fd['file']
+            d.log = fd['log']
             d.signal = fd['signal']
           end
         end
@@ -38,6 +38,7 @@ module Nonnative
             s.klass = Object.const_get(fd['klass'])
             s.timeout = fd['timeout']
             s.port = fd['port']
+            s.log = fd['log']
 
             proxy = fd['proxy']
 

data/lib/nonnative/configuration_process.rb

@@ -2,6 +2,6 @@
 
 module Nonnative
   class ConfigurationProcess
-    attr_accessor :name, :command, :timeout, :port, :file, :signal
+    attr_accessor :name, :command, :timeout, :port, :log, :signal
   end
 end

data/lib/nonnative/configuration_server.rb

@@ -2,7 +2,7 @@
 
 module Nonnative
   class ConfigurationServer
-    attr_accessor :name, :klass, :timeout, :port
+    attr_accessor :name, :klass, :timeout, :port, :log
     attr_reader :proxy
 
     def initialize

data/lib/nonnative/grpc_server.rb

@@ -6,6 +6,11 @@ module Nonnative
       @server = GRPC::RpcServer.new
       server.handle(svc)
 
+      # Unfortunately gRPC has only one logger so the first server wins.
+      GRPC.define_singleton_method(:logger) do
+        @logger ||= Logger.new(service.log)
+      end
+
       super service
     end
 

data/lib/nonnative/http_server.rb

@@ -3,7 +3,9 @@
 module Nonnative
   class HTTPServer < Nonnative::Server
     def initialize(service)
-      @server = Puma::Server.new(app, Puma::Events.strings)
+      log = File.open(service.log, 'a')
+      events = Puma::Events.new(log, log)
+      @server = Puma::Server.new(app, events)
 
       super service
     end

data/lib/nonnative/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.25.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-11 00:00:00.000000000 Z
+date: 2020-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby