tapsoob 0.1.35 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0514df0bb69707476f8e3ba408967fbbb74e6af6
-  data.tar.gz: 2bb8bc052da152786710e94bef38cdbb65bf089c
+SHA256:
+  metadata.gz: 3e28274d8d5730a830f2f8a1f64a10f4cf5a0973598473a7c2eadaaa93ff88cc
+  data.tar.gz: e01694dfcf507d66cb80edc7855c068898077da06c88a29c61f19d42d6654a65
 SHA512:
-  metadata.gz: b70ce1b460011a223aafcf061af81dd23dc5341545bebcc2fc4c8c662b85521bb05a74747eb3f2edf87731e0eaff95b4bed8d617b6de447393f8ec92083ec200
-  data.tar.gz: 7be56b1c90040d0be6ddb7b38fe1e3c540ef9f4251ce41abaefac0b0aea8f4db01e44ef6eb2fbe039eaf68a7bc374fdda4173c64772048f37adcedbeb8e09e31
+  metadata.gz: 8ed2bd463e75ccbcf9605d41d75551c6ab47bcb0483f809207be1b21a6729cb5f7d86d20fa54f18d47964e34b391228a52ad28e0aa0e05b20fee7a12042665b2
+  data.tar.gz: e09b0e823cd9756d6422e95ee9b416569bc79414c86e8ad5230d450164cf87b9c8458f58f7811a5fa59fdd108106794bf658e7ee6b110b3780b50420cfe1c8ff

data/.gitignore

@@ -1,5 +1,10 @@
 # Ignore dev stuffs
+config/
 coverage/
 db/
+dist/
+lib/java/
 *.dat
 *.gem
+*.lock
+.ruby-version

data/Gemfile

@@ -1,8 +1,43 @@
 source "http://rubygems.org"
 
-# load the gem's dependencies
+# monkey patching to support dual booting
+module Bundler::SharedHelpers
+  def default_lockfile=(path)
+    @default_lockfile = path
+  end
+  def default_lockfile
+    @default_lockfile ||= Pathname.new("#{default_gemfile}.lock")
+  end
+end
+
+module ::Kernel
+  def jruby?
+    !(RUBY_PLATFORM =~ /java/).nil?
+  end
+end
+
+if jruby?
+  Bundler::SharedHelpers.default_lockfile = Pathname.new("#{Bundler::SharedHelpers.default_gemfile}_jruby.lock")
+
+  # Bundler::Dsl.evaluate already called with an incorrect lockfile ... fix it
+  class Bundler::Dsl
+    # A bit messy, this can be called multiple times by bundler, avoid blowing the stack
+    unless self.method_defined? :to_definition_unpatched
+      alias_method :to_definition_unpatched, :to_definition
+    end
+    def to_definition(bad_lockfile, unlock)
+      to_definition_unpatched(Bundler::SharedHelpers.default_lockfile, unlock)
+    end
+  end
+end
+
+# gemspec
 gemspec
 
+group :development do
+  gem 'warbler', '~> 2.0.4', platform: :jruby, require: false
+end
+
 group :test do
   gem 'rspec', '~> 3.2.0'
   gem 'simplecov', '~> 0.9.2'

data/Rakefile

@@ -0,0 +1,4 @@
+unless (RUBY_PLATFORM =~ /java/).nil?
+  require 'warbler'
+  Warbler::Task.new
+end

data/bin/tapsoob

@@ -1,6 +1,191 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
+require 'fileutils'
+require 'sequel'
+require 'tempfile'
+require 'thor'
+
 $:.unshift File.dirname(__FILE__) + '/../lib'
-require 'tapsoob/cli'
+require 'tapsoob/config'
+require 'tapsoob/log'
+require 'tapsoob/operation'
+require 'tapsoob/schema'
+require 'tapsoob/version'
+
+Tapsoob::Config.tapsoob_database_url = ENV['TAPSOOB_DATABASE_URL'] || begin
+  # this is dirty but it solves a weird problem where the tempfile disappears mid-process
+  #require ((RUBY_PLATFORM =~ /java/).nil? ? 'sqlite3' : 'jdbc-sqlite3')
+  $__taps_database = Tempfile.new('tapsoob.db')
+  $__taps_database.open()
+  "sqlite://#{$__taps_database.path}"
+end
+
+module TapsoobCLI
+  class Schema < Thor
+    desc "console DATABASE_URL", "Create an IRB REPL connected to a database"
+    def console(database_url)
+      $db = Sequel.connect(database_url)
+      require 'irb'
+      require 'irb/completion'
+      IRB.start
+    end
+
+    desc "dump DATABASE_URL", "Dump a database using a database URL"
+    def dump(database_url)
+      puts Tapsoob::Schema.dump(database_url)
+    end
+
+    desc "dump_table DATABASE_URL TABLE", "Dump a table from a database using a database URL"
+    def dump_table(database_url, table)
+      puts Tapsoob::Schema.dump_table(database_url, table)
+    end
+
+    desc "indexes DATABASE_URL", "Dump indexes from a database using a database URL"
+    def indexes(database_url)
+      puts Tapsoob::Schema.indexes(database_url)
+    end
+
+    desc "indexes_individual DATABASE_URL", "Dump indexes per table individually using a database URL"
+    def indexes_individual(database_url)
+      puts Tapsoob::Schema.indexes_individual(database_url)
+    end
+
+    desc "reset_db_sequences DATABASE_URL", "Reset database sequences using a database URL"
+    def reset_db_sequences(database_url)
+      Tapsoob::Schema.reset_db_sequences(database_url)
+    end
+
+    desc "load DATABASE_URL FILENAME", "Load a database schema from a file to a database using a database URL"
+    def load(database_url, filename)
+      schema = File.read(filename) rescue help
+      Tapsoob::Schema.load(database_url, schema)
+    end
+
+    desc "load_indexes DATABASE_URL FILENAME", "Load indexes from a file to a database using a database URL"
+    def load_indexes(database_url, filename)
+      indexes = File.read(filename) rescue help
+      Tapsoob::Schema.load_indexes(database_url, indexes)
+    end
+  end
+
+  class Root < Thor
+    desc "pull DUMP_PATH DATABASE_URL", "Pull a dump from a database to a folder"
+    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"
+    def pull(dump_path, database_url)
+      opts = parse_opts(options)
+      Tapsoob.log.level = Logger::DEBUG if opts[:debug]
+      if opts[:resume_filename]
+        clientresumexfer(:pull, dump_path, database_url, opts)
+      else
+        clientxfer(:pull, dump_path, database_url, opts)
+      end
+    end
+
+    desc "push DUMP_PATH DATABASE_URL", "Push a previously tapsoob dump to a database"
+    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"
+    def push(dump_path, database_url)
+      opts = parse_opts(options)
+      Tapsoob.log.level = Logger::DEBUG if opts[:debug]
+      if opts[:resume_filename]
+        clientresumexfer(:push, dump_path, database_url, opts)
+      else
+        clientxfer(:push, dump_path, database_url, opts)
+      end
+    end
+
+    desc "version", "Show tapsoob version"
+    def version
+      puts Tapsoob::VERSION.dup
+    end
+
+    desc "schema SUBCOMMAND ...ARGS", "Direct access to Tapsoob::Schema class methods"
+    subcommand "schema", Schema
+
+    private
+      def parse_opts(options)
+        # Default options
+        opts = {
+          skip_schema: options[:"skip-schema"],
+          indexes_first: options[:"indexes_first"],
+          disable_compression: options[:"disable-compression"],
+          debug: options[:debug]
+        }
+
+        # Resume
+        if options[:resume]
+          if File.exists?(options[:resume])
+            opts[:resume_file] = options[:resume]
+          else
+            raise "Unable to find resume file."
+          end
+        end
+
+        # Default chunksize
+        if options[:chunksize]
+          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"]
+
+        opts
+      end
+
+      def clientxfer(method, dump_path, database_url, opts)
+        Tapsoob::Config.verify_database_url(database_url)
+
+        FileUtils.mkpath "#{dump_path}/schemas"
+        FileUtils.mkpath "#{dump_path}/data"
+        FileUtils.mkpath "#{dump_path}/indexes"
+
+        require 'tapsoob/operation'
+
+        Tapsoob::Operation.factory(method, database_url, dump_path, opts).run
+      end
+
+      def clientresumexfer(method, dump_path, database_url, opts)
+        session = JSON.parse(File.read(opts.delete(:resume_filename)))
+        session.symbolize_recursively!
+
+        dump_path = dump_path || session.delete(:dump_path)
+
+        require 'taps/operation'
+
+        newsession = session.merge({
+          :default_chunksize => opts[:default_chunksize],
+          :disable_compression => opts[:disable_compression],
+          :resume => true
+        })
+
+        Tapsoob::Operation.factory(method, database_url, dump_path, newsession).run
+      end
+  end
+end
 
