lib/wordmove/hosts/remote_host.rb in wordmove-0.0.6 vs lib/wordmove/hosts/remote_host.rb in wordmove-0.0.7

@@ -34,15 +34,19 @@
         ssh.scp.upload! source_file, destination_file
       end
     end
 
     def download_dir(source_dir, destination_dir)
-      rsync "#{source_dir}/", "#{options.ssh.username}@#{options.ssh.host}:#{destination_dir}"
+      destination_dir = "#{options.ssh.host}:#{destination_dir}"
+      destination_dir = "#{options.ssh.username}@#{destination_dir}" if options.ssh.username
+      rsync "#{source_dir}/", destination_dir
     end
 
     def upload_dir(source_dir, destination_dir)
-      rsync "#{options.ssh.username}@#{options.ssh.host}:#{source_dir}/", destination_dir
+      source_dir = "#{options.ssh.host}:#{source_dir}/"
+      source_dir = "#{options.ssh.username}@#{source_dir}" if options.ssh.username
+      rsync source_dir, destination_dir
     end
 
     def run(*args)
       command = shell_command(*args)
       logger.verbose "Executing remotely #{command}"
@@ -57,29 +61,28 @@
       exclude_file.write(options.exclude.join("\n"))
       exclude_file.close
 
       arguments = [ "-azLK" ]
 
-      password_file = nil
-      if options.ssh
+      if options.ssh && (options.ssh.port || options.ssh.password)
 
+        remote_shell_arguments = [ "ssh" ]
+
         if options.ssh.port
-          arguments << [ '-e', "ssh -p #{options.ssh.port}" ]
+          remote_shell_arguments << [ "-p", options.ssh.port ]
         end
 
         if options.ssh.password
-          password_file = Tempfile.new('rsync_password')
-          password_file.write(options.ssh.password)
-          password_file.close
-          arguments << "--password-file=#{password_file.path}"
+          remote_shell_arguments = [ "sshpass", "-p", options.ssh.password ] + remote_shell_arguments
         end
+
+        arguments << [ "-e", remote_shell_arguments.join(" ") ]
       end
 
       arguments <<  [ "--exclude-from=#{exclude_file.path}", "--delete", source_dir, destination_dir ]
       arguments.flatten!
       locally_run "rsync", *arguments
 
-      password_file.unlink if password_file
       exclude_file.unlink
     end
 
   end
 end