nonnative 1.9.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01d1fb5190a9ee2aa28a1fda1b910077421c2117484485270f030bf1d60d47b8
-  data.tar.gz: 8154d5f5c8bf9368a379d5076fa1c725a92b1717aa0acde6bd66c88daf8fe8ca
+  metadata.gz: d3d063b72e79c07612ef45de94f2b318c59d600be60823a3b72b97e14b819863
+  data.tar.gz: e49d9d93bd0657896c7fb1abba459ca59c6c8fc3e59b409fe9c231b20f77cf34
 SHA512:
-  metadata.gz: 5b9aecc50dbf9f41cd7e1baaeb07bd40d3619aa83475021aedffead2d686793fa7a2a993a436c15adf62ef6603438e76eb913e3bf0539ce2731e06f63cc8bd66
-  data.tar.gz: a068e479b0ee2cec5f486a9f17417a279a8fc0e74308a607608cfe766a0d0fbab56c5514b88d23fbeb2681cac1fe869b765c02cff06e91a9915223b8c28e07bc
+  metadata.gz: 7d12d87e1f2681fc8e9fef1eecb5b55d81eb773b1845ffb22ab094c17cd9d73bced1874ee277e11c024ca82d66d9f7c4c9d49f6f3827052f06d0ce3bdc86f1f5
+  data.tar.gz: 6436da5c0393b9842881722a50f23e80f3264c0a36006e9aeb8402b26910645e875313b430da8df9bd2ba02b5ff08bce576cc74f590a8b5707f6454a27ca83b4

data/.rubocop.yml

@@ -31,3 +31,9 @@ Layout/SpaceAroundMethodCallOperator:
 
 Style/ExponentialNotation:
   Enabled: true
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.9.0)
+    nonnative (1.14.0)
       cucumber (~> 3.1, >= 3.1.2)
       grpc (~> 1.28)
       puma (~> 4.3, >= 4.3.3)
@@ -16,9 +16,9 @@ GEM
     amatch (0.4.0)
       mize
       tins (~> 1.0)
-    ast (2.4.0)
+    ast (2.4.1)
     backport (1.1.2)
-    backports (3.17.1)
+    backports (3.17.2)
     benchmark (0.1.0)
     benchmark-malloc (0.2.0)
     benchmark-perf (0.6.0)
@@ -31,7 +31,7 @@ GEM
       pastel (~> 0.7)
       tty-pie (~> 0.3)
     concurrent-ruby (1.1.6)
-    cucumber (3.1.2)
+    cucumber (3.2.0)
       builder (>= 2.1.2)
       cucumber-core (~> 3.2.0)
       cucumber-expressions (~> 6.0.1)
@@ -54,7 +54,7 @@ GEM
     e2mmap (0.1.0)
     equatable (0.6.1)
     gherkin (5.1.0)
-    google-protobuf (3.11.4)
+    google-protobuf (3.12.2)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
     grpc (1.28.0)
@@ -64,14 +64,14 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     json (2.3.0)
     maruku (0.7.3)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0425)
+    mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
     mize (0.4.0)
       protocol (~> 2.0)
@@ -83,17 +83,17 @@ GEM
     nio4r (2.5.2)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    parallel (1.19.1)
-    parser (2.7.1.2)
+    parallel (1.19.2)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
     pastel (0.7.4)
       equatable (~> 0.6)
       tty-color (~> 0.5)
     protocol (2.0.0)
       ruby_parser (~> 3.0)
-    puma (4.3.3)
+    puma (4.3.5)
       nio4r (~> 2.0)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-protection (2.0.8.1)
       rack
     rainbow (3.0.0)
@@ -103,7 +103,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    reverse_markdown (1.4.0)
+    reverse_markdown (2.0.0)
       nokogiri
     rexml (3.2.4)
     rspec (3.9.0)
@@ -124,8 +124,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.83.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
@@ -136,7 +135,7 @@ GEM
     ruby2_keywords (0.0.2)
     ruby_parser (3.14.2)
       sexp_processor (~> 4.9)
-    sexp_processor (4.14.1)
+    sexp_processor (4.15.0)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -147,7 +146,7 @@ GEM
       rack (~> 2.0)
       rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
-    solargraph (0.39.7)
+    solargraph (0.39.8)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)
@@ -156,7 +155,7 @@ GEM
       maruku (~> 0.7, >= 0.7.3)
       nokogiri (~> 1.9, >= 1.9.1)
       parser (~> 2.3)
