data_keeper 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0666762022ca90ffac33878de1b342661885b9aeecfdac775a729f3de2b48cc3
-  data.tar.gz: 0c17de29ea41f6023579bd8e8b6bb1e5bf34e682ff934291686d3c5721af02c2
+  metadata.gz: 1f0067051d0aa4c4a42aba134510233f0b8cd9acdbc4fe07a827df4af1fbd48c
+  data.tar.gz: 67bae8fe0fb71d313229da366e47173ff06f0c0ffcf082d4f6743722be66c500
 SHA512:
-  metadata.gz: 6369301be6b94b87e5a8ea26d0e56926d560c9229c3ed7dba6a12e70193324584d7eec1e10ca7f3d02a4de5f5473a2b4fb0a4109094dd7176af5e8f2a5729995
-  data.tar.gz: c6ef2e6e5d521def03e06e3eb8c7113f9a8f61376d6b7d3f3e3d2b26fdc4c8ebc5cfba615d84224517fb5955c15d16e89e6a7a170f21bd6eb751aac810fdc975
+  metadata.gz: 33aa3ca995eef2f037bb4a2dfdfba5dc207d3265eb9a4ccc0568d592ed1ab3f609bd49ad3bc9732283a52814daa443302e125be1ae4219001d9e14f44e7084bf
+  data.tar.gz: 9a6a28ef62cf97960031c9b73d5d02aa942120692155c340dd7b73539d9df5c3695dd981c13bf15a8a6d04afef730f5c2ce1e4dee4c18851218ff8c81faa4e68

data/README.md

@@ -110,6 +110,29 @@ in your current database. It will give you an error if you try to run this in a
 Note when using raw sql, your statement is expected to return all columns for the configured table, in the default
 order (`select *`). This uses pg's COPY from/to for the full table internally. 
 
+## Docker
+
+If you're using pg under docker, you can configure also DataKeeper with the docker pg settings and then this gem
+will use the binaries under that docker container (`psql`, `pg_restore`, etc.).
+
+Since then the commands to execute are ran from within the docker instance, the port will be different
+as the one the rails app uses, so you'll need to configure what's the pg access from the docker container, use:
+
+```
+DataKeeper.docker_config = {
+  instance_name: "pg_my_app",
+  pg_host: "localhost",
+  pg_port: "5432",
+  pg_user: "myapp",
+  pg_password: "myapp"
+}
+```
+
+If the host, or user and password are the same as the ones used from the rails app, you can ignore them.
+If you configure this `docker_config` hash, then data keeper will try to use docker via `docker exec` to 
+run the pg commands.
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/data_keeper/database_config.rb

@@ -5,13 +5,27 @@ module DataKeeper
     end
 
     def psql_env
-      env = { 'PGUSER' => database_connection_config['username'] }
-      env['PGPASSWORD'] = database_connection_config['password'] if database_connection_config['password']
+      env = { 'PGUSER' => username }
+      env['PGPASSWORD'] = password if password
       env
     end
 
+    def docker_env_params
+      psql_env.map do |k, v|
+        "-e #{k}=#{v}"
+      end.join(" ")
+    end
+
+    def username
+      DataKeeper.docker_config[:pg_user] || database_connection_config['username']
+    end
+
+    def password
+      DataKeeper.docker_config[:pg_password] || database_connection_config['password']
+    end
+
     def host
-      database_connection_config['host'] || '127.0.0.1'
+      DataKeeper.docker_config[:pg_host] || database_connection_config['host'] || '127.0.0.1'
     end
 
     def database
@@ -19,12 +33,12 @@ module DataKeeper
     end
 
     def port
-      database_connection_config['port']
+      DataKeeper.docker_config[:pg_port] || database_connection_config['port'] || '5432'
     end
 
     def connection_args
       connection_opts = '--host=:host'
-      connection_opts += ' --port=:port' if database_connection_config['port']
+      connection_opts += ' --port=:port' if port
       connection_opts
     end
   end

data/lib/data_keeper/definition.rb

@@ -37,9 +37,12 @@ module DataKeeper
     end
 
     def evaluate!
-      instance_eval(&@definition_block) if @definition_block
+      @definition ||=
+        begin
+          instance_eval(&@definition_block) if @definition_block
 
-      Definition.new(@type, @tables, @raw_sqls, @on_after_load_block)
+          Definition.new(@type, @tables, @raw_sqls, @on_after_load_block)
+        end
     end
 
     def table(name)

data/lib/data_keeper/loader.rb

@@ -7,9 +7,9 @@ module DataKeeper
     def initialize(dump, file)
       @dump = dump
       @file = file
-      @psql_version = Terrapin::CommandLine.new('psql', '--version').run
-                                           .match(/[0-9]{1,}\.[0-9]{1,}/)
-                                           .to_s.to_f
+      @psql_version = build_terrapin_command('psql', '--version').run
+                                                                 .match(/[0-9]{1,}\.[0-9]{1,}/)
+                                                                 .to_s.to_f
     end
 
     def load!
@@ -35,12 +35,23 @@ module DataKeeper
       end
     end
 
