taps 0.2.5 → 0.2.6

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 5
+:patch: 6

data/lib/taps/client_session.rb

@@ -53,6 +53,18 @@ class ClientSession
 		@session_resource.delete(:taps_version => Taps.version) if @session_resource
 	end
 
+	def safe_url(url)
+		url.sub(/\/\/(.+?)?:(.*?)@/, '//\1:[hidden]@')
+	end
+
+	def safe_remote_url
+		safe_url(remote_url)
+	end
+
+	def safe_database_url
+		safe_url(database_url)
+	end
+
 	def cmd_send
 		verify_server
 		cmd_send_schema
@@ -62,27 +74,27 @@ class ClientSession
 	end
 
 	def cmd_send_indexes
-		puts "Sending schema indexes to remote taps server #{remote_url} from local database #{database_url}"
+		puts "Sending schema indexes to remote taps server #{safe_remote_url} from local database #{safe_database_url}"
 
 		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 #{remote_url} from local database #{database_url}"
+		puts "Sending schema to remote taps server #{safe_remote_url} from local database #{safe_database_url}"
 
 		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 #{remote_url}"
+		puts "Resetting db sequences in remote taps server at #{safe_remote_url}"
 
 		session_resource["reset_sequences"].post('', :taps_version => Taps.version)
 	end
 
 	def cmd_send_data
-		puts "Sending schema and data from local database #{database_url} to remote taps server at #{remote_url}"
+		puts "Sending schema and data from local database #{safe_database_url} to remote taps server at #{safe_remote_url}"
 
 		db.tables.each do |table_name|
 			table = db[table_name]
@@ -132,7 +144,7 @@ class ClientSession
 	end
 
 	def cmd_receive_data
-		puts "Receiving data from remote taps server #{remote_url} into local database #{database_url}"
+		puts "Receiving data from remote taps server #{safe_remote_url} into local database #{safe_database_url}"
 
 		tables_with_counts, record_count = fetch_tables_info
 
@@ -199,7 +211,7 @@ class ClientSession
 	end
 
 	def cmd_receive_schema
-		puts "Receiving schema from remote taps server #{remote_url} into local database #{database_url}"
+		puts "Receiving schema from remote taps server #{safe_remote_url} into local database #{safe_database_url}"
 
 		schema_data = session_resource['schema'].get(:taps_version => Taps.version)
 		output = Taps::Utils.load_schema(database_url, schema_data)
@@ -207,7 +219,7 @@ class ClientSession
 	end
 
 	def cmd_receive_indexes
-		puts "Receiving schema indexes from remote taps server #{remote_url} into local database #{database_url}"
+		puts "Receiving schema indexes from remote taps server #{safe_remote_url} into local database #{safe_database_url}"
 
 		index_data = session_resource['indexes'].get(:taps_version => Taps.version)
 
@@ -216,7 +228,7 @@ class ClientSession
 	end
 
 	def cmd_reset_sequences
-		puts "Resetting db sequences in #{database_url}"
+		puts "Resetting db sequences in #{safe_database_url}"
 
 		output = `#{File.dirname(__FILE__)}/../../bin/schema reset_db_sequences #{database_url}`
 		puts output if output
@@ -238,10 +250,10 @@ class ClientSession
 				raise
 			end
 		rescue RestClient::Unauthorized
-			puts "Bad credentials given for #{remote_url}"
+			puts "Bad credentials given for #{safe_remote_url}"
 			exit(1)
 		rescue Errno::ECONNREFUSED
-			puts "Can't connect to #{remote_url}. Please check that it's running"
+			puts "Can't connect to #{safe_remote_url}. Please check that it's running"
 			exit(1)
 		end
 	end

data/spec/client_session_spec.rb

@@ -78,5 +78,11 @@ describe Taps::ClientSession do
 		@response.stubs(:headers).returns({ :taps_checksum => Taps::Utils.checksum(@gzip_data) })
 		@client.fetch_table_rows('mytable', 1000, 0).should == [ 1000, { :header => [:x, :y], :data => [[1, 2], [3, 4]] } ]
 	end
+
+	it "hides the password in urls" do
+		@client.safe_url("postgres://postgres:password@localhost/mydb").should == "postgres://postgres:[hidden]@localhost/mydb"
+		@client.safe_url("postgres://postgres@localhost/mydb").should == "postgres://postgres@localhost/mydb"
+		@client.safe_url("http://x:y@localhost:5000").should == "http://x:[hidden]@localhost:5000"
+	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taps
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Ricardo Chimal, Jr.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-24 00:00:00 -08:00
+date: 2009-02-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,20 +85,20 @@ extra_rdoc_files: []
 files: 
 - spec/base.rb
 - spec/utils_spec.rb
-- spec/client_session_spec.rb
 - spec/server_spec.rb
 - spec/schema_spec.rb
+- spec/client_session_spec.rb
 - lib/taps/db_session.rb
 - lib/taps/progress_bar.rb
 - lib/taps/cli.rb
-- lib/taps/client_session.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/schema.rb
-- lib/taps/adapter_hacks.rb
-- lib/taps/config.rb
 - lib/taps/server.rb
 - lib/taps/utils.rb
+- lib/taps/client_session.rb
+- lib/taps/config.rb
 - README.rdoc
 - LICENSE
 - VERSION.yml