pgsync 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5965c8b07a78e8b6a7366c82f62a671c5132680f
-  data.tar.gz: fd0eb3f98cb80da49994b432a16da3b502f1e7e1
+  metadata.gz: 26c6ed8e9e75f8392d08f9c9930b659053bcb6bf
+  data.tar.gz: 67d1caf0199d8c2bbbe99322360d4f06347c3a1e
 SHA512:
-  metadata.gz: 5de08c4e8f0bb3d9375c2b29a13f7e9acfc9d1e123ce132f9563a78dc770b92c0f19a5b25f63c8c2c3862c3efbaa59eeea6f4988e79ff9670040667e90ab181e
-  data.tar.gz: 7a751f528cfc295a71e2dc3123d4c17fe635dfff5b451baa76ec24d6343578afe2921caa28b15f576bd867ce73a1fad8b3c0d294361eeb272edc711c115cff8b
+  metadata.gz: 203a74151aa72e5aee142ccc6a5d96e9bf800cf2710e80da1a54126fdf16323135a4ce197db3bccf76a1ae5f8d591b2ee283124dd00e45d6056ec6a612ccac44
+  data.tar.gz: 4f51ce05bcfe128010850614cf64b0e17b9cac63ce7937b5cbed1bbf2824705e44db6a52c972548db3663860c25082f2e586b246492679d5017bc291e7d68aa1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.1
+
+- Do not require config file
+
 # 0.2.0
 
 - Fixed idle transaction timeout errors - respects `statement_timeout` as a result

data/lib/pgsync.rb

@@ -13,19 +13,9 @@ module PgSync
   class Rollback < StandardError; end
 
   class Client
-    attr_reader :config_file
-
     def initialize(args)
       $stdout.sync = true
       @arguments, @options = parse_args(args)
-      @config_file =
-        if @options[:db]
-          db_config_file(@options[:db])
-        else
-          @options[:config] || ".pgsync.yml"
-        end
-      @config_file = search_tree(@config_file)
-      abort "Config not found" unless @config_file
       @mutex = MultiProcessing::Mutex.new
     end
 
@@ -57,14 +47,14 @@ module PgSync
         if args[0] == "schema"
           time =
             benchmark do
-              puts "* Dumping schema"
+              log "* Dumping schema"
               tables = to_arr(args[1]).map { |t| "-t #{t}" }.join(" ")
               dump_command = "pg_dump --verbose --schema-only --no-owner --no-acl --clean #{tables} #{to_url(source_uri)}"
               restore_command = "psql -q -d #{to_url(destination_uri)}"
               system("#{dump_command} | #{restore_command}")
             end
 
-          puts "* DONE (#{time.round(1)}s)"
+          log "* DONE (#{time.round(1)}s)"
         else
           from_uri = source_uri
           to_uri = destination_uri
@@ -127,51 +117,53 @@ module PgSync
                     where = opts[:where]
 
                     @mutex.synchronize do
-                      puts "* Syncing #{table}"
+                      log "* Syncing #{table}"
                       if where
-                        puts "    #{where}"
+                        log "    #{where}"
                         where = " WHERE #{opts[:where]}"
                       end
-                      puts "EXTRA COLUMNS: #{extra_fields}" if extra_fields.any?
-                      puts "MISSING COLUMNS: #{missing_fields}" if missing_fields.any?
-                      puts "EXTRA SEQUENCES: #{extra_sequences}" if extra_sequences.any?
-                      puts "MISSING SEQUENCES: #{missing_sequences}" if missing_sequences.any?
-                    end
+                      log "    Extra columns: #{extra_fields.join(", ")}" if extra_fields.any?
+                      log "    Missing columns: #{missing_fields.join(", ")}" if missing_fields.any?
+                      log "    Extra sequences: #{extra_sequences.join(", ")}" if extra_sequences.any?
+                      log "    Missing sequences: #{missing_sequences.join(", ")}" if missing_sequences.any?
 
-                    if shared_fields.empty?
-                      abort "No fields to copy: #{table}"
+                      if shared_fields.empty?
+                        log "    No fields to copy"
+                      end
                     end
 
-                    copy_fields = shared_fields.map { |f| f2 = bad_fields.to_a.find { |bf, bk| rule_match?(table, f, bf) }; f2 ? "#{apply_strategy(f2[1], f, from_connection)} AS #{escape_identifier(f)}" : escape_identifier(f) }.join(", ")
-                    fields = shared_fields.map { |f| escape_identifier(f) }.join(", ")
+                    if shared_fields.any?
+                      copy_fields = shared_fields.map { |f| f2 = bad_fields.to_a.find { |bf, bk| rule_match?(table, f, bf) }; f2 ? "#{apply_strategy(f2[1], f, from_connection)} AS #{escape_identifier(f)}" : escape_identifier(f) }.join(", ")
+                      fields = shared_fields.map { |f| escape_identifier(f) }.join(", ")
 
-                    seq_values = {}
-                    shared_sequences.each do |seq|
-                      seq_values[seq] = from_connection.exec("select last_value from #{seq}").to_a[0]["last_value"]
-                    end
+                      seq_values = {}
+                      shared_sequences.each do |seq|
+                        seq_values[seq] = from_connection.exec("select last_value from #{seq}").to_a[0]["last_value"]
+                      end
 
-                    to_connection.exec("TRUNCATE #{table} CASCADE")
-                    to_connection.copy_data "COPY #{table} (#{fields}) FROM STDIN" do
-                      from_connection.copy_data "COPY (SELECT #{copy_fields} FROM #{table}#{where}) TO STDOUT" do
-                        while row = from_connection.get_copy_data
-                          to_connection.put_copy_data(row)
+                      to_connection.exec("TRUNCATE #{table} CASCADE")
+                      to_connection.copy_data "COPY #{table} (#{fields}) FROM STDIN" do
+                        from_connection.copy_data "COPY (SELECT #{copy_fields} FROM #{table}#{where}) TO STDOUT" do
+                          while row = from_connection.get_copy_data
+                            to_connection.put_copy_data(row)
+                          end
                         end
                       end
-                    end
-                    seq_values.each do |seq, value|
-                      to_connection.exec("SELECT setval(#{escape(seq)}, #{escape(value)})")
+                      seq_values.each do |seq, value|
+                        to_connection.exec("SELECT setval(#{escape(seq)}, #{escape(value)})")
+                      end
                     end
                   end
                 end
               end
 
             @mutex.synchronize do
-              puts "* DONE #{table} (#{time.round(1)}s)"
+              log "* DONE #{table} (#{time.round(1)}s)"
             end
           end
 
           time = Time.now - start_time
-          puts "Completed in #{time.round(1)}s"
+          log "Completed in #{time.round(1)}s"
         end
       end
       true
@@ -191,11 +183,11 @@ module PgSync
         # TODO much better name for this option
         o.boolean "--to-safe", "accept danger", default: false
         o.on "-v", "--version", "print the version" do
-          puts PgSync::VERSION
+          log PgSync::VERSION
           exit
         end
         o.on "-h", "--help", "prints help" do
-          puts o
+          log o
           exit
         end
       end
@@ -206,10 +198,14 @@ module PgSync
 
     def config
       @config ||= begin
-        begin
-          YAML.load_file(config_file) || {}
-        rescue Psych::SyntaxError => e
-          raise PgSync::Error, e.message
+        if config_file
+          begin
+            YAML.load_file(config_file) || {}
+          rescue Psych::SyntaxError => e
+            raise PgSync::Error, e.message
+          end
+        else
+          {}
         end
       end
     end
@@ -217,7 +213,7 @@ module PgSync
     def parse_source(source)
       if source && source[0..1] == "$(" && source[-1] == ")"
         command = source[2..-2]
-        # puts "Running #{command}"
+        # log "Running #{command}"
         source = `#{command}`.chomp
         unless $?.success?
           abort "Command exited with non-zero status:\n#{command}"
@@ -231,7 +227,7 @@ module PgSync
         abort "#{config_file} exists."
       else
         FileUtils.cp(File.dirname(__FILE__) + "/../config.yml", config_file)
-        puts "#{config_file} created. Add your database credentials."
+        log "#{config_file} created. Add your database credentials."
       end
     end
 
@@ -256,7 +252,7 @@ module PgSync
         conn.close
       end
     rescue PG::ConnectionBad => e
-      puts
+      log
       abort e.message
     end
 
@@ -352,7 +348,7 @@ module PgSync
     end
 
     def print_uri(prefix, uri)
-      puts "#{prefix}: #{uri.path.sub(/\A\//, '')} on #{uri.host}:#{uri.port}"
+      log "#{prefix}: #{uri.path.sub(/\A\//, '')} on #{uri.host}:#{uri.port}"
     end
 
     def to_url(uri)
@@ -374,10 +370,27 @@ module PgSync
       end
     end
 
+    def config_file
+      return @config_file if instance_variable_get(:@config_file)
+
+      @config_file =
+        search_tree(
+          if @options[:db]
+            db_config_file(@options[:db])
+          else
+            @options[:config] || ".pgsync.yml"
+          end
+        )
+    end
+
     def abort(message)
       raise PgSync::Error, message
     end
 
+    def log(message)
+      $stderr.puts message
+    end
+
     def sequences(conn, table, columns)
       conn.exec("SELECT #{columns.map { |f| "pg_get_serial_sequence(#{escape(table)}, #{escape(f)}) AS #{f}" }.join(", ")}").to_a[0].values.compact
     end

data/lib/pgsync/version.rb

@@ -1,3 +1,3 @@
 module PgSync
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsync
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop