taps 0.3.11 → 0.3.12

data/Rakefile

@@ -13,7 +13,7 @@ begin
     s.add_dependency 'json_pure', '>= 1.2.0', '< 1.5.0'
     s.add_dependency 'sinatra', '~> 1.0.0'
     s.add_dependency 'rest-client', '~> 1.4.0'
-    s.add_dependency 'sequel', '~> 3.13.0'
+    s.add_dependency 'sequel', '~> 3.15.0'
     s.add_dependency 'sqlite3-ruby', '~> 1.2'
     s.add_dependency 'rack', '>= 1.0.1'
 
@@ -65,8 +65,8 @@ end
 
 desc "copy/paste env vars for dev testing"
 task :env do
-	puts "export RUBYLIB='#{File.dirname(__FILE__) + '/lib'}'"
-	puts "export RUBYOPT='-rrubygems'"
+  puts "export RUBYLIB='#{File.dirname(__FILE__) + '/lib'}'"
+  puts "export RUBYOPT='-rrubygems'"
 end
 
 task :default => :spec

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :minor: 3
-:patch: 11
+:patch: 12
 :major: 0

data/bin/schema

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-gem 'sequel', '~> 3.13.0'
+gem 'sequel', '~> 3.15.0'
 
 $:.unshift File.dirname(__FILE__) + '/../lib'
 
@@ -11,44 +11,44 @@ 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>
+  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)
+  exit(1)
 end
 
 case cmd
 when 'dump'
-	puts Taps::Schema.dump(database_url)
+  puts Taps::Schema.dump(database_url)
 when 'dump_table'
-	table = ARGV.shift.strip
-	puts Taps::Schema.dump_table(database_url, table)
+  table = ARGV.shift.strip
+  puts Taps::Schema.dump_table(database_url, table)
 when 'indexes'
-	puts Taps::Schema.indexes(database_url)
+  puts Taps::Schema.indexes(database_url)
 when 'indexes_individual'
-	puts Taps::Schema.indexes_individual(database_url)
+  puts Taps::Schema.indexes_individual(database_url)
 when 'load_indexes'
-	filename = ARGV.shift.strip rescue ''
-	indexes = File.read(filename) rescue show_usage_and_exit
-	Taps::Schema.load_indexes(database_url, indexes)
+  filename = ARGV.shift.strip rescue ''
+  indexes = File.read(filename) rescue show_usage_and_exit
+  Taps::Schema.load_indexes(database_url, indexes)
 when 'load'
-	filename = ARGV.shift.strip rescue ''
-	schema = File.read(filename) rescue show_usage_and_exit
-	Taps::Schema.load(database_url, schema)
+  filename = ARGV.shift.strip rescue ''
+  schema = File.read(filename) rescue show_usage_and_exit
+  Taps::Schema.load(database_url, schema)
 when 'reset_db_sequences'
-	Taps::Schema.reset_db_sequences(database_url)
+  Taps::Schema.reset_db_sequences(database_url)
 when 'console'
-	$db = Sequel.connect(database_url)
-	require 'irb'
-	require 'irb/completion'
-	IRB.start
+  $db = Sequel.connect(database_url)
+  require 'irb'
+  require 'irb/completion'
+  IRB.start
 else
-	show_usage_and_exit
+  show_usage_and_exit
 end

data/lib/taps/cli.rb

@@ -5,68 +5,73 @@ require 'taps/monkey'
 require 'taps/config'
 require 'taps/log'
 
-Taps::Config.taps_database_url = ENV['TAPS_DATABASE_URL'] || "sqlite://#{Tempfile.new('taps.db').path}"
+Taps::Config.taps_database_url = ENV['TAPS_DATABASE_URL'] || begin
+  # this is dirty but it solves a weird problem where the tempfile disappears mid-process
+  $__taps_database = Tempfile.new('taps.db')
+  $__taps_database.open()
+  "sqlite://#{$__taps_database.path}"
+end
 
 module Taps
 class Cli
-	attr_accessor :argv
-
-	def initialize(argv)
-		@argv = argv
-	end
-
-	def run
-		method = (argv.shift || 'help').to_sym
-		if [:pull, :push, :server, :version].include? method
-			send(method)
-		else
-			help
-		end
-	end
-
-	def pull
-		opts = clientoptparse(:pull)
-		Taps.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)
-		Taps.log.level = Logger::DEBUG if opts[:debug]
-		if opts[:resume_filename]
-			clientresumexfer(:push, opts)
-		else
-			clientxfer(:push, opts)
-		end
-	end
-
-	def server
-		opts = serveroptparse
-		Taps.log.level = Logger::DEBUG if opts[:debug]
-		Taps::Config.database_url = opts[:database_url]
-		Taps::Config.login = opts[:login]
-		Taps::Config.password = opts[:password]
-
-		Taps::Config.verify_database_url
-		require 'taps/server'
-		Taps::Server.run!({
-			:port => opts[:port],
-			:environment => :production,
-			:logging => true,
-			:dump_errors => true,
-		})
-	end
-
-	def version
-		puts Taps.version
-	end
-
-	def help
-		puts <<EOHELP
+  attr_accessor :argv
+
+  def initialize(argv)
+    @argv = argv
+  end
+
+  def run
+    method = (argv.shift || 'help').to_sym
+    if [:pull, :push, :server, :version].include? method
+      send(method)
+    else
+      help
+    end
+  end
+
+  def pull
+    opts = clientoptparse(:pull)
+    Taps.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)
+    Taps.log.level = Logger::DEBUG if opts[:debug]
+    if opts[:resume_filename]
+      clientresumexfer(:push, opts)
+    else
+      clientxfer(:push, opts)
+    end
+  end
+
+  def server
+    opts = serveroptparse
+    Taps.log.level = Logger::DEBUG if opts[:debug]
+    Taps::Config.database_url = opts[:database_url]
+    Taps::Config.login = opts[:login]
+    Taps::Config.password = opts[:password]
+
+    Taps::Config.verify_database_url
+    require 'taps/server'
+    Taps::Server.run!({
+      :port => opts[:port],
+      :environment => :production,
+      :logging => true,
+      :dump_errors => true,
+    })
+  end
+
+  def version
+    puts Taps.version
+  end
+
+  def help
+    puts <<EOHELP
 Options
 =======
 server    Start a taps database import/export server
@@ -76,113 +81,113 @@ version   Taps version
 
 Add '-h' to any command to see their usage
 EOHELP
-	end
-
-	def serveroptparse
-		opts={:port => 5000, :database_url => nil, :login => nil, :password => nil, :debug => false}
-		OptionParser.new do |o|
-			o.banner = "Usage: #{File.basename($0)} server [OPTIONS] <local_database_url> <login> <password>"
-			o.define_head "Start a taps database import/export server"
-
-			o.on("-p", "--port=N", "Server Port") { |v| opts[:port] = v.to_i if v.to_i > 0 }
-			o.on("-d", "--debug", "Enable Debug Messages") { |v| opts[:debug] = true }
-			o.parse!(argv)
-
-			opts[:database_url] = argv.shift
-			opts[:login] = argv.shift
-			opts[:password] = argv.shift
-
-			if opts[:database_url].nil?
-				$stderr.puts "Missing Database URL"
-				puts o
-				exit 1
-			end
-			if opts[:login].nil?
-				$stderr.puts "Missing Login"
-				puts o
-				exit 1
-			end
-			if opts[:password].nil?
-				$stderr.puts "Missing Password"
-				puts o
-				exit 1
-			end
-		end
-		opts
-	end
-
-	def clientoptparse(cmd)
-		opts={:default_chunksize => 1000, :database_url => nil, :remote_url => nil, :debug => false, :resume_filename => nil, :disable_compresion => false, :indexes_first => false}
-		OptionParser.new do |o|
-			o.banner = "Usage: #{File.basename($0)} #{cmd} [OPTIONS] <local_database_url> <remote_url>"
-
-			case cmd
-			when :pull
-				o.define_head "Pull a database from a taps server"
-			when :push
-				o.define_head "Push a database to a taps server"
-			end
-
-			o.on("-i", "--indexes-first", "Transfer indexes first before data") { |v| opts[:indexes_first] = true }
-			o.on("-r", "--resume=file", "Resume a Taps 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("-d", "--debug", "Enable Debug Messages") { |v| opts[:debug] = true }
-			o.parse!(argv)
-
-			opts[:database_url] = argv.shift
-			opts[:remote_url] = argv.shift
-
-			if opts[:database_url].nil?
-				$stderr.puts "Missing Database URL"
-				puts o
-				exit 1
-			end
-			if opts[:remote_url].nil?
-				$stderr.puts "Missing Remote Taps URL"
-				puts o
-				exit 1
-			end
-		end
-
-		opts
-	end
-
-	def clientxfer(method, opts)
-		database_url = opts.delete(:database_url)
-		remote_url = opts.delete(:remote_url)
-
-		Taps::Config.verify_database_url(database_url)
-
-		require 'taps/operation'
-
-		Taps::Operation.factory(method, database_url, remote_url, 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)
-		remote_url = opts.delete(:remote_url) || session.delete(:remote_url)
-
-		Taps::Config.verify_database_url(database_url)
-
-		require 'taps/operation'
-
-		newsession = session.merge({
-			:default_chunksize => opts[:default_chunksize],
-			:disable_compression => opts[:disable_compression],
-			:resume => true,
-		})
-
-		Taps::Operation.factory(method, database_url, remote_url, newsession).run
-	end
+  end
+
+  def serveroptparse
+    opts={:port => 5000, :database_url => nil, :login => nil, :password => nil, :debug => false}
+    OptionParser.new do |o|
+      o.banner = "Usage: #{File.basename($0)} server [OPTIONS] <local_database_url> <login> <password>"
+      o.define_head "Start a taps database import/export server"
+
+      o.on("-p", "--port=N", "Server Port") { |v| opts[:port] = v.to_i if v.to_i > 0 }
+      o.on("-d", "--debug", "Enable Debug Messages") { |v| opts[:debug] = true }
+      o.parse!(argv)
+
+      opts[:database_url] = argv.shift
+      opts[:login] = argv.shift
+      opts[:password] = argv.shift
+
+      if opts[:database_url].nil?
+        $stderr.puts "Missing Database URL"
+        puts o
+        exit 1
+      end
+      if opts[:login].nil?
+        $stderr.puts "Missing Login"
+        puts o
+        exit 1
+      end
+      if opts[:password].nil?
+        $stderr.puts "Missing Password"
+        puts o
+        exit 1
+      end
+    end
+    opts
+  end
+
+  def clientoptparse(cmd)
+    opts={:default_chunksize => 1000, :database_url => nil, :remote_url => nil, :debug => false, :resume_filename => nil, :disable_compresion => false, :indexes_first => false}
+    OptionParser.new do |o|
+      o.banner = "Usage: #{File.basename($0)} #{cmd} [OPTIONS] <local_database_url> <remote_url>"
+
+      case cmd
+      when :pull
+        o.define_head "Pull a database from a taps server"
+      when :push
+        o.define_head "Push a database to a taps server"
+      end
+
+      o.on("-i", "--indexes-first", "Transfer indexes first before data") { |v| opts[:indexes_first] = true }
+      o.on("-r", "--resume=file", "Resume a Taps 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("-d", "--debug", "Enable Debug Messages") { |v| opts[:debug] = true }
+      o.parse!(argv)
+
+      opts[:database_url] = argv.shift
+      opts[:remote_url] = argv.shift
+
+      if opts[:database_url].nil?
+        $stderr.puts "Missing Database URL"
+        puts o
+        exit 1
+      end
+      if opts[:remote_url].nil?
+        $stderr.puts "Missing Remote Taps URL"
+        puts o
+        exit 1
+      end
+    end
+
+    opts
+  end
+
+  def clientxfer(method, opts)
+    database_url = opts.delete(:database_url)
+    remote_url = opts.delete(:remote_url)
+
+    Taps::Config.verify_database_url(database_url)
+
+    require 'taps/operation'
+
+    Taps::Operation.factory(method, database_url, remote_url, 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)
+    remote_url = opts.delete(:remote_url) || session.delete(:remote_url)
+
+    Taps::Config.verify_database_url(database_url)
+
+    require 'taps/operation'
+
+    newsession = session.merge({
+      :default_chunksize => opts[:default_chunksize],
+      :disable_compression => opts[:disable_compression],
+      :resume => true,
+    })
+
+    Taps::Operation.factory(method, database_url, remote_url, newsession).run
+  end
 
 end
 end