nonnative 1.59.1 → 1.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a2c4751f90acdfd5c610819ec3c6400c06ef5565a21a57de76ca934e0ae4c4c
-  data.tar.gz: 0543d81897672535887ded26db0631b03868ee465dfe0a1361795da890223f12
+  metadata.gz: 7c0356dc5f399e9fa703d3bf310a03349d5b3762124738746fbb982ab7f9261c
+  data.tar.gz: b69f1ac927e2f6dad05a453d0e9919dd09d7ed7a67b5473cf61874b53404a67a
 SHA512:
-  metadata.gz: 92d476f0b27e5524b7698846b25b7cd4dd761582784dc53124093bb0c6bff31f8dec73869685a43e77de00d826204fe55d7bcd0644b83a5bbdae27a9add43e36
-  data.tar.gz: b2bbaa52ee9e45e36c5903f5989ab1100c3f4c23a49e344f2fa287bc870e98d206c956d94c5af75be7136880b1a50294846dba314e081bf6562cef1ccc999c0d
+  metadata.gz: 0b15cc973504888ef73f821a74105b0209eb25c708451062fee4612ea8e4b16f07fbdbac24e6aab05ab6e33e0bb6da3866b6a1ed8145411f6cc4d4a7f77a3af9
+  data.tar.gz: eb46dc1747a0390f4ad0736fa4bdbf4621430b957a9d79ed7d1b85f42e10405f83ab1c39c26d2ab6c6d044b6e866b24d71aba1ff25ebb4f0b1956cd1d2de4574

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 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.62.0](https://github.com/alexfalkowski/nonnative/compare/v1.61.0...v1.62.0) (2022-04-25)
+
+
+### Features
+
+* add ability to read from log file ([#121](https://github.com/alexfalkowski/nonnative/issues/121)) ([eb4638f](https://github.com/alexfalkowski/nonnative/commit/eb4638f3ca8636ca68f989209a6e73831e61a678))
+
+## [1.61.0](https://github.com/alexfalkowski/nonnative/compare/v1.60.0...v1.61.0) (2022-04-25)
+
+
+### Features
+
+* allow checking logs ([#120](https://github.com/alexfalkowski/nonnative/issues/120)) ([dc95fd2](https://github.com/alexfalkowski/nonnative/commit/dc95fd2977c3900d2ae6447d517f410e1128837f))
+
+## [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)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.59.1)
+    nonnative (1.62.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       cucumber (>= 7, < 8)
       get_process_mem (~> 0.2.1)
@@ -76,7 +76,7 @@ GEM
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     jaro_winkler (1.5.4)
-    kramdown (2.3.2)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)

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:
@@ -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
@@ -47,6 +39,13 @@ module Nonnative
       services << service
     end
 
+    def process_by_name(name)
+      process = processes.find { |s| s.name == name }
+      raise NotFoundError, "Could not find process with name '#{name}'" if process.nil?
+
+      process
+    end
+
     private
 
     def add_processes(file)

data/lib/nonnative/cucumber.rb

@@ -2,10 +2,22 @@
 
 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)
@@ -56,3 +68,12 @@ end
 Then('stopping the system should raise an error') do
   expect { Nonnative.stop }.to raise_error(Nonnative::StopError)
 end
+
+Then('I should see a log entry of {string} for process {string}') do |message, process|
+  process = Nonnative.configuration.process_by_name(process)
+  expect(Nonnative.log_lines(process.log, ->(l) { l.include?(message) }).first).to include(message)
+end
+
+Then('I should see a log entry of {string} in the file {string}') do |message, path|
+  expect(Nonnative.log_lines(path, ->(l) { l.include?(message) }).first).to include(message)
+end

data/lib/nonnative/version.rb

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

data/lib/nonnative.rb

@@ -47,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'
 
@@ -69,8 +68,6 @@ module Nonnative
 
     def configure
       yield configuration
-
-      require "nonnative/#{configuration.strategy}"
     end
 
     def start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.59.1
+  version: 1.62.0
 platform: ruby
 authors:
 - Alejandro Falkowski
@@ -245,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
@@ -262,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
@@ -279,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.fetch('NONNATIVE_STRATEGY', nil)
-    end
-
-    def env_timeout
-      @env_timeout ||= ENV.fetch('NONNATIVE_TIMEOUT', nil)
-    end
-  end
-end