taps 0.2.7 → 0.2.8

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 8
 :major: 0
 :minor: 2
-:patch: 7

data/lib/taps/client_session.rb

@@ -74,27 +74,32 @@ class ClientSession
 	end
 
 	def cmd_send_indexes
-		puts "Sending schema indexes to remote taps server #{safe_remote_url} from local database #{safe_database_url}"
+		puts "Sending indexes"
 
 		index_data = `#{File.dirname(__FILE__)}/../../bin/schema indexes #{database_url}`
 		session_resource['indexes'].post(index_data, :taps_version => Taps.version)
 	end
 
 	def cmd_send_schema
-		puts "Sending schema to remote taps server #{safe_remote_url} from local database #{safe_database_url}"
+		puts "Sending schema"
 
 		schema_data = `#{File.dirname(__FILE__)}/../../bin/schema dump #{database_url}`
 		session_resource['schema'].post(schema_data, :taps_version => Taps.version)
 	end
 
 	def cmd_send_reset_sequences
-		puts "Resetting db sequences in remote taps server at #{safe_remote_url}"
+		puts "Resetting sequences"
 
 		session_resource["reset_sequences"].post('', :taps_version => Taps.version)
 	end
 
 	def cmd_send_data
-		puts "Sending schema and data from local database #{safe_database_url} to remote taps server at #{safe_remote_url}"
+		puts "Sending data"
+
+		tables_with_counts, record_count = fetch_tables_info
+
+		puts "#{tables_with_counts.size} tables, #{format_number(record_count)} records"
+
 
 		db.tables.each do |table_name|
 			table = db[table_name]
@@ -135,6 +140,17 @@ class ClientSession
 		end
 	end
 
+	def fetch_tables_info
+		record_count = 0
+		tables = db.tables
+		tables_with_counts = tables.inject({}) do |accum, table|
+			accum[table] = db[table].count
+			record_count += accum[table]
+		end
+
+		[ tables_with_counts, record_count ]
+	end
+
 	def cmd_receive
 		verify_server
 		cmd_receive_schema
@@ -144,9 +160,9 @@ class ClientSession
 	end
 
 	def cmd_receive_data
-		puts "Receiving data from remote taps server #{safe_remote_url} into local database #{safe_database_url}"
+		puts "Receiving data"
 
-		tables_with_counts, record_count = fetch_tables_info
+		tables_with_counts, record_count = fetch_remote_tables_info
 
 		puts "#{tables_with_counts.size} tables, #{format_number(record_count)} records"
 
@@ -194,7 +210,7 @@ class ClientSession
 		[chunksize, rows]
 	end
 
-	def fetch_tables_info
+	def fetch_remote_tables_info
 		retries = 0
 		max_retries = 1
 		begin
@@ -211,7 +227,7 @@ class ClientSession
 	end
 
 	def cmd_receive_schema
-		puts "Receiving schema from remote taps server #{safe_remote_url} into local database #{safe_database_url}"
+		puts "Receiving schema"
 
 		schema_data = session_resource['schema'].get(:taps_version => Taps.version)
 		output = Taps::Utils.load_schema(database_url, schema_data)
@@ -219,7 +235,7 @@ class ClientSession
 	end
 
 	def cmd_receive_indexes
-		puts "Receiving schema indexes from remote taps server #{safe_remote_url} into local database #{safe_database_url}"
+		puts "Receiving indexes"
 
 		index_data = session_resource['indexes'].get(:taps_version => Taps.version)
 
@@ -228,7 +244,7 @@ class ClientSession
 	end
 
 	def cmd_reset_sequences
-		puts "Resetting db sequences in #{safe_database_url}"
+		puts "Resetting sequences"
 
 		output = `#{File.dirname(__FILE__)}/../../bin/schema reset_db_sequences #{database_url}`
 		puts output if output

data/lib/taps/progress_bar.rb

@@ -127,7 +127,7 @@ class ProgressBar
       data = [0, 0, 0, 0].pack("SSSS")
       if @out.ioctl(tiocgwinsz, data) >= 0 then
         rows, cols, xpixels, ypixels = data.unpack("SSSS")
-        if cols >= 0 then cols else default_width end
+        if cols > 0 then cols else default_width end
       else
         default_width
       end

data/lib/taps/schema.rb

@@ -27,7 +27,9 @@ module Schema
 
 	def sqlite_config(url)
 		m = %r{(sqlite3?)://(.+)}.match(url)
-		{ 'adapter' => 'sqlite3', 'database' => m[2] }
+		database = m[2]
+		database, q = database.split('?')
+		{ 'adapter' => 'sqlite3', 'database' => database }
 	end
 
 	def connection(database_url)

data/spec/client_session_spec.rb

@@ -49,7 +49,7 @@ describe Taps::ClientSession do
 		@progressbar.stubs(:inc)
 		@progressbar.stubs(:finish)
 		@mytable = mock('mytable')
-		@client.expects(:fetch_tables_info).returns([ { :mytable => 2 }, 2 ])
+		@client.expects(:fetch_remote_tables_info).returns([ { :mytable => 2 }, 2 ])
 		@client.stubs(:db).returns(mock('db'))
 		@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]] } ])
@@ -59,11 +59,11 @@ describe Taps::ClientSession do
 		lambda { @client.cmd_receive_data }.should.not.raise
 	end
 
-	it "fetches tables info from taps server" do
+	it "fetches remote tables info from taps server" do
 		@marshal_data = Marshal.dump({ :mytable => 2 })
 		@client.session_resource.stubs(:[]).with('tables').returns(mock('tables'))
 		@client.session_resource['tables'].stubs(:get).with(:taps_version => Taps.version).returns(@marshal_data)
-		@client.fetch_tables_info.should == [ { :mytable => 2 }, 2 ]
+		@client.fetch_remote_tables_info.should == [ { :mytable => 2 }, 2 ]
 	end
 
 	it "fetches table rows given a chunksize and offset from taps server" do

data/spec/schema_spec.rb

@@ -25,6 +25,7 @@ describe Taps::Schema do
 	it "translates sqlite database path" do
 		Taps::Schema.create_config("sqlite://pathtodb/mydb")['database'].should == 'pathtodb/mydb'
 		Taps::Schema.create_config("sqlite:///pathtodb/mydb")['database'].should == '/pathtodb/mydb'
+		Taps::Schema.create_config("sqlite:///pathtodb/mydb?encoding=utf8")['database'].should == '/pathtodb/mydb'
 	end
 
 	it "connects activerecord to the database" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taps
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Ricardo Chimal, Jr.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 -08:00
+date: 2009-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,16 +89,16 @@ files:
 - spec/client_session_spec.rb
 - spec/schema_spec.rb
 - lib/taps/db_session.rb
-- lib/taps/client_session.rb
 - lib/taps/progress_bar.rb
+- lib/taps/server.rb
 - lib/taps/cli.rb
 - lib/taps/adapter_hacks.rb
 - lib/taps/adapter_hacks/invalid_text_limit.rb
 - lib/taps/adapter_hacks/non_rails_schema_dump.rb
-- lib/taps/server.rb
 - lib/taps/schema.rb
-- lib/taps/config.rb
+- lib/taps/client_session.rb
 - lib/taps/utils.rb
+- lib/taps/config.rb
 - README.rdoc
 - LICENSE
 - VERSION.yml