tapsoob 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9f89e46ef22f2e9408bd4613bd3da2b9c191ca13f3cf76f571a2932a68e8f25
-  data.tar.gz: b21fbaf6196cda1dcb6b9452e4be5e693333d09c48f07b608f5700df55a3cdc3
+  metadata.gz: 2c6a5d0ed2f7a08b6cb726bc5665c2d5a092e55fa68a6ea746127b210c32958c
+  data.tar.gz: cde8aeb717eed72da5b30090ce0d6e3b4771a9a4b01073941560f07d4ddcaa4c
 SHA512:
-  metadata.gz: 11accb2c8934253b8ca96c7ca7fd4e014674af03b43675534239e511941fe40c75b6bea07ae64d055c2bd236ad4ce8e6e5eb1fedf171bec4812511e958fb8ccd
-  data.tar.gz: 66a644912171360147ced4c8f6941cdaff439111f0074d2ea61a59bcabf7c7bb7dc530260e708ed543dd0e007c46059ec30395db292799683696553ebb506f6c
+  metadata.gz: 0dd87ff8b5d2e0d28437b2d6bc315ef52dd6aa87406393aa882573848eacb0fee97207fe7a3d8ce8dc716aa1e0f269eb3f43501b4754a3f95a195add4b4fd34c
+  data.tar.gz: 0deaf4217e61ce5ca09db15b0314135ae45b57482fdb96adabf2e818c0fb64374a1efeb66395421cc44cf4e61ca76f1d11631ebb85facbf61a3285ef5b7734a4

data/bin/tapsoob

@@ -1,191 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'fileutils'
-require 'sequel'
-require 'tempfile'
-require 'thor'
-
 $:.unshift File.dirname(__FILE__) + '/../lib'
-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
+require 'tapsoob/cli'
 
-TapsoobCLI::Root.start(ARGV)
+Tapsoob::CLI::Root.start(ARGV)

data/lib/tapsoob/cli.rb

@@ -0,0 +1,192 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'fileutils'
+require 'sequel'
+require 'tempfile'
+require 'thor'
+
+# tapsoob deps
+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 Tapsoob
+  module CLI
+    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
+end
+

data/lib/tapsoob/utils.rb

@@ -154,10 +154,11 @@ Data : #{data}
       Tapsoob::Schema.load_indexes(database_url, index)
     end
 
-    def schema_bin(*args)
-      bin_path   = File.expand_path("#{File.dirname(__FILE__)}/../../bin/#{bin('tapsoob')}")
+    def schema_bin(command, *args)
+      require 'tapsoob/cli'
       subcommand = "schema"
-      `#{Gem.ruby} -S "#{bin_path}" "#{subcommand}" #{args.map { |a| "'#{a}'" }.join(' ') }`
+      script = Tapsoob::CLI::Schema.new
+      script.invoke(command, args.map { |a| "#{a}" })
     end
 
     def primary_key(db, table)

data/lib/tapsoob/version.rb

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

data/tapsoob.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |s|
   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"
+    s.add_dependency "jdbc-mysql",    "~> 5.1.44"
+    s.add_dependency "jdbc-postgres", "~> 42.1.4"
+    s.add_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.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Félix Bellanger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -97,6 +97,7 @@ files:
 - 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