taps 0.2.16 → 0.2.17

data/Rakefile

@@ -8,11 +8,11 @@ begin
     s.description = "A simple database agnostic import/export app to transfer data to/from a remote database."
     s.authors = ["Ricardo Chimal, Jr.", "Adam Wiggins"]
 
-    s.add_dependency 'sinatra', '~> 0.9.0'
+    s.add_dependency 'sinatra', '= 0.9.2'
     s.add_dependency 'activerecord', '= 2.2.2'
     s.add_dependency 'thor', '= 0.9.9'
     s.add_dependency 'rest-client', '~> 0.9.0'
-    s.add_dependency 'sequel', '~> 2.11.0'
+    s.add_dependency 'sequel', '>= 3.0.0', '< 3.1.0'
     s.add_dependency 'sqlite3-ruby', '~> 1.2.0'
 
     s.rubyforge_project = "taps"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 16
+:patch: 17
 :major: 0
 :minor: 2

data/bin/taps

@@ -4,8 +4,8 @@ require 'rubygems'
 gem 'activerecord', '= 2.2.2'
 gem 'thor', '= 0.9.9'
 gem 'rest-client', '~> 0.9.0'
-gem 'sinatra', '~> 0.9.0'
-gem 'sequel', '~> 2.11.0'
+gem 'sinatra', '= 0.9.2'
+gem 'sequel', '>= 3.0.0', '< 3.1.0'
 gem 'sqlite3-ruby', '~> 1.2.0'
 
 require File.dirname(__FILE__) + '/../lib/taps/cli'

data/lib/taps/client_session.rb

@@ -90,14 +90,14 @@ class ClientSession
 	def cmd_send_indexes
 		puts "Sending indexes"
 
-		index_data = `#{File.dirname(__FILE__)}/../../bin/schema indexes #{database_url}`
+		index_data = Taps::Utils.schema_bin(:indexes, database_url)
 		session_resource['indexes'].post(index_data, http_headers)
 	end
 
 	def cmd_send_schema
 		puts "Sending schema"
 
-		schema_data = `#{File.dirname(__FILE__)}/../../bin/schema dump #{database_url}`
+		schema_data = Taps::Utils.schema_bin(:dump, database_url)
 		session_resource['schema'].post(schema_data, http_headers)
 	end
 
@@ -209,7 +209,7 @@ class ClientSession
 				end
 				break if rows == { }
 
-				table.multi_insert(rows[:header], rows[:data])
+				table.import(rows[:header], rows[:data])
 
 				progress.inc(rows[:data].size)
 				offset += rows[:data].size
@@ -274,7 +274,7 @@ class ClientSession
 	def cmd_reset_sequences
 		puts "Resetting sequences"
 
-		output = `#{File.dirname(__FILE__)}/../../bin/schema reset_db_sequences #{database_url}`
+		output = Taps::Utils.schema_bin(:reset_db_sequences, database_url)
 		puts output if output
 	end
 

data/lib/taps/db_session.rb

@@ -3,6 +3,7 @@ require 'thread'
 Sequel::Model.db = Sequel.connect(Taps::Config.taps_database_url)
 
 class DbSession < Sequel::Model
+	plugin :schema
 	set_schema do
 		primary_key :id
 		text :key

data/lib/taps/server.rb

@@ -45,7 +45,7 @@ class Server < Sinatra::Default
 
 		db = session.connection
 		table = db[params[:table].to_sym]
-		table.multi_insert(rows[:header], rows[:data])
+		table.import(rows[:header], rows[:data])
 
 		"#{rows[:data].size}"
 	end
@@ -55,7 +55,7 @@ class Server < Sinatra::Default
 		halt 404 unless session
 
 		schema_app = File.dirname(__FILE__) + '/../../bin/schema'
-		`#{schema_app} reset_db_sequences #{session.database_url}`
+		Taps::Utils.schema_bin(:reset_db_sequences, session.database_url)
 	end
 
 	post '/sessions/:key/schema' do
@@ -79,7 +79,7 @@ class Server < Sinatra::Default
 		halt 404 unless session
 
 		schema_app = File.dirname(__FILE__) + '/../../bin/schema'
-		`#{schema_app} dump #{session.database_url}`
+		Taps::Utils.schema_bin(:dump, session.database_url)
 	end
 
 	get '/sessions/:key/indexes' do
@@ -87,7 +87,7 @@ class Server < Sinatra::Default
 		halt 404 unless session
 
 		schema_app = File.dirname(__FILE__) + '/../../bin/schema'
-		`#{schema_app} indexes #{session.database_url}`
+		Taps::Utils.schema_bin(:indexes, session.database_url)
 	end
 
 	get '/sessions/:key/tables' do

data/lib/taps/utils.rb

@@ -7,6 +7,15 @@ module Taps
 module Utils
 	extend self
 
+	def windows?
+		RUBY_PLATFORM =~ /mswin32/
+	end
+
+	def bin(cmd)
+		cmd = "#{cmd}.cmd" if windows?
+		cmd
+	end
+
 	def checksum(data)
 		Zlib.crc32(data)
 	end
@@ -48,7 +57,7 @@ module Utils
 		return [] unless db.class.to_s == "Sequel::MySQL::Database"
 
 		columns = []
-		db.schema[table].each do |data|
+		db.schema(table).each do |data|
 			column, cdata = data
 			columns << column if cdata[:db_type] =~ /text/
 		end
@@ -98,22 +107,26 @@ module Utils
 	def load_schema(database_url, schema_data)
 		Tempfile.open('taps') do |tmp|
 			File.open(tmp.path, 'w') { |f| f.write(schema_data) }
-			`#{File.dirname(__FILE__)}/../../bin/schema load #{database_url} #{tmp.path}`
+			schema_bin(:load, database_url, tmp.path)
 		end
 	end
 
 	def load_indexes(database_url, index_data)
 		Tempfile.open('taps') do |tmp|
 			File.open(tmp.path, 'w') { |f| f.write(index_data) }
-			`#{File.dirname(__FILE__)}/../../bin/schema load_indexes #{database_url} #{tmp.path}`
+			schema_bin(:load_indexes, database_url, tmp.path)
 		end
 	end
 
+	def schema_bin(*args)
+		`#{File.dirname(__FILE__)}/../../bin/#{bin('schema')} #{args.join(' ')}`
+	end
+
 	def primary_key(db, table)
 		if db.respond_to?(:primary_key)
 			db.primary_key(table)
 		else
-			db.schema[table].select { |c| c[1][:primary_key] }.map { |c| c.first }.shift
+			db.schema(table).select { |c| c[1][:primary_key] }.map { |c| c.first }.shift
 		end
 	end
 

data/spec/client_session_spec.rb

@@ -54,7 +54,7 @@ describe Taps::ClientSession do
 		@client.db.stubs(:[]).with(:mytable).returns(@mytable)
 		@client.expects(:fetch_table_rows).with(:mytable, 1000, 0).returns([ 1000, { :header => [:x, :y], :data => [[1, 2], [3, 4]] } ])
 		@client.expects(:fetch_table_rows).with(:mytable, 1000, 2).returns([ 1000, { }])
-		@mytable.expects(:multi_insert).with([:x, :y], [[1, 2], [3, 4]])
+		@mytable.expects(:import).with([:x, :y], [[1, 2], [3, 4]])
 
 		lambda { @client.cmd_receive_data }.should.not.raise
 	end

data/spec/utils_spec.rb

@@ -16,7 +16,9 @@ describe Taps::Utils do
 	end
 
 	it "formats a data hash into one hash that contains an array of headers and an array of array of data" do
-		Taps::Utils.format_data([ { :x => 1, :y => 1 }, { :x => 2, :y => 2 } ], []).should == { :header => [ :x, :y ], :data => [ [1, 1], [2, 2] ] }
+		first_row = { :x => 1, :y => 1 }
+		first_row.stubs(:keys).returns([:x, :y])
+		Taps::Utils.format_data([ first_row, { :x => 2, :y => 2 } ], []).should == { :header => [ :x, :y ], :data => [ [1, 1], [2, 2] ] }
 	end
 
 	it "scales chunksize down slowly when the time delta of the block is just over a second" do
@@ -49,8 +51,7 @@ describe Taps::Utils do
 	it "returns a list of columns that are text fields if the database is mysql" do
 		@db = mock("db")
 		@db.class.stubs(:to_s).returns("Sequel::MySQL::Database")
-		@db.stubs(:schema).returns(mock("schema"))
-		@db.schema.stubs(:[]).with(:mytable).returns([
+		@db.stubs(:schema).with(:mytable).returns([
 			[:id, { :db_type => "int" }],
 			[:mytext, { :db_type => "text" }]
 		])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taps
 version: !ruby/object:Gem::Version 
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors: 
 - Ricardo Chimal, Jr.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-28 00:00:00 -07:00
+date: 2009-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,9 +19,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.0
+        version: 0.9.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -59,9 +59,12 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.11.0
+        version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version 
+        version: 3.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
@@ -94,13 +97,13 @@ files:
 - lib/taps/adapter_hacks/invalid_text_limit.rb
 - lib/taps/adapter_hacks/mysql_invalid_primary_key.rb
 - lib/taps/adapter_hacks/invalid_binary_limit.rb
-- lib/taps/utils.rb
-- lib/taps/server.rb
-- lib/taps/config.rb
 - lib/taps/cli.rb
-- lib/taps/schema.rb
 - lib/taps/db_session.rb
+- lib/taps/utils.rb
+- lib/taps/schema.rb
 - lib/taps/client_session.rb
+- lib/taps/config.rb
+- lib/taps/server.rb
 - README.rdoc
 - LICENSE
 - VERSION.yml