pgtk 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a786eefdf5750efb4fc874c1d56cabf81925652323df45cf305f7e7cd6db5f
-  data.tar.gz: 9d03860055718f2793aa0805307679240d4bd7765e9ae3310dae849511327134
+  metadata.gz: 5b201e77d472e16891cd9b86c0c403431319b14f651be6f4f8891f1d4373b346
+  data.tar.gz: 764f9a225a0025b0c88457bb1875e1b11c8c972a487482547427dbee0af02748
 SHA512:
-  metadata.gz: 4bea1c503932c6a77edb73272aaaaa015abc36d82fb6d96d06e9576237f42430f6871d22bdb096feccb0f91eebc01fa41ff5cf64b025bbd8b23ec254914b6fab
-  data.tar.gz: 347c2d8171c8ce34390cad9b66c6753f4f40ff1a6f597cfece1284a690d9063951d6fbf9763307a880296161eeac75c3dcadeb54686711424bd87447747e617e
+  metadata.gz: 73e7225c5e2fb009a170df8bf047323e023751ec185c62aaa21479620020e1939f834b9358f417950aaf9bcc04469cdefd8c0e716401f66eaebf4fc56ae969b6
+  data.tar.gz: 20d725cf5522d2342b4ea894c4eb6b4177baa5906687a89e5d9b0ee827100bbd8594f6e9c2f996f0632717ccb6e4bccb370b861ab32d38b429791ebd2587b4fa

data/.rubocop.yml

@@ -24,6 +24,6 @@ Metrics/ClassLength:
 Metrics/MethodLength:
   Max: 100
 Metrics/PerceivedComplexity:
-  Max: 12
+  Max: 15
 Metrics/ParameterLists:
   Max: 6

data/.rultor.yml

@@ -3,10 +3,10 @@ docker:
 assets:
   rubygems.yml: yegor256/home#assets/rubygems.yml
 install: |
-  sudo chown -R "$(whoami)" /usr/local/rvm
   pdd -f /dev/null
-  bundle install --no-color "--gemfile=$(pwd)/Gemfile"
+  bundle install --no-color
 release:
+  pre: false
   script: |-
     [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1
     bundle exec rake

data/README.md

@@ -50,13 +50,16 @@ Pgtk::PgsqlTask.new :pgsql do |t|
 end
 ```
 
-And this too:
+And this too ([org.postgresql:postgresql](https://mvnrepository.com/artifact/org.postgresql/postgresql) and [org.liquibase:liquibase-maven-plugin](https://mvnrepository.com/artifact/org.liquibase/liquibase-maven-plugin) are used inside):
 
 ```ruby
 require 'pgtk/liquibase_task'
 Pgtk::LiquibaseTask.new liquibase: :pgsql do |t|
   t.master = 'liquibase/master.xml' # Master XML file path
   t.yaml = ['target/pgsql-config.yml', 'config.yml'] # YAML files with connection details
+  t.quiet = false # TRUE by default
+  t.postgresql_version = '42.7.0' # overwriting default version
+  t.liquibase_version = '3.2.2' # overwriting default version
 end
 ```
 
@@ -129,10 +132,12 @@ end
 
 Should work.
 
-Well, it works in [wts.zold.io](https://github.com/zold-io/wts.zold.io),
+Well, it works in 
+[netbout.com](https://github.com/yegor256/netbout),
+[wts.zold.io](https://github.com/zold-io/wts.zold.io),
 [mailanes.com](https://github.com/yegor256/mailanes), and
-[0rsk.com](https://github.com/yegor256/0rsk). They are all
-open source, you can see how they use `pgtk`.
+[0rsk.com](https://github.com/yegor256/0rsk). 
+They are all open source, you can see how they use `pgtk`.
 
 ## How to contribute
 

data/lib/pgtk/liquibase_task.rb

@@ -54,17 +54,25 @@ class Pgtk::LiquibaseTask < Rake::TaskLib
   def run
     raise "Option 'master' is mandatory" unless @master
     raise "Option 'yaml' is mandatory" unless @yaml
-    yml = YAML.load_file(
-      if @yaml.is_a?(Array)
-        @yaml.drop_while { |f| !File.exist?(f) }.first
-      else
-        @yaml
-      end
-    )
-    raise "YAML at #{yaml} is missing 'pgsql' section" unless yml['pgsql']
-    pom = File.expand_path(File.join(__dir__, '../../resources/pom.xml'))
-    raise "Liquibase master is absent at #{@master}" unless File.exist?(@master)
+    yml = @yaml
+    unless yml.is_a?(Hash)
+      yml = YAML.load_file(
+        if @yaml.is_a?(Array)
+          @yaml.drop_while { |f| !File.exist?(f) }.first
+        else
+          @yaml
+        end
+      )
+    end
+    raise "YAML configuration is missing the 'pgsql' section" unless yml['pgsql']
     @master = File.expand_path(@master)
+    unless File.exist?(@master)
+      raise "Liquibase master is absent at '#{@master}'. \
+More about this file you can find in Liquibase documentation: \
+https://docs.liquibase.com/concepts/changelogs/xml-format.html"
+    end
+    pom = File.expand_path(File.join(__dir__, '../../resources/pom.xml'))
+    old = @liquibase_version.match?(/^[1-3]\..+$/)
     Dir.chdir(File.dirname(@master)) do
       system(
         [
@@ -80,7 +88,9 @@ class Pgtk::LiquibaseTask < Rake::TaskLib
           '--define',
           "postgresql.version=#{@postgresql_version}",
           '--define',
-          "liquibase.changeLogFile=#{@master}",
+          "liquibase.searchPath=#{File.dirname(@master)}",
+          '--define',
+          "liquibase.changeLogFile=#{old ? @master : File.basename(@master)}",
           '--define',
           "liquibase.url=#{Shellwords.escape(yml['pgsql']['url'])}",
           '--define',

data/lib/pgtk/version.rb

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

data/test/test_liquibase_task.rb

@@ -53,4 +53,36 @@ class TestLiquibaseTask < Minitest::Test
       Rake::Task['liquibase2'].invoke
     end
   end
+
+  def test_latest_version
+    Dir.mktmpdir 'test' do |dir|
+      Pgtk::PgsqlTask.new(:pgsql) do |t|
+        t.dir = File.join(dir, 'pgsql')
+        t.user = 'xxx'
+        t.password = 'xxx'
+        t.dbname = 'xxx'
+        t.yaml = File.join(dir, 'xxx.yml')
+        t.quiet = true
+      end
+      Rake::Task['pgsql'].invoke
+      Pgtk::LiquibaseTask.new(:liquibase) do |t|
+        t.master = File.join(__dir__, '../test-resources/master.xml')
+        t.yaml = File.join(dir, 'xxx.yml')
+        t.postgresql_version = '42.7.1'
+        t.liquibase_version = '4.25.1'
+      end
+      Rake::Task['liquibase'].invoke
+    end
+  end
+
+  def test_with_invalid_master_file
+    Pgtk::LiquibaseTask.new(:lb) do |t|
+      t.master = 'the-file-doesnt-exist.xml'
+      t.yaml = { 'pgsql' => {} }
+    end
+    ex = assert_raises do
+      Rake::Task['lb'].invoke
+    end
+    assert(ex.message.include?('the-file-doesnt-exist.xml'))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace