pg-ephemeral 0.0.2-aarch64-linux → 0.0.3-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99b910dc0813197f3ef7ac4cf811b0183375e8f44387bb2c1ff7ad759f04c15f
-  data.tar.gz: ea1a15d473eacbadedff15104d36f3877779f7a674697c79fd797b7bb9227aba
+  metadata.gz: 45169bb80e9ec4a27cfd940185049da5b88b526803573a0cc6ffa2feaba74033
+  data.tar.gz: e80eb2e4a2493d08cb9f50c95d063aca4f9e8d8b58d39bf4cfd1671df195cadb
 SHA512:
-  metadata.gz: f2b2fda631a07a27e64e3039ac5d48d424126891753bda25b480bd73f505513f7ed555c0310587cb73afab4121f0861f8df9abb12c8d6f035cc5768bf1ee929b
-  data.tar.gz: 714a5cde214940c4821e1458d7b6bc55963bdc84bc752075766cb0f985adb0584369b04038600c44c7b49d6b77ddbede05ad4561cad330f635ed81e5589d2343
+  metadata.gz: 609a6f2c3dde0d73b9e26a5c0c045b4c0130edd425800229d950d0dca07f8b8273fb7a7c1a8421b0b7eadcafa9867e16a0846c7414afcd1b2172eaeba86fb6e1
+  data.tar.gz: 3e5ce1dfccf9bd797b532fbde1d010cff9b90f4c9f5fae6cc12f9ad53b8a2fa654e5efd053ffc16a36a023b1cd0c4545eddb4bd871e20b584588fc2a36e8d18e

data/lib/pg_ephemeral.rb

@@ -50,6 +50,9 @@ module PgEphemeral
   end
 
   def self.run_server(instance_name, config, &block)
+    result_read, result_write = IO.pipe
+    control_read, control_write = IO.pipe
+
     command = [binary_path]
 
     if config
@@ -59,22 +62,27 @@ module PgEphemeral
     command.concat([
       'integration-server',
       '--instance', instance_name,
-      '--protocol', 'v0'
+      '--result-fd', result_write.fileno.to_s,
+      '--control-fd', control_read.fileno.to_s
     ])
 
-    Open3.popen2(*command) do |stdin, stdout, wait_thread|
-      config_json = stdout.gets
+    pid = Process.spawn(*command, result_write.fileno => result_write, control_read.fileno => control_read)
 
-      raise 'Failed to read server configuration' unless config_json
+    result_write.close
+    control_read.close
 
-      url = JSON.parse(config_json).fetch('url')
-      server = Server.new(url, stdin, wait_thread)
+    config_json = result_read.gets
+    result_read.close
 
-      begin
-        block.call(server)
-      ensure
-        server.shutdown
-      end
+    raise 'Failed to read server configuration' unless config_json
+
+    url = JSON.parse(config_json).fetch('url')
+    server = Server.new(url, control_write, pid)
+
+    begin
+      block.call(server)
+    ensure
+      server.shutdown
     end
   end
   private_class_method :run_server
@@ -82,15 +90,15 @@ module PgEphemeral
   class Server
     attr_reader :url
 
-    def initialize(url, stdin, wait_thread)
+    def initialize(url, control_write, pid)
       @url = url
-      @stdin = stdin
-      @wait_thread = wait_thread
+      @control_write = control_write
+      @pid = pid
     end
 
     def shutdown
-      @stdin.close unless @stdin.closed?
-      @wait_thread.value
+      @control_write.close unless @control_write.closed?
+      Process.wait(@pid)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg-ephemeral
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: aarch64-linux
 authors:
 - Markus Schirp