tapsoob 0.5.2 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10ae20ca73c6821c188d7345388336477aa6517e8761d2caefccf1b0df073556
-  data.tar.gz: f36c26256ff6531439a4c1e0f1e93694128157a17b4e9a4d92c98fc45e3e03d0
+  metadata.gz: 2d2ae55167cb75761e58521b0949e1aa580e3f68f74f89de39922a0d8fd6a772
+  data.tar.gz: c74c5c77da207e769a96c5fee90d6a42aac2a121546dfd371030dd786c3442d6
 SHA512:
-  metadata.gz: 4d052875c6dc6d045c673b2e8d6505be0823d8a9ec45ed2c47c8ab8cfe9a9b17007cef94db6a05bece6a95900eae992888be12585e906bef8f40eede6bc96848
-  data.tar.gz: 3e3b6d5c73ae96dc28c44777207c6f7a70379e6c9efbbfa6ab241b2324a3f759d1c970e91cb868f06659945498dafbbb4e4f62f14b02cc3a623b0d3a23d7446f
+  metadata.gz: 65342221b6d64f8e20df8cc67996173f37a7be0859f3fe4d4bfa4a2688fd016852518a233aa4bd3249fa5a725c77687f8816c743962ddf13de53a0ca498ec92a
+  data.tar.gz: 778bf22700739743ebdb80067c673d4c4ca5f545314bab61c1c8a7a88b8c60d7ecda90876e893f43e5d7f45adf410c524dff85365f7fa0079dd1f48b83d19b7b

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],
+            schema: 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.5".freeze
 end

data/lib/tasks/tapsoob.rake

@@ -2,7 +2,7 @@ namespace :tapsoob do
   desc "Pulls a database to your filesystem"
   task :pull => :environment do
     # Default options
-    opts={:default_chunksize => 1000, :debug => false, :resume_filename => nil, :disable_compression => false, :indexes_first => false}
+    opts={:default_chunksize => 1000, :debug => false, :resume_filename => nil, :disable_compression => false, :schema => true, :data => true, :indexes_first => false}
 
     # Get the dump_path
     dump_path = File.expand_path(Rails.root.join("db", Time.now.strftime("%Y%m%d%I%M%S%p"))).to_s
@@ -23,7 +23,7 @@ namespace :tapsoob do
   desc "Push a compatible dump on your filesystem to a database"
   task :push, [:timestamp] => :environment do |t, args|
     # Default options
-    opts={:default_chunksize => 1000, :debug => false, :resume_filename => nil, :disable_compression => false, :indexes_first => false}
+    opts={:default_chunksize => 1000, :debug => false, :resume_filename => nil, :disable_compression => false, :schema => true, :data => true, :indexes_first => false}
 
     # Get the dumps
     dumps = Dir[Rails.root.join("db", "*/")].select { |e| e =~ /([0-9]{14})([A-Z]{2})/ }.sort

data/tapsoob.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.add_dependency "ripl", "~> 0.7.1"
-  s.add_dependency "sequel", "~> 5.37.0"
-  s.add_dependency "thor", "~> 1.0.1"
+  s.add_dependency "sequel", "~> 5.55.0"
+  s.add_dependency "thor", "~> 1.2.1"
 
   if (RUBY_PLATFORM =~ /java/).nil?
     s.add_development_dependency "mysql2",  "~> 0.4.10"
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
     s.platform = 'java'
 
     s.add_dependency "jdbc-mysql",    "~> 5.1.44"
-    s.add_dependency "jdbc-postgres", "~> 42.1.4"
-    s.add_dependency "jdbc-sqlite3",  "~> 3.20.1"
+    s.add_dependency "jdbc-postgres", "~> 42.2.25"
+    s.add_dependency "jdbc-sqlite3",  "~> 3.28.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.5
 platform: ruby
 authors:
 - Félix Bellanger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ripl
@@ -31,28 +31,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.37.0
+        version: 5.55.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.37.0
+        version: 5.55.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement