lib/rbfs/rsync.rb in rbfs-0.0.2 vs lib/rbfs/rsync.rb in rbfs-0.0.3

@@ -1,10 +1,32 @@
 module Rbfs
-  module Rsync
-    def sync(config)
-      command = "rsync -ave ssh --delete #{config[:root]} #{ip}:#{config[:root]}"
-      command += " -n" if config[:dry]
-      result = `#{command}`
-      puts result if config[:verbose]
+  class Rsync
+    def initialize(config = {}, host = nil)
+      @config = config
+      @host = host
+    end
+
+    def sync
+      args = ["-ae", "ssh", "--delete", @config[:root], "#{@host.ip}:#{@config[:root]}"]
+      args << "-v" if @config[:verbose]
+      args << "-n" if @config[:dry]
+      args << "--timeout=#{@config[:timeout]}" if @config[:timeout]
+      output = command("rsync", args)
+      exitcode = $?
+      {:output => output, :exitcode => exitcode}
+    end
+
+    def command(cmd, options = [], &block)
+      cmd_line = "#{cmd} "
+      cmd_line += options.join(' ')
+      run_command(cmd_line, &block)
+    end
+
+    def run_command(cmd, &block)
+      if block_given?
+        IO.popen("#{cmd} 2>&1", &block)
+      else
+        `#{cmd} 2>&1`
+      end
     end
   end
 end