nonnative 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9da36cc51d6dd5d1a440767c808455d81dacbf9aa425c185b6d3c3cba24ba949
-  data.tar.gz: b5f13df29130761c28cf96f277392ab7b7a9f0a479ed7539d54b3ffc207687bf
+  metadata.gz: 06c156ebea189af501939979653772a2f87dcb6c262f373134d061bd0f07a48c
+  data.tar.gz: 6d41fd8ac177d6565517423c73b031c0c4e03512f2406e7be6f12e2611dfe87d
 SHA512:
-  metadata.gz: 7a7efe67bb02696eec25e19ff231199219a4e709fb74b746d3d7326358131331f7cb6300e9ec466eec1a7d644d31968d9015ca2a94187d8870fa5c8e6fdf20a1
-  data.tar.gz: 2ef73fa52844639694efa346214f95f6705ffbfeea2b8ab6a1476948cd485a7aaf7269150be72b43dd7d660021c77beb8c61a875a10782061557963824c30e03
+  metadata.gz: a34000c945bc7902645dd32a381311160353193efce3fcc9fbdc563a9e191b192b5e14b72bb4c1efa9d87a821558b801ba002d213e5aad7dceeef1f1ebf12e92
+  data.tar.gz: 9d31997089ebaf6e01b4394b4b13d916791e8d5366acb0fd78e09db3cc662609202d1ac0d6ed605dda35796eae84201f607e5255cf6a25e8e2dedd01ef87e43d

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    nonnative (1.15.0)
+    nonnative (1.16.0)
       cucumber (~> 3.1, >= 3.1.2)
       grpc (~> 1.28)
+      puma (~> 4.3, >= 4.3.3)
       rest-client (~> 2.1)
       rspec-benchmark (~> 0.6.0)
       rspec-expectations (~> 3.9, >= 3.9.2)
@@ -46,7 +47,7 @@ GEM
     cucumber-expressions (6.0.1)
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
-    diff-lcs (1.4.2)
+    diff-lcs (1.4.4)
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -79,6 +80,7 @@ GEM
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
+    nio4r (2.5.2)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.2)
@@ -89,6 +91,8 @@ GEM
       tty-color (~> 0.5)
     protocol (2.0.0)
       ruby_parser (~> 3.0)
+    puma (4.3.5)
+      nio4r (~> 2.0)
     rack (2.2.3)
     rack-protection (2.0.8.1)
       rack

data/lib/nonnative.rb

@@ -4,11 +4,12 @@ require 'socket'
 require 'timeout'
 require 'thwait'
 require 'yaml'
-require 'webrick'
 
 require 'grpc'
 require 'sinatra'
 require 'rest-client'
+require 'puma'
+require 'puma/server'
 
 require 'nonnative/version'
 require 'nonnative/error'

data/lib/nonnative/grpc_server.rb

@@ -26,7 +26,15 @@ module Nonnative
     end
 
     def wait_start
-      server.wait_till_running(service.timeout)
+      timeout.perform do
+        super until server.running?
+      end
+    end
+
+    def wait_stop
+      timeout.perform do
+        super until server.stopped?
+      end
     end
 
     private

data/lib/nonnative/http_server.rb

@@ -2,23 +2,33 @@
 
 module Nonnative
   class HTTPServer < Nonnative::Server
+    def initialize(service)
+      @server = Puma::Server.new(app, Puma::Events.strings)
+
+      super service
+    end
+
     protected
 
     def perform_start
-      options = {
-        Host: '0.0.0.0',
-        Port: proxy.port,
-        Logger: ::WEBrick::Log.new('/dev/null'),
-        AccessLog: []
-      }
-
-      Rack::Handler::WEBrick.run(app, options) do |server|
-        @server = server
-      end
+      server.add_tcp_listener '0.0.0.0', proxy.port
+      server.run.join
     end
 
     def perform_stop
-      server.shutdown
+      server.stop(true)
+    end
+
+    def wait_start
+      timeout.perform do
+        super until server.running
+      end
+    end
+
+    def wait_stop
+      timeout.perform do
+        super while server.running
+      end
     end
 
     private

data/lib/nonnative/service.rb

@@ -16,11 +16,11 @@ module Nonnative
     attr_reader :service, :timeout
 
     def wait_start
-      sleep 0.2
+      sleep 0.1
     end
 
     def wait_stop
-      sleep 0.2
+      sleep 0.1
     end
   end
 end

data/lib/nonnative/version.rb

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

data/nonnative.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'cucumber', '~> 3.1', '>= 3.1.2'
   spec.add_dependency 'grpc', '~> 1.28'
+  spec.add_dependency 'puma', '~> 4.3', '>= 4.3.3'
   spec.add_dependency 'rest-client', '~> 2.1'
   spec.add_dependency 'rspec-benchmark', '~> 0.6.0'
   spec.add_dependency 'rspec-expectations', '~> 3.9', '>= 3.9.2'

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Alex Falkowski
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
 date: 2020-07-03 00:00:00.000000000 Z
@@ -44,6 +44,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.28'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -281,7 +301,7 @@ homepage: https://github.com/alexfalkowski/nonnative
 licenses:
 - Unlicense
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -296,8 +316,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.0.8
+signing_key: 
 specification_version: 4
 summary: Allows you to keep using the power of ruby to test other systems
 test_files: []