pgtk 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baa19244cc0bb678a2a694232365acc92b72102ec96c2fe41f9a47d36487a0d3
-  data.tar.gz: ea5749be062492fceb1fbac012f1b55c9b6a43991f3718e4d8b65e05bf67a0e4
+  metadata.gz: b219dccbf16fe5c25e14e50419ec42b500ac9d62e940dde922549345ff263ead
+  data.tar.gz: 5b604cedbc33cc7e6945dc8747d218605109bd6c5f20b3fa009fb9f7d806c8a7
 SHA512:
-  metadata.gz: 706e072b93b40d26ae5efda68870cb6f9c59eaa0e0d13205a2be858871c4c1e1a487a4ff07384d68a80bd0ece19cee214d58631ddab51cd5c66c807907cd5512
-  data.tar.gz: a92669230a4f7c92a0ededd321e795648a712f0f9951bc0e410ea89b782c1479156c1b4b8105b943e6eee5505121fd23f7e23d01a322053d7dc28214bd5c72d4
+  metadata.gz: f60a0d134a37cff5ccd1d45209121588950fa0a24ae885cdec78d65e1afb5f36f41c0714c2d7a9d16c9d5336f9a7b4b74c3bdeb5dabe4d2937d323307bd52733
+  data.tar.gz: b5d85d743ab268a8213619ed5a44f6f84c8eed7b21953275bcd8cc57facbda71cd40b8dfac6c3c16d1ae41ee151dc5f4ce81276a92da5ec0d997b6d668117f27

data/.rubocop.yml

@@ -16,10 +16,12 @@ Layout/EmptyLineAfterGuardClause:
 Metrics/AbcSize:
   Max: 50
 Metrics/CyclomaticComplexity:
-  Max: 10
+  Max: 12
+Metrics/ClassLength:
+  Max: 120
 Metrics/MethodLength:
   Max: 100
 Metrics/PerceivedComplexity:
-  Max: 10
+  Max: 12
 Metrics/ParameterLists:
   Max: 6

data/lib/pgtk/pgsql_task.rb

@@ -43,6 +43,7 @@ class Pgtk::PgsqlTask < Rake::TaskLib
   attr_accessor :dbname
   attr_accessor :yaml
   attr_accessor :quiet
+  attr_accessor :port
 
   def initialize(*args, &task_block)
     @name = args.shift || :pgsql
@@ -51,6 +52,7 @@ class Pgtk::PgsqlTask < Rake::TaskLib
     @user = 'test'
     @password = 'test'
     @dbname = 'test'
+    @port = nil
     unless ::Rake.application.last_description
       desc 'Start a local PostgreSQL server'
     end
@@ -88,8 +90,15 @@ class Pgtk::PgsqlTask < Rake::TaskLib
       )
     end
     raise unless $CHILD_STATUS.exitstatus.zero?
-    port = RandomPort::Pool.new.acquire
+    port = @port
+    if port.nil?
+      port = RandomPort::Pool::SINGLETON.acquire
+      puts "Random TCP port #{port} is used"
+    else
+      puts "Required TCP port #{port} is used"
+    end
     pid = Process.spawn('postgres', '-k', home, '-D', home, "--port=#{port}")
+    IO.write(File.join(@dir, 'pid'), pid)
     at_exit do
       `kill -TERM #{pid}`
       puts "PostgreSQL killed in PID #{pid}"
@@ -130,6 +139,6 @@ class Pgtk::PgsqlTask < Rake::TaskLib
         }
       }.to_yaml
     )
-    puts "PostgreSQL is running in PID #{pid}"
+    puts "PostgreSQL has been started in process ##{pid}, port #{port}"
   end
 end

data/lib/pgtk/pool.rb

@@ -165,7 +165,7 @@ class Pgtk::Pool
     begin
       yield conn
     rescue StandardError => e
-      conn.close
+      conn.close unless conn.finished?
       conn = @wire.connection
       raise e
     ensure

data/lib/pgtk/version.rb

@@ -28,5 +28,5 @@ require_relative '../pgtk'
 # License:: MIT
 module Pgtk
   # Current version of the library.
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

data/test/test_pool.rb

@@ -80,6 +80,40 @@ class TestPool < Minitest::Test
     end
   end
 
+  def test_reconnects_on_pg_reboot
+    port = RandomPort::Pool::SINGLETON.acquire
+    Dir.mktmpdir 'test' do |dir|
+      id = rand(100..999)
+      Pgtk::PgsqlTask.new("pgsql#{id}") do |t|
+        t.dir = File.join(dir, 'pgsql')
+        t.user = 'hello'
+        t.password = 'A B C привет ! & | !'
+        t.dbname = 'test'
+        t.yaml = File.join(dir, 'cfg.yml')
+        t.quiet = true
+        t.fresh_start = true
+        t.port = port
+      end
+      task = Rake::Task["pgsql#{id}"]
+      task.invoke
+      pool = Pgtk::Pool.new(
+        Pgtk::Wire::Yaml.new(File.join(dir, 'cfg.yml')),
+        log: Loog::VERBOSE
+      )
+      pool.start(1)
+      pool.exec('SELECT * FROM pg_catalog.pg_tables')
+      pid = IO.read(File.join(dir, 'pgsql/pid')).to_i
+      `kill -KILL #{pid}`
+      sleep 1
+      task.reenable
+      task.invoke
+      assert_raises PG::UnableToSend do
+        pool.exec('SELECT * FROM pg_catalog.pg_tables')
+      end
+      pool.exec('SELECT * FROM pg_catalog.pg_tables')
+    end
+  end
+
   private
 
   def bootstrap

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-20 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace