nonnative 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a5cb014d7be492fca744eb85ac93dc367935a8ac2e3693e133833597a3bd549
-  data.tar.gz: ff5f799bb3dd66da7d9d933b0c16a596e43841a9bbcb2c87573de03a1dbf5f2f
+  metadata.gz: 5ccdd2979601ad074af9108e0cad92b25912bdb4cbfc53ba70c4dab7c833b828
+  data.tar.gz: af791d87b74e5db4d962405e975ee527e1d3e4522c48120835971f94af3a486a
 SHA512:
-  metadata.gz: ca60a62a4fffa470f50afabe68e51eb3ed93c139c06c4f6cd12a061058c7ef92f75e025ae4fa4eaeae456a47511a97f305c5d3dcdbfb8f090406f2567db4ccc1
-  data.tar.gz: 53b1f5fba7553ccac0cfada04affa93e0cf7c22c9778d807b70376f5fa7f542b61d262311daac903ae3d929828fcfaac6f053a91377b4b8cf2c4124c4e5fbe79
+  metadata.gz: 9bc5f8258ebbc338ff5fc6c09b0af4651c9969e4401ba91dbf2daebfe4ff8e4078520b822f51d14a080726ea7279b13dde7ded0d7b247c1c0c10015f4ee1ae96
+  data.tar.gz: 97ff9785e3eb41370fe71dea80c37497d90b16805e5999b6ef0d17575b16c68fdf8584445dfd151285c8f1c4e6c3410ba33f1d2f81fd6ffdafea2461a9d46178

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.11.0)
+    nonnative (1.12.0)
       cucumber (~> 3.1, >= 3.1.2)
       grpc (~> 1.28)
       puma (~> 4.3, >= 4.3.3)

data/lib/nonnative.rb

@@ -18,6 +18,7 @@ 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'
@@ -45,18 +46,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/command.rb

@@ -1,40 +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
-
-        sleep 0.1 # Processes take time to start
+      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
+      if command_exists?
+        command_kill
+        wait_stop
+      end
 
-      ::Process.kill('SIGINT', pid)
-      @started = false
+      pid
+    end
 
-      sleep 0.1 # Processes take time to stop
+    protected
 
-      pid
+    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)
@@ -23,6 +23,12 @@ module Nonnative
       server.stop
     end
 
+    protected
+
+    def wait_start
+      server.wait_till_running(1)
+    end
+
     private
 
     attr_reader :server

data/lib/nonnative/http_server.rb

@@ -2,11 +2,11 @@
 
 module Nonnative
   class HTTPServer < Nonnative::Server
-    def initialize(port)
-      Application.set :port, port
+    def initialize(service)
+      Application.set :port, service.port
       configure Application
 
-      super port
+      super service
     end
 
     def configure(http)

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,19 +12,25 @@ module Nonnative
     end
 
     def start
-      sleep 0.1 # Servers take time to start
+      unless thread
+        @thread = Thread.new { perform_start }
+        wait_start
+      end
 
-      object_id
+      id
     end
 
     def stop
-      perform_stop
-
-      sleep 0.1 # Servers take time to stop
+      if thread
+        perform_stop
+        thread.terminate
+        @thread = nil
+        wait_stop
+      end
 
-      object_id
+      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.11.0'
+  VERSION = '1.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -284,6 +284,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