taps 0.3.4 → 0.3.5

data/VERSION.yml

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

data/lib/taps/cli.rb

@@ -112,7 +112,7 @@ EOHELP
 	end
 
 	def clientoptparse(cmd)
-		opts={:default_chunksize => 1000, :database_url => nil, :remote_url => nil, :debug => false, :resume_filename => nil, :disable_compresion => false}
+		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>"
 
@@ -123,6 +123,7 @@ EOHELP
 				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 }

data/lib/taps/operation.rb

@@ -28,6 +28,10 @@ class Operation
 		"op"
 	end
 
+	def indexes_first?
+		!!opts[:indexes_first]
+	end
+
 	def table_filter
 		opts[:table_filter]
 	end
@@ -208,14 +212,14 @@ class Pull < Operation
 		verify_server
 
 		begin
-			pull_schema unless resuming?
-
+			unless resuming?
+				pull_schema
+				pull_indexes if indexes_first?
+			end
 			setup_signal_trap
-
 			pull_partial_data if resuming?
-
 			pull_data
-			pull_indexes
+			pull_indexes unless indexes_first?
 			pull_reset_sequences
 			close_session
 		rescue RestClient::Exception => e
@@ -375,14 +379,14 @@ class Push < Operation
 	def run
 		verify_server
 		begin
-			push_schema unless resuming?
-
+			unless resuming?
+				push_schema
+				push_indexes if indexes_first?
+			end
 			setup_signal_trap
-
 			push_partial_data if resuming?
-
 			push_data
-			push_indexes
+			push_indexes unless indexes_first?
 			push_reset_sequences
 			close_session
 		rescue RestClient::Exception => e
@@ -406,6 +410,7 @@ class Push < Operation
 		puts "Sending indexes"
 
 		apply_table_filter(idxs).each do |table, indexes|
+			next unless indexes.size > 0
 			progress = ProgressBar.new(table, indexes.size)
 			indexes.each do |idx|
 				session_resource['push/indexes'].post(idx, http_headers)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Ricardo Chimal, Jr.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 -07:00
+date: 2010-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency