fiverr_copy 0.0.11 → 0.0.12

data/lib/fiverr_copy/client.rb

@@ -52,7 +52,7 @@ class FiverrCopy::Client
     end
 
     @real_file_name = ""
-    temp_file = "fiverr_copy_#{Time.now.to_i}.tgz"
+    temp_file = Tempfile.new("fiverr_copy_#{Time.now.to_i}.tgz")
     Tempfile.open(temp_file) do |f|
       while (session = server.accept)
         Thread.start do

data/lib/fiverr_copy/recipe.rb

@@ -1,5 +1,12 @@
 class FiverrCopy::Recipe
-  attr_accessor :name, :description, :filter, :clients, :username, :port, :chunk_size
+  attr_accessor :name, 
+                :description, 
+                :filter, 
+                :clients, 
+                :username, 
+                :port, 
+                :chunk_size, 
+                :manual
 
   attr_reader :initialized_clients
 
@@ -9,11 +16,16 @@ class FiverrCopy::Recipe
     self.description = description
     self.port = 1234
     self.chunk_size = 1024
+    self.manual = false
     @initialized_clients = []
     yield(self)
     self
   end
 
+  def manual_client_activation?
+    self.manual == true
+  end
+
   def clients=(clients_array = [])
     raise "No clients specified" if clients_array.empty?    
     clients_array.uniq!
@@ -36,6 +48,7 @@ class FiverrCopy::Recipe
     puts "Clients : #{self.initialized_clients.size}"
     puts "Port    : #{self.port}"
     puts "Chunk   : #{self.chunk_size}"
+    puts "Manual  : #{self.manual_client_activation?}"
     puts "---------------------"
   end
 end

data/lib/fiverr_copy/server.rb

@@ -13,29 +13,41 @@ class FiverrCopy::Server
   def self.run!
     threads = []
     files_to_sync = Dir[self.recipe.filter]
-    self.recipe.initialized_clients.each do |client|
-      threads << Thread.new(client) do |current_client|
-        current_client.setup!
-        puts "Connecting to #{current_client.client_ip}:#{self.recipe.port}"
-        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} \&")
+
+    if !(self.recipe.manual_client_activation?)
+      self.recipe.initialized_clients.each do |client|
+        threads << Thread.new(client) do |current_client|
+          current_client.setup!
+          puts "Connecting to #{current_client.client_ip}:#{self.recipe.port}"
+          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} \&")
+          end
         end
+        sleep 10
       end
-      sleep 10
     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}`
     rescue Errno::ECONNREFUSED => e
-      puts "ERROR: unable to connect to #{self.recipe.initialized_clients.first.client_ip} => #{e.to_s}"
+      if attempts < 10
+        attempts += 1
+        sleep 1.5
+        print "Retry #{attempts}: "
+        retry
+      else
+        puts "ERROR: unable to connect to #{self.recipe.initialized_clients.first.client_ip} => #{e.to_s}"
+        exit 0
+      end
     end
 
     puts "Validating Compressed file"
@@ -49,8 +61,8 @@ class FiverrCopy::Server
     puts "Transmitting..."
 
     File.open("#{compressed_file_name}.tgz") do |transmitted_file|
-      client_session.write "FILENAME:#{"#{compressed_file_name}.tgz"}"
-      puts "Transmitting #{transmitted_file.basename} (#{transmitted_file.size})"
+      client_session.puts "FILENAME:#{"#{compressed_file_name}.tgz"}"
+      puts "Transmitting #{transmitted_file.to_s} (#{File.size(transmitted_file)})"
       while (buffer = transmitted_file.read(self.recipe.chunk_size)) do
         puts "Sending #{buffer.size}B"
         client_session.write buffer

data/lib/fiverr_copy/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fiverr_copy
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Elad Meidar
@@ -64,7 +64,6 @@ files:
 - bin/fiverr_copy
 - elad.sql
 - fiverr_copy.gemspec
-- fiverr_copy_compressed_1333352437.tgz
 - lib/fiverr_copy.rb
 - lib/fiverr_copy/client.rb
 - lib/fiverr_copy/recipe.rb