pgtk 0.9.6 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04bf16143dbb42f1081b9ccbbe914b689437b851a639c8aa3260f26f6fbe7bb7
-  data.tar.gz: 6baa628d9a3fa5d559120cd85479caa281b0b45bd332878882c13b1d9536fdc1
+  metadata.gz: 5dcffe3ba23b17694740ccad32c11d2813f1606b4dfa9b93c63480ebb0e54299
+  data.tar.gz: b166a621155d4be6f8e7294d46b7a07ead34a711a17a3119cd34c289313d8f62
 SHA512:
-  metadata.gz: fe16da33edcbecc5d946c87576df7cc9df2095ad82b3f4f7dc62e8f7974bc2bdbfb783dedb053abab4dc9adeb5e2f45354e5d4cc1f0787a39607f783711427fd
-  data.tar.gz: 25301a409afe7a607262104d790943a64903c0d07a21efba0476f5667413e860970bc596cd7604b09a61b7b7ebb15ec9f776b6e69d6004ccdbdbd69becb9ca10
+  metadata.gz: 522afdb2e8c28af25cffd7a298f7caa6e1d964f8551408b7c9200650013d4b2e17c59363e6826011b175269744fb0436a351a79d5d85c5eafcf97d38c2bd7a5a
+  data.tar.gz: fa0eae28c330618462229826c735b1802e483ae07db63f6a8cc617cfb41f2a70dcf40ddd1ec86ce33b5ea3ec605b47f6b50335f22d456cde919a7bbe8c852663

data/.github/workflows/actionlint.yml

@@ -28,7 +28,7 @@ name: actionlint
       - master
 jobs:
   actionlint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Download actionlint

data/.github/workflows/codecov.yml

@@ -25,7 +25,7 @@ on:
       - master
 jobs:
   codecov:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
@@ -34,12 +34,13 @@ jobs:
           bundler-cache: true
       - run: |
           sudo apt-get update
-          sudo apt-get install -y postgresql-14
-          sudo ln -s /usr/lib/postgresql/14/bin/initdb /bin/initdb
-          sudo ln -s /usr/lib/postgresql/14/bin/postgres /bin/postgres
+          sudo apt-get install -y libpq-dev postgresql-client postgresql
+          sudo ln -s "$(realpath /usr/lib/postgresql/*/bin/initdb)" /bin/initdb
+          sudo ln -s "$(realpath /usr/lib/postgresql/*/bin/postgres)" /bin/postgres
+          sudo ln -s "$(realpath /usr/lib/postgresql/*/bin/pg_ctl)" /bin/pg_ctl
       - run: bundle install
       - run: bundle exec rake
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: coverage/.resultset.json

data/.github/workflows/copyrights.yml

@@ -24,7 +24,7 @@ name: copyrights
   pull_request:
 jobs:
   copyrights:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: yegor256/copyrights-action@0.0.5
+      - uses: yegor256/copyrights-action@0.0.8

data/.github/workflows/license.yml

@@ -28,7 +28,7 @@ name: license
       - master
 jobs:
   license:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - shell: bash

data/.github/workflows/markdown-lint.yml

@@ -32,7 +32,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   markdown-lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: articulate/actions-markdownlint@v1

data/.github/workflows/pdd.yml

@@ -28,7 +28,7 @@ on:
       - master
 jobs:
   pdd:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: volodya-lombrozo/pdd-action@master

data/.github/workflows/rake.yml

@@ -27,23 +27,24 @@ on:
     branches:
       - master
 jobs:
-  test:
-    name: test
+  rake:
+    name: rake
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        ruby: [3.2]
+        os: [ubuntu-24.04]
+        ruby: [3.3]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - run: |
           sudo apt-get update
-          sudo apt-get install -y postgresql-14
-          sudo ln -s /usr/lib/postgresql/14/bin/initdb /bin/initdb
-          sudo ln -s /usr/lib/postgresql/14/bin/postgres /bin/postgres
+          sudo apt-get install -y libpq-dev postgresql-client postgresql
+          sudo ln -s "$(realpath /usr/lib/postgresql/*/bin/initdb)" /bin/initdb
+          sudo ln -s "$(realpath /usr/lib/postgresql/*/bin/postgres)" /bin/postgres
+          sudo ln -s "$(realpath /usr/lib/postgresql/*/bin/pg_ctl)" /bin/pg_ctl
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - run: bundle install
+      - run: bundle update
       - run: bundle exec rake

data/.github/workflows/xcop.yml

@@ -28,7 +28,7 @@ name: xcop
       - master
 jobs:
   xcop:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: g4s8/xcop-action@master

data/.github/workflows/yamllint.yml

@@ -28,7 +28,7 @@ name: yamllint
       - master
 jobs:
   yamllint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: ibiqlik/action-yamllint@v3

data/.rubocop.yml

@@ -33,15 +33,15 @@ Style/ClassAndModuleChildren:
 Layout/EndOfLine:
   EnforcedStyle: lf
 Metrics/BlockLength:
-  Max: 50
+  Max: 100
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 Metrics/AbcSize:
-  Max: 50
+  Max: 100
 Metrics/CyclomaticComplexity:
   Max: 15
 Metrics/ClassLength:
-  Max: 150
+  Max: 200
 Metrics/MethodLength:
   Max: 100
 Metrics/PerceivedComplexity:

data/.rultor.yml

@@ -19,10 +19,16 @@
 # SOFTWARE.
 ---
 docker:
-  image: yegor256/rultor-image:1.23.1
+  image: yegor256/rultor-java
 assets:
   rubygems.yml: yegor256/home#assets/rubygems.yml
 install: |
+  sudo hostname docker
+  sudo apt-get update
+  sudo apt-get install -y libpq-dev postgresql-client postgresql
+  sudo ln -s "$(realpath /usr/lib/postgresql/*/bin/initdb)" /bin/initdb
+  sudo ln -s "$(realpath /usr/lib/postgresql/*/bin/postgres)" /bin/postgres
+  sudo ln -s "$(realpath /usr/lib/postgresql/*/bin/pg_ctl)" /bin/pg_ctl
   pdd -f /dev/null
   bundle install --no-color
 release:

data/.yamllint.yml

@@ -20,5 +20,5 @@
 ---
 rules:
   line-length:
-    max: 80
+    max: 200
     allow-non-breakable-words: true

data/Gemfile

@@ -23,11 +23,13 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'minitest', '5.24.1', require: false
-gem 'rack', '3.1.7', require: false
+gem 'minitest', '5.25.4', require: false
+gem 'minitest-reporters', '~>1.7', require: false
+gem 'rack', '3.1.8', require: false
 gem 'rake', '13.2.1', require: false
-gem 'rspec-rails', '6.1.3', require: false
-gem 'rubocop', '1.65.0', require: false
-gem 'rubocop-rspec', '3.0.3', require: false
+gem 'rspec-rails', '7.1.0', require: false
+gem 'rubocop', '1.69.2', require: false
+gem 'rubocop-rspec', '3.3.0', require: false
 gem 'simplecov', '0.22.0', require: false
+gem 'simplecov-cobertura', '~>2.1'
 gem 'xcop', '0.7.1', require: false

data/Gemfile.lock

@@ -2,180 +2,208 @@ PATH
   remote: .
   specs:
     pgtk (0.0.0)
-      backtrace (~> 0.3)
-      loog (~> 0.2)
+      backtrace (> 0)
+      loog (> 0)
       pg (~> 1.1)
-      random-port (~> 0.3)
+      qbash (> 0)
+      random-port (> 0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.3.4)
-      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionpack (8.0.1)
+      actionview (= 8.0.1)
+      activesupport (= 8.0.1)
       nokogiri (>= 1.8.5)
-      racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
+      useragent (~> 0.16)
+    actionview (8.0.1)
+      activesupport (= 8.0.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.4)
+    activesupport (8.0.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ansi (1.5.0)
     ast (2.4.2)
     backtrace (0.4.0)
     base64 (0.2.0)
-    bigdecimal (3.1.8)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     builder (3.3.0)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
+    date (3.4.1)
     diff-lcs (1.5.1)
     differ (0.1.2)
-    docile (1.4.0)
+    docile (1.4.1)
     drb (2.2.1)
-    erubi (1.13.0)
-    i18n (1.14.5)
+    elapsed (0.0.1)
+      loog (> 0)
+      tago (> 0)
+    erubi (1.13.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    io-console (0.7.2)
-    irb (1.14.0)
+    io-console (0.8.0)
+    irb (1.14.3)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.7.2)
+    json (2.9.1)
     language_server-protocol (3.17.0.3)
-    loofah (2.22.0)
+    logger (1.6.4)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    loog (0.5.2)
-    minitest (5.24.1)
-    mutex_m (0.2.0)
-    nokogiri (1.16.6-arm64-darwin)
+    loog (0.6.0)
+    minitest (5.25.4)
+    minitest-reporters (1.7.1)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    nokogiri (1.18.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.6-x86_64-linux)
+    nokogiri (1.18.0-x86_64-linux-gnu)
       racc (~> 1.4)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.6)
-    psych (5.1.2)
+    pg (1.5.9)
+    psych (5.2.2)
+      date
       stringio
-    racc (1.8.0)
-    rack (3.1.7)
+    qbash (0.2.2)
+      backtrace (> 0)
+      elapsed (> 0)
+      loog (> 0)
+      tago (> 0)
+    racc (1.8.1)
+    rack (3.1.8)
     rack-session (2.0.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (2.1.0)
+    rackup (2.2.1)
       rack (>= 3)
-      webrick (~> 1.8)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
-      irb
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (8.0.1)
+      actionpack (= 8.0.1)
+      activesupport (= 8.0.1)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    random-port (0.7.0)
-    rdoc (6.7.0)
+    random-port (0.7.1)
+    rdoc (6.10.0)
       psych (>= 4.0.0)
-    regexp_parser (2.9.2)
-    reline (0.5.9)
+    regexp_parser (2.10.0)
+    reline (0.6.0)
       io-console (~> 0.5)
-    rexml (3.3.1)
-      strscan
-    rspec-core (3.13.0)
+    rexml (3.4.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.3)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
+    rspec-rails (7.1.0)
+      actionpack (>= 7.0)
+      activesupport (>= 7.0)
+      railties (>= 7.0)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.1)
-    rubocop (1.65.0)
+    rspec-support (3.13.2)
+    rubocop (1.69.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
-    rubocop-rspec (3.0.3)
+    rubocop-rspec (3.3.0)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-cobertura (2.1.0)
+      rexml
+      simplecov (~> 0.19)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     slop (4.10.1)
-    stringio (3.1.1)
-    strscan (3.1.0)
-    thor (1.3.1)
+    stringio (3.1.2)
+    tago (0.0.2)
+    thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    webrick (1.8.1)
+    unicode-display_width (3.1.2)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.2)
+    useragent (0.16.11)
     xcop (0.7.1)
       differ (~> 0.1.2)
       nokogiri (~> 1.10)
       rainbow (~> 3.0)
       slop (~> 4.4)
-    zeitwerk (2.6.16)
+    zeitwerk (2.7.1)
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
-  minitest (= 5.24.1)
+  minitest (= 5.25.4)
+  minitest-reporters (~> 1.7)
   pgtk!
-  rack (= 3.1.7)
+  rack (= 3.1.8)
   rake (= 13.2.1)
-  rspec-rails (= 6.1.3)
-  rubocop (= 1.65.0)
-  rubocop-rspec (= 3.0.3)
+  rspec-rails (= 7.1.0)
+  rubocop (= 1.69.2)
+  rubocop-rspec (= 3.3.0)
   simplecov (= 0.22.0)
+  simplecov-cobertura (~> 2.1)
   xcop (= 0.7.1)
 
 BUNDLED WITH
-   2.5.6
+   2.5.16

data/lib/pgtk/liquibase_task.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'English'
+require 'qbash'
 require 'rake'
 require 'rake/tasklib'
 require 'shellwords'
@@ -79,7 +80,7 @@ class Pgtk::LiquibaseTask < Rake::TaskLib
     password = yml['pgsql']['password']
     raise "The 'password' is not set in the config (YAML)" if password.nil?
     Dir.chdir(File.dirname(@master)) do
-      system(
+      qbash(
         [
           'mvn verify',
           '--errors',
@@ -101,9 +102,8 @@ class Pgtk::LiquibaseTask < Rake::TaskLib
           '--define',
           "liquibase.password=#{Shellwords.escape(password)}",
           '2>&1'
-        ].join(' ')
+        ]
       )
     end
-    raise unless $CHILD_STATUS.exitstatus.zero?
   end
 end

data/lib/pgtk/pgsql_task.rb

@@ -22,6 +22,7 @@
 
 require 'cgi'
 require 'English'
+require 'qbash'
 require 'rake'
 require 'rake/tasklib'
 require 'random-port'
@@ -63,55 +64,74 @@ class Pgtk::PgsqlTask < Rake::TaskLib
     home = File.expand_path(@dir)
     FileUtils.rm_rf(home) if @fresh_start
     raise "Directory/file #{home} is present, use fresh_start=true" if File.exist?(home)
-    out = "2>&1 #{@quiet ? '>/dev/null' : ''}"
+    stdout = @quiet ? nil : $stdout
     Tempfile.open do |pwfile|
       File.write(pwfile.path, @password)
-      system(
+      qbash(
         [
-          'initdb --auth=trust',
-          "-D #{Shellwords.escape(home)}",
+          'initdb',
+          '--auth=trust',
+          '-D',
+          Shellwords.escape(home),
           '--username',
           Shellwords.escape(@user),
           '--pwfile',
-          Shellwords.escape(pwfile.path),
-          out
-        ].join(' ')
+          Shellwords.escape(pwfile.path)
+        ],
+        log: stdout
       )
     end
-    raise unless $CHILD_STATUS.exitstatus.zero?
     port = @port
     if port.nil?
       port = RandomPort::Pool::SINGLETON.acquire
-      puts "Random TCP port #{port} is used"
+      puts "Random TCP port #{port} is used for PostgreSQL server" unless @quiet
     else
-      puts "Required TCP port #{port} is used"
+      puts "Required TCP port #{port} is used for PostgreSQL server" unless @quiet
     end
-    pid = Process.spawn('postgres', '-k', home, '-D', home, "--port=#{port}")
+    cmd = [
+      'postgres',
+      '-k', Shellwords.escape(home),
+      '-D', Shellwords.escape(home),
+      '-c', Shellwords.escape("log_directory=#{home}"),
+      '-c', 'logging_collector=on',
+      '-c', 'log_statement=all',
+      '-c', 'log_filename=pgsql.log',
+      "--port=#{port}"
+    ].join(' ')
+    pid = Process.spawn(
+      cmd,
+      $stdout => File.join(home, 'stdout.txt'),
+      $stderr => File.join(home, 'stderr.txt')
+    )
     File.write(File.join(@dir, 'pid'), pid)
     at_exit do
-      `kill -TERM #{pid}`
-      puts "PostgreSQL killed in PID #{pid}"
+      qbash("kill -TERM #{pid}", log: stdout)
+      puts "PostgreSQL killed in PID #{pid}" unless @quiet
     end
-    sleep 1
     attempt = 0
     begin
-      system(
-        [
-          "createdb -h localhost -p #{port}",
-          '--username',
-          Shellwords.escape(@user),
-          Shellwords.escape(@dbname),
-          out
-        ].join(' ')
-      )
-      raise unless $CHILD_STATUS.exitstatus.zero?
+      TCPSocket.new('localhost', port)
     rescue StandardError => e
-      puts e.message
-      sleep(5)
+      sleep(0.1)
       attempt += 1
-      raise if attempt > 10
+      if attempt > 50
+        puts "+ #{cmd}"
+        puts "stdout:\n#{File.read(File.join(home, 'stdout.txt'))}"
+        puts "stderr:\n#{File.read(File.join(home, 'stderr.txt'))}"
+        raise "Failed to start PostgreSQL database server on port #{port}: #{e.message}"
+      end
       retry
     end
+    qbash(
+      [
+        'createdb',
+        '--host', 'localhost',
+        '--port', Shellwords.escape(port),
+        '--username', Shellwords.escape(@user),
+        Shellwords.escape(@dbname)
+      ],
+      log: stdout
+    )
     File.write(
       @yaml,
       {
@@ -128,6 +148,6 @@ class Pgtk::PgsqlTask < Rake::TaskLib
         }
       }.to_yaml
     )
-    puts "PostgreSQL has been started in process ##{pid}, port #{port}"
+    puts "PostgreSQL has been started in process ##{pid}, port #{port}" unless @quiet
   end
 end

data/lib/pgtk/version.rb

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

data/pgtk.gemspec

@@ -32,9 +32,10 @@ Gem::Specification.new do |s|
   s.version = Pgtk::VERSION
   s.license = 'MIT'
   s.summary = 'PostgreSQL ToolKit for Ruby apps'
-  s.description = 'This small Ruby gem helps you integrate PostgreSQL \
-with your Ruby web app, through Liquibase. It also adds a simple \
-connection pool and query processor, to make SQL manipulation simpler.'
+  s.description =
+    'This small Ruby gem helps you integrate PostgreSQL ' \
+    'with your Ruby web app, through Liquibase. It also adds a simple ' \
+    'connection pool and query processor, to make SQL manipulation simpler.'
   s.authors = ['Yegor Bugayenko']
   s.email = 'yegor256@gmail.com'
   s.homepage = 'http://github.com/yegor256/pgtk'
@@ -42,9 +43,10 @@ connection pool and query processor, to make SQL manipulation simpler.'
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_dependency 'backtrace', '~> 0.3'
-  s.add_dependency 'loog', '~> 0.2'
-  s.add_dependency 'pg', '~> 1.1'
-  s.add_dependency 'random-port', '~> 0.3'
+  s.add_dependency 'backtrace', '>0'
+  s.add_dependency 'loog', '>0'
+  s.add_dependency 'pg', '~>1.1'
+  s.add_dependency 'qbash', '>0'
+  s.add_dependency 'random-port', '>0'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/resources/pom.xml

@@ -29,8 +29,8 @@ SOFTWARE.
   <version>0.0.0</version>
   <packaging>pom</packaging>
   <properties>
-    <postgresql.version>42.7.3</postgresql.version>
-    <liquibase.version>4.29.0</liquibase.version>
+    <postgresql.version>42.7.4</postgresql.version>
+    <liquibase.version>4.30.0</liquibase.version>
   </properties>
   <dependencies>
     <dependency>

data/test/test__helper.rb

@@ -25,5 +25,11 @@ $stdout.sync = true
 require 'simplecov'
 SimpleCov.start
 
+require 'simplecov-cobertura'
+SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
+
+require 'minitest/reporters'
+Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new]
+
 require 'minitest/autorun'
 require_relative '../lib/pgtk'

data/test/test_pgsql_task.rb

@@ -21,8 +21,8 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
-require 'tmpdir'
 require 'rake'
+require 'tmpdir'
 require 'yaml'
 require_relative '../lib/pgtk/pgsql_task'
 
@@ -44,6 +44,24 @@ class TestPgsqlTask < Minitest::Test
       Rake::Task['p2'].invoke
       yaml = YAML.load_file(File.join(dir, 'cfg.yml'))
       assert(yaml['pgsql']['url'].start_with?('jdbc:postgresql://localhost'))
+      assert(File.exist?(File.join(dir, 'pgsql/pgsql.log')))
+    end
+  end
+
+  def test_not_quiet
+    Dir.mktmpdir 'test' do |dir|
+      Pgtk::PgsqlTask.new(:p3) do |t|
+        t.dir = File.join(dir, 'pgsql')
+        t.user = 'hello'
+        t.password = 'the password'
+        t.dbname = 'test'
+        t.yaml = File.join(dir, 'cfg.yml')
+        t.quiet = false
+      end
+      Rake::Task['p3'].invoke
+      yaml = YAML.load_file(File.join(dir, 'cfg.yml'))
+      assert(yaml['pgsql']['url'].start_with?('jdbc:postgresql://localhost'))
+      assert(File.exist?(File.join(dir, 'pgsql/pgsql.log')))
     end
   end
 end

data/test/test_pool.rb

@@ -20,14 +20,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'loog'
 require 'minitest/autorun'
-require 'tmpdir'
 require 'pg'
+require 'qbash'
 require 'rake'
+require 'tmpdir'
 require 'yaml'
-require 'loog'
-require_relative '../lib/pgtk/pgsql_task'
 require_relative '../lib/pgtk/liquibase_task'
+require_relative '../lib/pgtk/pgsql_task'
 require_relative '../lib/pgtk/pool'
 
 # Pool test.
@@ -127,7 +128,7 @@ class TestPool < Minitest::Test
         t.password = 'A B C привет ! & | !'
         t.dbname = 'test'
         t.yaml = File.join(dir, 'cfg.yml')
-        t.quiet = true
+        t.quiet = false
         t.fresh_start = true
         t.port = port
       end
@@ -139,15 +140,37 @@ class TestPool < Minitest::Test
       )
       pool.start(1)
       pool.exec('SELECT * FROM pg_catalog.pg_tables')
-      pid = File.read(File.join(dir, 'pgsql/pid')).to_i
-      `kill -KILL #{pid}`
-      sleep 1
-      task.reenable
-      task.invoke
+      qbash("pg_ctl -D #{Shellwords.escape(File.join(dir, 'pgsql'))} stop", log: $stdout)
+      cycle = 0
+      loop do
+        begin
+          TCPSocket.new('localhost', port)
+          sleep(0.1)
+          cycle += 1
+          if cycle > 50
+            qbash('ps -ax | grep postgres')
+            raise "Can't stop running postgres at port #{port}, for some reason"
+          end
+        rescue StandardError => e
+          puts e.message
+          break
+        end
+      end
       assert_raises(PG::UnableToSend, PG::ConnectionBad) do
         pool.exec('SELECT * FROM pg_catalog.pg_tables')
       end
-      pool.exec('SELECT * FROM pg_catalog.pg_tables')
+      task.reenable
+      task.invoke
+      loop do
+        begin
+          pool.exec('SELECT * FROM pg_catalog.pg_tables')
+          break
+        rescue StandardError => e
+          puts e.message
+          sleep(0.1)
+          retry
+        end
+      end
     end
   end
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.11.0
 platform: ruby
 authors:
 - Yegor Bugayenko
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: loog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -52,24 +52,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: qbash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: random-port
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.3'
-description: |-
-  This small Ruby gem helps you integrate PostgreSQL \
-  with your Ruby web app, through Liquibase. It also adds a simple \
-  connection pool and query processor, to make SQL manipulation simpler.
+        version: '0'
+description: This small Ruby gem helps you integrate PostgreSQL with your Ruby web
+  app, through Liquibase. It also adds a simple connection pool and query processor,
+  to make SQL manipulation simpler.
 email: yegor256@gmail.com
 executables: []
 extensions: []
@@ -120,7 +133,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -137,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: PostgreSQL ToolKit for Ruby apps
 test_files: []