pgtk 0.29.2 → 0.29.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88629ebcfef471a523b2b9cbec16eab60a49cc8c08a3a277c293db1b49babb3c
-  data.tar.gz: 3a6b0a8a313fac7d034f6714b3a6c2b5d5801788e21794a2bd3e642eb85968ee
+  metadata.gz: ed1f139f521063e30992649b32a67bc125d5cd2ae549e56da21c0e88b600455b
+  data.tar.gz: 3994612c8c3856d246e6a28a5656e23033aa4cfe8433ca6d8d75dfaaa7d5d41b
 SHA512:
-  metadata.gz: 874afd6bc48dc18a48ec686c396f73f7dbd999802ec9f67236e11576808451642bdcb36a0d9a2938eb9cee35e8c00140e3cd75193d75b8301c0eae36cb7e9408
-  data.tar.gz: 97e5c27aacbc29a04805b24304766a2bc329829ecff64f0032dc84287d0b47656582ecb4f3c63dfc4870796fd2664d9df9057b7d09b08d84c75a1d6fb9c6ac52
+  metadata.gz: a5957d0bb3e4921d457726aaae131ee0356f5aac2cfe8dcd0d2df658742822026fd84f098c6da3d62078d27bf70bc3096b98d7a9c625f5464f1d5efb51ce3874
+  data.tar.gz: 9294d02de72588841dac47a066b7833e25bd0532d5c3a92a3f7ac7d1f59acd1b51277f1f127c897cae023b57dceea6e4a210bc2dcedcab416db8518397bd0709

data/lib/pgtk/pgsql_task.rb

@@ -91,9 +91,14 @@ class Pgtk::PgsqlTask < Rake::TaskLib
   private
 
   def run
-    local = qbash('postgres -V; initdb -V', accept: nil, both: true)[1].zero?
-    docker = qbash('docker -v', accept: nil, both: true)[1].zero?
-    raise 'You must have PostgreSQL or Docker installed locally' unless local && docker
+    pg_out = qbash('postgres -V; initdb -V', accept: nil, both: true)
+    local = pg_out[1].zero?
+    docker_out = qbash('docker -v', accept: nil, both: true)
+    docker = docker_out[1].zero?
+    unless local || docker
+      raise \
+        "Failed to find either PostgreSQL or Docker:\n#{pg_out.first}\n#{docker_out.first}"
+    end
     raise 'You cannot force Docker to run, because it is not installed locally' if @force_docker && !docker
     raise "Option 'dir' is mandatory" unless @dir
     raise "Option 'yaml' is mandatory" unless @yaml
@@ -143,7 +148,6 @@ class Pgtk::PgsqlTask < Rake::TaskLib
         [
           'docker',
           'run',
-          '--name pgtk',
           "--publish #{port}:5432",
           "-e POSTGRES_USER=#{Shellwords.escape(@user)}",
           "-e POSTGRES_PASSWORD=#{Shellwords.escape(@password)}",
@@ -158,8 +162,10 @@ class Pgtk::PgsqlTask < Rake::TaskLib
     container = out.scan(/[a-f0-9]+\Z/).first
     File.write(File.join(home, 'docker-container'), container)
     at_exit do
-      qbash("docker stop #{container}")
-      puts "PostgreSQL docker container #{container.inspect} was stopped" unless @quiet
+      if qbash("docker ps --format '{{.ID}}' --no-trunc | grep '#{container}'", both: true, accept: nil)[1].zero?
+        qbash("docker stop #{container}")
+        puts "PostgreSQL docker container #{container.inspect} was stopped" unless @quiet
+      end
     end
     begin
       WaitUtil.wait_for_service('PG in Docker', 'localhost', port, timeout_sec: 10, delay_sec: 0.1)

data/lib/pgtk/version.rb

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

data/lib/pgtk/wire.rb

@@ -70,11 +70,11 @@ class Pgtk::Wire::Env
     raise "The environment variable #{@var.inspect} is not set" if v.nil?
     uri = URI(v)
     Pgtk::Wire::Direct.new(
-      host: uri.host,
+      host: CGI.unescape(uri.host),
       port: uri.port,
-      dbname: uri.path[1..],
-      user: uri.userinfo.split(':')[0],
-      password: uri.userinfo.split(':')[1]
+      dbname: CGI.unescape(uri.path[1..]),
+      user: CGI.unescape(uri.userinfo.split(':')[0]),
+      password: CGI.unescape(uri.userinfo.split(':')[1])
     ).connection
   end
 end

metadata

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