six-rsync 0.2.1 → 0.2.2

data/Rakefile

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

data/lib/six/rsync/lib.rb

@@ -401,51 +401,66 @@ module Six
               # direct unpack of gz into working folder
               # Update file
               if online
-                # TODO: Progress bar
-                if mismatch.count > (@repos_remote[typ].count / 2)
-                  @logger.info "Many files mismatched (#{mismatch.count}), running full update on .pack folder"
-                  arr_opts = []
-                  arr_opts << PARAMS
-                  if host[/\A(\w)*\@/]
-                    arr_opts << RSH
-                  end
-
-                  arr_opts << esc(File.join(host, '.pack/.'))
-                  arr_opts << esc(pack_path)
-                  begin
-                    command('', arr_opts)
-                  rescue
-                    @logger.warn "There was a problem during updating, please retry!"
-                  end
-                else
-                  c = mismatch.size
-                  @logger.info "Fetching #{mismatch.size} files... Please wait"
-                  slist = File.join(TOOLS_PATH, ".six-updater_#{rand 9999}-list")
-                  File.open(slist, 'w') do |f|
-                    mismatch.each { |e| f.puts e }
-                  end
-                  arr_opts = []
-                  arr_opts << PARAMS
+                hosts = config[:hosts].clone
+                done = false
+
+                ## Pack
+                if online
+                  b = false
+                  while hosts.size > 0 && !done do
+                    # FIXME: Nasty
+                    if b
+                      host = hosts.sample
+                      @logger.info "Trying #{host}"
+                    end
+                    b = true
+                    hosts -= [host]
+                    begin
+                      # TODO: Progress bar
+                      if mismatch.count > (@repos_remote[typ].count / 2)
+                        @logger.info "Many files mismatched (#{mismatch.count}), running full update on .pack folder"
+                        arr_opts = []
+                        arr_opts << PARAMS
+                        if host[/\A(\w)*\@/]
+                          arr_opts << RSH
+                        end
+
+                        arr_opts << esc(File.join(host, '.pack/.'))
+                        arr_opts << esc(pack_path)
+                        command('', arr_opts)
+                      else
+                        c = mismatch.size
+                        @logger.info "Fetching #{mismatch.size} files... Please wait"
+                        slist = File.join(TOOLS_PATH, ".six-updater_#{rand 9999}-list")
+                        File.open(slist, 'w') do |f|
+                          mismatch.each { |e| f.puts e }
+                        end
+                        arr_opts = []
+                        arr_opts << PARAMS
                   
-                  arr_opts << RSH if host[/\A(\w)*\@/]
-
-                  slist = "\"#{slist}\""
-
-                  while slist[WINDRIVE] do
-                    drive = slist[WINDRIVE]
-                    slist.gsub!(drive, "\"/cygdrive/#{$1}")
-                  end
-                  arr_opts << "--files-from=#{slist}"
-
-                  arr_opts << esc(File.join(host, '.pack/.'))
-                  arr_opts << esc(pack_path)
-
-                  begin
-                    command('', arr_opts)
-                  rescue
-                    @logger.warn "There was a problem during updating, please retry!"
+                        arr_opts << RSH if host[/\A(\w)*\@/]
+
+                        slist = "\"#{slist}\""
+
+                        while slist[WINDRIVE] do
+                          drive = slist[WINDRIVE]
+                          slist.gsub!(drive, "\"/cygdrive/#{$1}")
+                        end
+                        arr_opts << "--files-from=#{slist}"
+
+                        arr_opts << esc(File.join(host, '.pack/.'))
+                        arr_opts << esc(pack_path)
+
+                        command('', arr_opts)
+                        FileUtils.rm_f slist
+                      end
+                      done = true
+                    rescue
+                      @logger.warn "Failure"
+                      @logger.debug "#{$!}"
+                    end
                   end
-                  FileUtils.rm_f slist
+                  @logger.warn "There was a problem during updating, please retry!" unless done
                 end
               end
             when :wd

data/lib/six/rsync.rb

@@ -30,7 +30,7 @@ module Six
     end
 
     module Rsync
-      VERSION = '0.2.1'
+      VERSION = '0.2.2'
       TOOLS_PATH = File.join(BASE_PATH, 'tools')
       FOLDER = /(.*)\/(.*)/
       ENV['PATH'] = ENV['PATH'] + ";#{TOOLS_PATH};#{File.join(TOOLS_PATH, 'bin')}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: six-rsync
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Sickboy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-06 00:00:00 +01:00
+date: 2009-12-07 00:00:00 +01:00
 default_executable: 
 dependencies: []