nonnative 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e7e65f8d75171190e48eab43b00ef7111120cb4415a8e23f49f60505daf9b0c
-  data.tar.gz: a4e95dba74837226e76a1069f983a529eb7a2237fbc514088907b43a88a63a76
+  metadata.gz: fc6f50328a922bda342a198bfd05466d91d44396b199a1d5fb2a22f253173134
+  data.tar.gz: fc5136cd3bc6e72cafd5d2c001113584519ab557160980a145e0b20355a74dfd
 SHA512:
-  metadata.gz: 47781233a53ad167a6163fa5467d39a481db3cd00ab839497a7c455417f3a642144692c9b65267b2bc9f811088078daf8322a524ace26dae62dc5dffb6c72828
-  data.tar.gz: 48a169c713c2ce28012b69cdb48a5011dff0a2e3e4bec0dbb798ee54647107aeccf9e275d89f1e733f9e18d43e318469454940f0de6bdaa3ad77d258a2075f77
+  metadata.gz: 86ac0cd343b1152b0c69e6444878ce488b51224afe0bae9ed6b0be37c378913721db2523ade6837d138d7fb3d3f78ea1dae5fb2e58ad038aecb6f05b2069d422
+  data.tar.gz: 59f750286f87cc715835d3391b4a7e5f3d0b22ec89ca47bb2165f86debc36e16a8aa1e0c575b6794bcec5fabb72af903edab3d51dd0221d8f6436c585daa2060

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    nonnative (1.7.0)
+    nonnative (1.8.0)
       cucumber (~> 3.1, >= 3.1.2)
       grpc (~> 1.28)
       rest-client (~> 2.1)
+      rspec-benchmark (~> 0.6.0)
       rspec-expectations (~> 3.9, >= 3.9.2)
-      semantic_logger (~> 4.6, >= 4.6.1)
       sinatra (~> 2.0, >= 2.0.8.1)
 
 GEM
@@ -20,7 +20,6 @@ GEM
     benchmark-perf (0.6.0)
     benchmark-trend (0.4.0)
     builder (3.2.4)
-    concurrent-ruby (1.1.6)
     cucumber (3.1.2)
       builder (>= 2.1.2)
       cucumber-core (~> 3.2.0)
@@ -91,8 +90,8 @@ GEM
       benchmark-perf (~> 0.6)
       benchmark-trend (~> 0.4)
       rspec (>= 3.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
     rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
@@ -110,8 +109,6 @@ GEM
       unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.2)
-    semantic_logger (4.6.1)
-      concurrent-ruby (~> 1.0)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -151,7 +148,6 @@ DEPENDENCIES
   grpc-tools (~> 1.28)
   nonnative!
   rake (~> 13.0, >= 13.0.1)
-  rspec-benchmark (~> 0.6.0)
   rubocop (~> 0.82.0)
   simplecov (~> 0.18.5)
   solargraph (~> 0.39.7)

data/Makefile

@@ -6,7 +6,7 @@ dependencies:
 outdated-dependencies:
 	bundle outdated --only-explicit
 
-features:
+features: cleanup-logs
 	bundle exec cucumber $(feature)
 
 analysis:

data/lib/nonnative.rb

@@ -11,6 +11,8 @@ require 'rest-client'
 
 require 'nonnative/version'
 require 'nonnative/error'
+require 'nonnative/start_error'
+require 'nonnative/stop_error'
 require 'nonnative/timeout'
 require 'nonnative/port'
 require 'nonnative/configuration'
@@ -19,7 +21,6 @@ require 'nonnative/configuration_server'
 require 'nonnative/command'
 require 'nonnative/pool'
 require 'nonnative/server'
-require 'nonnative/logger'
 require 'nonnative/http_client'
 require 'nonnative/http_server'
 require 'nonnative/grpc_server'
@@ -28,10 +29,6 @@ require 'nonnative/observability'
 
 module Nonnative
   class << self
-    def logger
-      @logger ||= Nonnative::Logger.create
-    end
-
     def load_configuration(path)
       @configuration ||= Nonnative::Configuration.load_file(path) # rubocop:disable Naming/MemoizedInstanceVariableName
     end
