pgtk 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dcffe3ba23b17694740ccad32c11d2813f1606b4dfa9b93c63480ebb0e54299
-  data.tar.gz: b166a621155d4be6f8e7294d46b7a07ead34a711a17a3119cd34c289313d8f62
+  metadata.gz: 54cb8f69f002389612e9b89bb2514fecbb351c5aed6d70eb1ed570bc4ec45b6d
+  data.tar.gz: 0f4c36563a1eae3360ce0b3e50ef2f80e91fdc4a7a14b35efa9282499f1b9b20
 SHA512:
-  metadata.gz: 522afdb2e8c28af25cffd7a298f7caa6e1d964f8551408b7c9200650013d4b2e17c59363e6826011b175269744fb0436a351a79d5d85c5eafcf97d38c2bd7a5a
-  data.tar.gz: fa0eae28c330618462229826c735b1802e483ae07db63f6a8cc617cfb41f2a70dcf40ddd1ec86ce33b5ea3ec605b47f6b50335f22d456cde919a7bbe8c852663
+  metadata.gz: 53a8780bf422b4660d8a360c5580918a6fa84158d9f0111f382932167f1f8bd027b6135b690ff8b56500c71fae4920ef646ae46ae90d6d178d31c53f1763a347
+  data.tar.gz: 5551171c38c80efca7d9dca950c251387634889682085e546de58bafc8f8ffd6579d5beaf2993cdbe34897fbc22047e861c6c6cf3b7dcbed37328e50d6a519ea

data/.github/workflows/rake.yml

@@ -45,6 +45,5 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
       - run: bundle update
       - run: bundle exec rake

data/.rultor.yml

@@ -23,7 +23,6 @@ docker:
 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

data/Gemfile.lock

@@ -175,7 +175,7 @@ GEM
     thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.2)
+    unicode-display_width (3.1.3)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uri (1.0.2)

data/README.md

@@ -50,6 +50,10 @@ Pgtk::PgsqlTask.new :pgsql do |t|
   t.password = 'test'
   t.dbname = 'test'
   t.yaml = 'target/pgsql-config.yml' # YAML file to be created with connection details
+  t.config = { # list of PostgreSQL configuration options
+    log_min_messages: 'ERROR',
+    log_filename: 'target/pg.log'
+  }
 end
 ```
 

data/lib/pgtk/liquibase_task.rb

@@ -82,7 +82,7 @@ class Pgtk::LiquibaseTask < Rake::TaskLib
     Dir.chdir(File.dirname(@master)) do
       qbash(
         [
-          'mvn verify',
+          'mvn', 'verify',
           '--errors',
           '--batch-mode',
           '--fail-fast',
@@ -94,14 +94,13 @@ class Pgtk::LiquibaseTask < Rake::TaskLib
           '--define',
           "postgresql.version=#{@postgresql_version}",
           '--define',
-          "liquibase.searchPath=#{File.dirname(@master)}",
+          Shellwords.escape("liquibase.searchPath=#{File.dirname(@master)}"),
           '--define',
-          "liquibase.changeLogFile=#{old ? @master : File.basename(@master)}",
+          Shellwords.escape("liquibase.changeLogFile=#{old ? @master : File.basename(@master)}"),
           '--define',
-          "liquibase.url=#{Shellwords.escape(url)}",
+          Shellwords.escape("liquibase.url=#{url}"),
           '--define',
-          "liquibase.password=#{Shellwords.escape(password)}",
-          '2>&1'
+          Shellwords.escape("liquibase.password=#{password}")
         ]
       )
     end

data/lib/pgtk/pgsql_task.rb

@@ -36,7 +36,7 @@ require_relative '../pgtk'
 # Copyright:: Copyright (c) 2019-2024 Yegor Bugayenko
 # License:: MIT
 class Pgtk::PgsqlTask < Rake::TaskLib
-  attr_accessor :name, :dir, :fresh_start, :user, :password, :dbname, :yaml, :quiet, :port
+  attr_accessor :name, :dir, :fresh_start, :user, :password, :dbname, :yaml, :quiet, :port, :config
 
   def initialize(*args, &task_block)
     super()
@@ -44,6 +44,7 @@ class Pgtk::PgsqlTask < Rake::TaskLib
     @fresh_start = false
     @quiet = false
     @user = 'test'
+    @config = {}
     @password = 'test'
     @dbname = 'test'
     @port = nil
@@ -92,10 +93,7 @@ class Pgtk::PgsqlTask < Rake::TaskLib
       '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',
+      @config.map { |k, v| "-c #{Shellwords.escape("#{k}=#{v}")}" },
       "--port=#{port}"
     ].join(' ')
     pid = Process.spawn(

data/lib/pgtk/version.rb

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

data/test/test_pgsql_task.rb

@@ -40,11 +40,13 @@ class TestPgsqlTask < Minitest::Test
         t.dbname = 'test'
         t.yaml = File.join(dir, 'cfg.yml')
         t.quiet = true
+        t.config = {
+          log_min_error_statement: 'ERROR'
+        }
       end
       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
 
@@ -57,11 +59,17 @@ class TestPgsqlTask < Minitest::Test
         t.dbname = 'test'
         t.yaml = File.join(dir, 'cfg.yml')
         t.quiet = false
+        t.config = {
+          log_directory: dir,
+          logging_collector: 'on',
+          log_statement: 'all',
+          log_filename: 'pgsql.log'
+        }
       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')))
+      assert(File.exist?(File.join(dir, 'pgsql.log')))
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Yegor Bugayenko