fix ftp sync for mpw 3.0

lib/mpw/sync/ftp.rb

@@ -2,80 +2,53 @@
 # author: nishiki
 # mail: nishiki@yaegashi.fr
 
-require 'rubygems'
 require 'i18n'
 require 'net/ftp'
 		
 module MPW
-	class FTP
+class FTP
 
-		attr_accessor :error_msg
+	# Constructor
-		attr_accessor :enable
+	# @args: config -> the config
+	def initialize(config)
+		@host      = config['host']
+		@user      = config['user']
+		@password  = config['password']
+		@path      = config['path']
+		@port      = config['port'].instance_of?(Integer) ? 22 : config['port']
+	end
 
-		# Constructor
-		# @args: host -> the server host
-		#        port -> ther connection port
-		#        gpg_key -> the gpg key
-		#        password -> the remote password
-		#        suffix -> the suffix file
-		def initialize(host, user, password, path, port=nil)
-			@error_msg = nil
-			@enable    = false
 
-			@host     = host
+	# Connect to server
-			@user     = user
+	def connect
-			@password = password
+		Net::FTP.open(@host) do |ftp|
-			@path     = path
+			ftp.login(@user, @password)
-			@port     = port.instance_of?(Integer) ? 21 : port
+			break
 		end
+	rescue Exception => e
+		raise "#{I18n.t('error.sync.connection')}\n#{e}"
+	end
 
-		# Connect to server
+	# Get data on server
-		# @rtrn: false if the connection fail
+	# @args: file_tmp -> the path where download the file
-		def connect
+	def get(file_tmp)
-			Net::FTP.open(@host) do |ftp|
+		Net::FTP.open(@host) do |ftp|
-				ftp.login(@user, @password)
+			ftp.login(@user, @password)
-				@enable = true
+			ftp.gettextfile(@path, file_tmp)
-			end
-		rescue Exception => e
-			@error_msg = "#{I18n.t('error.sync.connection')}\n#{e}"
-			@enable    = false
-		else
-			return @enable
 		end
+	rescue Exception => e
+		raise "#{I18n.t('error.sync.download')}\n#{e}"
+	end
 
-		# Get data on server
+	# Update the remote data
-		# @args: gpg_password -> the gpg password
+	# @args: file_gpg -> the data to send on server
-		# @rtrn: nil if nothing data or error
+	def update(file_gpg)
-		def get(file_tmp)
+		Net::FTP.open(@host) do |ftp|
-			return false if not @enable
+			ftp.login(@user, @password)
-			
+			ftp.puttextfile(file_gpg, @path)
-			Net::FTP.open(@host) do |ftp|
-				ftp.login(@user, @password)
-				ftp.gettextfile(@path, file_tmp)
-			end
-		
-			return true
-		rescue Exception => e
-			@error_msg = "#{I18n.t('error.sync.download')}\n#{e}"
-			return false
 		end
-	
+	rescue Exception => e
-		# Update the remote data
+		raise "#{I18n.t('error.sync.upload')}\n#{e}"
-		# @args: data -> the data to send on server
-		# @rtrn: false if there is a problem
-		def update(file_gpg)
-			return true if not @enable
-	
-			Net::FTP.open(@host) do |ftp|
-				ftp.login(@user, @password)
-				ftp.puttextfile(file_gpg, @path)
-			end
-
-			return true
-		rescue Exception => e
-			@error_msg = "#{I18n.t('error.sync.upload')}\n#{e}"
-			return false
-		end
-
 	end
 end
+end