six-rsync 0.4.12 → 0.4.13

data/Rakefile

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

data/lib/six/rsync/lib.rb

@@ -135,14 +135,14 @@ module Six
             arr_opts << "-I" if opts[:force]
             begin
               update('', arr_opts)
-            rescue RsyncError
-              @logger.error "Unable to sucessfully update, aborting..."
-              @logger.debug "#{$!}"
+            rescue RsyncError => e
+              @logger.error "Unable to sucessfully update, aborting... (#{e.class}: #{e.message})"
+              @logger.debug e.backtrace.join("\n") 
               FileUtils.rm_rf @rsync_work_dir if File.exists?(@rsync_work_dir)
             end
-          rescue RsyncError
-            @logger.error "Unable to initialize"
-            @logger.debug "#{$!}"
+          rescue RsyncError => e
+            @logger.error "Unable to initialize (#{e.class}: #{e.message})"
+            @logger.debug e.backtrace.join("\n")
           end
 
           opts[:bare] ? {:repository => @rsync_work_dir} : {:working_directory => @rsync_work_dir}
@@ -178,7 +178,6 @@ module Six
               b = true
               hosts -= [host]
               @logger.info "Trying #{host}"
-
               begin
                 arr_opts = []
                 arr_opts << PARAMS
@@ -192,8 +191,9 @@ module Six
                 calc
                 save_repos
                 done = true
-              rescue
-                @logger.debug "#{$!}"
+              rescue => e
+                @logger.warn "#{e.class}: #{e.message}"
+                @logger.debug e.backtrace.join("\n")
               end
             end
             @verbose = verbose
@@ -505,8 +505,9 @@ module Six
                   raise RsyncError
                 end
                 done = true
-              rescue
-                @logger.debug "#{$!}"
+              rescue => e
+                @logger.warn "#{e.class}: #{e.message}"
+                @logger.debug e.backtrace.join("\n") 
               ensure
                 FileUtils.rm(rsync_path(".repository-pack.yml"))
               end
@@ -790,7 +791,7 @@ module Six
           end
 
           out[/rsync error: .* \(code ([0-9]*)\)/]
-          status = $1 ? $1 : 0
+          status = $1 ? $1.to_i : 0
 
           if status > 0
             return '' if status == 1 && out == ''

data/lib/six/rsync.rb

@@ -31,7 +31,7 @@ module Six
 
     module Rsync
       COMPONENT = 'six-rsync'
-      VERSION = '0.4.12'
+      VERSION = '0.4.13'
       FOLDER = /(.*)\/(.*)/
 
       case RUBY_PLATFORM

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 12
-  version: 0.4.12
+  - 13
+  version: 0.4.13
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-24 00:00:00 +02:00
+date: 2010-04-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency