six-rsync 0.3.4 → 0.3.5

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-rsync'
-  s.version = '0.3.4'
+  s.version = '0.3.5'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/rsync/lib.rb

@@ -127,27 +127,43 @@ module Six
             raise RsyncError
           end
 
-          #unpack
+          hosts = config[:hosts].clone
 
           # FIXME: This does not work when not forced, as host is sampled in comparesums :)
-          host = config[:hosts].sample
+          host = hosts.sample
 
           if opts[:force]
-            @logger.info "Trying: #{host}, please wait..."
-            arr_opts = []
-            arr_opts << PARAMS
-            arr_opts += x_opts
-            if host[/\A(\w)*\@/]
-              arr_opts << RSH#"-e ssh"
-            end
-
-            # TODO: UNCLUSTERFUCK
-            arr_opts << esc(File.join(host, '.pack/.'))
-            arr_opts << esc(pack_path)
+            done = false
+            b = false
+            verbose = @verbose
+            @verbose = false
+            while hosts.size > 0 && !done do
+              # FIXME: Nasty
+              host = hosts.sample if b
+              b = true
+              hosts -= [host]
+              @logger.info "Trying #{host}"
 
-            command(cmd, arr_opts)
-            calc
-            save_repos
+              begin
+                arr_opts = []
+                arr_opts << PARAMS
+                arr_opts += x_opts
+                if host[/\A(\w)*\@/]
+                  arr_opts << RSH#"-e ssh"
+                end
+                # TODO: UNCLUSTERFUCK
+                arr_opts << esc(File.join(host, '.pack/.'))
+                arr_opts << esc(pack_path)
+                command(cmd, arr_opts)
+                calc
+                save_repos
+                done = true
+              rescue
+                @logger.debug "#{$!}"
+              end
+            end
+            @verbose = verbose
+            raise RsyncError if !done
           else
             #reset(:hard => true)
             calc

data/lib/six/rsync.rb

@@ -30,7 +30,7 @@ module Six
     end
 
     module Rsync
-      VERSION = '0.3.4'
+      VERSION = '0.3.5'
       TOOLS_PATH = File.join(BASE_PATH, 'tools')
 
       FOLDER = /(.*)\/(.*)/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: six-rsync
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Sickboy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 +01:00
+date: 2010-02-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency