data_keeper 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f0067051d0aa4c4a42aba134510233f0b8cd9acdbc4fe07a827df4af1fbd48c
-  data.tar.gz: 67bae8fe0fb71d313229da366e47173ff06f0c0ffcf082d4f6743722be66c500
+  metadata.gz: 1ea02e8856f7dbdcc74cd8c82a57893d792a6a2aeb5c6963258d06b8707e9a2b
+  data.tar.gz: a6dbcdc1d8266d8a554ab6b7b1650dad9b810b5f91f8be3da1f157a877e537e9
 SHA512:
-  metadata.gz: 33aa3ca995eef2f037bb4a2dfdfba5dc207d3265eb9a4ccc0568d592ed1ab3f609bd49ad3bc9732283a52814daa443302e125be1ae4219001d9e14f44e7084bf
-  data.tar.gz: 9a6a28ef62cf97960031c9b73d5d02aa942120692155c340dd7b73539d9df5c3695dd981c13bf15a8a6d04afef730f5c2ce1e4dee4c18851218ff8c81faa4e68
+  metadata.gz: cb567b6fd35e1c68f051ee3b06e712dd9ed17e9895362ac7f025940b74cff0973255b51d95cd1effb91a67a7bd92188e50a30a07bc77e1f354008fbeab9f1d39
+  data.tar.gz: eab10951b2cf77197c6d360d2676726ea01ddfc9c6696647e96806724d7cdaf370e33f046fbc2620ee1753b7ad697200e28d932ec45bb550bbd19a655f9b5f1b

data/lib/data_keeper/database_config.rb

@@ -10,12 +10,26 @@ module DataKeeper
       env
     end
 
+    def dumper_psql_env
+      env = { 'PGUSER' => server_username }
+      env['PGPASSWORD'] = server_password if server_password
+      env
+    end
+
     def docker_env_params
       psql_env.map do |k, v|
         "-e #{k}=#{v}"
       end.join(" ")
     end
 
+    def server_username
+      database_connection_config['username']
+    end
+
+    def server_password
+      database_connection_config['password']
+    end
+
     def username
       DataKeeper.docker_config[:pg_user] || database_connection_config['username']
     end
@@ -36,10 +50,20 @@ module DataKeeper
       DataKeeper.docker_config[:pg_port] || database_connection_config['port'] || '5432'
     end
 
+    def server_port
+      database_connection_config['port'] || '5432'
+    end
+
     def connection_args
       connection_opts = '--host=:host'
       connection_opts += ' --port=:port' if port
       connection_opts
     end
+
+    def dumper_connection_args
+      connection_opts = '--host=:host'
+      connection_opts += ' --port=:port' if server_port
+      connection_opts
+    end
   end
 end

data/lib/data_keeper/dumper.rb

@@ -24,8 +24,8 @@ module DataKeeper
       Tempfile.create do |file|
         cmd = Terrapin::CommandLine.new(
           'pg_dump',
-          "#{connection_args} -x -Fc :database > :output_path",
-          environment: psql_env
+          "#{dumper_connection_args} -x -Fc :database > :output_path",
+          environment: dumper_psql_env
         )
 
         cmd.run(
@@ -61,8 +61,8 @@ module DataKeeper
         Tempfile.create do |table_file|
           cmd = Terrapin::CommandLine.new(
             'psql',
-            "#{connection_args} -d :database -c :command > #{table_file.path}",
-            environment: psql_env
+            "#{dumper_connection_args} -d :database -c :command > #{table_file.path}",
+            environment: dumper_psql_env
           )
 
           cmd.run(
@@ -89,8 +89,8 @@ module DataKeeper
         table_args = @definition.full_tables_to_export.map { |table| "-t #{table}" }.join(' ')
         cmd = Terrapin::CommandLine.new(
           'pg_dump',
-          "#{connection_args} -x -Fc :database #{table_args} > :output_path",
-          environment: psql_env
+          "#{dumper_connection_args} -x -Fc :database #{table_args} > :output_path",
+          environment: dumper_psql_env
         )
 
         cmd.run(
@@ -116,8 +116,8 @@ module DataKeeper
 
         cmd = Terrapin::CommandLine.new(
           'pg_dump',
-          "#{connection_args} -x --schema-only -Fc :database > :output_path",
-          environment: psql_env
+          "#{dumper_connection_args} -x --schema-only -Fc :database > :output_path",
+          environment: dumper_psql_env
         )
 
         cmd.run(
@@ -144,8 +144,8 @@ module DataKeeper
         sequences_args = all_sequences_to_export.map { |table| "-t #{table}" }.join(' ')
         cmd = Terrapin::CommandLine.new(
           'pg_dump',
-          "#{connection_args} -x -Fc :database #{sequences_args} > :output_path",
-          environment: psql_env
+          "#{dumper_connection_args} -x -Fc :database #{sequences_args} > :output_path",
+          environment: dumper_psql_env
         )
 
         cmd.run(database: database, host: host, port: port, output_path: sequences_dump_file.path)
@@ -167,8 +167,8 @@ module DataKeeper
     def all_sequences_to_export
       cmd = Terrapin::CommandLine.new(
         'psql',
-        "#{connection_args} -d :database -c :sql -A -R ',' -t",
-        environment: psql_env
+        "#{dumper_connection_args} -d :database -c :sql -A -R ',' -t",
+        environment: dumper_psql_env
       )
 
       sequences = cmd.run(

data/lib/data_keeper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_keeper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Roger Campos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord