nonnative 1.53.0 → 1.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64af28e950a344ef821dbe75028136dc1d79a7fa6a6abfb388b4428e44e11d98
-  data.tar.gz: 15e4681afc473711a5b78329680636b3adb082517bd5b0adb5da11e9d8c8a552
+  metadata.gz: c282877137dc63a9bfbf14ab857e666e084032e8c32a21b9c9c4241d159e67b2
+  data.tar.gz: 3b8b0e15d4e745af0fc8bc30317b448e1edea8bd294227d265ae348479ec8c16
 SHA512:
-  metadata.gz: e5cb7c08078df70ca47d49941e29207594fbe1b118048e925c5c433265328f4e1792688f54a483d67ffc35745d46e7f1f6f7e94bcfbe632c18ba443e1bc0eae2
-  data.tar.gz: b1d4715e7557ef4e949a92c01acfaca7bff28ed56d3eda5bb6fa05249a945bb4790673e0aa7076ba00e4e376dccabb8b24f7524ed2536d7643a4b84813302354
+  metadata.gz: 229fdd9c01f0538cd458a05ae58225c95defe944f8b5662aa0fc668a354fd4ca897cb1a2d40f97ca7a4c729b4ad52283b8c6ff88398e314a818c4b5bf411afcb
+  data.tar.gz: 0f2f5c89745c517ae6855818844d5eb2f685f9c0aef0b674c4a242ab3604233cdf0a48498290705aaaff36e1b0b5c6c27bd0eae4cff83ef91ee79682c20fa973

data/.ruby-version

@@ -1 +1 @@
-ruby-3.0.2
+ruby-3.0.3

