nonnative 1.14.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3d063b72e79c07612ef45de94f2b318c59d600be60823a3b72b97e14b819863
-  data.tar.gz: e49d9d93bd0657896c7fb1abba459ca59c6c8fc3e59b409fe9c231b20f77cf34
+  metadata.gz: d50a3cb35c875fa077d8ca3bd756e11d10deaffec26a90b142dc8e70a690ba97
+  data.tar.gz: 8396fbee42d4d138ca270a39cf916f701a3874aa55c62312f05bc613de39b1ed
 SHA512:
-  metadata.gz: 7d12d87e1f2681fc8e9fef1eecb5b55d81eb773b1845ffb22ab094c17cd9d73bced1874ee277e11c024ca82d66d9f7c4c9d49f6f3827052f06d0ce3bdc86f1f5
-  data.tar.gz: 6436da5c0393b9842881722a50f23e80f3264c0a36006e9aeb8402b26910645e875313b430da8df9bd2ba02b5ff08bce576cc74f590a8b5707f6454a27ca83b4
+  metadata.gz: f7b04f930d6743048cbb33bf5e7cdcfc915aee45ce1f788ec392fe100edab8a2a39e714fe6bb51a8bfd376d51c00c15870a3a3d5f79bd7449ce1ffaefbeea628
+  data.tar.gz: 35df2beddc2ef0c9aae2c5f4c5c4f4e0a3ea013af03571a01024aa0cf329804f0867bd59d8087ec04c91eef10a53150a2a251998cf4fa4a1d07a4f66812f6328

data/.rubocop.yml

@@ -8,6 +8,12 @@ Layout/LineLength:
 Metrics/MethodLength:
   Max: 15
 
+Metrics/BlockLength:
+  Max: 50
+
+Metrics/AbcSize:
+  Max: 20
+
 Style/Documentation:
   Enabled: false
 
@@ -37,3 +43,18 @@ Layout/EmptyLinesAroundAttributeAccessor:
 
 Style/SlicingWithRange:
   Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/RedundantFetchBlock:
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.14.0)
+    nonnative (1.19.0)
       cucumber (~> 3.1, >= 3.1.2)
       grpc (~> 1.28)
       puma (~> 4.3, >= 4.3.3)
@@ -18,7 +18,7 @@ GEM
       tins (~> 1.0)
     ast (2.4.1)
     backport (1.1.2)
-    backports (3.17.2)
+    backports (3.18.1)
     benchmark (0.1.0)
     benchmark-malloc (0.2.0)
     benchmark-perf (0.6.0)
@@ -47,7 +47,7 @@ GEM
     cucumber-expressions (6.0.1)
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -84,8 +84,8 @@ GEM
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.2)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     pastel (0.7.4)
       equatable (~> 0.6)
       tty-color (~> 0.5)
@@ -98,6 +98,7 @@ GEM
       rack
     rainbow (3.0.0)
     rake (13.0.1)
+    regexp_parser (1.7.1)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -124,13 +125,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.83.0)
+    rubocop (0.86.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.1.0)
+      parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.2)
     ruby_parser (3.14.2)
@@ -146,7 +151,7 @@ GEM
       rack (~> 2.0)
       rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
-    solargraph (0.39.8)
+    solargraph (0.39.11)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)
@@ -185,7 +190,7 @@ DEPENDENCIES
   grpc-tools (~> 1.28)
   nonnative!
   rake (~> 13.0, >= 13.0.1)
-  rubocop (~> 0.83.0)
+  rubocop (~> 0.86.0)
   simplecov (~> 0.17.1)
   solargraph (~> 0.39.7)
 

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

@@ -38,13 +38,11 @@ Configure nonnative with the following:
 - Port to verify.
 - The class for servers.
 - The file you want STDOUT to be logged to for processes.
-- The strategy (Startup will start the process once and before will hook into cucumbers Before and After) for processes.
+- The strategy for processes/servers.
+  * Startup will start the process once.
+  * Before will hook into cucumbers Before and After.
 
-### Ruby
-
-We can start a process, server or both.
-
-#### Processes
+### Processes
 
 Setup it up programmatically:
 
@@ -55,13 +53,16 @@ Nonnative.configure do |config|
   config.strategy = :startup or :before or :manual
 
   config.process do |d|
+    d.name = 'start_1'
     d.command = 'features/support/bin/start 12_321'
     d.timeout = 0.5
     d.port = 12_321
     d.file = 'features/logs/12_321.log'
+    d.signal = 'INT' # Possible values are described in Signal.list.keys
   end
 
   config.process do |d|
