nonnative 1.58.2 → 1.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f15ed666a8ba11f08e78eaebfc60593652a23d39c4139848ff36ed94694de292
-  data.tar.gz: 35d9d9a38c1a38d41c0b1d7ada5976f02d560a0bf7f33944848be7ca1067e6d6
+  metadata.gz: 6020ea5cff78072f14de7b11b17af9db8c4be430ed98093b3251c45f72d51767
+  data.tar.gz: c8f94ee98cc1d2e6424d96fb4359bf851bec9133bb87e2250fb8905608bee6fa
 SHA512:
-  metadata.gz: 7842a29761b438bf355ed9cdbd55344d64009bc71b9bccfdeeb01452e4a8f377cd5da24029eafb2f7a64922007457b93eb162a45426965fd11408a1085e004c8
-  data.tar.gz: 1fa589968d4a4ba3cc6f27eea3f5a4dba3fe32468622c6749dd57b37af2b52c6549d17ffbf31c432f79470e0c2b9ece99aa8023d22fab241542f08efe4c8284f
+  metadata.gz: 505eefe99b975f2650ec1b805fdbb5c4dcd068103bea0698ecbfcba26985c53204ae75fa55a943d2d8dfbe0c6cf99748bb2999e4b7d4f07cc150bdf652fb8852
+  data.tar.gz: 6fbcc4ba9f618a6a1ed9fc910b379382cc4100112e18e3174739fb9f68f4a4f0fa7da01e93735440a00c6bd774af68f33db0b63af7a154f61ac025bcb7372f93

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 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.60.0](https://github.com/alexfalkowski/nonnative/compare/v1.59.1...v1.60.0) (2022-04-25)
+
+
+### Features
+
+* remove strategy to allow finer control in features. ([#119](https://github.com/alexfalkowski/nonnative/issues/119)) ([60b8310](https://github.com/alexfalkowski/nonnative/commit/60b8310ab8ae2a2761d867ab169f8ad5bbbed416))
+
+### [1.59.1](https://github.com/alexfalkowski/nonnative/compare/v1.59.0...v1.59.1) (2022-04-25)
+
+## [1.59.0](https://github.com/alexfalkowski/nonnative/compare/v1.58.2...v1.59.0) (2022-04-25)
+
+
+### Features
+
+* **cucumber:** verify system start errors ([#117](https://github.com/alexfalkowski/nonnative/issues/117)) ([f8c7f7f](https://github.com/alexfalkowski/nonnative/commit/f8c7f7f4cb4d1506e1b8ae038bd6c46f7ce529a2))
+
 ### [1.58.2](https://github.com/alexfalkowski/nonnative/compare/v1.58.1...v1.58.2) (2022-04-13)
 
 ### [1.58.1](https://github.com/alexfalkowski/nonnative/compare/v1.58.0...v1.58.1) (2022-04-06)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.58.2)
+    nonnative (1.60.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       cucumber (>= 7, < 8)
       get_process_mem (~> 0.2.1)
@@ -66,13 +66,12 @@ GEM
     ffi (1.15.5)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
-    google-protobuf (3.20.0-x86_64-darwin)
+    google-protobuf (3.20.1-x86_64-darwin)
     googleapis-common-protos-types (1.3.1)
       google-protobuf (~> 3.14)
     grpc (1.45.0-universal-darwin)
       google-protobuf (~> 3.19)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.45.0)
     http-accept (1.7.0)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
@@ -101,7 +100,7 @@ GEM
     rack-protection (2.2.0)
       rack
     rainbow (3.1.1)
-    regexp_parser (2.3.0)
+    regexp_parser (2.3.1)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -128,13 +127,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.27.0)
+    rubocop (1.28.2)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.17.0)
@@ -190,7 +189,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.3)
   coveralls_reborn (~> 0.24.0)
-  grpc-tools (>= 1, < 2)
   nonnative!
   rubocop (~> 1.26)
   solargraph (~> 0.44.3)

data/README.md

@@ -43,13 +43,9 @@ Configure nonnative with the following:
 ### Strategy
 
 The strategy can be one of the following values:
-- startup - will start the process once.
-- before - will hook into cucumbers Before and After.
-- manual - do this manually
-
-This can be overridden by the following environment variables:
-- NONNATIVE_STRATEGY - Set this to override what is set in the config.
-- NONNATIVE_TIMEOUT - Set this (in seconds, e.g 5) to override what is set in the config.
+- startup - When we include `nonnative/startup`, it will start it once.
+- before - When we tag our features with `@startup` it will start and stop after the scenario.
+- manual - When we tag our features with `@manual` it will stop after the scenario.
 
 ### Processes
 
@@ -61,12 +57,10 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :startup
-
   config.process do |p|
     p.name = 'start_1'
     p.command = -> { 'features/support/bin/start 12_321' }
-    p.timeout = config.strategy.timeout
+    p.timeout = 5
     p.port = 12_321
     p.log = 'features/logs/12_321.log'
     p.signal = 'INT' # Possible values are described in Signal.list.keys.
@@ -89,7 +83,6 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: startup
 processes:
   -
     name: start_1
@@ -157,8 +150,6 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :startup
-
   config.server do |s|
     s.name = 'server_1'
     s.klass = Nonnative::EchoServer
@@ -181,7 +172,6 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: startup
 servers:
   -
     name: server_1
@@ -239,8 +229,6 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :startup
-
   config.server do |s|
     s.name = 'http_server_1'
     s.klass = Nonnative::Features::HTTPServer
@@ -255,7 +243,6 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: startup
 servers:
   -
     name: http_server_1
@@ -303,8 +290,6 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :startup
-
   config.server do |s|
     s.name = 'grpc_server_1'
     s.klass = Nonnative::Features::GRPCServer
@@ -319,7 +304,6 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: startup
 servers:
   -
     name: grpc_server_1
@@ -349,8 +333,6 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :startup
-
   config.service do |s|
     s.name = 'postgres'
     p.port = 5432
@@ -367,7 +349,6 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: startup
 processes:
   -
     name: postgres
@@ -401,8 +382,6 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :startup
-
   config.process do |p|
     p.proxy = {
       type: 'fault_injection',
@@ -420,7 +399,6 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: startup
 processes:
   -
     proxy:
@@ -439,8 +417,6 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :startup
-
   config.server do |s|
     s.proxy = {
       type: 'fault_injection',
@@ -458,7 +434,6 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: startup
 servers:
   -
     proxy:
@@ -477,8 +452,6 @@ Setup it up programmatically:
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.strategy = :startup
-
   config.service do |s|
     s.proxy = {
       type: 'fault_injection',
@@ -496,7 +469,6 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: startup
 services:
   -
     proxy:
@@ -530,7 +502,7 @@ 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'
+Then I should reset the proxy for process 'process_1'
 ```
 
 ###### Servers
@@ -549,7 +521,7 @@ 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'
+Then I should reset the proxy for server 'server_1'
 ```
 
 ###### Services
@@ -568,7 +540,7 @@ 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'
+Then I should reset the proxy for service 'service_1'
 ```
 
 ### Go
@@ -605,7 +577,6 @@ Setup it up through configuration:
 
 ```yaml
 version: 1.0
-strategy: startup
 processes:
   -
     name: go

data/lib/nonnative/configuration.rb

@@ -3,29 +3,21 @@
 module Nonnative
   class Configuration
     def initialize
-      @strategy = Strategy.new
       @processes = []
       @servers = []
       @services = []
     end
 
     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
-
     def process
       process = Nonnative::ConfigurationProcess.new
       yield process

data/lib/nonnative/cucumber.rb

@@ -1,5 +1,23 @@
 # frozen_string_literal: true
 
+World(RSpec::Benchmark::Matchers)
+
+Before('@startup') do
+  Nonnative.start
+end
+
+After('@startup') do
+  Nonnative.stop
+end
+
+After('@manual') do
+  Nonnative.stop
+end
+
+Before('@clear') do
+  Nonnative.clear
+end
+
 Given('I set the proxy for process {string} to {string}') do |name, operation|
   process = Nonnative.pool.process_by_name(name)
   process.proxy.send(operation)
@@ -15,6 +33,10 @@ Given('I set the proxy for service {string} to {string}') do |name, operation|
   service.proxy.send(operation)
 end
 
+Given('I start the system') do
+  Nonnative.start
+end
+
 Then('I should reset the proxy for process {string}') do |name|
   process = Nonnative.pool.process_by_name(name)
   process.proxy.reset
@@ -38,3 +60,11 @@ Then('the process {string} should consume less than {string} of memory') do |nam
 
   expect(actual).to be < size
 end
+
+Then('starting the system should raise an error') do
+  expect { Nonnative.start }.to raise_error(Nonnative::StartError)
+end
+
+Then('stopping the system should raise an error') do
+  expect { Nonnative.stop }.to raise_error(Nonnative::StopError)
+end

data/lib/nonnative/process.rb

@@ -56,7 +56,7 @@ module Nonnative
       environment = environment.transform_keys(&:to_s).transform_values(&:to_s)
 
       environment.each_key do |k|
-        environment[k] = ENV[k] || environment[k]
+        environment[k] = ENV.fetch(k, nil) || environment[k]
       end
 
       spawn(environment, service.command.call, %i[out err] => [service.log, 'a'])

data/lib/nonnative/version.rb

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

data/lib/nonnative.rb

@@ -14,6 +14,7 @@ require 'puma/server'
 require 'concurrent'
 require 'cucumber'
 require 'get_process_mem'
+require 'rspec-benchmark'
 
 require 'nonnative/version'
 require 'nonnative/error'
@@ -46,7 +47,6 @@ require 'nonnative/close_all_socket_pair'
 require 'nonnative/delay_socket_pair'
 require 'nonnative/invalid_data_socket_pair'
 require 'nonnative/socket_pair_factory'
-require 'nonnative/strategy'
 require 'nonnative/go_command'
 require 'nonnative/cucumber'
 
@@ -68,8 +68,6 @@ module Nonnative
 
     def configure
       yield configuration
-
-      require "nonnative/#{configuration.strategy}"
     end
 
     def start

data/nonnative.gemspec

@@ -36,7 +36,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.3'
   spec.add_development_dependency 'coveralls_reborn', '~> 0.24.0'
-  spec.add_development_dependency 'grpc-tools', ['>= 1', '< 2']
   spec.add_development_dependency 'rubocop', '~> 1.26'
   spec.add_development_dependency 'solargraph', '~> 0.44.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.58.2
+  version: 1.60.0
 platform: ruby
 authors:
 - Alejandro Falkowski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -194,26 +194,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.24.0
-- !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: :development
-  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: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -265,7 +245,6 @@ files:
 - bin/console
 - bin/setup
 - lib/nonnative.rb
-- lib/nonnative/before.rb
 - lib/nonnative/close_all_socket_pair.rb
 - lib/nonnative/configuration.rb
 - lib/nonnative/configuration_process.rb
@@ -282,7 +261,6 @@ files:
 - lib/nonnative/http_client.rb
 - lib/nonnative/http_server.rb
 - 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
@@ -299,7 +277,6 @@ files:
 - lib/nonnative/start_error.rb
 - lib/nonnative/startup.rb
 - lib/nonnative/stop_error.rb
-- lib/nonnative/strategy.rb
 - lib/nonnative/timeout.rb
 - lib/nonnative/version.rb
 - nonnative.gemspec

data/lib/nonnative/before.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-Before do
-  Nonnative.start
-end
-
-After do
-  Nonnative.stop
-end

data/lib/nonnative/manual.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-# Do nothing as it's manual

data/lib/nonnative/strategy.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Nonnative
-  class Strategy
-    def initialize(strategy = 'before', timeout = 5)
-      @strategy = strategy
-      @timeout = timeout
-    end
-
-    def timeout
-      (env_timeout || @timeout).to_i
-    end
-
-    def to_s
-      (env_strategy || @strategy).to_s
-    end
-
-    private
-
-    def env_strategy
-      @env_strategy ||= ENV['NONNATIVE_STRATEGY']
-    end
-
-    def env_timeout
-      @env_timeout ||= ENV['NONNATIVE_TIMEOUT']
-    end
-  end
-end