fiverr_copy 1.0.1 → 1.0.2

data/lib/fiverr_copy/client.rb

@@ -33,30 +33,21 @@ class FiverrCopy::Client
 
     client_session = nil
     if !(next_client.nil?)
-      puts "Connecting to next hop at #{next_client}:#{port}"
       client_session = TCPSocket.new(next_client, port)
-    else
-      puts "Last hop mode"
     end
 
     File.open(filename, "w+") do |f|
 #      Thread.start do
-        while (stream = session.read(chunk.to_i)) do
+        while (stream = session.read(chunk.to_i)) do    
           
-          puts "Connection from #{session.peeraddr[2]} at #{session.peeraddr[3]}"
-          
-          
-          puts "Got #{stream.size} bytes"
           f.write stream
-          
+
           if !(next_client.nil?)
-            puts "Forwarding to #{next_client}"
             client_session.write(stream)
           end
           session.puts "OK:#{stream.size}"
         end
-#      end  #end thread conversation
     end
-    puts "Done."
+    
   end
 end

data/lib/fiverr_copy/server.rb

@@ -29,7 +29,9 @@ class FiverrCopy::Server
             end
             next_client = "--nexthop #{current_client.next_client}" if current_client.next_client
             puts "#{current_client.client_ip}: fiverr_copy --client --port #{self.recipe.port} --filename #{compressed_file_name} --chunk #{self.recipe.chunk_size} #{next_client} \&"
-            ssh.exec("fiverr_copy --client --port #{self.recipe.port} --filename #{compressed_file_name} --chunk #{self.recipe.chunk_size} #{next_client} \&")
+            silence_stream(STDOUT) do
+              ssh.exec("fiverr_copy --client --port #{self.recipe.port} --filename #{compressed_file_name} --chunk #{self.recipe.chunk_size} #{next_client} \&")
+            end
           end
         end
       end
@@ -65,12 +67,15 @@ class FiverrCopy::Server
     end
 
     puts "Transmitting..."
+    file_size = File.size(compressed_file_name)
 
     File.open("#{compressed_file_name}") do |transmitted_file|
-      puts "Transmitting #{transmitted_file.path.to_s} (#{File.size(transmitted_file)})"
+      puts "Transmitting #{transmitted_file.path.to_s} (#{file_size.to_f / 1024})"
+      sent = 0
       while !(client_session.closed?) && (buffer = transmitted_file.read(self.recipe.chunk_size)) do
-        puts "Sending #{buffer.size}B"
         client_session.write buffer
+        sent += self.recipe.chunk_size
+        print "\r#{"%.2f" % (sent.to_f / file_size.to_f * 100)}% "
       end
       puts "Done!"
     end

data/lib/fiverr_copy/version.rb

@@ -1,3 +1,3 @@
 module FiverrCopy
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fiverr_copy
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Elad Meidar