+    d.name = 'start_2'
     d.command = 'features/support/bin/start 12_322'
     d.timeout = 0.5
     d.port = 12_322
@@ -77,11 +78,14 @@ version: 1.0
 strategy: manual
 processes:
   -
+    name: start_1
     command: features/support/bin/start 12_321
     timeout: 5
     port: 12321
     file: 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
@@ -96,7 +100,7 @@ require 'nonnative'
 Nonnative.load_configuration('configuration.yml')
 ```
 
-#### Servers
+### Servers
 
 Define your server:
 
@@ -130,12 +134,14 @@ 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
   end
 
   config.server do |d|
+    d.name = 'server_2'
     d.klass = Nonnative::EchoServer
     d.timeout = 1
     d.port = 12_324
@@ -150,10 +156,12 @@ version: 1.0
 strategy: manual
 servers:
   -
+    name: server_1
     klass: Nonnative::EchoServer
     timeout: 1
     port: 12323
   -
+    name: server_2
     klass: Nonnative::EchoServer
     timeout: 1
     port: 12324
@@ -167,26 +175,22 @@ require 'nonnative'
 Nonnative.load_configuration('configuration.yml')
 ```
 
-##### HTTP
+#### HTTP
 
 Define your server:
 
 ```ruby
 module Nonnative
   module Features
-    module Hello
-      class << self
-        def registered(app)
-          app.get '/hello' do
-            'Hello World!'
-          end
-        end
+    class Application < Sinatra::Base
+      get '/hello' do
+        'Hello World!'
       end
     end
 
     class HTTPServer < Nonnative::HTTPServer
-      def configure(http)
-        http.register(Hello)
+      def app
+        Application.new
       end
     end
   end
@@ -202,6 +206,7 @@ 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
@@ -216,6 +221,7 @@ version: 1.0
 strategy: manual
 servers:
   -
+    name: http_server_1
     klass: Nonnative::Features::HTTPServer
     timeout: 1
     port: 4567
@@ -229,7 +235,7 @@ require 'nonnative'
 Nonnative.load_configuration('configuration.yml')
 ```
 
-##### gRPC
+#### gRPC
 
 Define your server:
 
@@ -243,8 +249,8 @@ module Nonnative
     end
 
     class GRPCServer < Nonnative::GRPCServer
-      def configure(grpc)
-        grpc.handle(GreeterService.new)
+      def svc
+        GreeterService.new
       end
     end
   end
@@ -260,6 +266,7 @@ 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
@@ -274,6 +281,7 @@ version: 1.0
 strategy: manual
 servers:
   -
+    name: grpc_server_1
     klass: Nonnative::Features::GRPCServer
     timeout: 1
     port: 9002
@@ -286,3 +294,35 @@ require 'nonnative'
 
 Nonnative.load_configuration('configuration.yml')
 ```
+#### Proxies
+
+We allow different proxies to be configured. These proxies can be used to simulate all kind of situations. The proxies that can be configured are:
+- none (this is the default)
+- chaos
+
+Setup it up programmatically:
+
+```ruby
+require 'nonnative'
+
+Nonnative.configure do |config|
+  config.strategy = :manual
+
+  config.server do |d|
+    d.proxy.type = 'chaos'
+    d.proxy.port = 20_000
+  end
+end
+```
+
+Setup it up through configuration:
+
+```yaml
+version: 1.0
+strategy: manual
+servers:
+  -
+    proxy:
+      type: chaos
+      port: 20000
+```

data/lib/nonnative.rb

@@ -8,6 +8,8 @@ require 'yaml'
 require 'grpc'
 require 'sinatra'
 require 'rest-client'
+require 'puma'
+require 'puma/server'
 
 require 'nonnative/version'
 require 'nonnative/error'
@@ -18,16 +20,22 @@ require 'nonnative/port'
 require 'nonnative/configuration'
 require 'nonnative/configuration_process'
 require 'nonnative/configuration_server'
+require 'nonnative/configuration_proxy'
 require 'nonnative/service'
 require 'nonnative/command'
 require 'nonnative/pool'
 require 'nonnative/server'
 require 'nonnative/http_client'
-require 'nonnative/application'
 require 'nonnative/http_server'
 require 'nonnative/grpc_server'
 require 'nonnative/grpc_server'
 require 'nonnative/observability'
+require 'nonnative/proxy_factory'
+require 'nonnative/proxy'
+require 'nonnative/no_proxy'
+require 'nonnative/chaos_proxy'
+
+Thread.abort_on_exception = true
 
 module Nonnative
   class << self
@@ -40,7 +48,7 @@ module Nonnative
     end
 
     def configure
-      yield configuration if block_given?
+      yield configuration
 
       require "nonnative/#{configuration.strategy}"
     end

data/lib/nonnative/chaos_proxy.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class ChaosProxy < Nonnative::Proxy
+    def start
+      @tcp_server = ::TCPServer.new('0.0.0.0', service.port)
+      @thread = Thread.new { perform_start }
+    end
+
+    def stop
+      thread.terminate
+      tcp_server.close
+    end
+
+    def port
+      service.proxy.port
+    end
+
+    private
+
+    attr_reader :tcp_server, :thread
+
+    def perform_start
+      loop do
+        Thread.start(tcp_server.accept) { |local_socket| connect(local_socket) }
+      end
+    end
+
+    def connect(local_socket)
+      remote_socket = create_remote_socket
+      return unless remote_socket
+
+      loop do
+        ready = select([local_socket, remote_socket], nil, nil)
+
+        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
+    end
+
+    def create_remote_socket
+      timeout.perform do
+        ::TCPSocket.new('0.0.0.0', port)
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+        sleep 0.01
+        retry
+      end
+    end
+
+    def write(ready, socket1, socket2)
+      if ready[0].include?(socket1)
+        data = socket1.recv(1024)
+        return true if data.empty?
+
+        socket2.write(data)
+      end
+
+      false
+    end
+  end
+end

data/lib/nonnative/command.rb

@@ -2,15 +2,6 @@
 
 module Nonnative
   class Command < Nonnative::Service
-    def initialize(service)
-      @service = service
-      @timeout = Nonnative::Timeout.new(service.timeout)
-    end
-
-    def name
-      service.command
-    end
-
     def start
       unless command_exists?
         @pid = command_spawn
@@ -39,10 +30,11 @@ module Nonnative
 
     private
 
-    attr_reader :service, :timeout, :pid
+    attr_reader :pid
 
     def command_kill
-      Process.kill('SIGINT', pid)
+      signal = Signal.list[service.signal || 'INT'] || Signal.list['INT']
+      Process.kill(signal, pid)
     end
 
     def command_spawn
@@ -52,7 +44,8 @@ module Nonnative
     def command_exists?
       return false if pid.nil?
 
-      Process.kill(0, pid)
+      signal = Signal.list['EXIT']
+      Process.kill(signal, pid)
       true
     rescue Errno::ESRCH
       false

data/lib/nonnative/configuration.rb

@@ -20,10 +20,12 @@ module Nonnative
         processes = file['processes'] || []
         processes.each do |fd|
           config.process do |d|
+            d.name = fd['name']
             d.command = fd['command']
             d.timeout = fd['timeout']
             d.port = fd['port']
             d.file = fd['file']
+            d.signal = fd['signal']
           end
         end
       end
@@ -32,9 +34,17 @@ module Nonnative
         servers = file['servers'] || []
         servers.each do |fd|
           config.server do |s|
+            s.name = fd['name']
             s.klass = Object.const_get(fd['klass'])
             s.timeout = fd['timeout']
             s.port = fd['port']
+
+            proxy = fd['proxy']
+
+            if proxy
+              s.proxy.type = proxy['type']
+              s.proxy.port = proxy['port']
+            end
           end
         end
       end

data/lib/nonnative/configuration_process.rb

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

data/lib/nonnative/configuration_proxy.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class ConfigurationProxy
+    attr_accessor :type
+    attr_accessor :port
+
+    def initialize
+      self.type = 'none'
+      self.port = 0
+    end
+  end
+end

data/lib/nonnative/configuration_server.rb

@@ -2,8 +2,14 @@
 
 module Nonnative
   class ConfigurationServer
+    attr_accessor :name
     attr_accessor :klass
     attr_accessor :timeout
     attr_accessor :port
+    attr_accessor :proxy
+
+    def initialize
+      self.proxy = Nonnative::ConfigurationProxy.new
+    end
   end
 end

data/lib/nonnative/grpc_server.rb

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

@@ -3,39 +3,36 @@
 module Nonnative
   class HTTPServer < Nonnative::Server
     def initialize(service)
-      @timeout = Nonnative::Timeout.new(service.timeout)
-      @queue = Queue.new
-
-      Application.set :port, service.port
-      configure Application
+      @server = Puma::Server.new(app, Puma::Events.strings)
 
       super service
     end
 
-    def configure(http)
-      # Classes will add configuration
-    end
+    protected
 
     def perform_start
-      Application.start! do |server|
-        queue << server
-      end
+      server.add_tcp_listener '0.0.0.0', proxy.port
+      server.run.join
     end
 
     def perform_stop
-      Application.stop!
+      server.stop(true)
     end
 
-    protected
-
     def wait_start
       timeout.perform do
-        queue.pop
+        super until server.running
+      end
+    end
+
+    def wait_stop
+      timeout.perform do
+        super while server.running
       end
     end
 
     private
 
-    attr_reader :timeout, :queue
+    attr_reader :queue, :server
   end
 end

data/lib/nonnative/no_proxy.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class NoProxy < Proxy
+    def start
+      # Do nothing.
+    end
+
+    def stop
+      # Do nothing.
+    end
+
+    def port
+      service.port
+    end
+  end
+end

data/lib/nonnative/pool.rb

@@ -7,13 +7,11 @@ 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
 
     private
@@ -32,7 +30,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/proxy.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class Proxy
+    def initialize(service)
+      @service = service
+      @timeout = Nonnative::Timeout.new(service.timeout)
+    end
+
+    protected
+
+    attr_reader :service, :timeout
+  end
+end

data/lib/nonnative/proxy_factory.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class ProxyFactory
+    class << self
+      def create(service)
+        case service.proxy.type
+        when 'chaos'
+          ChaosProxy.new(service)
+        else
+          # By default we want no proxy.
+          NoProxy.new(service)
+        end
+      end
+    end
+  end
+end

data/lib/nonnative/server.rb

@@ -3,17 +3,17 @@
 module Nonnative
   class Server < Nonnative::Service
     def initialize(service)
-      @service = service
       @id = SecureRandom.hex(5)
-    end
+      @proxy = Nonnative::ProxyFactory.create(service)
 
-    def name
-      self.class.to_s
+      super service
     end
 
     def start
       unless thread
+        proxy.start
         @thread = Thread.new { perform_start }
+
         wait_start
       end
 
@@ -24,6 +24,8 @@ module Nonnative
       if thread
         perform_stop
         thread.terminate
+        proxy.stop
+
         @thread = nil
         wait_stop
       end
@@ -31,6 +33,12 @@ module Nonnative
       id
     end
 
-    attr_reader :service, :id, :thread
+    protected
+
+    attr_reader :id
+
+    private
+
+    attr_reader :proxy, :thread
   end
 end

data/lib/nonnative/service.rb

@@ -2,8 +2,19 @@
 
 module Nonnative
   class Service
+    def initialize(service)
+      @service = service
+      @timeout = Nonnative::Timeout.new(service.timeout)
+    end
+
+    def name
+      service.name
+    end
+
     protected
 
+    attr_reader :service, :timeout
+
     def wait_start
       sleep 0.1
     end

data/lib/nonnative/version.rb

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

data/nonnative.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'chutney', '~> 2.0', '>= 2.0.3.1'
   spec.add_development_dependency 'grpc-tools', '~> 1.28'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
-  spec.add_development_dependency 'rubocop', '~> 0.83.0'
+  spec.add_development_dependency 'rubocop', '~> 0.86.0'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'solargraph', '~> 0.39.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.19.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.83.0
+        version: 0.86.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.83.0
+        version: 0.86.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -270,20 +270,24 @@ files:
 - bin/console
 - bin/setup
 - lib/nonnative.rb
-- lib/nonnative/application.rb
 - lib/nonnative/before.rb
+- lib/nonnative/chaos_proxy.rb
 - lib/nonnative/command.rb
 - lib/nonnative/configuration.rb
 - lib/nonnative/configuration_process.rb
+- lib/nonnative/configuration_proxy.rb
 - lib/nonnative/configuration_server.rb
 - lib/nonnative/error.rb
 - lib/nonnative/grpc_server.rb
 - lib/nonnative/http_client.rb
 - lib/nonnative/http_server.rb
 - lib/nonnative/manual.rb
+- lib/nonnative/no_proxy.rb
 - lib/nonnative/observability.rb
 - lib/nonnative/pool.rb
 - lib/nonnative/port.rb
+- lib/nonnative/proxy.rb
+- lib/nonnative/proxy_factory.rb
 - lib/nonnative/server.rb
 - lib/nonnative/service.rb
 - lib/nonnative/start_error.rb

data/lib/nonnative/application.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Nonnative
-  class Application < Sinatra::Application
-    set :bind, '0.0.0.0'
-    set :server, :puma
-    set :logging, false
-    set :quiet, true
-  end
-end