-      reverse_markdown (~> 1.0, >= 1.0.5)
+      reverse_markdown (>= 1.0.5, < 3)
       rubocop (~> 0.52)
       thor (~> 1.0)
       tilt (~> 2.0)
@@ -164,7 +163,7 @@ GEM
     sync (0.5.0)
     thor (1.0.1)
     tilt (2.0.10)
-    tins (1.24.1)
+    tins (1.25.0)
       sync
     tty-color (0.5.1)
     tty-cursor (0.7.1)
@@ -186,7 +185,7 @@ DEPENDENCIES
   grpc-tools (~> 1.28)
   nonnative!
   rake (~> 13.0, >= 13.0.1)
-  rubocop (~> 0.82.0)
+  rubocop (~> 0.83.0)
   simplecov (~> 0.17.1)
   solargraph (~> 0.39.7)
 

data/lib/nonnative.rb

@@ -18,10 +18,12 @@ require 'nonnative/port'
 require 'nonnative/configuration'
 require 'nonnative/configuration_process'
 require 'nonnative/configuration_server'
+require 'nonnative/service'
 require 'nonnative/command'
 require 'nonnative/pool'
 require 'nonnative/server'
 require 'nonnative/http_client'
+require 'nonnative/application'
 require 'nonnative/http_server'
 require 'nonnative/grpc_server'
 require 'nonnative/grpc_server'
@@ -45,18 +47,25 @@ module Nonnative
 
     def start
       @pool ||= Nonnative::Pool.new(configuration)
+      errors = []
 
       @pool.start do |name, id, result|
-        raise Nonnative::StartError, "Started #{name} with id #{id}, though did respond in time" unless result
+        errors << "Started #{name} with id #{id}, though did respond in time" unless result
       end
+
+      raise Nonnative::StartError, errors.join("\n") unless errors.empty?
     end
 
     def stop
       return if @pool.nil?
 
+      errors = []
+
       @pool.stop do |name, id, result|
-        raise Nonnative::StopError, "Stopped #{name} with id #{id}, though did respond in time" unless result
+        errors << "Stopped #{name} with id #{id}, though did respond in time" unless result
       end
+
+      raise Nonnative::StopError, errors.join("\n") unless errors.empty?
     end
 
     def clear

data/lib/nonnative/application.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class Application < Sinatra::Application
+    set :bind, '0.0.0.0'
+    set :server, :puma
+    set :logging, false
+    set :quiet, true
+  end
+end

data/lib/nonnative/command.rb

@@ -1,36 +1,61 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class Command
-    def initialize(process)
-      @process = process
-      @started = false
+  class Command < Nonnative::Service
+    def initialize(service)
+      @service = service
+      @timeout = Nonnative::Timeout.new(service.timeout)
     end
 
     def name
-      process.command
+      service.command
     end
 
     def start
-      unless started
-        @pid = spawn(process.command, %i[out err] => [process.file, 'a'])
-        @started = true
+      unless command_exists?
+        @pid = command_spawn
+        wait_start
       end
 
       pid
     end
 
     def stop
-      raise Nonnative::Error, "Can't stop a process that has not started" unless started
-
-      ::Process.kill('SIGINT', pid)
-      @started = false
+      if command_exists?
+        command_kill
+        wait_stop
+      end
 
       pid
     end
 
+    protected
+
+    def wait_stop
+      timeout.perform do
+        Process.waitpid2(pid)
+      end
+    end
+
     private
 
-    attr_reader :process, :pid, :started
+    attr_reader :service, :timeout, :pid
+
+    def command_kill
+      Process.kill('SIGINT', pid)
+    end
+
+    def command_spawn
+      spawn(service.command, %i[out err] => [service.file, 'a'])
+    end
+
+    def command_exists?
+      return false if pid.nil?
+
+      Process.kill(0, pid)
+      true
+    rescue Errno::ESRCH
+      false
+    end
   end
 end

data/lib/nonnative/grpc_server.rb

@@ -2,13 +2,13 @@
 
 module Nonnative
   class GRPCServer < Nonnative::Server
-    def initialize(port)
+    def initialize(service)
       @server = GRPC::RpcServer.new
 
-      server.add_http2_port("0.0.0.0:#{port}", :this_port_is_insecure)
+      server.add_http2_port("0.0.0.0:#{service.port}", :this_port_is_insecure)
       configure server
 
-      super port
+      super service
     end
 
     def configure(grpc)
@@ -16,13 +16,19 @@ module Nonnative
     end
 
     def perform_start
-      server.run_till_terminated
+      server.run
     end
 
     def perform_stop
       server.stop
     end
 
+    protected
+
+    def wait_start
+      server.wait_till_running(service.timeout)
+    end
+
     private
 
     attr_reader :server

data/lib/nonnative/http_client.rb

@@ -22,6 +22,20 @@ module Nonnative
       end
     end
 
+    def delete(pathname, headers = {})
+      with_exception do
+        uri = URI.join(host, pathname)
+        RestClient.delete(uri.to_s, headers)
+      end
+    end
+
+    def put(pathname, payload, headers = {})
+      with_exception do
+        uri = URI.join(host, pathname)
+        RestClient.put(uri.to_s, payload.to_json, headers)
+      end
+    end
+
     private
 
     attr_reader :host

data/lib/nonnative/http_server.rb

@@ -2,11 +2,14 @@
 
 module Nonnative
   class HTTPServer < Nonnative::Server
-    def initialize(port)
-      Application.set :port, port
+    def initialize(service)
+      @timeout = Nonnative::Timeout.new(service.timeout)
+      @queue = Queue.new
+
+      Application.set :port, service.port
       configure Application
 
-      super port
+      super service
     end
 
     def configure(http)
@@ -14,18 +17,25 @@ module Nonnative
     end
 
     def perform_start
-      Application.start!
+      Application.start! do |server|
+        queue << server
+      end
     end
 
     def perform_stop
       Application.stop!
     end
 
-    class Application < Sinatra::Application
-      set :bind, '0.0.0.0'
-      set :server, :puma
-      set :logging, false
-      set :quiet, true
+    protected
+
+    def wait_start
+      timeout.perform do
+        queue.pop
+      end
     end
+
+    private
+
+    attr_reader :timeout, :queue
   end
 end

data/lib/nonnative/pool.rb

@@ -28,7 +28,7 @@ module Nonnative
 
     def servers
       @servers ||= configuration.servers.map do |d|
-        [d.klass.new(d.port), Nonnative::Port.new(d)]
+        [d.klass.new(d), Nonnative::Port.new(d)]
       end
     end
 

data/lib/nonnative/server.rb

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class Server < Thread
-    def initialize(port)
-      @port = port
-      self.abort_on_exception = true
-
-      super do
-        perform_start
-      end
+  class Server < Nonnative::Service
+    def initialize(service)
+      @service = service
+      @id = SecureRandom.hex(5)
     end
 
     def name
@@ -16,14 +12,25 @@ module Nonnative
     end
 
     def start
-      object_id
+      unless thread
+        @thread = Thread.new { perform_start }
+        wait_start
+      end
+
+      id
     end
 
     def stop
-      perform_stop
-      object_id
+      if thread
+        perform_stop
+        thread.terminate
+        @thread = nil
+        wait_stop
+      end
+
+      id
     end
 
-    attr_reader :port
+    attr_reader :service, :id, :thread
   end
 end

data/lib/nonnative/service.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class Service
+    protected
+
+    def wait_start
+      sleep 0.1
+    end
+
+    def wait_stop
+      sleep 0.1
+    end
+  end
+end

data/lib/nonnative/startup.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-Nonnative.start
-
 at_exit do
   Nonnative.stop
 end
+
+Nonnative.start

data/lib/nonnative/version.rb

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

data/nonnative.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'chutney', '~> 2.0', '>= 2.0.3.1'
   spec.add_development_dependency 'grpc-tools', '~> 1.28'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
-  spec.add_development_dependency 'rubocop', '~> 0.82.0'
+  spec.add_development_dependency 'rubocop', '~> 0.83.0'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'solargraph', '~> 0.39.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Alex Falkowski
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-09 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 0.83.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 0.83.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +270,7 @@ files:
 - bin/console
 - bin/setup
 - lib/nonnative.rb
+- lib/nonnative/application.rb
 - lib/nonnative/before.rb
 - lib/nonnative/command.rb
 - lib/nonnative/configuration.rb
@@ -284,6 +285,7 @@ files:
 - lib/nonnative/pool.rb
 - lib/nonnative/port.rb
 - lib/nonnative/server.rb
+- lib/nonnative/service.rb
 - lib/nonnative/start_error.rb
 - lib/nonnative/startup.rb
 - lib/nonnative/stop_error.rb
@@ -295,7 +297,7 @@ homepage: https://github.com/alexfalkowski/nonnative
 licenses:
 - Unlicense
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -311,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Allows you to keep using the power of ruby to test other systems
 test_files: []