fiverr_copy 1.0.0 → 1.0.1

data/lib/fiverr_copy/client.rb

@@ -21,23 +21,7 @@ class FiverrCopy::Client
   end
 
   def setup!
-    puts "Setting up #{self.client_ip}"
-    Net::SSH.start(self.client_ip, self.username) do |ssh|
-      bundler_exists = ssh.exec!("which bundle") == "" ? false : true
-      if !(bundler_exists)
-        puts "Installing bundler on #{client_ip}."
-        puts ssh.exec!("gem install bundler --no-rdoc --no-ri")
-      end
-
-      fiverr_copy_exists = ssh.exec!("gem list | grep fiverr_copy") == "" ? false : true
-      
-      if !(fiverr_copy_exists)
-        puts "Installing fiverr_copy."
-        puts ssh.exec!("gem install fiverr_copy --no-rdoc --no-ri")
-      end
-
-      @ready = true
-    end
+    @ready = true
   end
 
 
@@ -65,7 +49,10 @@ class FiverrCopy::Client
           puts "Got #{stream.size} bytes"
           f.write stream
           
-          client_session.write(stream) if !(next_client.nil?)
+          if !(next_client.nil?)
+            puts "Forwarding to #{next_client}"
+            client_session.write(stream)
+          end
           session.puts "OK:#{stream.size}"
         end
 #      end  #end thread conversation

data/lib/fiverr_copy/recipe.rb

@@ -6,7 +6,8 @@ class FiverrCopy::Recipe
                 :username, 
                 :port, 
                 :chunk_size, 
-                :manual
+                :manual,
+                :gem_installation_auth
 
   attr_reader :initialized_clients
 
@@ -17,6 +18,7 @@ class FiverrCopy::Recipe
     self.port = 1234
     self.chunk_size = 1024
     self.manual = false
+    self.gem_installation_auth = ""
     @initialized_clients = []
     yield(self)
     self
@@ -25,7 +27,7 @@ class FiverrCopy::Recipe
   def manual_client_activation?
     self.manual == true
   end
-
+ 
   def clients=(clients_array = [])
     raise "No clients specified" if clients_array.empty?    
     clients_array.uniq!

data/lib/fiverr_copy/server.rb

@@ -19,24 +19,29 @@ class FiverrCopy::Server
     if !(self.recipe.manual_client_activation?)
       self.recipe.initialized_clients.each do |client|
         threads << Thread.new(client) do |current_client|
-          #current_client.setup!
+          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")
+            gem_exists = ssh.exec("which fiverr_copy") == "" ? false : true
+            if !(gem_exists)
+              puts "Please install the fiverr_copy gem on all clients."
+              exit 0
+            end
             next_client = "--nexthop #{current_client.next_client}" if current_client.next_client
-            puts "#{current_client}: fiverr_copy --client --port #{self.recipe.port} --filename #{compressed_file_name} --chunk #{self.recipe.chunk_size} #{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} \&")
           end
         end
       end
     end
 
+    #threads.collect(&:join)
     puts "Booting clients"
 
     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 "Attempting Connection to #{self.recipe.initialized_clients.last.client_ip}:#{self.recipe.port}"
+      client_session = TCPSocket.new(self.recipe.initialized_clients.last.client_ip, self.recipe.port)
       puts "Compressing: tar cvzf #{compressed_file_name} #{self.recipe.filter}"
       `tar cvzf #{compressed_file_name} #{self.recipe.filter}`
     rescue Errno::ECONNREFUSED => e
@@ -46,7 +51,7 @@ class FiverrCopy::Server
         print "Retry #{attempts}: "
         retry
       else
-        puts "ERROR: unable to connect to #{self.recipe.initialized_clients.first.client_ip} => #{e.to_s}"
+        puts "ERROR: unable to connect to #{self.recipe.initialized_clients.last.client_ip} => #{e.to_s}"
         exit 0
       end
     end
@@ -62,7 +67,7 @@ class FiverrCopy::Server
     puts "Transmitting..."
 
     File.open("#{compressed_file_name}") do |transmitted_file|
-      puts "Transmitting #{transmitted_file.to_s} (#{File.size(transmitted_file)})"
+      puts "Transmitting #{transmitted_file.path.to_s} (#{File.size(transmitted_file)})"
       while !(client_session.closed?) && (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 = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

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