rsyncbackup 2.0.5 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd638cd1c9f3af9ee9ede11eeb571413e570cb54
-  data.tar.gz: f51a1ae7ceb42660093230da4f1788e640da9d9a
+  metadata.gz: 461b1bf53f729f56cee8d7c4fc1139b7cdd5c933
+  data.tar.gz: 1a87c1837c47b8059c9b4433f819f35db78bc0bf
 SHA512:
-  metadata.gz: c925add59bf3076cfa7086ef9b9253765d73dfc5914291e2a8a4a1ba31b8034231012db5074f834a512171b20ee09dc00e95b20798f4ca5898c7ab50793043a9
-  data.tar.gz: d6bf332aa5e2b34f4c23d0aa5ac3a4b27a9e3dfdddbf5a3e6f30dfc3176c46e894e512f4e4ff71c0d261389c9702f805d1d371b4260d973ecae6e0357c2629a1
+  metadata.gz: 1ecae151fd9c7b238ed18326dad926164955ec8939b79712d1d46ff12c6ec3a3306b354e035adfa4f9bbc436b2d627b4c046c98910b89ed8c73a14454cb86817
+  data.tar.gz: a3fbdf1a992ff78fc7f82e7d6645a74d4d9c62023959cc647eeea05e697d2fe040bb07c687cd529b265d02afa50f2049c780ecf9df6bda8b87b9b9a904340ee9

data/bin/rsyncbackup

@@ -14,18 +14,11 @@ class App
     begin
       syncer = Rsyncbackup.new(source, target, options)
       syncer.run
-      syncer.finalize
-      if syncer.status.success?
-        info syncer.output
-      else
-        error syncer.error
-      end
     rescue Exception => e
       error "Error occured in rsyncbackup: #{e.class} #{e}"
-      debug "Backtrace:\n#{e.backtrace}"
+      debug "Backtrace:\n#{e.backtrace.join("\n")}"
       exit 127
     end
-    syncer.status.exitstatus 
   end
 
   description "Yet another rsync backup script, this time in ruby"

data/lib/rsyncbackup.rb

@@ -55,16 +55,13 @@ class Rsyncbackup
 
     # the dry run option will be passed through to the rsync command,
     # so we still do want to run it.
-    self.output, self.error, self.status = Open3.capture3(@cmd)
-    debug "#{caller(0,1).first} self.output.size: #{self.output.size} self.error.size: #{self.error.size} self.status #{self.status.inspect}"
-    raise "Rsync Error: exit status: #{self.status.exit_code}: error: #{e}" unless self.status.success?
+    self.status = _run_the_command(@cmd)
+    debug "#{caller(0,1).first} self.status #{self.status.inspect}"
+    raise "Rsync Error: exit status: #{self.status.exitstatus}" unless (self.status.success? || self.status.exitstatus == 23) # don't abort if some files could not be transferred
+    finalize
     self
   end
 
-  def success?
-    (@status.nil?) ? nil : @status.success?
-  end
-
   def finalize
     File.rename(@incomplete, @complete) if File.exist?(@incomplete)
     File.write(File.join(@target,DEFAULT_LAST_FULL_DIR_NAME), backup_dir_name)

data/lib/rsyncbackup/utilities.rb

@@ -12,7 +12,31 @@
 require 'methadone'
 
 class Rsyncbackup
-  
+
+  def _run_the_command(cmd)
+    Open3.popen3(cmd) do |stdin, stdout, stderr, t|
+      pid = t.pid
+      stdin.close
+      err_thr = Thread.new { copy_lines(stderr, $stderr) }
+      puts "Reading STDOUT"
+      copy_lines(stdout, $stdout)
+      err_thr.join
+      t.value
+    end
+  end
+
+  def copy_lines(str_in, str_out)
+    str_in.each_line {|line| str_out.puts line}
+  end
+
+
+
+  # returns true if the rsync command was successful
+  def success?
+    (@status.nil?) ? nil : @status.success?
+  end
+
+
   # returns the command string to execute with all parameters set
   def build_command
     

data/lib/rsyncbackup/version.rb

@@ -1,5 +1,5 @@
 class Rsyncbackup
-  VERSION = "2.0.5"
+  VERSION = "2.1.1"
   DEFAULT_EXCLUSIONS = File.expand_path('.rsyncbackup.exclusions', ENV['HOME'])
   DEFAULT_INCOMPLETE_DIR_NAME = '.incomplete'
   DEFAULT_LAST_FULL_DIR_NAME  = '.lastfull'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsyncbackup
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.1
 platform: ruby
 authors:
 - Tamara Temple