nonnative 1.40.0 → 1.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 870143059910a181598b40406aebc0e8d7882133aa01b82091da14436dee664a
-  data.tar.gz: 6a1e9449a4eb21b1c58c6c5b3a8256546956f84db8cd5c09c7a939ea09f33cbc
+  metadata.gz: 50953dcfe695bf9196b5d3968a88f15fa6db81c630c0537e8c796ad63486d15f
+  data.tar.gz: f910aec0fdb41fd9cea678657be191be85756d2c99ae45d64750a6f31c2534f7
 SHA512:
-  metadata.gz: 38f4f40a6460548a9470f707c66e1b5067c3a336a97f49de4415ffdcbb85f07c7f626b61f5948485c630ddcb9d8235b0a6ed069cbd1c6844bfd25b4e9109879c
-  data.tar.gz: a19898c50a83a2f7d3d330eec829d7420236f87f0f00919256ebe1ab34c4bffd175124cd5ed832b09275942707b9a15fc3f84a7b14e82d85a5d9437e89bcbadf
+  metadata.gz: 621d4af2d17163e749f0a706b991a52583f32603f64ba3a0fd978c31961c1de11c4b713a0023e0baf7309a9abf072f8642a4551d5a87d1c33bb4caa8844116b6
+  data.tar.gz: 7f1516ab344e4ce99388046490809cb6a63e4de40909aab41c018b73d18e70d3d3b6c76069b9a747a15eed801d9bc94d83e097012bd82cdbcc49ff7a140443eb

data/.coveralls.yml

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

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 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.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)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.40.0)
+    nonnative (1.41.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       cucumber (>= 6, < 7)
       grpc (>= 1, < 2)
@@ -29,6 +29,12 @@ GEM
     benchmark-trend (0.4.0)
     builder (3.2.4)
     concurrent-ruby (1.1.8)
+    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 (~> 9.0, >= 9.0.0)
@@ -70,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)
@@ -153,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)
@@ -178,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)
@@ -197,9 +208,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.1, >= 2.1.4)
+  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
 
@@ -60,21 +61,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
 ```
@@ -320,6 +321,8 @@ We allow different proxies to be configured. These proxies can be used to simula
 - `none` (this is the default)
 - `fault_injection`
 
+##### Processes
+
 Setup it up programmatically:
 
 ```ruby
@@ -328,8 +331,46 @@ require 'nonnative'
 Nonnative.configure do |config|
   config.strategy = :manual
 
-  config.server do |d|
-    d.proxy = {
+  config.process do |p|
+    p.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: manual
+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 = :manual
+
+  config.server do |s|
+    s.proxy = {
       type: 'fault_injection',
       port: 20_000,
       log: 'features/logs/proxy_server.log',
@@ -363,6 +404,20 @@ 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.
+```
+
+###### Servers
+
 Setup it up programmatically:
 
 ```ruby
@@ -380,24 +435,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

@@ -19,11 +19,12 @@ require 'nonnative/stop_error'
 require 'nonnative/timeout'
 require 'nonnative/port'
 require 'nonnative/configuration'
+require 'nonnative/configuration_service'
 require 'nonnative/configuration_process'
 require 'nonnative/configuration_server'
 require 'nonnative/configuration_proxy'
 require 'nonnative/service'
-require 'nonnative/command'
+require 'nonnative/process'
 require 'nonnative/pool'
 require 'nonnative/server'
 require 'nonnative/http_client'

data/lib/nonnative/configuration.rb

@@ -26,6 +26,8 @@ module Nonnative
             d.port = fd['port']
             d.log = fd['log']
             d.signal = fd['signal']
+
+            proxy d, fd['proxy']
           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 < ConfigurationService
+    attr_accessor :command, :signal
   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 < ConfigurationService
+    attr_accessor :klass
   end
 end

data/lib/nonnative/configuration_service.rb

@@ -0,0 +1,19 @@
+# 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
+  end
+end

data/lib/nonnative/pool.rb

@@ -14,6 +14,11 @@ module Nonnative
       [processes, servers].each { |t| process(t, :stop, :closed?, &block) }
     end
 
+    def process_by_name(name)
+      index = configuration.processes.find_index { |s| s.name == name }
+      processes[index].first
+    end
+
     def server_by_name(name)
       index = configuration.servers.find_index { |s| s.name == name }
       servers[index].first
@@ -25,7 +30,7 @@ module Nonnative
 
     def processes
       @processes ||= configuration.processes.map do |d|
-        [Nonnative::Command.new(d), Nonnative::Port.new(d)]
+        [Nonnative::Process.new(d), Nonnative::Port.new(d)]
       end
     end
 

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

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class Command < Nonnative::Service
+  class Process < Nonnative::Service
     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/server.rb

@@ -4,12 +4,6 @@ module Nonnative
   class Server < Nonnative::Service
     attr_reader :proxy
 
-    def initialize(service)
-      @proxy = Nonnative::ProxyFactory.create(service)
-
-      super service
-    end
-
     def start
       unless thread
         proxy.start

data/lib/nonnative/service.rb

@@ -2,9 +2,12 @@
 
 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

data/lib/nonnative/version.rb

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

data/nonnative.gemspec

@@ -34,7 +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 '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.40.0
+  version: 1.41.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2021-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -193,33 +193,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.4
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 0.8.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 0.8.23
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: '1.12'
 - !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,11 @@ 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_server.rb
+- lib/nonnative/configuration_service.rb
 - lib/nonnative/delay_socket_pair.rb
 - lib/nonnative/error.rb
 - lib/nonnative/fault_injection_proxy.rb
@@ -276,6 +277,7 @@ files:
 - 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/server.rb