tapsoob 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10ae20ca73c6821c188d7345388336477aa6517e8761d2caefccf1b0df073556
-  data.tar.gz: f36c26256ff6531439a4c1e0f1e93694128157a17b4e9a4d92c98fc45e3e03d0
+  metadata.gz: af1c77e65193e1c885e35d4e0b7e2c28b933f915b9b2ad0d21398fe5fa7abd8c
+  data.tar.gz: 0a286d60df2babfe2282a708fb802d561afa9960ca7e8287030c1e9d9df3500e
 SHA512:
-  metadata.gz: 4d052875c6dc6d045c673b2e8d6505be0823d8a9ec45ed2c47c8ab8cfe9a9b17007cef94db6a05bece6a95900eae992888be12585e906bef8f40eede6bc96848
-  data.tar.gz: 3e3b6d5c73ae96dc28c44777207c6f7a70379e6c9efbbfa6ab241b2324a3f759d1c970e91cb868f06659945498dafbbb4e4f62f14b02cc3a623b0d3a23d7446f
+  metadata.gz: 4fad86e7e1ec643b8d3f3a86ea06a69f2b5878cf20ae0c866f48bbbceae5af09f8d1da55533d875045b6e75470e3bf73be82512db90ef86be931616207c86a30
+  data.tar.gz: e4740da5ddbdbe77248707db361cb825afb9130a6db63a6dd212cad06fc0a266a11f6424503ecec6c676ba41d62f68c9c108a38c8b43109890da15f9512f83ed

data/lib/tapsoob/cli/data_stream.rb

@@ -26,7 +26,7 @@ module Tapsoob
       option :tables, desc: "Shortcut to filter on a list of tables", type: :array, aliases: "-t"
       option :"exclude-tables", desc: "Shortcut to exclude a list of tables", type: :array, aliases: "-e"
       option :progress, desc: "Show progress", default: true, type: :boolean, aliases: "-p"
-      option :purge, desc: "Purge data in tables prior to performing the import", default: false, type: :boolean, aliases: "-p"
+      option :purge, desc: "Purge data in tables prior to performing the import", default: false, type: :boolean
       option :"skip-duplicates", desc: "Remove duplicates when loading data", default: false, type: :boolean
       option :"discard-identity", desc: "Remove identity when pushing data (may result in creating duplicates)", default: false, type: :boolean
       option :debug, desc: "Enable debug messages", default: false, type: :boolean, aliases: "-d"

data/lib/tapsoob/cli/root.rb

@@ -10,8 +10,8 @@ module Tapsoob
   module CLI
     class Root < Thor
       desc "pull DUMP_PATH DATABASE_URL", "Pull a dump from a database to a folder"
-      option :"schema-only", desc: "Don't transfer the data just schema", default: false, type: :boolean
-      option :"skip-schema", desc: "Don't transfer the schema just data", default: false, type: :boolean, aliases: "-s"
+      option :data, desc: "Pull the data to the database", default: true, type: :boolean, aliases: '-d'
+      option :schema, desc: "Pull the schema to the database", default: true, type: :boolean, aliases: "-s"
       option :"indexes-first", desc: "Transfer indexes first before data", default: false, type: :boolean, aliases: "-i"
       option :resume, desc: "Resume a Tapsoob Session from a stored file", type: :string, aliases: "-r"
       option :chunksize, desc: "Initial chunksize", default: 1000, type: :numeric, aliases: "-c"
@@ -19,7 +19,7 @@ module Tapsoob
       option :tables, desc: "Shortcut to filter on a list of tables", type: :array, aliases: "-t"
       option :"exclude-tables", desc: "Shortcut to exclude a list of tables", type: :array, aliases: "-e"
       option :progress, desc: "Show progress", default: true, type: :boolean
-      option :debug, desc: "Enable debug messages", default: false, type: :boolean, aliases: "-d"
+      option :debug, desc: "Enable debug messages", default: false, type: :boolean
       def pull(dump_path, database_url)
         opts = parse_opts(options)
         Tapsoob.log.level = Logger::DEBUG if opts[:debug]
@@ -31,8 +31,8 @@ module Tapsoob
       end
 
       desc "push DUMP_PATH DATABASE_URL", "Push a previously tapsoob dump to a database"
-      option :"schema-only", desc: "Don't transfer the data just schema", default: false, type: :boolean
-      option :"skip-schema", desc: "Don't transfer the schema just data", default: false, type: :boolean, aliases: "-s"
+      option :data, desc: "Push the data to the database", default: true, type: :boolean, aliases: '-d'
+      option :schema, desc: "Push the schema to the database", default: true, type: :boolean, aliases: "-s"
       option :"indexes-first", desc: "Transfer indexes first before data", default: false, type: :boolean, aliases: "-i"
       option :resume, desc: "Resume a Tapsoob Session from a stored file", type: :string, aliases: "-r"
       option :chunksize, desc: "Initial chunksize", default: 1000, type: :numeric, aliases: "-c"
@@ -43,7 +43,7 @@ module Tapsoob
       option :"skip-duplicates", desc: "Remove duplicates when loading data", default: false, type: :boolean
       option :"discard-identity", desc: "Remove identity when pushing data (may result in creating duplicates)", default: false, type: :boolean
       option :progress, desc: "Show progress", default: true, type: :boolean
-      option :debug, desc: "Enable debug messages", default: false, type: :boolean, aliases: "-d"
+      option :debug, desc: "Enable debug messages", default: false, type: :boolean
       def push(dump_path, database_url)
         opts = parse_opts(options)
         Tapsoob.log.level = Logger::DEBUG if opts[:debug]
@@ -69,8 +69,8 @@ module Tapsoob
         def parse_opts(options)
           # Default options
           opts = {
-            schema_only: options[:"schema-only"],
-            skip_schema: options[:"skip-schema"],
+            data: options[:data],
+            data: options[:schema],
             indexes_first: options[:"indexes_first"],
             disable_compression: options[:"disable-compression"],
             tables: options[:tables],

data/lib/tapsoob/operation.rb

@@ -21,12 +21,12 @@ module Tapsoob
       "op"
     end
 
-    def schema_only?
-      !!opts[:schema_only]
+    def data?
+      opts[:data]
     end
 
-    def skip_schema?
-      !!opts[:skip_schema]
+    def schema?
+      opts[:schema]
     end
 
     def indexes_first?
@@ -166,13 +166,13 @@ module Tapsoob
     def run
       catch_errors do
         unless resuming?
-          pull_schema if !skip_schema?
-          pull_indexes if indexes_first? && !skip_schema?
+          pull_schema if schema?
+          pull_indexes if indexes_first? && schema?
         end
         setup_signal_trap
-        pull_partial_data if resuming?
-        pull_data unless schema_only?
-        pull_indexes if !indexes_first? && !skip_schema?
+        pull_partial_data if data? && resuming?
+        pull_data if data?
+        pull_indexes if !indexes_first? && schema?
         pull_reset_sequences
       end
     end
@@ -359,13 +359,13 @@ module Tapsoob
     def run
       catch_errors do
         unless resuming?
-          push_schema if !skip_schema?
-          push_indexes if indexes_first? && !skip_schema?
+          push_schema if schema?
+          push_indexes if indexes_first? && schema?
         end
         setup_signal_trap
-        push_partial_data if resuming?
-        push_data unless schema_only?
-        push_indexes if !indexes_first? && !skip_schema?
+        push_partial_data if data? && resuming?
+        push_data if data?
+        push_indexes if !indexes_first? && schema?
         push_reset_sequences
       end
     end

data/lib/tapsoob/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Tapsoob
-  VERSION = "0.5.2".freeze
+  VERSION = "0.5.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Félix Bellanger