+    def build_terrapin_command(binary, args, docker_args = args)
+      if DataKeeper.docker_config.any?
+        Terrapin::CommandLine.new(
+          'docker',
+          "exec #{docker_env_params} -i #{DataKeeper.docker_config[:instance_name]} #{binary} #{docker_args}"
+        )
+      else
+        Terrapin::CommandLine.new(
+          binary,
+          args,
+          environment: psql_env
+        )
+      end
+    end
+
     def set_ar_internal_metadata!
-      cmd = Terrapin::CommandLine.new(
-        'psql',
-        "#{connection_args} -d :database -c :sql",
-        environment: psql_env
-      )
+      cmd = build_terrapin_command("psql", "#{connection_args} -d :database -c :sql")
 
       cmd.run(
         database: database,
@@ -58,12 +69,10 @@ module DataKeeper
     end
 
     def load_full_database!
-      ensure_schema_compatibility!
-
-      pg_restore = Terrapin::CommandLine.new(
-        'pg_restore',
+      pg_restore = build_terrapin_command(
+        "pg_restore",
         "#{connection_args} -j 4 --no-owner --dbname #{database} #{@file.path}#{log_redirect}",
-        environment: psql_env
+        "#{connection_args} --no-owner --dbname #{database} < #{@file.path}#{log_redirect}"
       )
 
       pg_restore.run(
@@ -79,10 +88,10 @@ module DataKeeper
       ensure_schema_compatibility!
 
       inflate(@file.path) do |schema_path, tables_path, sql_files, sequences_path|
-        pg_restore = Terrapin::CommandLine.new(
-          'pg_restore',
+        pg_restore = build_terrapin_command(
+          "pg_restore",
           "#{connection_args} -j 4 --no-owner -s --dbname :database #{schema_path}#{log_redirect}",
-          environment: psql_env
+          "#{connection_args} --no-owner -s --dbname :database < #{schema_path}#{log_redirect}"
         )
 
         pg_restore.run(
@@ -91,10 +100,10 @@ module DataKeeper
           port: port
         )
 
-        pg_restore = Terrapin::CommandLine.new(
-          'pg_restore',
+        pg_restore = build_terrapin_command(
+          "pg_restore",
           "#{connection_args} --data-only -j 4 --no-owner --disable-triggers --dbname :database #{tables_path}#{log_redirect}",
-          environment: psql_env
+          "#{connection_args} --data-only --no-owner --disable-triggers --dbname :database < #{tables_path}#{log_redirect}"
         )
 
         pg_restore.run(
@@ -104,11 +113,7 @@ module DataKeeper
         )
 
         sql_files.each do |table, csv_path|
-          cmd = Terrapin::CommandLine.new(
-            'psql',
-            "#{connection_args} -d :database -c :command < :csv_path",
-            environment: psql_env
-          )
+          cmd = build_terrapin_command("psql", "#{connection_args} -d :database -c :command < :csv_path")
 
           cmd.run(
             database: database,
@@ -119,10 +124,10 @@ module DataKeeper
           )
         end
 
-        pg_restore = Terrapin::CommandLine.new(
-          'pg_restore',
+        pg_restore = build_terrapin_command(
+          "pg_restore",
           "#{connection_args} --data-only -j 4 --no-owner --disable-triggers --dbname :database #{sequences_path}#{log_redirect}",
-          environment: psql_env
+          "#{connection_args} --data-only --no-owner --disable-triggers --dbname :database < #{sequences_path}#{log_redirect}"
         )
 
         pg_restore.run(
@@ -136,11 +141,7 @@ module DataKeeper
     end
 
     def ensure_schema_compatibility!
-      cmd = Terrapin::CommandLine.new(
-        'psql',
-        "#{connection_args} -d :database -c :command",
-        environment: psql_env
-      )
+      cmd = build_terrapin_command("psql", "#{connection_args} -d :database -c :command")
 
       if @psql_version >= 11.0
         cmd.run(database: database, host: host, port: port, command: "drop schema if exists public")
@@ -207,9 +208,9 @@ module DataKeeper
 
           yield(
             inflated_files.schema_path,
-            inflated_files.tables_path,
-            inflated_files.sql_dumps,
-            inflated_files.sequences_path
+              inflated_files.tables_path,
+              inflated_files.sql_dumps,
+              inflated_files.sequences_path
           )
         end
       end

data/lib/data_keeper/version.rb

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

data/lib/data_keeper.rb

@@ -17,6 +17,7 @@ module DataKeeper
 
   @dump_definition_builders = {}
   @storage = nil
+  @docker_config = {}
   @database_config = -> { Rails.configuration.database_configuration[Rails.env] }
 
   def self.define_dump(name, type = :partial, &block)
@@ -69,6 +70,10 @@ module DataKeeper
     @storage = value
   end
 
+  def self.docker_config=(value)
+    @docker_config = value
+  end
+
   def self.database_config=(value)
     @database_config = value
   end
@@ -77,6 +82,10 @@ module DataKeeper
     @database_config
   end
 
+  def self.docker_config
+    @docker_config
+  end
+
   def self.clear_dumps!
     @dump_definition_builders = {}
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_keeper
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Roger Campos
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -100,7 +100,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/rogercampos/data_keeper
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Easy management of database dumps for dev env
 test_files: []