nonnative 1.41.0 → 1.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50953dcfe695bf9196b5d3968a88f15fa6db81c630c0537e8c796ad63486d15f
-  data.tar.gz: f910aec0fdb41fd9cea678657be191be85756d2c99ae45d64750a6f31c2534f7
+  metadata.gz: 5ab3f3907cd50fe1984cc57c28da9a17612beba23d73e8e82111ab133569a082
+  data.tar.gz: 71601b678ec6a2dbf53a1a2347955c691619dcf7310224d974d0b84bdc4de922
 SHA512:
-  metadata.gz: 621d4af2d17163e749f0a706b991a52583f32603f64ba3a0fd978c31961c1de11c4b713a0023e0baf7309a9abf072f8642a4551d5a87d1c33bb4caa8844116b6
-  data.tar.gz: 7f1516ab344e4ce99388046490809cb6a63e4de40909aab41c018b73d18e70d3d3b6c76069b9a747a15eed801d9bc94d83e097012bd82cdbcc49ff7a140443eb
+  metadata.gz: 0bcee6e1dfcba57e0a6be43cff1be649f9fcff7c1ec94a26cca48e47b1ae0d734a279ff61464acdca5e531ba4abfb79479a9f473bd893f63d97efa575b7387e4
+  data.tar.gz: 91d0a695d1d2efc013af95e4a10db2637c8d47dfa21ab49a0765098f7f69c34520e514598aadca2652d69610b7baeea76822388c6030f33b3f0c78c33ec039ea

data/CHANGELOG.md

@@ -2,6 +2,52 @@
 
 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.46.0](https://github.com/alexfalkowski/nonnative/compare/v1.45.0...v1.46.0) (2021-05-10)
+
+
+### Features
+
+* add loading config through configure ([#87](https://github.com/alexfalkowski/nonnative/issues/87)) ([a95e8b6](https://github.com/alexfalkowski/nonnative/commit/a95e8b6817380afd732d0aefb170726f905548cb))
+
+## [1.45.0](https://github.com/alexfalkowski/nonnative/compare/v1.44.1...v1.45.0) (2021-05-10)
+
+
+### Features
+
+* add loading go command through config ([#86](https://github.com/alexfalkowski/nonnative/issues/86)) ([2f500d3](https://github.com/alexfalkowski/nonnative/commit/2f500d34ef6eb536b223651f84213f4f3d10c496))
+
+### [1.44.1](https://github.com/alexfalkowski/nonnative/compare/v1.44.0...v1.44.1) (2021-05-06)
+
+## [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)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.41.0)
+    nonnative (1.46.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       cucumber (>= 6, < 7)
       grpc (>= 1, < 2)
@@ -15,7 +15,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.1)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -73,7 +73,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     e2mmap (0.1.0)
     ffi (1.15.0)
-    google-protobuf (3.15.8)
+    google-protobuf (3.16.0)
     googleapis-common-protos-types (1.0.6)
       google-protobuf (~> 3.14)
     grpc (1.37.1)
@@ -106,14 +106,14 @@ GEM
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     parallel (1.20.1)
-    parser (3.0.1.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     protobuf-cucumber (3.10.8)
       activesupport (>= 3.2)
       middleware
       thor
       thread_safe
-    puma (5.2.2)
+    puma (5.3.0)
       nio4r (~> 2.0)
     racc (1.5.2)
     rack (2.2.3)
@@ -147,17 +147,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.13.0)
+    rubocop (1.14.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.4)
     simplecov (0.16.1)
@@ -210,7 +210,7 @@ DEPENDENCIES
   bundler (~> 2.1, >= 2.1.4)
   coveralls (~> 0.8.23)
   nonnative!
-  rubocop (~> 1.12)
+  rubocop (~> 1.14)
   solargraph (~> 0.40.4)
 
 BUNDLED WITH

data/README.md

@@ -33,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
 
@@ -53,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
@@ -84,7 +86,7 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: manual
+strategy: startup
 processes:
   -
     name: start_1
@@ -106,11 +108,15 @@ Then load the file with
 ```ruby
 require 'nonnative'
 
-Nonnative.load_configuration('configuration.yml')
+Nonnative.configure do |config|
+  config.load_file('configuration.yml')
+end
 ```
 
 ### Servers
 
+A server is a dependency to some external API.
+
 Define your server:
 
 ```ruby
@@ -140,7 +146,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'
@@ -164,17 +170,17 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: manual
+strategy: startup
 servers:
   -
     name: server_1
-    klass: Nonnative::EchoServer
+    class: Nonnative::EchoServer
     timeout: 1
     port: 12323
     log: features/logs/server_1.log
   -
     name: server_2
-    klass: Nonnative::EchoServer
+    class: Nonnative::EchoServer
     timeout: 1
     port: 12324
     log: features/logs/server_2.log
@@ -185,7 +191,9 @@ Then load the file with:
 ```ruby
 require 'nonnative'
 
-Nonnative.load_configuration('configuration.yml')
+Nonnative.configure do |config|
+  config.load_file('configuration.yml')
+end
 ```
 
 #### HTTP
@@ -220,7 +228,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'
@@ -236,11 +244,11 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: manual
+strategy: startup
 servers:
   -
     name: http_server_1
-    klass: Nonnative::Features::HTTPServer
+    class: Nonnative::Features::HTTPServer
     timeout: 1
     port: 4567
     log: features/logs/http_server_1.log
@@ -251,7 +259,9 @@ Then load the file with:
 ```ruby
 require 'nonnative'
 
-Nonnative.load_configuration('configuration.yml')
+Nonnative.configure do |config|
+  config.load_file('configuration.yml')
+end
 ```
 
 #### gRPC
@@ -282,7 +292,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'
@@ -298,11 +308,11 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: manual
+strategy: startup
 servers:
   -
     name: grpc_server_1
-    klass: Nonnative::Features::GRPCServer
+    class: Nonnative::Features::GRPCServer
     timeout: 1
     port: 9002
     log: features/logs/grpc_server_1.log
@@ -313,8 +323,59 @@ Then load the file with:
 ```ruby
 require 'nonnative'
 
-Nonnative.load_configuration('configuration.yml')
+Nonnative.configure do |config|
+  config.load_file('configuration.yml')
+end
+```
+
+### 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.configure do |config|
+  config.load_file('configuration.yml')
+end
 ```
+
 #### 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:
@@ -329,7 +390,7 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :manual
+  config.strategy = :startup
 
   config.process do |p|
     p.proxy = {
@@ -348,7 +409,7 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: manual
+strategy: startup
 processes:
   -
     proxy:
@@ -367,7 +428,7 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :manual
+  config.strategy = :startup
 
   config.server do |s|
     s.proxy = {
@@ -386,7 +447,7 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: manual
+strategy: startup
 servers:
   -
     proxy:
@@ -397,6 +458,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:
@@ -416,6 +515,13 @@ 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:
@@ -428,6 +534,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`
@@ -439,16 +571,10 @@ To get this to work you will need to create a `main_test.go` file with these con
 
 package main
 
-import (
-	"testing"
-
-	"github.com/your_location/cmd"
-)
+import "testing"
 
 func TestFeatures(t *testing.T) {
-	if err := cmd.Execute(); err != nil {
-		t.Fatal(err.Error())
-	}
+	main()
 }
 ```
 
@@ -458,8 +584,27 @@ Then to compile this binary you will need to do the following:
 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:
+Setup it up programmatically:
 
 ```ruby
 Nonnative.go_executable('reports', 'your_binary', 'sub_command', '--config config.yaml')
 ```
+
+Setup it up through configuration:
+
+```yaml
+version: 1.0
+strategy: startup
+processes:
+  -
+    name: go
+    go:
+      output: reports
+      executable: your_binary
+      command: sub_command
+      parameters:
+        - --config config.yaml
+    timeout: 5
+    port: 8000
+    log: features/logs/go.log
+```

data/lib/nonnative.rb

@@ -11,22 +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_service'
+require 'nonnative/configuration_runner'
 require 'nonnative/configuration_process'
 require 'nonnative/configuration_server'
+require 'nonnative/configuration_service'
 require 'nonnative/configuration_proxy'
-require 'nonnative/service'
+require 'nonnative/runner'
 require 'nonnative/process'
-require 'nonnative/pool'
 require 'nonnative/server'
+require 'nonnative/service'
+require 'nonnative/pool'
 require 'nonnative/http_client'
 require 'nonnative/http_server'
 require 'nonnative/grpc_server'
@@ -42,17 +46,18 @@ 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
     attr_reader :pool
 
-    def go_executable(output, exec, cmd, *params)
-      Nonnative::GoCommand.new(exec, output).executable(cmd, params)
+    def log_lines(path, predicate)
+      File.readlines(path).select { |l| predicate.call(l) }
     end
 
-    def load_configuration(path)
-      @configuration ||= Nonnative::Configuration.load_file(path) # rubocop:disable Naming/MemoizedInstanceVariableName
+    def go_executable(output, exec, cmd, *params)
+      Nonnative::GoCommand.new(exec, output).executable(cmd, params)
     end
 
     def configuration

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

@@ -2,72 +2,26 @@
 
 module Nonnative
   class Configuration
-    class << self
-      def load_file(path)
-        file = YAML.load_file(path)
-
-        new.tap do |c|
-          c.strategy = file['strategy']
-
-          processes(file, c)
-          servers(file, c)
-        end
-      end
-
-      private
-
-      def processes(file, config)
-        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.log = fd['log']
-            d.signal = fd['signal']
-
-            proxy d, fd['proxy']
-          end
-        end
-      end
-
-      def servers(file, config)
-        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']
-            s.log = fd['log']
-
-            proxy s, fd['proxy']
-          end
-        end
-      end
-
-      def proxy(server, proxy)
-        return unless proxy
-
-        server.proxy = {
-          type: proxy['type'],
-          port: proxy['port'],
-          log: proxy['log'],
-          options: proxy['options']
-        }
-      end
-    end
-
     def initialize
       @strategy = Strategy.new
       @processes = []
       @servers = []
+      @services = []
     end
 
-    attr_accessor :processes, :servers
+    attr_accessor :processes, :servers, :services
     attr_reader :strategy
 
+    def load_file(path)
+      file = YAML.load_file(path)
+
+      self.strategy = file['strategy']
+
+      add_processes(file)
+      add_servers(file)
+      add_services(file)
+    end
+
     def strategy=(value)
       @strategy = Strategy.new(value)
     end
@@ -85,5 +39,80 @@ module Nonnative
 
       servers << server
     end
+
+    def service
+      service = Nonnative::ConfigurationService.new
+      yield service
+
+      services << service
+    end
+
+    private
+
+    def add_processes(file)
+      processes = file['processes'] || []
+      processes.each do |fd|
+        process do |d|
+          d.name = fd['name']
+          d.command = command(fd)
+          d.timeout = fd['timeout']
+          d.port = fd['port']
+          d.log = fd['log']
+          d.signal = fd['signal']
+
+          proxy d, fd['proxy']
+        end
+      end
+    end
+
+    def command(process)
+      go = process['go']
+      if go
+        params = go['parameters'] || []
+        Nonnative.go_executable(go['output'], go['executable'], go['command'], *params)
+      else
+        process['command']
+      end
+    end
+
+    def add_servers(file)
+      servers = file['servers'] || []
+      servers.each do |fd|
+        server do |s|
+          s.name = fd['name']
+          s.klass = Object.const_get(fd['class'])
+          s.timeout = fd['timeout']
+          s.port = fd['port']
+          s.log = fd['log']
+
+          proxy s, fd['proxy']
+        end
+      end
+    end
+
+    def add_services(file)
+      services = file['services'] || []
+      services.each do |fd|
+        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(runner, proxy)
+      return unless proxy
+
+      runner.proxy = {
+        type: proxy['type'],
+        port: proxy['port'],
+        log: proxy['log'],
+        options: proxy['options']
+      }
+    end
   end
 end

data/lib/nonnative/configuration_process.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class ConfigurationProcess < ConfigurationService
+  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,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class ConfigurationServer < ConfigurationService
+  class ConfigurationServer < ConfigurationRunner
     attr_accessor :klass
   end
 end

data/lib/nonnative/configuration_service.rb

@@ -1,19 +1,6 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class ConfigurationService
-    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
+  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,39 +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)
-      index = configuration.processes.find_index { |s| s.name == name }
-      processes[index].first
+      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::Process.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/process.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class Process < Nonnative::Service
+  class Process < Runner
     def start
       unless process_exists?
         proxy.start

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,9 +1,7 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class Server < Nonnative::Service
-    attr_reader :proxy
-
+  class Server < Runner
     def start
       unless thread
         proxy.start

data/lib/nonnative/service.rb

@@ -1,29 +1,13 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class Service
-    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
+  class Service < Runner
+    def start
+      proxy.start
     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.41.0'
+  VERSION = '1.46.0'
 end

data/nonnative.gemspec

@@ -8,7 +8,7 @@ require 'nonnative/version'
 Gem::Specification.new do |spec|
   spec.name          = 'nonnative'
   spec.version       = Nonnative::VERSION
-  spec.authors       = ['Alex Falkowski']
+  spec.authors       = ['Alejandro Falkowski']
   spec.email         = ['alexrfalkowski@gmail.com']
 
   spec.summary       = 'Allows you to keep using the power of ruby to test other systems'
@@ -35,6 +35,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.1', '>= 2.1.4'
   spec.add_development_dependency 'coveralls', '~> 0.8.23'
-  spec.add_development_dependency 'rubocop', '~> 1.12'
+  spec.add_development_dependency 'rubocop', '~> 1.14'
   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.41.0
+  version: 1.46.0
 platform: ruby
 authors:
-- Alex Falkowski
+- Alejandro Falkowski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
@@ -262,8 +262,10 @@ files:
 - 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
@@ -274,12 +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