-Tapsoob::Cli.new(ARGV.dup).run
+TapsoobCLI::Root.start(ARGV)

data/lib/tapsoob.rb

@@ -1,7 +1,4 @@
 # -*- encoding : utf-8 -*-
-$:.unshift File.dirname(__FILE__)
-
-# internal requires
 require 'tapsoob/operation'
 
 module Tapsoob

data/lib/tapsoob/utils.rb

@@ -155,7 +155,7 @@ Data : #{data}
     end
 
     def schema_bin(*args)
-      bin_path = File.expand_path("#{File.dirname(__FILE__)}/../../bin/#{bin('schema')}")
+      bin_path = File.expand_path("#{File.dirname(__FILE__)}/../../bin/#{bin('tapsoob schema')}")
       `#{Gem.ruby} -S "#{bin_path}" #{args.map { |a| "'#{a}'" }.join(' ') }`
     end
 

data/lib/tapsoob/version.rb

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

data/lib/tasks/tapsoob.rake

@@ -71,7 +71,7 @@ namespace :tapsoob do
 
       case connection_config['adapter']
       when "mysql", "mysql2"
-        uri = "#{connection_config['adapter']}://#{connection_config['host']}/#{connection_config['database']}?user=#{connection_config['username']}&password=#{connection_config['password']}"
+        uri = "mysql://#{connection_config['host']}/#{connection_config['database']}?user=#{connection_config['username']}&password=#{connection_config['password']}"
       when "postgresql", "postgres", "pg"
         uri = "://#{connection_config['host']}/#{connection_config['database']}?user=#{connection_config['username']}&password=#{connection_config['password']}"
         uri = ((RUBY_PLATFORM =~ /java/).nil? ? "postgres" : "postgresql") + uri

data/tapsoob.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "tapsoob/version"
+require "./lib/tapsoob/version" unless defined? Tapsoob::VERSION
 
 Gem::Specification.new do |s|
   # Metadata
@@ -17,13 +16,22 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.bindir        = 'bin'
   s.require_paths = ["lib"]
 
   # Dependencies
   s.add_dependency "sequel", "~> 5.0.0"
+  s.add_dependency "thor", "~> 0.20.0"
 
-  s.add_development_dependency "mysql",   "~> 2.9.1"
-  s.add_development_dependency "mysql2",  "~> 0.4.2"
-  s.add_development_dependency "pg",      "~> 0.18.4"
-  s.add_development_dependency "sqlite3", "~> 1.3.11"
+  if (RUBY_PLATFORM =~ /java/).nil?
+    s.add_development_dependency "mysql2",  "~> 0.4.10"
+    s.add_development_dependency "pg",      "~> 1.0.0"
+    s.add_development_dependency "sqlite3", "~> 1.3.11"
+  else
+    s.platform = 'java'
+
+    s.add_development_dependency "jdbc-mysql",    "~> 5.1.44"
+    s.add_development_dependency "jdbc-postgres", "~> 42.1.4"
+    s.add_development_dependency "jdbc-sqlite3",  "~> 3.20.1"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.2.1
 platform: ruby
 authors:
 - Félix Bellanger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -26,47 +26,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: mysql
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.1
-  type: :development
+        version: 0.20.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.10
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,6 @@ description: Simple tool to import/export databases inspired by taps but OOB, me
   databases are imported/exported from the filesystem.
 email: felix.bellanger@faveod.com
 executables:
-- schema
 - tapsoob
 extensions: []
 extra_rdoc_files: []
@@ -93,14 +92,11 @@ files:
 - ".gitignore"
 - ".rspec"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
-- bin/schema
 - bin/tapsoob
 - lib/tapsoob.rb
 - lib/tapsoob/chunksize.rb
-- lib/tapsoob/cli.rb
 - lib/tapsoob/config.rb
 - lib/tapsoob/data_stream.rb
 - lib/tapsoob/errors.rb
@@ -136,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Simple tool to import/export databases.

data/Gemfile.lock

@@ -1,50 +0,0 @@
-PATH
-  remote: .
-  specs:
-    tapsoob (0.1.26)
-      sequel (~> 4.30.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    multi_json (1.11.0)
-    mysql (2.9.1)
-    mysql2 (0.4.2)
-    pg (0.18.4)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    sequel (4.30.0)
-    simplecov (0.9.2)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
-    sqlite3 (1.3.11)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  mysql (~> 2.9.1)
-  mysql2 (~> 0.4.2)
-  pg (~> 0.18.4)
-  rspec (~> 3.2.0)
-  simplecov (~> 0.9.2)
-  sqlite3 (~> 1.3.11)
-  tapsoob!
-
-BUNDLED WITH
-   1.11.2

data/bin/schema

@@ -1,54 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'sequel'
-
-$:.unshift File.dirname(__FILE__) + '/../lib'
-
-require 'tapsoob/schema'
-
-cmd = ARGV.shift.strip rescue ''
-database_url = ARGV.shift.strip rescue ''
-
-def show_usage_and_exit
-  puts <<EOTXT
-  schema console <database_url>
-  schema dump <database_url>
-  schema dump_table <database_url> <table>
-  schema indexes <database_url>
-  schema indexes_individual <database_url>
-  schema reset_db_sequences <database_url>
-  schema load <database_url> <schema_file>
-  schema load_indexes <database_url> <indexes_file>
-EOTXT
-  exit(1)
-end
-
-case cmd
-when 'dump'
-  puts Tapsoob::Schema.dump(database_url)
-when 'dump_table'
-  table = ARGV.shift.strip
-  puts Tapsoob::Schema.dump_table(database_url, table)
-when 'indexes'
-  puts Tapsoob::Schema.indexes(database_url)
-when 'indexes_individual'
-  puts Tapsoob::Schema.indexes_individual(database_url)
-when 'load_indexes'
-  filename = ARGV.shift.strip rescue ''
-  indexes = File.read(filename) rescue show_usage_and_exit
-  Tapsoob::Schema.load_indexes(database_url, indexes)
-when 'load'
-  filename = ARGV.shift.strip rescue ''
-  schema = File.read(filename) rescue show_usage_and_exit
-  Tapsoob::Schema.load(database_url, schema)
-when 'reset_db_sequences'
-  Tapsoob::Schema.reset_db_sequences(database_url)
-when 'console'
-  $db = Sequel.connect(database_url)
-  require 'irb'
-  require 'irb/completion'
-  IRB.start
-else
-  show_usage_and_exit
-end

data/lib/tapsoob/cli.rb

@@ -1,145 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'fileutils'
-require 'optparse'
-require 'tempfile'
-require 'tapsoob/config'
-require 'tapsoob/log'
-
-Tapsoob::Config.tapsoob_database_url = ENV['TAPSOOB_DATABASE_URL'] || begin
-  # this is dirty but it solves a weird problem where the tempfile disappears mid-process
-  require 'sqlite3'
-  $__taps_database = Tempfile.new('tapsoob.db')
-  $__taps_database.open()
-  "sqlite://#{$__taps_database.path}"
-end
-
-module Tapsoob
-  class Cli
-    attr_accessor :argv
-
-    def initialize(argv)
-      @argv = argv
-    end
-
-    def run
-      method = (argv.shift || 'help').to_sym
-      if [:pull, :push, :version].include? method
-        send(method)
-      else
-        help
-      end
-    end
-
-    def pull
-      opts = clientoptparse(:pull)
-      Tapsoob.log.level = Logger::DEBUG if opts[:debug]
-      if opts[:resume_filename]
-        clientresumexfer(:pull, opts)
-      else
-        clientxfer(:pull, opts)
-      end
-    end
-
-    def push
-      opts = clientoptparse(:push)
-      Tapsoob.log.level = Logger::DEBUG if opts[:debug]
-      if opts[:resume_filename]
-        clientresumexfer(:push, opts)
-      else
-        clientxfer(:push, opts)
-      end
-    end
-
-    def version
-      puts Tapsoob.version
-    end
-
-    def help
-      puts <<EOHELP
-Options
-=======
-pull      Pull a database and export it into a directory
-push      Push a database from a directory
-version   Tapsoob version
-
-Add '-h' to any command to see their usage
-EOHELP
-    end
-
-    def clientoptparse(cmd)
-      opts={:default_chunksize => 1000, :database_url => nil, :dump_path => nil, :debug => false, :resume_filename => nil, :disable_compression => false, :indexes_first => false}
-      OptionParser.new do |o|
-        o.banner = "Usage: #{File.basename($0)} #{cmd} [OPTIONS] <dump_path> <database_url>"
-
-        case cmd
-        when :pull
-          o.define_head "Pull a database and export it into a directory"
-        when :push
-          o.define_head "Push a database from a directory"
-        end
-
-        o.on("-s", "--skip-schema", "Don't transfer the schema just data") { |v| opts[:skip_schema] = true }
-        o.on("-i", "--indexes-first", "Transfer indexes first before data") { |v| opts[:indexes_first] = true }
-        o.on("-r", "--resume=file", "Resume a Tapsoob Session from a stored file") { |v| opts[:resume_filename] = v }
-        o.on("-c", "--chunksize=N", "Initial Chunksize") { |v| opts[:default_chunksize] = (v.to_i < 10 ? 10 : v.to_i) }
-        o.on("-g", "--disable-compression", "Disable Compression") { |v| opts[:disable_compression] = true }
-        o.on("-f", "--filter=regex", "Regex Filter for tables") { |v| opts[:table_filter] = v }
-        o.on("-t", "--tables=A,B,C", Array, "Shortcut to filter on a list of tables") do |v|
-          r_tables = v.collect { |t| "^#{t}" }.join("|")
-          opts[:table_filter] = "#{r_tables}"
-        end
-        o.on("-e", "--exclude-tables=A,B,C", Array, "Shortcut to exclude a list of tables") { |v| opts[:exclude_tables] = v }
-        o.on("-d", "--debug", "Enable Debug Messages") { |v| opts[:debug] = true }
-
-        opts[:dump_path] = argv.shift
-        opts[:database_url] = argv.shift
-
-        if opts[:database_url].nil?
-          $stderr.puts "Missing Database URL"
-          puts o
-          exit 1
-        end
-        if opts[:dump_path].nil?
-          $stderr.puts "Missing Tapsoob Dump Path"
-          puts o
-          exist 1
-        end
-      end
-
-      opts
-    end
-
-    def clientxfer(method, opts)
-      database_url = opts.delete(:database_url)
-      dump_path = opts.delete(:dump_path)
-
-      Tapsoob::Config.verify_database_url(database_url)
-
-      FileUtils.mkpath "#{dump_path}/schemas"
-      FileUtils.mkpath "#{dump_path}/data"
-      FileUtils.mkpath "#{dump_path}/indexes"
-
-      require 'tapsoob/operation'
-
-      Tapsoob::Operation.factory(method, database_url, dump_path, opts).run
-    end
-
-    def clientresumexfer(method, opts)
-      session = JSON.parse(File.read(opts.delete(:resume_filename)))
-      session.symbolize_recursively!
-
-      database_url = opts.delete(:database_url)
-      dump_path = opts.delete(:dump_path) || session.delete(:dump_path)
-
-      require 'taps/operation'
-
-      newsession = session.merge({
-        :default_chunksize => opts[:default_chunksize],
-        :disable_compression => opts[:disable_compression],
-        :resume => true
-      })
-
-      Tapsoob::Operation.factory(method, database_url, dump_path, newsession).run
-    end
-  end
-end