fiverr_copy 0.0.12 → 0.0.13

data/bin/fiverr_copy

@@ -35,6 +35,16 @@ optparse = OptionParser.new do |opts|
    options[:next_hop] = next_hop
   end
 
+  options[:filename] = "fiverr_copy_compressed_#{Time.now}.tgz"
+  opts.on( '-f', '--filename FILENAME', 'Specify filename' ) do |filename|
+   options[:filename] = filename
+  end
+
+  options[:chunk_size] = 1024
+  opts.on( '-w', '--chunk CHUNK_SIZE', 'specify chunk size' ) do |chunk_size|
+   options[:chunk_size] = chunk_size
+  end
+
   # This displays the help screen, all programs are
   # assumed to have this option.
   opts.on( '-h', '--help', 'Display this screen' ) do
@@ -55,6 +65,6 @@ if options[:mode] == :server
     FiverrCopy::Server.run!
   end
 else
-  FiverrCopy::Client.run!(options[:port], options[:next_hop])
+  FiverrCopy::Client.run!(options[:port], options[:next_hop], options[:filename], options[:chunk_size])
 end
 

data/lib/fiverr_copy/client.rb

@@ -41,39 +41,37 @@ class FiverrCopy::Client
   end
 
 
-  def self.run!(port, next_client)
+  def self.run!(port, next_client, filename, chunk)
+    puts "FiverrCopy client initializing"
     server = TCPServer.new(port)
+
+    session = server.accept
+
     client_session = nil
     if !(next_client.nil?)
-      puts "Next: #{next_client}"
+      puts "Connecting to next hop at #{next_client}:#{port}"
       client_session = TCPSocket.new(next_client, port)
     else
-      puts "I'm last!"
+      puts "Last hop mode"
     end
 
-    @real_file_name = ""
     temp_file = Tempfile.new("fiverr_copy_#{Time.now.to_i}.tgz")
     Tempfile.open(temp_file) do |f|
-      while (session = server.accept)
-        Thread.start do
-          ## I want to be sure to output something on the server side
-          ## to show that there has been a connection
-          puts "log: Connection from #{session.peeraddr[2]} at #{session.peeraddr[3]}"
+      Thread.start do
+        while (stream = session.read(chunk)) do
+          
+          puts "Connection from #{session.peeraddr[2]} at #{session.peeraddr[3]}"
+          
           
-          stream = session.gets
+          puts "Got #{stream.size} bytes"
+          f.write stream
           
-          if (stream.slice(0...8) == "FILENAME")
-            @real_file_name = stream.chomp.split(":").last
-            puts "log: Recieving #{@real_file_name}"
-          else
-            puts "log: got #{stream.size} bytes"
-            f.write stream
-          end
-          client_session.puts(stream) if !(next_client.nil?)
+          client_session.write(stream) if !(next_client.nil?)
           session.puts "OK:#{stream.size}"
-        end  #end thread conversation
-      end   #end loop
+        end
+      end  #end thread conversation
     end
-    FileUtils.mv(temp_file, "#{Dir.pwd}/#{@real_file_name}")
+    puts "Done."
+    FileUtils.mv(temp_file, "#{Dir.pwd}/#{filename}")
   end
 end

data/lib/fiverr_copy/server.rb

@@ -14,6 +14,8 @@ class FiverrCopy::Server
     threads = []
     files_to_sync = Dir[self.recipe.filter]
 
+    compressed_file_name = "fiverr_copy_compressed_#{Time.now.to_i}.tgz"
+
     if !(self.recipe.manual_client_activation?)
       self.recipe.initialized_clients.each do |client|
         threads << Thread.new(client) do |current_client|
@@ -22,22 +24,22 @@ class FiverrCopy::Server
           Net::SSH.start(current_client.client_ip, current_client.username) do |ssh|
             ssh.exec("killall fiverr_copy")
             next_client = "--nexthop #{current_client.next_client}" if current_client.next_client
-            puts "Running: fiverr_copy --client --port #{self.recipe.port} #{next_client} @ #{current_client.client_ip}"
-            ssh.exec("fiverr_copy --client --port #{self.recipe.port} #{next_client} \&")
+            puts "#{current_client}: 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} \&")
           end
         end
         sleep 10
       end
     end
 
-    compressed_file_name = "fiverr_copy_compressed_#{Time.now.to_i}"
+    
 
     attempts = 1
     begin
       puts "Attempting Connection to #{self.recipe.initialized_clients.first.client_ip}:#{self.recipe.port}"
       client_session = TCPSocket.new(self.recipe.initialized_clients.first.client_ip, self.recipe.port)
-      puts "Compressing: tar cvzf #{compressed_file_name}.tgz #{self.recipe.filter}"
-      `tar cvzf #{compressed_file_name}.tgz #{self.recipe.filter}`
+      puts "Compressing: tar cvzf #{compressed_file_name} #{self.recipe.filter}"
+      `tar cvzf #{compressed_file_name} #{self.recipe.filter}`
     rescue Errno::ECONNREFUSED => e
       if attempts < 10
         attempts += 1
@@ -51,7 +53,7 @@ class FiverrCopy::Server
     end
 
     puts "Validating Compressed file"
-    if !(FileTest.exists?("#{compressed_file_name}.tgz"))
+    if !(FileTest.exists?("#{compressed_file_name}"))
       puts "Could not find the compressed file to transfer:"
       puts `ls *.tgz`
       puts "exiting"
@@ -60,13 +62,14 @@ class FiverrCopy::Server
 
     puts "Transmitting..."
 
-    File.open("#{compressed_file_name}.tgz") do |transmitted_file|
-      client_session.puts "FILENAME:#{"#{compressed_file_name}.tgz"}"
+    File.open("#{compressed_file_name}") do |transmitted_file|
+      client_session.puts "FILENAME:#{"#{compressed_file_name}"}"
       puts "Transmitting #{transmitted_file.to_s} (#{File.size(transmitted_file)})"
-      while (buffer = transmitted_file.read(self.recipe.chunk_size)) do
+      while !(client_session.closed?) && (client_response = client_session.gets) && (buffer = transmitted_file.read(self.recipe.chunk_size)) do
         puts "Sending #{buffer.size}B"
-        client_session.write buffer
+        client_session.puts buffer
       end
+      puts "Done!"
     end
 
   end

data/lib/fiverr_copy/version.rb

@@ -1,3 +1,3 @@
 module FiverrCopy
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fiverr_copy
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Elad Meidar