tapsoob 0.4.21 → 0.4.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6894559fc6e93ef21963e790ec461551355785551906af8b3919c562efe58917
-  data.tar.gz: 01d3b9ae459ae41d598e7146cb7334d3e154fd28e71a617f52ee134bea00ebef
+  metadata.gz: f87d929aa027581755bc0a9cf313fc6532505a99ce68a1537a02539a1bbc4fd9
+  data.tar.gz: ea9242c530789c7175db850b178e7a824e77742c44c04f29731e9e5badb6fb0e
 SHA512:
-  metadata.gz: fc5b9ce215d00c4966aa85e2c9c0d9270197a2bacc1f444b758bc3f7f9b03bfc26ccb250ccf69e0fefbf7db2c31b7b3778790c527607bee6515837f6169825d6
-  data.tar.gz: 780dc83b47bf036f25182bb0e37b1f9f89db9f65a2a9889942eb2ba28fab872118f359e40c5a3abe014d8ec7aedcaa52aafc956e2a2eec8e268783061a6dc7be
+  metadata.gz: feea04845e17624632d56fa5258b8492040bb8078baa0fae7c5f7c0e99e3d4cd3158520d4a84d9aa4e2955e81a5a6a213e350f54b3ff48a820808a9718bb1df5
+  data.tar.gz: 182d6f6df58ff78e1e53e3539a5de2f8ccdec862255bb876b2b8828e890f51b3e4ba7d065fcecbe5d79dddd8c9e6f514b3a56ecdcb2d516d4825cbdcb6cc525b

data/lib/tapsoob/cli/data_stream.rb

@@ -12,7 +12,6 @@ module Tapsoob
     class DataStream < Thor
       desc "pull DATABASE_URL [DUMP_PATH]", "Pull data from a database."
       option :chunksize, desc: "Initial chunksize", default: 1000, type: :numeric, aliases: "-c"
-      option :filter, desc: "Regex Filter for tables", type: :string, aliases: "-f"
       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"
@@ -24,7 +23,6 @@ module Tapsoob
 
       desc "push DATABASE_URL [DUMP_PATH]", "Push data to a database."
       option :chunksize, desc: "Initial chunksize", default: 1000, type: :numeric, aliases: "-c"
-      option :filter, desc: "Regex Filter for tables", type: :string, aliases: "-f"
       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"
@@ -65,6 +63,7 @@ module Tapsoob
           # Default options
           opts = {
             progress: options[:progress],
+            tables: options[:tables],
             debug: options[:debug]
           }
 
@@ -78,15 +77,6 @@ module Tapsoob
             opts[:default_chunksize] = (options[:chunksize] < 10 ? 10 : options[:chunksize])
           end
 
-          # Regex filter
-          opts[:table_filter] = options[:filter] if options[:filter]
-
-          # Table filter
-          if options[:tables]
-            r_tables = options[:tables].collect { |t| "^#{t}" }.join("|")
-            opts[:table_filter] = "#{r_tables}"
-          end
-
           # Exclude tables
           opts[:exclude_tables] = options[:"exclude-tables"] if options[:"exclude-tables"]
 

data/lib/tapsoob/cli/root.rb

@@ -10,12 +10,12 @@ 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 :"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"
       option :"disable-compression", desc: "Disable Compression", default: false, type: :boolean, aliases: "-g"
-      option :filter, desc: "Regex Filter for tables", type: :string, aliases: "-f"
       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 :debug, desc: "Enable debug messages", default: false, type: :boolean, aliases: "-d"
@@ -30,12 +30,12 @@ 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 :"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"
       option :"disable-compression", desc: "Disable Compression", default: false, type: :boolean, aliases: "-g"
-      option :filter, desc: "Regex Filter for tables", type: :string, aliases: "-f"
       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 :purge, desc: "Purge data in tables prior to performing the import", default: false, type: :boolean, aliases: "-p"
@@ -67,9 +67,11 @@ module Tapsoob
         def parse_opts(options)
           # Default options
           opts = {
+            schema_only: options[:"schema-only"],
             skip_schema: options[:"skip-schema"],
             indexes_first: options[:"indexes_first"],
             disable_compression: options[:"disable-compression"],
+            tables: options[:tables],
             debug: options[:debug]
           }
 
@@ -92,15 +94,6 @@ module Tapsoob
             opts[:default_chunksize] = (options[:chunksize] < 10 ? 10 : options[:chunksize])
           end
 
-          # Regex filter
-          opts[:table_filter] = options[:filter] if options[:filter]
-
-          # Table filter
-          if options[:tables]
-            r_tables = options[:tables].collect { |t| "^#{t}" }.join("|")
-            opts[:table_filter] = "#{r_tables}"
-          end
-
           # Exclude tables
           opts[:exclude_tables] = options[:"exclude-tables"] if options[:"exclude-tables"]
 

data/lib/tapsoob/operation.rb

@@ -21,6 +21,10 @@ module Tapsoob
       "op"
     end
 
+    def schema_only?
+      !!opts[:schema_only]
+    end
+
     def skip_schema?
       !!opts[:skip_schema]
     end
@@ -30,7 +34,7 @@ module Tapsoob
     end
 
     def table_filter
-      opts[:table_filter]
+      opts[:tables] || []
     end
 
     def exclude_tables
@@ -38,19 +42,18 @@ module Tapsoob
     end
 
     def apply_table_filter(tables)
-      return tables unless table_filter || exclude_tables
+      return tables if table_filter.empty? && exclude_tables.empty?
 
-      re = table_filter ? Regexp.new(table_filter) : nil
       if tables.kind_of?(Hash)
         ntables = {}
         tables.each do |t, d|
-          if !exclude_tables.include?(t.to_s) && (!re || !re.match(t.to_s).nil?)
+          if !exclude_tables.include?(t.to_s) && (!table_filter.empty? && table_filter.include?(t.to_s))
             ntables[t] = d
           end
         end
         ntables
       else
-        tables.reject { |t| exclude_tables.include?(t.to_s) || (re && re.match(t.to_s).nil?) }
+        tables.reject { |t| exclude_tables.include?(t.to_s) }.select { |t| table_filter.include?(t.to_s) }
       end
     end
 
@@ -168,7 +171,7 @@ module Tapsoob
         end
         setup_signal_trap
         pull_partial_data if resuming?
-        pull_data
+        pull_data unless schema_only?
         pull_indexes if !indexes_first? && !skip_schema?
         pull_reset_sequences
       end
@@ -182,7 +185,7 @@ module Tapsoob
         schema_data = Tapsoob::Schema.dump_table(database_url, table_name)
         log.debug "Table: #{table_name}\n#{schema_data}\n"
         output = Tapsoob::Utils.export_schema(dump_path, table_name, schema_data)
-        puts output if output
+        puts output if dump_path.nil? && output
         progress.inc(1)
       end
       progress.finish
@@ -290,7 +293,7 @@ module Tapsoob
     def pull_indexes
       log.info "Receiving indexes"
 
-      raw_idxs = Tapsoob::Utils.schema_bin(:indexes_individual, database_url)
+      raw_idxs = Tapsoob::Schema.indexes_individual(database_url)
       idxs     = (raw_idxs && raw_idxs.length >= 2 ? JSON.parse(raw_idxs) : {})
 
       apply_table_filter(idxs).each do |table, indexes|
@@ -298,7 +301,7 @@ module Tapsoob
         progress = ProgressBar.new(table, indexes.size)
         indexes.each do |idx|
           output = Tapsoob::Utils.export_indexes(dump_path, table, idx)
-          puts output if output
+          puts output if dump_path.nil? && output
           progress.inc(1)
         end
         progress.finish
@@ -309,7 +312,7 @@ module Tapsoob
       log.info "Resetting sequences"
 
       output = Tapsoob::Utils.schema_bin(:reset_db_sequences, database_url)
-      puts output if output
+      puts output if dump_path.nil? && output
     end
   end
 
@@ -330,7 +333,7 @@ module Tapsoob
         end
         setup_signal_trap
         push_partial_data if resuming?
-        push_data
+        push_data unless schema_only?
         push_indexes if !indexes_first? && !skip_schema?
         push_reset_sequences
       end
@@ -393,7 +396,7 @@ module Tapsoob
       log.info "#{tables.size} tables, #{format_number(record_count)} records"
 
       tables.each do |table_name, count|
-        next unless File.exists?(File.join(dump_path, "data", "#{table_name}.json")) || JSON.parse(File.read(File.join(dump_path, "data", "#{table}.json")))["data"].size == 0
+        next unless File.exists?(File.join(dump_path, "data", "#{table_name}.json")) || File.exists?(File.join(dump_path, "data", "#{table_name}.json")) && JSON.parse(File.read(File.join(dump_path, "data", "#{table_name}.json")))["data"].size == 0
         db[table_name.to_sym].truncate if @opts[:purge]
         stream = Tapsoob::DataStream.factory(db, {
           :table_name => table_name,

data/lib/tapsoob/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.4.21
+  version: 0.4.27
 platform: ruby
 authors:
 - Félix Bellanger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ripl
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Simple tool to import/export databases.