nonnative 1.29.0 → 1.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38e0bc3edd8186e46c09f6ced347428e59c84d2fd1fa3621b43d750e6869df24
-  data.tar.gz: bce006f5c6c8efec4ee05eed6e596a387362efd533d39a76730d4c418da3ca96
+  metadata.gz: c7fcfc568dcb73f6f1b5263807e8da469598b6c800cac106ae804491a58be884
+  data.tar.gz: 814ef1f813b390375f91f01cfffe79fd250aa66b35f985f5923b0192313fe08f
 SHA512:
-  metadata.gz: de9987b642545511b4b4357b1b74670ba2f82d15c13b6df442ea6ef8954ac1f4225d2fdd8029395a085491dace93f827bae0fa85256a6c7c8fed90681e252b72
-  data.tar.gz: aecc4f783443ecfc13dc8a93329e16fbf0677f09dff875bf878316e64c468e19abf3d93f08a8e246de56c33c2c103a14653b07b9048e1be2cde2458e69ca7752
+  metadata.gz: 4f2b14b410443eab9974039a71ccfd1fbb68591096441822df23c4a64979e39d9378ff113713918446881b91e25fcef0c3a084edb5bd2fcf40d938dcdd311c4c
+  data.tar.gz: eea2c695c8ea090729c65ab0b8d4926d0242125b5c11f4d1ddd62576a013ea50d0f99252ffee62e28735d705e5d0b9b434687967525ee2736bb9c175e90cf62d

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   DisplayCopNames: true
+  NewCops: enable
 
 Layout/LineLength:
   Max: 120
@@ -16,72 +17,3 @@ Metrics/AbcSize:
 
 Style/Documentation:
   Enabled: false
-
-Lint/RaiseException:
-  Enabled: true
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
-
-Lint/StructNewOverride:
-  Enabled: true
-
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-
-Style/ExponentialNotation:
-  Enabled: true
-
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-
-Style/SlicingWithRange:
-  Enabled: true
-
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
-
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-
-Style/RedundantRegexpEscape:
-  Enabled: true
-
-Style/RedundantFetchBlock:
-  Enabled: true
-
-Style/AccessorGrouping:
-  Enabled: true
-
-Style/BisectedAttrAccessor:
-  Enabled: true
-
-Style/RedundantAssignment:
-  Enabled: true
-
-Lint/DuplicateElsifCondition:
-  Enabled: true
-
-Style/ArrayCoercion:
-  Enabled: true
-
-Style/CaseLikeIf:
-  Enabled: true
-
-Style/HashAsLastArrayItem:
-  Enabled: true
-
-Style/HashLikeCase:
-  Enabled: true
-
-Style/RedundantFileExtensionInRequire:
-  Enabled: true

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    nonnative (1.29.0)
+    nonnative (1.30.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       cucumber (>= 4, < 5)
       grpc (>= 1, < 2)
-      puma (~> 4.3, >= 4.3.3)
+      puma (~> 5.0)
       rest-client (~> 2.1)
       rspec-benchmark (~> 0.6.0)
       rspec-expectations (~> 3.9, >= 3.9.2)
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -27,7 +27,7 @@ GEM
     benchmark-perf (0.6.0)
     benchmark-trend (0.4.0)
     builder (3.2.4)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     cucumber (4.1.0)
       builder (~> 3.2, >= 3.2.3)
       cucumber-core (~> 7.1, >= 7.1.0)
@@ -47,7 +47,7 @@ GEM
     cucumber-create-meta (1.0.0)
       cucumber-messages (~> 12.2, >= 12.2.0)
       sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.2.2)
+    cucumber-cucumber-expressions (10.3.0)
     cucumber-gherkin (14.2.0)
       cucumber-messages (~> 12.4, >= 12.4.0)
     cucumber-html-formatter (7.2.0)
@@ -65,50 +65,50 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     e2mmap (0.1.0)
     ffi (1.13.1)
-    google-protobuf (3.12.4)
+    google-protobuf (3.13.0)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
-    grpc (1.30.2)
-      google-protobuf (~> 3.12)
+    grpc (1.32.0)
+      google-protobuf (~> 3.13)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.30.2)
+    grpc-tools (1.32.0)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
-    json (2.3.0)
+    json (2.3.1)
     maruku (0.7.3)
     middleware (0.1.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     multi_test (0.1.2)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
-    nio4r (2.5.2)
+    nio4r (2.5.4)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.1.5)
       ast (~> 2.4.1)
     protobuf-cucumber (3.10.8)
       activesupport (>= 3.2)
       middleware
       thor
       thread_safe
-    puma (4.3.5)
+    puma (5.0.0)
       nio4r (~> 2.0)
     rack (2.2.3)
-    rack-protection (2.0.8.1)
+    rack-protection (2.1.0)
       rack
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -135,17 +135,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.88.0)
+    rubocop (0.92.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      rubocop-ast (>= 0.5.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.2.0)
-      parser (>= 2.7.0.1)
+    rubocop-ast (0.6.0)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.2)
     simplecov (0.17.1)
@@ -153,12 +153,12 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sinatra (2.0.8.1)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    solargraph (0.39.12)
+    solargraph (0.39.15)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)

data/Makefile

@@ -13,7 +13,7 @@ analysis:
 	bundle exec rubocop
 
 cleanup-analysis:
-	bundle exec rubocop -a
+	bundle exec rubocop -A
 
 cleanup-logs:
 	rm -rf features/logs/*.log

data/lib/nonnative.rb

@@ -29,7 +29,6 @@ require 'nonnative/server'
 require 'nonnative/http_client'
 require 'nonnative/http_server'
 require 'nonnative/grpc_server'
-require 'nonnative/grpc_server'
 require 'nonnative/observability'
 require 'nonnative/proxy_factory'
 require 'nonnative/proxy'

data/lib/nonnative/configuration.rb

@@ -40,19 +40,21 @@ module Nonnative
             s.port = fd['port']
             s.log = fd['log']
 
-            proxy = fd['proxy']
-
-            if proxy
-              s.proxy = {
-                type: proxy['type'],
-                port: proxy['port'],
-                log: proxy['log'],
-                options: proxy['options']
-              }
-            end
+            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

data/lib/nonnative/delay_socket_pair.rb

@@ -3,7 +3,7 @@
 module Nonnative
   class DelaySocketPair < SocketPair
     def read(socket)
-      duration = proxy.options.dig(:delay) || 2
+      duration = proxy.options[:delay] || 2
       sleep duration
 
       super socket

data/lib/nonnative/timeout.rb

@@ -6,10 +6,8 @@ module Nonnative
       @time = time
     end
 
-    def perform
-      ::Timeout.timeout(time) do
-        yield
-      end
+    def perform(&block)
+      ::Timeout.timeout(time, &block)
     rescue ::Timeout::Error
       false
     end

data/lib/nonnative/version.rb

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

data/nonnative.gemspec

@@ -2,6 +2,7 @@
 
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'nonnative/version'
 
 Gem::Specification.new do |spec|
@@ -14,20 +15,18 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/alexfalkowski/nonnative'
   spec.license       = 'Unlicense'
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.required_ruby_version = ['>= 2.0.0', '< 2.8.0']
 
   spec.add_dependency 'concurrent-ruby', '~> 1.0', '>= 1.0.5'
   spec.add_dependency 'cucumber', ['>= 4', '< 5']
   spec.add_dependency 'grpc', ['>= 1', '< 2']
-  spec.add_dependency 'puma', '~> 4.3', '>= 4.3.3'
+  spec.add_dependency 'puma', '~> 5.0'
   spec.add_dependency 'rest-client', '~> 2.1'
   spec.add_dependency 'rspec-benchmark', '~> 0.6.0'
   spec.add_dependency 'rspec-expectations', '~> 3.9', '>= 3.9.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.29.0
+  version: 1.30.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -76,20 +76,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -328,7 +322,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: 2.8.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="