@@ -50,7 +47,7 @@ module Nonnative
       @pool ||= Nonnative::Pool.new(configuration)
 
       @pool.start do |name, id, result|
-        logger.error('Started though did respond in time', id: id, name: name) unless result
+        raise Nonnative::StartError, "Started #{name} with id #{id}, though did respond in time" unless result
       end
     end
 
@@ -58,7 +55,7 @@ module Nonnative
       return if @pool.nil?
 
       @pool.stop do |name, id, result|
-        logger.error('Stopped though did respond in time', id: id, name: name) unless result
+        raise Nonnative::StopError, "Stopped #{name} with id #{id}, though did respond in time" unless result
       end
     end
 

data/lib/nonnative/http_client.rb

@@ -9,21 +9,27 @@ module Nonnative
     protected
 
     def get(pathname, headers = {})
-      uri = URI.join(host, pathname)
-      RestClient.get(uri.to_s, headers)
-    rescue RestClient::Exception => e
-      e.response
+      with_exception do
+        uri = URI.join(host, pathname)
+        RestClient.get(uri.to_s, headers)
+      end
     end
 
     def post(pathname, payload, headers = {})
-      uri = URI.join(host, pathname)
-      RestClient.post(uri.to_s, payload.to_json, headers)
-    rescue RestClient::Exception => e
-      e.response
+      with_exception do
+        uri = URI.join(host, pathname)
+        RestClient.post(uri.to_s, payload.to_json, headers)
+      end
     end
 
     private
 
     attr_reader :host
+
+    def with_exception
+      yield
+    rescue RestClient::Exception => e
+      e.response
+    end
   end
 end

data/lib/nonnative/start_error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class StartError < Nonnative::Error
+  end
+end

data/lib/nonnative/stop_error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class StopError < Nonnative::Error
+  end
+end

data/lib/nonnative/version.rb

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

data/nonnative.gemspec

@@ -27,14 +27,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'cucumber', '~> 3.1', '>= 3.1.2'
   spec.add_dependency 'grpc', '~> 1.28'
   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'
-  spec.add_dependency 'semantic_logger', '~> 4.6', '>= 4.6.1'
   spec.add_dependency 'sinatra', '~> 2.0', '>= 2.0.8.1'
 
   spec.add_development_dependency 'bundler', '~> 2.1', '>= 2.1.4'
   spec.add_development_dependency 'grpc-tools', '~> 1.28'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
-  spec.add_development_dependency 'rspec-benchmark', '~> 0.6.0'
   spec.add_development_dependency 'rubocop', '~> 0.82.0'
   spec.add_development_dependency 'simplecov', '~> 0.18.5'
   spec.add_development_dependency 'solargraph', '~> 0.39.7'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Alex Falkowski
@@ -59,45 +59,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: rspec-expectations
+  name: rspec-benchmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.9.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.9.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: semantic_logger
+  name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '3.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.6.1
+        version: 3.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '3.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.6.1
+        version: 3.9.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -172,20 +166,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 13.0.1
-- !ruby/object:Gem::Dependency
-  name: rspec-benchmark
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -258,13 +238,14 @@ files:
 - lib/nonnative/grpc_server.rb
 - lib/nonnative/http_client.rb
 - lib/nonnative/http_server.rb
-- lib/nonnative/logger.rb
 - lib/nonnative/manual.rb
 - lib/nonnative/observability.rb
 - lib/nonnative/pool.rb
 - lib/nonnative/port.rb
 - lib/nonnative/server.rb
+- lib/nonnative/start_error.rb
 - lib/nonnative/startup.rb
+- lib/nonnative/stop_error.rb
 - lib/nonnative/timeout.rb
 - lib/nonnative/version.rb
 - nonnative.gemspec

data/lib/nonnative/logger.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'semantic_logger'
-
-SemanticLogger.default_level = :info
-SemanticLogger.add_appender(io: STDOUT, formatter: :color)
-
-module Nonnative
-  class Logger
-    class << self
-      def create
-        SemanticLogger['nonnative']
-      end
-    end
-  end
-end