pgtk 0.12.1 → 0.13.1

data/test/test_liquibase_task.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2025 Yegor Bugayenko
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
+# SPDX-FileCopyrightText: Copyright (c) 2019-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
 
 require 'minitest/autorun'
 require 'tmpdir'
@@ -29,7 +12,7 @@ require_relative '../lib/pgtk/liquibase_task'
 
 # Liquibase rake task test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2017-2019 Yegor Bugayenko
+# Copyright:: Copyright (c) 2017-2025 Yegor Bugayenko
 # License:: MIT
 class TestLiquibaseTask < Minitest::Test
   def test_basic
@@ -82,9 +65,9 @@ class TestLiquibaseTask < Minitest::Test
       t.yaml = { 'pgsql' => {} }
       t.quiet = true
     end
-    ex = assert_raises do
+    ex = assert_raises(StandardError) do
       Rake::Task['lb'].invoke
     end
-    assert(ex.message.include?('the-file-doesnt-exist.xml'))
+    assert_includes(ex.message, 'the-file-doesnt-exist.xml')
   end
 end

data/test/test_pgsql_task.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2025 Yegor Bugayenko
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
+# SPDX-FileCopyrightText: Copyright (c) 2019-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
 
 require 'minitest/autorun'
 require 'rake'
@@ -28,7 +11,7 @@ require_relative '../lib/pgtk/pgsql_task'
 
 # Pgsql rake task test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2017-2019 Yegor Bugayenko
+# Copyright:: Copyright (c) 2017-2025 Yegor Bugayenko
 # License:: MIT
 class TestPgsqlTask < Minitest::Test
   def test_basic
@@ -69,7 +52,7 @@ class TestPgsqlTask < Minitest::Test
       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.log')))
+      assert_path_exists(File.join(dir, 'pgsql.log'))
     end
   end
 end

data/test/test_pool.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2025 Yegor Bugayenko
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
+# SPDX-FileCopyrightText: Copyright (c) 2019-2025 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
 
 require 'loog'
 require 'minitest/autorun'
@@ -30,17 +13,18 @@ require 'yaml'
 require_relative '../lib/pgtk/liquibase_task'
 require_relative '../lib/pgtk/pgsql_task'
 require_relative '../lib/pgtk/pool'
+require_relative '../lib/pgtk/spy'
 
 # Pool test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2017-2019 Yegor Bugayenko
+# Copyright:: Copyright (c) 2017-2025 Yegor Bugayenko
 # License:: MIT
 class TestPool < Minitest::Test
   def test_reads_version
     bootstrap do |pool|
       ver = pool.version
       assert(ver.start_with?('1'))
-      assert(!ver.include?(' '))
+      refute_includes(ver, ' ')
     end
   end
 
@@ -50,10 +34,23 @@ class TestPool < Minitest::Test
         'INSERT INTO book (title) VALUES ($1) RETURNING id',
         ['Elegant Objects']
       )[0]['id'].to_i
-      assert(id.positive?)
+      assert_predicate(id, :positive?)
     end
   end
 
+  def test_with_spy
+    queries = []
+    bootstrap do |pool|
+      pool = Pgtk::Spy.new(pool) { |sql| queries.append(sql) }
+      pool.exec(
+        ['INSERT INTO book', '(title) VALUES ($1)'],
+        ['Elegant Objects']
+      )
+    end
+    assert_equal(1, queries.size)
+    assert_equal('INSERT INTO book (title) VALUES ($1)', queries.first)
+  end
+
   def test_complex_query
     bootstrap do |pool|
       pool.exec(
@@ -72,23 +69,23 @@ class TestPool < Minitest::Test
         'INSERT INTO book (title) VALUES ($1)',
         ['Object Thinking']
       )
-      assert(log.to_s.include?('INSERT INTO book (title) VALUES ($1)'))
+      assert_includes(log.to_s, 'INSERT INTO book (title) VALUES ($1)')
     end
   end
 
   def test_logs_errors
     log = Loog::Buffer.new
     bootstrap(log: log) do |pool|
-      assert_raises PG::UndefinedTable do
+      assert_raises(PG::UndefinedTable) do
         pool.exec('INSERT INTO tableDoesNotExist (a) VALUES (42)')
       end
-      assert(log.to_s.include?('INSERT INTO tableDoesNotExist'))
+      assert_includes(log.to_s, 'INSERT INTO tableDoesNotExist')
     end
   end
 
   def test_transaction
     bootstrap do |pool|
-      id = pool.transaction do |t|
+      id = Pgtk::Spy.new(pool).transaction do |t|
         t.exec('DELETE FROM book')
         t.exec(
           [
@@ -98,23 +95,23 @@ class TestPool < Minitest::Test
           ['Object Thinking']
         )[0]['id'].to_i
       end
-      assert(id.positive?)
+      assert_predicate(id, :positive?)
     end
   end
 
   def test_transaction_with_error
     bootstrap do |pool|
       pool.exec('DELETE FROM book')
-      assert(pool.exec('SELECT * FROM book').empty?)
-      assert_raises do
+      assert_empty(pool.exec('SELECT * FROM book'))
+      assert_raises(StandardError) do
         pool.transaction do |t|
           t.exec('INSERT INTO book (title) VALUES ($1)', ['hey'])
           t.exec('INSERT INTO book (error_here) VALUES ($1)', ['hey'])
         end
       end
-      assert(pool.exec('SELECT * FROM book').empty?)
+      assert_empty(pool.exec('SELECT * FROM book'))
       pool.exec('INSERT INTO book (title) VALUES ($1)', ['another'])
-      assert(!pool.exec('SELECT * FROM book').empty?)
+      refute_empty(pool.exec('SELECT * FROM book'))
     end
   end
 

data/test-resources/2019/01-test.xml

@@ -1,26 +1,7 @@
 <?xml version="1.0"?>
 <!--
-(The MIT License)
-
-Copyright (c) 2019-2025 Yegor Bugayenko
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the 'Software'), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+ * SPDX-FileCopyrightText: Copyright (c) 2019-2025 Yegor Bugayenko
+ * SPDX-License-Identifier: MIT
 -->
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd" logicalFilePath="001-initial-schema.xml">
   <changeSet id="01" author="yegor256">

data/test-resources/master.xml

@@ -1,26 +1,7 @@
 <?xml version="1.0"?>
 <!--
-(The MIT License)
-
-Copyright (c) 2019-2025 Yegor Bugayenko
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the 'Software'), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+ * SPDX-FileCopyrightText: Copyright (c) 2019-2025 Yegor Bugayenko
+ * SPDX-License-Identifier: MIT
 -->
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd">
   <includeAll path="2019"/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -99,6 +99,7 @@ files:
 - ".github/workflows/markdown-lint.yml"
 - ".github/workflows/pdd.yml"
 - ".github/workflows/rake.yml"
+- ".github/workflows/reuse.yml"
 - ".github/workflows/xcop.yml"
 - ".github/workflows/yamllint.yml"
 - ".gitignore"
@@ -110,13 +111,16 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- LICENSES/MIT.txt
 - README.md
+- REUSE.toml
 - Rakefile
 - cucumber.yml
 - lib/pgtk.rb
 - lib/pgtk/liquibase_task.rb
 - lib/pgtk/pgsql_task.rb
 - lib/pgtk/pool.rb
+- lib/pgtk/spy.rb
 - lib/pgtk/version.rb
 - lib/pgtk/wire.rb
 - pgtk.gemspec