nonnative 1.39.0 → 1.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05eabed13ed77a7eea02eb898db4a670c53286639168190c1f068e8683606e9d
-  data.tar.gz: a50f29b97792cf8248187e30f3aabfb5d204fae05235821b5b358176feca7997
+  metadata.gz: f2baafe2a724951013706a01a247386b01a6eecde9194f6cefbc04348e787f07
+  data.tar.gz: 99d3a81f1ba4ac6bbc217d0aa48f8d37b11682e6bc18067c07a2e9cf62cd6580
 SHA512:
-  metadata.gz: dbed996363616c31404a70079bdfa475aa8917b8f7edc492af04cff257db468599ffc04ab68ac452f47071bee00ffefc0d4e49186f9c58c7cb8a242bb0ea9240
-  data.tar.gz: 2190e7f96f504645c9e4069660d3af06309a08e48ecb13984656dcc68ee93edd813bbf8ab275eea7f3fee9c7efe2fa9a2c22df9017b5fbfcc673c244a35c0fba
+  metadata.gz: cf6dc4e8c8e5e7501c83f05080faba0cda93813ce47cb6b548341114c83f41757228dd0a9c58a2e326c828e7873cb7b85cd121e8ed5eb52ce92a6ebfa636581b
+  data.tar.gz: 831daa9769dcb510ac649010bd430bc74d335e93ce9f1791ebd420b37570735ba7cbb46ddb810310ccc0ed659138526e8b84060117c4e048cf55b9e9e8388298

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: x3EcMK4Nr770BeIFZengeQ2DLDCDjNfNo

data/CHANGELOG.md

@@ -2,6 +2,54 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.44.0](https://github.com/alexfalkowski/nonnative/compare/v1.43.0...v1.44.0) (2021-05-01)
+
+
+### Features
+
+* move to reusable steps ([#84](https://github.com/alexfalkowski/nonnative/issues/84)) ([37b6175](https://github.com/alexfalkowski/nonnative/commit/37b6175e920dfb70f3d6f13226240dd045c2db3d))
+
+## [1.43.0](https://github.com/alexfalkowski/nonnative/compare/v1.42.2...v1.43.0) (2021-04-30)
+
+
+### Features
+
+* release version 1.43.0 ([#83](https://github.com/alexfalkowski/nonnative/issues/83)) ([b51526d](https://github.com/alexfalkowski/nonnative/commit/b51526d99d24522a26f534d28769cc8cdee4af04))
+
+### [1.42.2](https://github.com/alexfalkowski/nonnative/compare/v1.42.1...v1.42.2) (2021-04-30)
+
+
+### Bug Fixes
+
+* make sure we parse services config ([#82](https://github.com/alexfalkowski/nonnative/issues/82)) ([2a52af7](https://github.com/alexfalkowski/nonnative/commit/2a52af74b75443674a2235c424d69f15516ab60f))
+
+### [1.42.1](https://github.com/alexfalkowski/nonnative/compare/v1.42.0...v1.42.1) (2021-04-30)
+
+## [1.42.0](https://github.com/alexfalkowski/nonnative/compare/v1.41.0...v1.42.0) (2021-04-30)
+
+
+### Features
+
+* add services ([#80](https://github.com/alexfalkowski/nonnative/issues/80)) ([454980e](https://github.com/alexfalkowski/nonnative/commit/454980e1eb141995c96203fcf9254bfe2cb0133e))
+
+## [1.41.0](https://github.com/alexfalkowski/nonnative/compare/v1.40.2...v1.41.0) (2021-04-30)
+
+
+### Features
+
+* add proxy to processes ([#79](https://github.com/alexfalkowski/nonnative/issues/79)) ([d52b2bb](https://github.com/alexfalkowski/nonnative/commit/d52b2bb6fad91612f9b9a64817c861d1c227ef0b))
+
+### [1.40.2](https://github.com/alexfalkowski/nonnative/compare/v1.40.1...v1.40.2) (2021-04-27)
+
+### [1.40.1](https://github.com/alexfalkowski/nonnative/compare/v1.40.0...v1.40.1) (2021-04-27)
+
+## [1.40.0](https://github.com/alexfalkowski/nonnative/compare/v1.39.0...v1.40.0) (2021-04-25)
+
+
+### Features
+
+* update deps ([#76](https://github.com/alexfalkowski/nonnative/issues/76)) ([83c9e16](https://github.com/alexfalkowski/nonnative/commit/83c9e16b5e5f9f14ed2cc5fd2eb29b83147c1e53))
+
 ## [1.39.0](https://github.com/alexfalkowski/nonnative/compare/v1.38.0...v1.39.0) (2021-04-23)
 
 

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    nonnative (1.39.0)
+    nonnative (1.44.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
-      cucumber (>= 5, < 6)
+      cucumber (>= 6, < 7)
       grpc (>= 1, < 2)
+      grpc-tools (>= 1, < 2)
       puma (~> 5.0)
       rest-client (~> 2.1)
       rspec-benchmark (~> 0.6.0)
@@ -28,37 +29,44 @@ GEM
     benchmark-trend (0.4.0)
     builder (3.2.4)
     concurrent-ruby (1.1.8)
-    cucumber (5.3.0)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    cucumber (6.0.0)
       builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-create-meta (~> 2.0, >= 2.0.2)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-html-formatter (~> 9.0, >= 9.0.0)
-      cucumber-messages (~> 13.1, >= 13.1.0)
-      cucumber-wire (~> 4.0, >= 4.0.1)
+      cucumber-core (~> 9.0, >= 9.0.0)
+      cucumber-create-meta (~> 4.0, >= 4.0.0)
+      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
+      cucumber-gherkin (~> 18.1, >= 18.1.0)
+      cucumber-html-formatter (~> 13.0, >= 13.0.0)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+      cucumber-wire (~> 5.0, >= 5.0.0)
       diff-lcs (~> 1.4, >= 1.4.4)
+      mime-types (~> 3.3, >= 3.3.1)
       multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-core (8.0.1)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-create-meta (2.0.4)
-      cucumber-messages (~> 13.1, >= 13.1.0)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.3.0)
-    cucumber-gherkin (15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-html-formatter (9.0.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-messages (13.2.1)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-core (9.0.0)
+      cucumber-gherkin (~> 18.1, >= 18.1.0)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+      cucumber-tag-expressions (~> 3.0, >= 3.0.1)
+    cucumber-create-meta (4.0.0)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-cucumber-expressions (12.1.1)
+    cucumber-gherkin (18.1.1)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+    cucumber-html-formatter (13.0.0)
+      cucumber-messages (~> 15.0, >= 15.0.0)
+    cucumber-messages (15.0.0)
       protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (2.0.4)
-    cucumber-wire (4.0.1)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-tag-expressions (3.0.1)
+    cucumber-wire (5.0.0)
+      cucumber-core (~> 9.0, >= 9.0.0)
+      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
+      cucumber-messages (~> 15.0, >= 15.0.0)
     diff-lcs (1.4.4)
     docile (1.3.5)
     domain_name (0.5.20190701)
@@ -68,16 +76,17 @@ GEM
     google-protobuf (3.15.8)
     googleapis-common-protos-types (1.0.6)
       google-protobuf (~> 3.14)
-    grpc (1.37.0)
+    grpc (1.37.1)
       google-protobuf (~> 3.15)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.37.0)
+    grpc-tools (1.37.1)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
+    json (2.5.1)
     kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -151,12 +160,11 @@ GEM
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.4)
-    simplecov (0.21.2)
+    simplecov (0.16.1)
       docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
@@ -176,11 +184,16 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
+    sync (0.5.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
+    tins (1.28.0)
+      sync
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
@@ -195,10 +208,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.1, >= 2.1.4)
-  grpc-tools (>= 1, < 2)
+  coveralls (~> 0.8.23)
   nonnative!
   rubocop (~> 1.12)
-  simplecov (~> 0.21.2)
   solargraph (~> 0.40.4)
 
 BUNDLED WITH

data/README.md

@@ -1,4 +1,5 @@
 [![CircleCI](https://circleci.com/gh/alexfalkowski/nonnative.svg?style=svg)](https://circleci.com/gh/alexfalkowski/nonnative)
+[![Coverage Status](https://coveralls.io/repos/github/alexfalkowski/nonnative/badge.svg?branch=master)](https://coveralls.io/github/alexfalkowski/nonnative?branch=master)
 
 # Nonnative
 
@@ -32,12 +33,12 @@ Or install it yourself as:
 
 Configure nonnative with the following:
 
-- Process/Server that you want to start.
+- Process, Server or Service that you want to start.
 - A timeout value.
 - Port to verify.
 - The class for servers.
 - The log for servers/processes
-- The strategy for processes/servers.
+- The strategy for processes, servers and services.
 
 ### Strategy
 
@@ -52,6 +53,8 @@ This can be overridden by the following environment variables:
 
 ### Processes
 
+A process is some sort of command that you would run locally.
+
 Setup it up programmatically:
 
 ```ruby
@@ -60,21 +63,21 @@ require 'nonnative'
 Nonnative.configure do |config|
   config.strategy = :startup
 
-  config.process do |d|
-    d.name = 'start_1'
-    d.command = 'features/support/bin/start 12_321'
-    d.timeout = config.strategy.timeout
-    d.port = 12_321
-    d.log = 'features/logs/12_321.log'
-    d.signal = 'INT' # Possible values are described in Signal.list.keys
+  config.process do |p|
+    p.name = 'start_1'
+    p.command = 'features/support/bin/start 12_321'
+    p.timeout = config.strategy.timeout
+    p.port = 12_321
+    p.log = 'features/logs/12_321.log'
+    p.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
-    d.log = 'features/logs/12_322.log'
+  config.process do |p|
+    p.name = 'start_2'
+    p.command = 'features/support/bin/start 12_322'
+    p.timeout = 0.5
+    p.port = 12_322
+    p.log = 'features/logs/12_322.log'
   end
 end
 ```
@@ -83,7 +86,7 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: manual
+strategy: startup
 processes:
   -
     name: start_1
@@ -110,6 +113,8 @@ Nonnative.load_configuration('configuration.yml')
 
 ### Servers
 
+A server is a dependency to some external API.
+
 Define your server:
 
 ```ruby
@@ -139,7 +144,7 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :manual
+  config.strategy = :startup
 
   config.server do |s|
     s.name = 'server_1'
@@ -163,7 +168,7 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: manual
+strategy: startup
 servers:
   -
     name: server_1
@@ -219,7 +224,7 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :manual
+  config.strategy = :startup
 
   config.server do |s|
     s.name = 'http_server_1'
@@ -235,7 +240,7 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: manual
+strategy: startup
 servers:
   -
     name: http_server_1
@@ -281,7 +286,7 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :manual
+  config.strategy = :startup
 
   config.server do |s|
     s.name = 'grpc_server_1'
@@ -297,7 +302,7 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: manual
+strategy: startup
 servers:
   -
     name: grpc_server_1
@@ -314,22 +319,71 @@ require 'nonnative'
 
 Nonnative.load_configuration('configuration.yml')
 ```
+
+### Services
+
+A service is an external dependency to your system. This is usually an expensive process to start like a DB and you would prefer to be managed externally. Services are not really exciting by themselves, it's when we add proxies that they allow us to do some extra work.
+
+Setup it up programmatically:
+
+```ruby
+require 'nonnative'
+
+Nonnative.configure do |config|
+  config.strategy = :startup
+
+  config.service do |s|
+    s.name = 'postgres'
+    p.port = 5432
+  end
+
+  config.service do |s|
+    s.name = 'redis'
+    s.port = 6379
+  end
+end
+```
+
+Setup it up through configuration:
+
+```yaml
+version: 1.0
+strategy: startup
+processes:
+  -
+    name: postgres
+    port: 5432
+  -
+    name: redis
+    port: 6379
+```
+
+Then load the file with
+
+```ruby
+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)
 - `fault_injection`
 
+##### Processes
+
 Setup it up programmatically:
 
 ```ruby
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :manual
+  config.strategy = :startup
 
-  config.server do |d|
-    d.proxy = {
+  config.process do |p|
+    p.proxy = {
       type: 'fault_injection',
       port: 20_000,
       log: 'features/logs/proxy_server.log',
@@ -345,7 +399,45 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: manual
+strategy: startup
+processes:
+  -
+    proxy:
+      type: fault_injection
+      port: 20000
+      log: features/logs/proxy_server.log
+      options:
+        delay: 5
+```
+
+##### Servers
+
+Setup it up programmatically:
+
+```ruby
+require 'nonnative'
+
+Nonnative.configure do |config|
+  config.strategy = :startup
+
+  config.server do |s|
+    s.proxy = {
+      type: 'fault_injection',
+      port: 20_000,
+      log: 'features/logs/proxy_server.log',
+      options: {
+        delay: 5
+      }
+    }
+  end
+end
+```
+
+Setup it up through configuration:
+
+```yaml
+version: 1.0
+strategy: startup
 servers:
   -
     proxy:
@@ -356,6 +448,44 @@ servers:
         delay: 5
 ```
 
+##### Services
+
+Setup it up programmatically:
+
+```ruby
+require 'nonnative'
+
+Nonnative.configure do |config|
+  config.strategy = :startup
+
+  config.service do |s|
+    s.proxy = {
+      type: 'fault_injection',
+      port: 20_000,
+      log: 'features/logs/proxy_server.log',
+      options: {
+        delay: 5
+      }
+    }
+  end
+end
+```
+
+Setup it up through configuration:
+
+```yaml
+version: 1.0
+strategy: startup
+services:
+  -
+    proxy:
+      type: fault_injection
+      port: 20000
+      log: features/logs/proxy_server.log
+      options:
+        delay: 5
+```
+
 ##### Fault Injection
 
 The `fault_injection` proxy allows you to simulate failures by injecting them. We currently support the following:
@@ -363,6 +493,27 @@ The `fault_injection` proxy allows you to simulate failures by injecting them. W
 - `delay` - This delays the communication between the connection. Default is 2 secs can be configured through options.
 - `invalid_data` - This takes the input and rearranges it to produce invalid data.
 
+###### Processes
+
+Setup it up programmatically:
+
+```ruby
+name = 'name of process in configuration'
+server = Nonnative.pool.process_by_name(name)
+
+server.proxy.close_all # To use close_all.
+server.proxy.reset # To reset it back to a good state.
+```
+
+With cucumber:
+
+```cucumber
+Given I set the proxy for process 'process_1' to 'close_all'
+Then And I should reset the proxy for process 'process_1'
+```
+
+###### Servers
+
 Setup it up programmatically:
 
 ```ruby
@@ -373,6 +524,32 @@ server.proxy.close_all # To use close_all.
 server.proxy.reset # To reset it back to a good state.
 ```
 
+With cucumber:
+
+```cucumber
+Given I set the proxy for server 'server_1' to 'close_all'
+Then And I should reset the proxy for server 'server_1'
+```
+
+###### Services
+
+Setup it up programmatically:
+
+```ruby
+name = 'name of service in configuration'
+service = Nonnative.pool.service_by_name(name)
+
+service.proxy.close_all # To use close_all.
+service.proxy.reset # To reset it back to a good state.
+```
+
+With cucumber:
+
+```cucumber
+Given I set the proxy for service 'service_1' to 'close_all'
+Then And I should reset the proxy for service 'service_1'
+```
+
 ### Go
 
 As we love using go as a language for services we have added support to start binaries with defined parameters. This expects that you build your services in the format of `command sub_command --params`
@@ -380,24 +557,27 @@ As we love using go as a language for services we have added support to start bi
 To get this to work you will need to create a `main_test.go` file with these contents:
 
 ```go
+// +build features
+
 package main
 
 import (
 	"testing"
+
+	"github.com/your_location/cmd"
 )
 
-// TestFeatures is a hack that allows us to figure out what the coverage is during
-// integration tests. I would not recommend that you use a binary built using
-// this hack outside of a test suite.
 func TestFeatures(t *testing.T) {
-	main()
+	if err := cmd.Execute(); err != nil {
+		t.Fatal(err.Error())
+	}
 }
 ```
 
 Then to compile this binary you will need to do the following:
 
 ```sh
-go test -mod vendor -c -covermode=count -o your_binary -coverpkg=./... github.com/your_location
+go test -mod vendor -c -tags features -covermode=count -o your_binary -coverpkg=./... github.com/your_location
 ```
 
 Then to get an executable you do the following:

data/lib/nonnative.rb

@@ -11,21 +11,26 @@ require 'rest-client'
 require 'puma'
 require 'puma/server'
 require 'concurrent'
+require 'cucumber'
 
 require 'nonnative/version'
 require 'nonnative/error'
 require 'nonnative/start_error'
 require 'nonnative/stop_error'
+require 'nonnative/not_found_error'
 require 'nonnative/timeout'
 require 'nonnative/port'
 require 'nonnative/configuration'
+require 'nonnative/configuration_runner'
 require 'nonnative/configuration_process'
 require 'nonnative/configuration_server'
+require 'nonnative/configuration_service'
 require 'nonnative/configuration_proxy'
+require 'nonnative/runner'
+require 'nonnative/process'
+require 'nonnative/server'
 require 'nonnative/service'
-require 'nonnative/command'
 require 'nonnative/pool'
-require 'nonnative/server'
 require 'nonnative/http_client'
 require 'nonnative/http_server'
 require 'nonnative/grpc_server'
@@ -41,6 +46,7 @@ require 'nonnative/invalid_data_socket_pair'
 require 'nonnative/socket_pair_factory'
 require 'nonnative/strategy'
 require 'nonnative/go_command'
+require 'nonnative/cucumber'
 
 module Nonnative
   class << self

data/lib/nonnative/before.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'cucumber'
-
 Before do
   Nonnative.start
 end

data/lib/nonnative/close_all_socket_pair.rb

@@ -3,7 +3,6 @@
 module Nonnative
   class CloseAllSocketPair < SocketPair
     def connect(local_socket)
-    ensure
       local_socket.close
     end
   end

data/lib/nonnative/configuration.rb

@@ -11,6 +11,7 @@ module Nonnative
 
           processes(file, c)
           servers(file, c)
+          services(file, c)
         end
       end
 
@@ -26,6 +27,8 @@ module Nonnative
             d.port = fd['port']
             d.log = fd['log']
             d.signal = fd['signal']
+
+            proxy d, fd['proxy']
           end
         end
       end
@@ -45,6 +48,20 @@ module Nonnative
         end
       end
 
+      def services(file, config)
+        services = file['services'] || []
+        services.each do |fd|
+          config.service do |s|
+            s.name = fd['name']
+            s.timeout = fd['timeout']
+            s.port = fd['port']
+            s.log = fd['log']
+
+            proxy s, fd['proxy']
+          end
+        end
+      end
+
       def proxy(server, proxy)
         return unless proxy
 
@@ -61,9 +78,10 @@ module Nonnative
       @strategy = Strategy.new
       @processes = []
       @servers = []
+      @services = []
     end
 
-    attr_accessor :processes, :servers
+    attr_accessor :processes, :servers, :services
     attr_reader :strategy
 
     def strategy=(value)
@@ -83,5 +101,12 @@ module Nonnative
 
       servers << server
     end
+
+    def service
+      service = Nonnative::ConfigurationService.new
+      yield service
+
+      services << service
+    end
   end
 end

data/lib/nonnative/configuration_process.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class ConfigurationProcess
-    attr_accessor :name, :command, :timeout, :port, :log, :signal
+  class ConfigurationProcess < ConfigurationRunner
+    attr_accessor :command, :signal
   end
 end

data/lib/nonnative/configuration_runner.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class ConfigurationRunner
+    attr_accessor :name, :timeout, :port, :log
+    attr_reader :proxy
+
+    def initialize
+      @proxy = Nonnative::ConfigurationProxy.new
+    end
+
+    def proxy=(value)
+      proxy.type = value[:type]
+      proxy.port = value[:port]
+      proxy.log = value[:log]
+      proxy.options = value[:options]
+    end
+  end
+end

data/lib/nonnative/configuration_server.rb

@@ -1,19 +1,7 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class ConfigurationServer
-    attr_accessor :name, :klass, :timeout, :port, :log
-    attr_reader :proxy
-
-    def initialize
-      @proxy = Nonnative::ConfigurationProxy.new
-    end
-
-    def proxy=(value)
-      proxy.type = value[:type]
-      proxy.port = value[:port]
-      proxy.log = value[:log]
-      proxy.options = value[:options]
-    end
+  class ConfigurationServer < ConfigurationRunner
+    attr_accessor :klass
   end
 end

data/lib/nonnative/configuration_service.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class ConfigurationService < ConfigurationRunner
+  end
+end

data/lib/nonnative/cucumber.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+Given('I set the proxy for process {string} to {string}') do |name, operation|
+  server = Nonnative.pool.process_by_name(name)
+  server.proxy.send(operation)
+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)
+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)
+end
+
+Then('I should reset the proxy for process {string}') do |name|
+  server = Nonnative.pool.process_by_name(name)
+  server.proxy.reset
+end
+
+Then('I should reset the proxy for server {string}') do |name|
+  server = Nonnative.pool.server_by_name(name)
+  server.proxy.reset
+end
+
+Then('I should reset the proxy for service {string}') do |name|
+  service = Nonnative.pool.service_by_name(name)
+  service.proxy.reset
+end

data/lib/nonnative/fault_injection_proxy.rb

@@ -17,8 +17,8 @@ module Nonnative
     end
 
     def stop
-      thread.terminate
-      tcp_server.close
+      thread&.terminate
+      tcp_server&.close
     end
 
     def close_all

data/lib/nonnative/not_found_error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class NotFoundError < Nonnative::Error
+  end
+end

data/lib/nonnative/pool.rb

@@ -7,34 +7,54 @@ module Nonnative
     end
 
     def start(&block)
+      services.each(&:start)
       [servers, processes].each { |t| process(t, :start, :open?, &block) }
     end
 
     def stop(&block)
       [processes, servers].each { |t| process(t, :stop, :closed?, &block) }
+      services.each(&:stop)
+    end
+
+    def process_by_name(name)
+      processes[runner_index(configuration.processes, name)].first
     end
 
     def server_by_name(name)
-      index = configuration.servers.find_index { |s| s.name == name }
-      servers[index].first
+      servers[runner_index(configuration.servers, name)].first
+    end
+
+    def service_by_name(name)
+      services[runner_index(configuration.services, name)]
     end
 
     private
 
     attr_reader :configuration
 
+    def runner_index(runners, name)
+      index = runners.find_index { |s| s.name == name }
+      raise NotFoundError, "Could not find runner with name '#{name}'" if index.nil?
+
+      index
+    end
+
     def processes
-      @processes ||= configuration.processes.map do |d|
-        [Nonnative::Command.new(d), Nonnative::Port.new(d)]
+      @processes ||= configuration.processes.map do |p|
+        [Nonnative::Process.new(p), Nonnative::Port.new(p)]
       end
     end
 
     def servers
-      @servers ||= configuration.servers.map do |d|
-        [d.klass.new(d), Nonnative::Port.new(d)]
+      @servers ||= configuration.servers.map do |s|
+        [s.klass.new(s), Nonnative::Port.new(s)]
       end
     end
 
+    def services
+      @services ||= configuration.services.map { |s| Nonnative::Service.new(s) }
+    end
+
     def process(all, type_method, port_method, &block)
       types = []
       pids = []

data/lib/nonnative/{command.rb → process.rb}

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class Command < Nonnative::Service
+  class Process < Runner
     def start
-      unless command_exists?
-        @pid = command_spawn
+      unless process_exists?
+        proxy.start
+        @pid = process_spawn
         wait_start
       end
 
@@ -12,8 +13,9 @@ module Nonnative
     end
 
     def stop
-      if command_exists?
-        command_kill
+      if process_exists?
+        process_kill
+        proxy.stop
         wait_stop
       end
 
@@ -24,7 +26,7 @@ module Nonnative
 
     def wait_stop
       timeout.perform do
-        Process.waitpid2(pid)
+        ::Process.waitpid2(pid)
       end
     end
 
@@ -32,20 +34,20 @@ module Nonnative
 
     attr_reader :pid
 
-    def command_kill
+    def process_kill
       signal = Signal.list[service.signal || 'INT'] || Signal.list['INT']
-      Process.kill(signal, pid)
+      ::Process.kill(signal, pid)
     end
 
-    def command_spawn
+    def process_spawn
       spawn(service.command, %i[out err] => [service.log, 'a'])
     end
 
-    def command_exists?
+    def process_exists?
       return false if pid.nil?
 
       signal = Signal.list['EXIT']
-      Process.kill(signal, pid)
+      ::Process.kill(signal, pid)
       true
     rescue Errno::ESRCH
       false

data/lib/nonnative/runner.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class Runner
+    attr_reader :proxy
+
+    def initialize(service)
+      @service = service
+      @timeout = Nonnative::Timeout.new(service.timeout)
+      @proxy = Nonnative::ProxyFactory.create(service)
+    end
+
+    def name
+      service.name
+    end
+
+    protected
+
+    attr_reader :service, :timeout
+
+    def wait_start
+      sleep 0.1
+    end
+
+    def wait_stop
+      sleep 0.1
+    end
+  end
+end

data/lib/nonnative/server.rb

@@ -1,15 +1,7 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class Server < Nonnative::Service
-    attr_reader :proxy
-
-    def initialize(service)
-      @proxy = Nonnative::ProxyFactory.create(service)
-
-      super service
-    end
-
+  class Server < Runner
     def start
       unless thread
         proxy.start

data/lib/nonnative/service.rb

@@ -1,26 +1,13 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class Service
-    def initialize(service)
-      @service = service
-      @timeout = Nonnative::Timeout.new(service.timeout)
+  class Service < Runner
+    def start
+      proxy.start
     end
 
-    def name
-      service.name
-    end
-
-    protected
-
-    attr_reader :service, :timeout
-
-    def wait_start
-      sleep 0.1
-    end
-
-    def wait_stop
-      sleep 0.1
+    def stop
+      proxy.stop
     end
   end
 end

data/lib/nonnative/version.rb

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

data/nonnative.gemspec

@@ -24,8 +24,9 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ['>= 2.7.0', '< 2.8.0']
 
   spec.add_dependency 'concurrent-ruby', '~> 1.0', '>= 1.0.5'
-  spec.add_dependency 'cucumber', ['>= 5', '< 6']
+  spec.add_dependency 'cucumber', ['>= 6', '< 7']
   spec.add_dependency 'grpc', ['>= 1', '< 2']
+  spec.add_dependency 'grpc-tools', ['>= 1', '< 2']
   spec.add_dependency 'puma', '~> 5.0'
   spec.add_dependency 'rest-client', '~> 2.1'
   spec.add_dependency 'rspec-benchmark', '~> 0.6.0'
@@ -33,8 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sinatra', '~> 2.0', '>= 2.0.8.1'
 
   spec.add_development_dependency 'bundler', '~> 2.1', '>= 2.1.4'
-  spec.add_development_dependency 'grpc-tools', ['>= 1', '< 2']
+  spec.add_development_dependency 'coveralls', '~> 0.8.23'
   spec.add_development_dependency 'rubocop', '~> 1.12'
-  spec.add_development_dependency 'simplecov', '~> 0.21.2'
   spec.add_development_dependency 'solargraph', '~> 0.40.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.39.0
+  version: 1.44.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +70,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: grpc-tools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -173,25 +193,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.4
 - !ruby/object:Gem::Dependency
-  name: grpc-tools
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 0.8.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 0.8.23
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +243,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".config/cucumber.yml"
+- ".coveralls.yml"
 - ".editorconfig"
 - ".gitignore"
 - ".rubocop.yml"
@@ -258,11 +259,13 @@ files:
 - lib/nonnative.rb
 - lib/nonnative/before.rb
 - lib/nonnative/close_all_socket_pair.rb
-- lib/nonnative/command.rb
 - lib/nonnative/configuration.rb
 - lib/nonnative/configuration_process.rb
 - lib/nonnative/configuration_proxy.rb
+- lib/nonnative/configuration_runner.rb
 - lib/nonnative/configuration_server.rb
+- lib/nonnative/configuration_service.rb
+- lib/nonnative/cucumber.rb
 - lib/nonnative/delay_socket_pair.rb
 - lib/nonnative/error.rb
 - lib/nonnative/fault_injection_proxy.rb
@@ -273,11 +276,14 @@ files:
 - lib/nonnative/invalid_data_socket_pair.rb
 - lib/nonnative/manual.rb
 - lib/nonnative/no_proxy.rb
+- lib/nonnative/not_found_error.rb
 - lib/nonnative/observability.rb
 - lib/nonnative/pool.rb
 - lib/nonnative/port.rb
+- lib/nonnative/process.rb
 - lib/nonnative/proxy.rb
 - lib/nonnative/proxy_factory.rb
+- lib/nonnative/runner.rb
 - lib/nonnative/server.rb
 - lib/nonnative/service.rb
 - lib/nonnative/socket_pair.rb