data/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 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.56.0](https://github.com/alexfalkowski/nonnative/compare/v1.55.0...v1.56.0) (2022-03-28)
+
+
+### Features
+
+* **process:** make sure we honour existing env variables ([#109](https://github.com/alexfalkowski/nonnative/issues/109)) ([b601974](https://github.com/alexfalkowski/nonnative/commit/b601974b50e8df7cc16dd0bd5c32a16f462b1053))
+
+## [1.55.0](https://github.com/alexfalkowski/nonnative/compare/v1.54.4...v1.55.0) (2022-03-25)
+
+
+### Features
+
+* **observability:** add liveness and readiness ([#108](https://github.com/alexfalkowski/nonnative/issues/108)) ([526f43c](https://github.com/alexfalkowski/nonnative/commit/526f43cf0a21876418233abca558d8611acd10c7))
+
+### [1.54.4](https://github.com/alexfalkowski/nonnative/compare/v1.54.3...v1.54.4) (2022-03-20)
+
+### [1.54.3](https://github.com/alexfalkowski/nonnative/compare/v1.54.2...v1.54.3) (2022-03-05)
+
+### [1.54.2](https://github.com/alexfalkowski/nonnative/compare/v1.54.1...v1.54.2) (2022-03-04)
+
+### [1.54.1](https://github.com/alexfalkowski/nonnative/compare/v1.54.0...v1.54.1) (2021-10-14)
+
+## [1.54.0](https://github.com/alexfalkowski/nonnative/compare/v1.53.0...v1.54.0) (2021-10-11)
+
+
+### Features
+
+* only add less than for memory ([#99](https://github.com/alexfalkowski/nonnative/issues/99)) ([fed4929](https://github.com/alexfalkowski/nonnative/commit/fed4929a157982adcfbefac9a79f593289234418))
+
 ## [1.53.0](https://github.com/alexfalkowski/nonnative/compare/v1.52.0...v1.53.0) (2021-10-11)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.53.0)
+    nonnative (1.56.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       cucumber (>= 7, < 8)
       get_process_mem (~> 0.2.1)
@@ -18,133 +18,130 @@ GEM
   specs:
     ast (2.4.2)
     backport (1.2.0)
-    benchmark (0.1.1)
+    benchmark (0.2.0)
     benchmark-malloc (0.2.0)
     benchmark-perf (0.6.0)
     benchmark-trend (0.4.0)
     builder (3.2.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     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 (7.0.0)
+    cucumber (7.1.0)
       builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 10.0, >= 10.0.1)
+      cucumber-core (~> 10.1, >= 10.1.0)
       cucumber-create-meta (~> 6.0, >= 6.0.1)
-      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
-      cucumber-gherkin (~> 20.0, >= 20.0.1)
-      cucumber-html-formatter (~> 16.0, >= 16.0.1)
-      cucumber-messages (~> 17.0, >= 17.0.1)
-      cucumber-wire (~> 6.0, >= 6.0.1)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-html-formatter (~> 17.0, >= 17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-wire (~> 6.2, >= 6.2.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.2)
-    cucumber-core (10.0.1)
-      cucumber-gherkin (~> 20.0, >= 20.0.1)
-      cucumber-messages (~> 17.0, >= 17.0.1)
-      cucumber-tag-expressions (~> 3.0, >= 3.0.1)
-    cucumber-create-meta (6.0.1)
-      cucumber-messages (~> 17.0, >= 17.0.1)
+    cucumber-core (10.1.1)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-tag-expressions (~> 4.1, >= 4.1.0)
+    cucumber-create-meta (6.0.4)
+      cucumber-messages (~> 17.1, >= 17.1.1)
       sys-uname (~> 1.2, >= 1.2.2)
-    cucumber-cucumber-expressions (12.1.3)
-    cucumber-gherkin (20.0.1)
-      cucumber-messages (~> 17.0, >= 17.0.1)
-    cucumber-html-formatter (16.0.1)
-      cucumber-messages (~> 17.0, >= 17.0.1)
+    cucumber-cucumber-expressions (14.0.0)
+    cucumber-gherkin (22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+    cucumber-html-formatter (17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.0)
     cucumber-messages (17.1.1)
-    cucumber-tag-expressions (3.0.1)
-    cucumber-wire (6.1.1)
-      cucumber-core (~> 10.0, >= 10.0.1)
-      cucumber-cucumber-expressions (~> 12.1, >= 12.1.2)
-      cucumber-messages (~> 17.0, >= 17.0.1)
-    diff-lcs (1.4.4)
+    cucumber-tag-expressions (4.1.0)
+    cucumber-wire (6.2.1)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+    diff-lcs (1.5.0)
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     e2mmap (0.1.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
-    google-protobuf (3.18.1)
-    googleapis-common-protos-types (1.2.0)
+    google-protobuf (3.19.4-x86_64-darwin)
+    googleapis-common-protos-types (1.3.0)
       google-protobuf (~> 3.14)
-    grpc (1.41.0)
-      google-protobuf (~> 3.17)
+    grpc (1.45.0-universal-darwin)
+      google-protobuf (~> 3.19)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.41.0)
+    grpc-tools (1.45.0)
     http-accept (1.7.0)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     jaro_winkler (1.5.4)
-    json (2.5.1)
+    json (2.6.1)
     kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
-    mini_portile2 (2.6.1)
+    mime-types-data (3.2022.0105)
     multi_test (0.1.2)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    parallel (1.22.0)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
-    puma (5.5.0)
+    puma (5.6.2)
       nio4r (~> 2.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
-    rack-protection (2.1.0)
+    rack-protection (2.2.0)
       rack
-    rainbow (3.0.0)
-    regexp_parser (2.1.1)
+    rainbow (3.1.1)
+    regexp_parser (2.2.1)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    reverse_markdown (2.0.0)
+    reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
     rspec-benchmark (0.6.0)
       benchmark-malloc (~> 0.2)
       benchmark-perf (~> 0.6)
       benchmark-trend (~> 0.4)
       rspec (>= 3.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.22.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.26.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     simplecov (0.16.1)
@@ -152,12 +149,12 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sinatra (2.1.0)
+    sinatra (2.2.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
-      rack-protection (= 2.1.0)
+      rack-protection (= 2.2.0)
       tilt (~> 2.0)
-    solargraph (0.44.0)
+    solargraph (0.44.3)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
@@ -177,25 +174,27 @@ GEM
       ffi (~> 1.1)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (1.1.0)
+    thor (1.2.1)
     tilt (2.0.10)
-    tins (1.29.1)
+    tins (1.31.0)
       sync
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.1)
     unicode-display_width (2.1.0)
-    yard (0.9.26)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-21
 
 DEPENDENCIES
-  bundler (~> 2.2, >= 2.2.17)
+  bundler (~> 2.3)
   coveralls (~> 0.8.23)
   nonnative!
-  rubocop (~> 1.22, >= 1.22.1)
-  solargraph (~> 0.44.0)
+  rubocop (~> 1.26)
+  solargraph (~> 0.44.3)
 
 BUNDLED WITH
-   2.2.22
+   2.3.9

data/README.md

@@ -121,7 +121,7 @@ end
 With cucumber you can also verify how much memory is used by the process:
 
 ```cucumber
-Then the process 'start_1' should consume '<=' '20mb' of memory
+Then the process 'start_1' should consume less than '25mb' of memory
 ```
 
 ### Servers

data/lib/nonnative/cucumber.rb

@@ -30,22 +30,11 @@ Then('I should reset the proxy for service {string}') do |name|
   service.proxy.reset
 end
 
-Then('the process {string} should consume {string} {string} of memory') do |name, op, mem|
+Then('the process {string} should consume less than {string} of memory') do |name, mem|
   process = Nonnative.pool.process_by_name(name)
   _, size, type = mem.split(/(\d+)/)
   actual = process.memory.send(type)
   size = size.to_i
 
-  case op
-  when '='
-    expect(actual).to eq(size)
-  when '<'
-    expect(actual).to be < size
-  when '<='
-    expect(actual).to be <= size
-  when '>'
-    expect(actual).to be > size
-  when '>='
-    expect(actual).to be >= size
-  end
+  expect(actual).to be < size
 end

data/lib/nonnative/observability.rb

@@ -6,6 +6,14 @@ module Nonnative
       get('health', { content_type: :json, accept: :json })
     end
 
+    def liveness
+      get('liveness', { content_type: :json, accept: :json })
+    end
+
+    def readiness
+      get('readiness', { content_type: :json, accept: :json })
+    end
+
     def metrics
       get('metrics')
     end

data/lib/nonnative/process.rb

@@ -55,6 +55,10 @@ module Nonnative
       environment = service.environment || {}
       environment = environment.transform_keys(&:to_s).transform_values(&:to_s)
 
+      environment.each do |k, v|
+        environment[k] = ENV[k] || environment[v]
+      end
+
       spawn(environment, service.command, %i[out err] => [service.log, 'a'])
     end
 

data/lib/nonnative/version.rb

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

data/nonnative.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   spec.required_ruby_version = ['>= 3.0.0', '< 4.0.0']
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.add_dependency 'concurrent-ruby', '~> 1.0', '>= 1.0.5'
   spec.add_dependency 'cucumber', ['>= 7', '< 8']
@@ -34,8 +35,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rspec-expectations', '~> 3.9', '>= 3.9.2'
   spec.add_dependency 'sinatra', '~> 2.0', '>= 2.0.8.1'
 
-  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.17'
+  spec.add_development_dependency 'bundler', '~> 2.3'
   spec.add_development_dependency 'coveralls', '~> 0.8.23'
-  spec.add_development_dependency 'rubocop', '~> 1.22', '>= 1.22.1'
-  spec.add_development_dependency 'solargraph', '~> 0.44.0'
+  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.53.0
+  version: 1.56.0
 platform: ruby
 authors:
 - Alejandro Falkowski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -192,20 +192,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.17
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.17
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -226,34 +220,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.22.1
+        version: '1.26'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.22.1
+        version: '1.26'
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.44.0
+        version: 0.44.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.44.0
+        version: 0.44.3
 description: Allows you to keep using the power of ruby to test other systems
 email:
 - alexrfalkowski@gmail.com
@@ -318,7 +306,8 @@ files:
 homepage: https://github.com/alexfalkowski/nonnative
 licenses:
 - Unlicense
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -337,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Allows you to keep using the power of ruby to test other systems