caterer 0.7.3 → 0.7.4

data/lib/caterer/communication/rsync.rb

@@ -4,6 +4,8 @@ module Caterer
   module Communication
     class Rsync
       
+      attr_reader :server
+
       class << self
         
         def available?
@@ -26,7 +28,7 @@ module Caterer
             begin
               out = stdout.readpartial(4096)
               if out.match /password:/
-                stdin.puts @server.password
+                stdin.puts server.password
               else
                 @logger.debug("stdout: #{out}")
               end
@@ -43,7 +45,14 @@ module Caterer
       protected
 
       def rsync_cmd(from, to)
-        "rsync -zr -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p #{@server.port}' --delete #{from} #{@server.username}@#{@server.host}:#{to}"
+        "rsync -zr -e '#{ssh_cmd}' --delete #{from} #{server.username}@#{server.host}:#{to}"
+      end
+
+      def ssh_cmd
+        cmd = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+        cmd += " -i #{server.key}" unless server.key.nil?
+        cmd += " -p #{server.port}" unless server.port == 22
+        cmd
       end
 
     end

data/lib/caterer/server.rb

@@ -114,7 +114,7 @@ module Caterer
         opts[:paranoid] = false
         opts[:port]     = port
         opts[:password] = password if password
-        opts[:keys]     = [].tap {|keys| keys << @key if @key }
+        opts[:keys]     = [].tap {|keys| keys << key if key }
       end
     end
 
@@ -146,6 +146,10 @@ module Caterer
       @port || 22
     end
 
+    def key
+      @key
+    end
+
     def data
       @data_hash ||= begin
         (@data.is_a? Hash) ? @data : {}

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors: