pgsync 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2005fe5d8c3aa978ebb5f85d2076e81ee1022564382a6401437c5c683a4968a2
-  data.tar.gz: 333ac51419e6e6ee8091a14ee78e4e8d1aa7559bdbd13384a27352f35641e9e9
+  metadata.gz: b57c0423d780695d7379788efa869966318b23e3d8b9d92c8218ffb4cdee8609
+  data.tar.gz: 8e07cdad5a540c72df19ebdcbcc0e1c0e9930b6c4b1eb46f0bf318cada503bdc
 SHA512:
-  metadata.gz: 0a90323a6a4d2829c0e62c2d3d78245e9978a1c051da7c0913ce1f9a91a4f01bd0a6d80d14d2dbc49b63a0943c492e71d0191a458d3a2e16f0480c59078b7ee4
-  data.tar.gz: 8d9fa803daf091baa26afc26eba40bdc720b5836651c101bd53ce0e24f9fa9179f49577b61426e1a3315a5bb7fd90c815bfab54a40fb90376756c10392cccef4
+  metadata.gz: b91a30483535b049852ef679fe5944f065db7c56825a147775a904290c4a1e6221bfde512d7509cd475d97e5c8586c1107870cea4f19407782cd2f7caba88fc7
+  data.tar.gz: fbd6e09e5231a89824098c193d58f2debd90005df01fa432aff546e72ffc0b7ec6b951a237fb65f09ce640f28f6c660b29c77bc231744378055fe8b53e643b34

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.7.3 (2022-11-09)
+
+- Fixed issue with pg 1.4.4
+- Fixed output when `pg_restore` not found
+
 ## 0.7.2 (2022-09-19)
 
 - Improved error message when a primary key is required

data/README.md

@@ -19,7 +19,13 @@ pgsync is a command line tool. To install, run:
 gem install pgsync
 ```
 
-This will give you the `pgsync` command. You can also install it with [Homebrew](#homebrew) or [Docker](#docker). If installation fails, you may need to install [dependencies](#dependencies).
+This will give you the `pgsync` command. If installation fails, you may need to install [dependencies](#dependencies).
+
+You can also install it with Homebrew:
+
+```sh
+brew install pgsync
+```
 
 ## Setup
 
@@ -347,23 +353,13 @@ Bundler.with_unbundled_env do
 end
 ```
 
-## Additional Installation Methods
-
-### Homebrew
-
-With Homebrew, you can use:
-
-```sh
-brew install ankane/brew/pgsync
-```
-
-### Docker
+## Docker
 
 Get the [Docker image](https://hub.docker.com/r/ankane/pgsync) with:
 
 ```sh
 docker pull ankane/pgsync
-alias pgsync="docker run --rm ankane/pgsync"
+alias pgsync="docker run -ti ankane/pgsync"
 ```
 
 This will give you the `pgsync` command.
@@ -399,6 +395,18 @@ gem install specific_install
 gem specific_install https://github.com/ankane/pgsync.git
 ```
 
+With Homebrew, run:
+
+```sh
+brew upgrade pgsync
+```
+
+With Docker, run:
+
+```sh
+docker pull ankane/pgsync
+```
+
 ## Related Projects
 
 Also check out:

data/lib/pgsync/data_source.rb

@@ -19,11 +19,11 @@ module PgSync
     end
 
     def host
-      @host ||= conninfo[:host]
+      @host ||= dedup_localhost(conninfo[:host])
     end
 
     def port
-      @port ||= conninfo[:port]
+      @port ||= dedup_localhost(conninfo[:port])
     end
 
     def dbname
@@ -189,5 +189,15 @@ module PgSync
         conn.conninfo_hash
       end
     end
+
+    # for pg 1.4.4
+    # https://github.com/ged/ruby-pg/issues/490
+    def dedup_localhost(value)
+      if conninfo[:host] == "localhost,localhost" && conninfo[:port].to_s.split(",").uniq.size == 1
+        value.split(",")[0]
+      else
+        value
+      end
+    end
   end
 end

data/lib/pgsync/schema_sync.rb

@@ -17,6 +17,11 @@ module PgSync
         raise Error, "Cannot use --preserve with --schema-first or --schema-only"
       end
 
+      # generate commands before starting spinner
+      # for better error output if pg_restore not found
+      dump_command = dump_command()
+      restore_command = restore_command()
+
       show_spinner = output.tty? && !opts[:debug]
 
       if show_spinner
@@ -29,7 +34,7 @@ module PgSync
       # if spinner, capture lines to show on error
       lines = []
       success =
-        run_command do |line|
+        run_command(dump_command, restore_command) do |line|
           if show_spinner
             lines << line
           else
@@ -51,7 +56,7 @@ module PgSync
 
     private
 
-    def run_command
+    def run_command(dump_command, restore_command)
       err_r, err_w = IO.pipe
       Open3.pipeline_start(dump_command, restore_command, err: err_w) do |wait_thrs|
         err_w.close

data/lib/pgsync/version.rb

@@ -1,3 +1,3 @@
 module PgSync
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsync
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel