nonnative 1.15.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9da36cc51d6dd5d1a440767c808455d81dacbf9aa425c185b6d3c3cba24ba949
-  data.tar.gz: b5f13df29130761c28cf96f277392ab7b7a9f0a479ed7539d54b3ffc207687bf
+  metadata.gz: b63357ad2bb8db426b0c2958835121c3fad6611240fbf74b3695d262850cc043
+  data.tar.gz: 2e69404a282502b0b244dccd62c471d32d80b12e624a26ef158a5400eca057ba
 SHA512:
-  metadata.gz: 7a7efe67bb02696eec25e19ff231199219a4e709fb74b746d3d7326358131331f7cb6300e9ec466eec1a7d644d31968d9015ca2a94187d8870fa5c8e6fdf20a1
-  data.tar.gz: 2ef73fa52844639694efa346214f95f6705ffbfeea2b8ab6a1476948cd485a7aaf7269150be72b43dd7d660021c77beb8c61a875a10782061557963824c30e03
+  metadata.gz: 289a4846e961fa08c9b851c81db5b66ee0689970dd4a6469ce1d344d19cfeb2bea26317510a203e50d7b5601d734489deabd95fdcb5966f2d8d687e8dd1de174
+  data.tar.gz: 6cf36198555ed5c189a37fac91a4d6f61b2a4361a3a0380b4c4c24040b22dc7d18b060ab708cb343e9af9ec95a346c7e84193307f250aa29f42dcb601ddde575

data/.rubocop.yml

@@ -6,10 +6,10 @@ Layout/LineLength:
   Max: 120
 
 Metrics/MethodLength:
-  Max: 15
+  Max: 20
 
 Metrics/BlockLength:
-  Max: 35
+  Max: 60
 
 Metrics/AbcSize:
   Max: 20
@@ -58,3 +58,12 @@ Style/RedundantRegexpEscape:
 
 Style/RedundantFetchBlock:
   Enabled: true
+
+Style/AccessorGrouping:
+  Enabled: true
+
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+Style/RedundantAssignment:
+  Enabled: true

data/Gemfile.lock

@@ -1,9 +1,11 @@
 PATH
   remote: .
   specs:
-    nonnative (1.15.0)
+    nonnative (1.20.0)
+      concurrent-ruby (~> 1.0, >= 1.0.5)
       cucumber (~> 3.1, >= 3.1.2)
-      grpc (~> 1.28)
+      grpc (~> 1.30, >= 1.30.1)
+      puma (~> 4.3, >= 4.3.3)
       rest-client (~> 2.1)
       rspec-benchmark (~> 0.6.0)
       rspec-expectations (~> 3.9, >= 3.9.2)
@@ -46,7 +48,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)
@@ -56,10 +58,10 @@ GEM
     google-protobuf (3.12.2)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
-    grpc (1.28.0)
-      google-protobuf (~> 3.11)
+    grpc (1.30.1)
+      google-protobuf (~> 3.12)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.28.0)
+    grpc-tools (1.30.1)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
@@ -79,7 +81,8 @@ GEM
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
-    nokogiri (1.10.9)
+    nio4r (2.5.2)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.2)
     parser (2.7.1.4)
@@ -89,6 +92,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
@@ -121,13 +126,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.86.0)
+    rubocop (0.87.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.1.0)
@@ -183,12 +188,12 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.1, >= 2.1.4)
   chutney (~> 2.0, >= 2.0.3.1)
-  grpc-tools (~> 1.28)
+  grpc-tools (~> 1.30, >= 1.30.1)
   nonnative!
   rake (~> 13.0, >= 13.0.1)
-  rubocop (~> 0.86.0)
+  rubocop (~> 0.87.1)
   simplecov (~> 0.17.1)
-  solargraph (~> 0.39.7)
+  solargraph (~> 0.39.11)
 
 BUNDLED WITH
    2.1.4

data/Makefile

@@ -7,7 +7,7 @@ outdated-dependencies:
 	bundle outdated --only-explicit
 
 features: clean
-	bundle exec cucumber --profile report $(feature)
+	bundle exec cucumber --profile report --fail-fast $(feature)
 
 analysis:
 	bundle exec rubocop

data/README.md

@@ -249,8 +249,8 @@ module Nonnative
     end
 
     class GRPCServer < Nonnative::GRPCServer
-      def configure(grpc)
-        grpc.handle(GreeterService.new)
+      def svc
+        GreeterService.new
       end
     end
   end
@@ -309,8 +309,10 @@ Nonnative.configure do |config|
   config.strategy = :manual
 
   config.server do |d|
-    d.proxy.type = 'chaos'
-    d.proxy.port = 20_000
+    d.proxy = {
+      type: 'chaos',
+      port: 20_000
+    }
   end
 end
 ```

data/lib/nonnative.rb

@@ -4,11 +4,13 @@ require 'socket'
 require 'timeout'
 require 'thwait'
 require 'yaml'
-require 'webrick'
 
 require 'grpc'
 require 'sinatra'
 require 'rest-client'
+require 'puma'
+require 'puma/server'
+require 'concurrent'
 
 require 'nonnative/version'
 require 'nonnative/error'
@@ -34,10 +36,10 @@ require 'nonnative/proxy'
 require 'nonnative/no_proxy'
 require 'nonnative/chaos_proxy'
 
-Thread.abort_on_exception = true
-
 module Nonnative
   class << self
+    attr_reader :pool
+
     def load_configuration(path)
       @configuration ||= Nonnative::Configuration.load_file(path) # rubocop:disable Naming/MemoizedInstanceVariableName
     end

data/lib/nonnative/chaos_proxy.rb

@@ -2,6 +2,14 @@
 
 module Nonnative
   class ChaosProxy < Nonnative::Proxy
+    def initialize(service)
+      @connections = Concurrent::Hash.new
+      @mutex = Mutex.new
+      @state = :none
+
+      super service
+    end
+
     def start
       @tcp_server = ::TCPServer.new('0.0.0.0', service.port)
       @thread = Thread.new { perform_start }
@@ -12,21 +20,32 @@ module Nonnative
       tcp_server.close
     end
 
+    def close_all
+      apply_state :close_all
+    end
+
+    def reset
+      apply_state :none
+    end
+
     def port
       service.proxy.port
     end
 
     private
 
-    attr_reader :tcp_server, :thread
+    attr_reader :tcp_server, :thread, :connections, :mutex, :state
 
     def perform_start
       loop do
-        Thread.start(tcp_server.accept) { |local_socket| connect(local_socket) }
+        thread = Thread.start(tcp_server.accept) { |local_socket| connect(local_socket) }
+        connections[thread.object_id] = thread
       end
     end
 
     def connect(local_socket)
+      return local_socket.close if state?(:close_all)
+
       remote_socket = create_remote_socket
       return unless remote_socket
 
@@ -36,9 +55,12 @@ module Nonnative
         break if write(ready, local_socket, remote_socket)
         break if write(ready, remote_socket, local_socket)
       end
+    rescue Errno::ECONNRESET
+      # Just ignore it.
     ensure
       local_socket.close
       remote_socket&.close
+      connections.delete(Thread.current.object_id)
     end
 
     def create_remote_socket
@@ -60,5 +82,13 @@ module Nonnative
 
       false
     end
+
+    def apply_state(state)
+      mutex.synchronize { @state = state }
+    end
+
+    def state?(state)
+      mutex.synchronize { @state == state }
+    end
   end
 end

data/lib/nonnative/configuration.rb

@@ -42,8 +42,10 @@ module Nonnative
             proxy = fd['proxy']
 
             if proxy
-              s.proxy.type = proxy['type']
-              s.proxy.port = proxy['port']
+              s.proxy = {
+                type: proxy['type'],
+                port: proxy['port']
+              }
             end
           end
         end
@@ -56,9 +58,7 @@ module Nonnative
       self.servers = []
     end
 
-    attr_accessor :strategy
-    attr_accessor :processes
-    attr_accessor :servers
+    attr_accessor :strategy, :processes, :servers
 
     def process
       process = Nonnative::ConfigurationProcess.new

data/lib/nonnative/configuration_process.rb

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

data/lib/nonnative/configuration_proxy.rb

@@ -2,8 +2,7 @@
 
 module Nonnative
   class ConfigurationProxy
-    attr_accessor :type
-    attr_accessor :port
+    attr_accessor :type, :port
 
     def initialize
       self.type = 'none'

data/lib/nonnative/configuration_server.rb

@@ -2,14 +2,17 @@
 
 module Nonnative
   class ConfigurationServer
-    attr_accessor :name
-    attr_accessor :klass
-    attr_accessor :timeout
-    attr_accessor :port
-    attr_accessor :proxy
+    attr_accessor :name, :klass, :timeout, :port
+
+    attr_reader :proxy
 
     def initialize
-      self.proxy = Nonnative::ConfigurationProxy.new
+      @proxy = Nonnative::ConfigurationProxy.new
+    end
+
+    def proxy=(value)
+      proxy.type = value[:type]
+      proxy.port = value[:port]
     end
   end
 end

data/lib/nonnative/grpc_server.rb

@@ -4,20 +4,15 @@ module Nonnative
   class GRPCServer < Nonnative::Server
     def initialize(service)
       @server = GRPC::RpcServer.new
+      server.handle(svc)
 
       super service
     end
 
-    def configure(server)
-      # Classes will add configuration
-    end
-
     protected
 
     def perform_start
       server.add_http2_port("0.0.0.0:#{proxy.port}", :this_port_is_insecure)
-      configure server
-
       server.run
     end
 
@@ -26,7 +21,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/pool.rb

@@ -7,13 +7,16 @@ module Nonnative
     end
 
     def start(&block)
-      all = processes + servers
-      process_all(all, :start, :open?, &block)
+      [servers, processes].each { |t| process(t, :start, :open?, &block) }
     end
 
     def stop(&block)
-      all = processes + servers
-      process_all(all, :stop, :closed?, &block)
+      [processes, servers].each { |t| process(t, :stop, :closed?, &block) }
+    end
+
+    def server_by_name(name)
+      index = configuration.servers.find_index { |s| s.name == name }
+      servers[index].first
     end
 
     private
@@ -32,7 +35,7 @@ module Nonnative
       end
     end
 
-    def process_all(all, type_method, port_method, &block)
+    def process(all, type_method, port_method, &block)
       types = []
       pids = []
       threads = []

data/lib/nonnative/server.rb

@@ -2,8 +2,9 @@
 
 module Nonnative
   class Server < Nonnative::Service
+    attr_reader :proxy
+
     def initialize(service)
-      @id = SecureRandom.hex(5)
       @proxy = Nonnative::ProxyFactory.create(service)
 
       super service
@@ -17,7 +18,7 @@ module Nonnative
         wait_start
       end
 
-      id
+      object_id
     end
 
     def stop
@@ -30,15 +31,11 @@ module Nonnative
         wait_stop
       end
 
-      id
+      object_id
     end
 
-    protected
-
-    attr_reader :id
-
     private
 
-    attr_reader :proxy, :thread
+    attr_reader :thread
   end
 end

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.20.0'
 end

data/nonnative.gemspec

@@ -24,8 +24,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'concurrent-ruby', '~> 1.0', '>= 1.0.5'
   spec.add_dependency 'cucumber', '~> 3.1', '>= 3.1.2'
-  spec.add_dependency 'grpc', '~> 1.28'
+  spec.add_dependency 'grpc', '~> 1.30', '>= 1.30.1'
+  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'
@@ -33,9 +35,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.1', '>= 2.1.4'
   spec.add_development_dependency 'chutney', '~> 2.0', '>= 2.0.3.1'
-  spec.add_development_dependency 'grpc-tools', '~> 1.28'
+  spec.add_development_dependency 'grpc-tools', '~> 1.30', '>= 1.30.1'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
-  spec.add_development_dependency 'rubocop', '~> 0.86.0'
+  spec.add_development_dependency 'rubocop', '~> 0.87.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'solargraph', '~> 0.39.7'
+  spec.add_development_dependency 'solargraph', '~> 0.39.11'
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -36,14 +56,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: '1.30'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.30.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.30'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.30.1
+- !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: '1.28'
+        version: '4.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -158,14 +204,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: '1.30'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: '1.30'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.30.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -192,14 +244,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.86.0
+        version: 0.87.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.86.0
+        version: 0.87.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -220,14 +272,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.7
+        version: 0.39.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.7
+        version: 0.39.11
 description: Allows you to keep using the power of ruby to test other systems
 email:
 - alexrfalkowski@gmail.com