From a49c975f19331f7462fa3c4199440f2f30ca9783 Mon Sep 17 00:00:00 2001
From: nishiki <nishiki@yaegashi.fr>
Date: Sat, 17 Jan 2015 12:01:37 +0100
Subject: [PATCH] fix sync ftp and ssh

---
 lib/Sync/FTP.rb     | 4 ++--
 lib/Sync/MPWSync.rb | 4 ++--
 lib/Sync/SSH.rb     | 4 ++--
 lib/UI/Cli.rb       | 6 +++++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/Sync/FTP.rb b/lib/Sync/FTP.rb
index 4b6ba33..1bb2a55 100644
--- a/lib/Sync/FTP.rb
+++ b/lib/Sync/FTP.rb
@@ -50,7 +50,7 @@ module MPW
 			# Get data on server
 			# @args: gpg_password -> the gpg password
 			# @rtrn: nil if nothing data or error
-			def get(gpg_password)
+			def get(gpg_key, gpg_password)
 				return nil if not @enable
 				
 				tmp_file = tmpfile
@@ -59,7 +59,7 @@ module MPW
 					ftp.gettextfile(@path, tmp_file)
 				end
 			
-				mpw = MPW.new(tmp_file)
+				mpw = MPW.new(tmp_file, gpg_key)
 				if not mpw.decrypt(gpg_password)
 					@error_msg = mpw.error_msg
 					return nil
diff --git a/lib/Sync/MPWSync.rb b/lib/Sync/MPWSync.rb
index df8066f..9bb6572 100644
--- a/lib/Sync/MPWSync.rb
+++ b/lib/Sync/MPWSync.rb
@@ -61,7 +61,7 @@ module MPW
 			# Get data on server
 			# @args: gpg_password -> the gpg password
 			# @rtrn: nil if nothing data or error
-			def get(gpg_password)
+			def get(gpg_key, gpg_password)
 				return nil if not @enable
 			
 				msg = nil
@@ -90,7 +90,7 @@ module MPW
 						file << msg['data']
 					end
 					
-					mpw = MPW.new(tmp_file, @gpg_key)
+					mpw = MPW.new(tmp_file, gpg_key)
 					if not mpw.decrypt(gpg_password)
 						@error_msg = mpw.error_msg
 						return nil
diff --git a/lib/Sync/SSH.rb b/lib/Sync/SSH.rb
index d1f3801..9ebca2d 100644
--- a/lib/Sync/SSH.rb
+++ b/lib/Sync/SSH.rb
@@ -50,7 +50,7 @@ module MPW
 			# Get data on server
 			# @args: gpg_password -> the gpg password
 			# @rtrn: nil if nothing data or error
-			def get(gpg_password)
+			def get(gpg_key, gpg_password)
 				return nil if not @enable
 				
 				tmp_file = tmpfile
@@ -58,7 +58,7 @@ module MPW
 					scp.download!(@path, tmp_file)
 				end
 			
-				mpw = MPW.new(tmp_file)
+				mpw = MPW.new(tmp_file, gpg_key)
 				if not mpw.decrypt(gpg_password)
 					@error_msg = mpw.error_msg
 					return nil
diff --git a/lib/UI/Cli.rb b/lib/UI/Cli.rb
index 95f6f5f..2dc3bd7 100644
--- a/lib/UI/Cli.rb
+++ b/lib/UI/Cli.rb
@@ -47,15 +47,19 @@ class Cli
 		end
 
 		if @sync.enable
-			if not @mpw.sync(@sync.get(@passwd), @config.last_update)
+			if not @mpw.sync(@sync.get(@config.key, @passwd), @config.last_update)
 				puts "#{I18n.t('display.error')} #2: #{@mpw.error_msg}".red  if not @mpw.error_msg.nil?
 				puts "#{I18n.t('display.error')} #3: #{@sync.error_msg}".red if not @sync.error_msg.nil?
+
 			elsif not @sync.update(File.open(@config.file_gpg).read)
 				puts "#{I18n.t('display.error')} #4: #{@sync.error_msg}".red
+
 			elsif not @config.set_last_update
 				puts "#{I18n.t('display.error')} #5: #{@config.error_msg}".red
+
 			elsif not @mpw.encrypt
 				puts "#{I18n.t('display.error')} #6: #{@mpw.error_msg}".red
+
 			else
 				return true
 			end