pgtk 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0e3dc64528c0ea54e3e2cc1d75e142f30ad127bf79ede0fcca307656bc42920
-  data.tar.gz: c671bfbce992f4c922ecbf228211465bea1623d66d54796802d97d17052ad152
+  metadata.gz: 5dcffe3ba23b17694740ccad32c11d2813f1606b4dfa9b93c63480ebb0e54299
+  data.tar.gz: b166a621155d4be6f8e7294d46b7a07ead34a711a17a3119cd34c289313d8f62
 SHA512:
-  metadata.gz: b6324e9656ae42a7735fa875fc9daffd306370f0f8afe2630900c9b2c76967eb666ba13b91cdf68eff7581c1f66110c5bf0a6bb617e2483ef5461b6f5e614914
-  data.tar.gz: 7336b30c06b4f34c3a2e4df89ed633a1cdc49f2dcd20020fbb3e65bd9f198508f5a69b6d7729301e0775381d3dd0e8522c41cfe217c3176e2248c1c719c35b1c
+  metadata.gz: 522afdb2e8c28af25cffd7a298f7caa6e1d964f8551408b7c9200650013d4b2e17c59363e6826011b175269744fb0436a351a79d5d85c5eafcf97d38c2bd7a5a
+  data.tar.gz: fa0eae28c330618462229826c735b1802e483ae07db63f6a8cc617cfb41f2a70dcf40ddd1ec86ce33b5ea3ec605b47f6b50335f22d456cde919a7bbe8c852663

data/.github/workflows/codecov.yml

@@ -37,9 +37,10 @@ jobs:
           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

@@ -27,4 +27,4 @@ jobs:
     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/rake.yml

@@ -27,23 +27,24 @@ on:
     branches:
       - master
 jobs:
-  test:
-    name: test
+  rake:
+    name: rake
     strategy:
       matrix:
         os: [ubuntu-24.04]
-        ruby: [3.2]
+        ruby: [3.3]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - run: |
           sudo apt-get update
-          sudo apt-get install -y postgresql
+          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/.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

@@ -23,10 +23,12 @@ docker:
 assets:
   rubygems.yml: yegor256/home#assets/rubygems.yml
 install: |
-  sudo apt-get -y update
-  sudo apt-get -y install libpq-dev postgresql-client postgresql
+  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/Gemfile

@@ -23,13 +23,13 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'minitest', '5.25.1', require: false
+gem 'minitest', '5.25.4', require: false
 gem 'minitest-reporters', '~>1.7', require: false
-gem 'rack', '3.1.7', require: false
+gem 'rack', '3.1.8', require: false
 gem 'rake', '13.2.1', require: false
-gem 'rspec-rails', '7.0.1', require: false
-gem 'rubocop', '1.66.1', require: false
-gem 'rubocop-rspec', '3.0.5', 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

@@ -11,25 +11,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.2.1)
-      actionview (= 7.2.1)
-      activesupport (= 7.2.1)
+    actionpack (8.0.1)
+      actionview (= 8.0.1)
+      activesupport (= 8.0.1)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (7.2.1)
-      activesupport (= 7.2.1)
+    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.2.1)
+    activesupport (8.0.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -39,76 +39,80 @@ GEM
       minitest (>= 5.1)
       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.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)
     elapsed (0.0.1)
       loog (> 0)
       tago (> 0)
-    erubi (1.13.0)
-    i18n (1.14.5)
+    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)
-    logger (1.6.1)
-    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.25.1)
+    loog (0.6.0)
+    minitest (5.25.4)
     minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.18.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.18.0-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.5.0)
+    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
-    qbash (0.0.4)
+    qbash (0.2.2)
       backtrace (> 0)
       elapsed (> 0)
       loog (> 0)
+      tago (> 0)
     racc (1.8.1)
-    rack (3.1.7)
+    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.2.1)
-      actionpack (= 7.2.1)
-      activesupport (= 7.2.1)
+      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)
@@ -116,22 +120,22 @@ GEM
       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.8)
-    rspec-core (3.13.1)
+    rexml (3.4.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.2)
+    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 (7.0.1)
+    rspec-rails (7.1.0)
       actionpack (>= 7.0)
       activesupport (>= 7.0)
       railties (>= 7.0)
@@ -139,23 +143,23 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.1)
-    rubocop (1.66.1)
+    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)
-      rubocop-ast (>= 1.32.2, < 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.32.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
-    rubocop-rspec (3.0.5)
+    rubocop-rspec (3.3.0)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    securerandom (0.3.1)
+    securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -163,40 +167,43 @@ GEM
     simplecov-cobertura (2.1.0)
       rexml
       simplecov (~> 0.19)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     slop (4.10.1)
-    stringio (3.1.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)
-    useragent (0.16.10)
-    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.18)
+    zeitwerk (2.7.1)
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
-  minitest (= 5.25.1)
+  minitest (= 5.25.4)
   minitest-reporters (~> 1.7)
   pgtk!
-  rack (= 3.1.7)
+  rack (= 3.1.8)
   rake (= 13.2.1)
-  rspec-rails (= 7.0.1)
-  rubocop (= 1.66.1)
-  rubocop-rspec (= 3.0.5)
+  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.18
+   2.5.16

data/lib/pgtk/pgsql_task.rb

@@ -64,20 +64,21 @@ 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)
       qbash(
         [
-          'initdb --auth=trust',
+          'initdb',
+          '--auth=trust',
           '-D',
           Shellwords.escape(home),
           '--username',
           Shellwords.escape(@user),
           '--pwfile',
-          Shellwords.escape(pwfile.path),
-          out
-        ]
+          Shellwords.escape(pwfile.path)
+        ],
+        log: stdout
       )
     end
     port = @port
@@ -87,40 +88,50 @@ class Pgtk::PgsqlTask < Rake::TaskLib
     else
       puts "Required TCP port #{port} is used for PostgreSQL server" unless @quiet
     end
+    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(
-      [
-        'postgres',
-        '-k', Shellwords.escape(home),
-        '-D', Shellwords.escape(home),
-        "--port=#{port}"
-      ].join(' '),
+      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}`
+      qbash("kill -TERM #{pid}", log: stdout)
       puts "PostgreSQL killed in PID #{pid}" unless @quiet
     end
-    sleep 1
     attempt = 0
     begin
-      qbash(
-        [
-          "createdb -h localhost -p #{port}",
-          '--username',
-          Shellwords.escape(@user),
-          Shellwords.escape(@dbname),
-          out
-        ]
-      )
+      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,
       {

data/lib/pgtk/version.rb

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

data/resources/pom.xml

@@ -30,7 +30,7 @@ SOFTWARE.
   <packaging>pom</packaging>
   <properties>
     <postgresql.version>42.7.4</postgresql.version>
-    <liquibase.version>4.29.2</liquibase.version>
+    <liquibase.version>4.30.0</liquibase.version>
   </properties>
   <dependencies>
     <dependency>

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace