From 76c5ab07c7d543189b0a18273bded20a35954a89 Mon Sep 17 00:00:00 2001
From: nishiki <nishiki@yaegashi.fr>
Date: Mon, 27 Jan 2014 20:19:38 +0100
Subject: [PATCH] rename function

---
 lib/Cli.rb  |  2 +-
 lib/MPW.rb  | 21 ++++++++++-----------
 lib/Sync.rb |  2 +-
 mpw         |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/lib/Cli.rb b/lib/Cli.rb
index b6ed04d..74f966b 100644
--- a/lib/Cli.rb
+++ b/lib/Cli.rb
@@ -54,7 +54,7 @@ class Cli
 				end
 			end
 		rescue Exception => e
-			puts "#{I18n.t('display.error')}: #{I18n.t('sync.error')}\n#{e}"
+			puts "#{I18n.t('display.error')}: #{e}"
 		end
 
 		return false
diff --git a/lib/MPW.rb b/lib/MPW.rb
index d69f334..366f657 100644
--- a/lib/MPW.rb
+++ b/lib/MPW.rb
@@ -147,15 +147,15 @@ class MPW
 		row_update       = Array.new()
 		row_update[DATE] = Time.now.to_i
 
-		id.nil?	      || id.empty?       ? (row_update[ID]       = MPW.generatePassword(16)) : (row_update[ID]       = id)
-		name.nil?     || name.empty?     ? (row_update[NAME]     = row[NAME])                : (row_update[NAME]     = name)
-		group.nil?    || group.empty?    ? (row_update[GROUP]    = row[GROUP])               : (row_update[GROUP]    = group)
-		server.nil?   || server.empty?   ? (row_update[SERVER]   = row[SERVER])              : (row_update[SERVER]   = server)
-		protocol.nil? || protocol.empty? ? (row_update[PROTOCOL] = row[PROTOCOL])            : (row_update[PROTOCOL] = protocol)
-		login.nil?    || login.empty?    ? (row_update[LOGIN]    = row[LOGIN])               : (row_update[LOGIN]    = login)
-		passwd.nil?   || passwd.empty?   ? (row_update[PASSWORD] = row[PASSWORD])            : (row_update[PASSWORD] = passwd)
-		port.nil?     || port.empty?     ? (row_update[PORT]     = row[PORT])                : (row_update[PORT]     = port)
-		comment.nil?  || comment.empty?  ? (row_update[COMMENT]  = row[COMMENT])             : (row_update[COMMENT]  = comment)
+		id.nil?	      || id.empty?       ? (row_update[ID]       = MPW.password(16)) : (row_update[ID]       = id)
+		name.nil?     || name.empty?     ? (row_update[NAME]     = row[NAME])        : (row_update[NAME]     = name)
+		group.nil?    || group.empty?    ? (row_update[GROUP]    = row[GROUP])       : (row_update[GROUP]    = group)
+		server.nil?   || server.empty?   ? (row_update[SERVER]   = row[SERVER])      : (row_update[SERVER]   = server)
+		protocol.nil? || protocol.empty? ? (row_update[PROTOCOL] = row[PROTOCOL])    : (row_update[PROTOCOL] = protocol)
+		login.nil?    || login.empty?    ? (row_update[LOGIN]    = row[LOGIN])       : (row_update[LOGIN]    = login)
+		passwd.nil?   || passwd.empty?   ? (row_update[PASSWORD] = row[PASSWORD])    : (row_update[PASSWORD] = passwd)
+		port.nil?     || port.empty?     ? (row_update[PORT]     = row[PORT])        : (row_update[PORT]     = port)
+		comment.nil?  || comment.empty?  ? (row_update[COMMENT]  = row[COMMENT])     : (row_update[COMMENT]  = comment)
 		
 		row_update[NAME].nil?     ? (row_update[NAME]     = row_update[NAME])     : (row_update[NAME]     = row_update[NAME].force_encoding('ASCII-8BIT'))
 		row_update[GROUP].nil?    ? (row_update[GROUP]    = row_update[GROUP])    : (row_update[GROUP]    = row_update[GROUP].force_encoding('ASCII-8BIT'))
@@ -312,7 +312,7 @@ class MPW
 	# Generate a random password
 	# @args: length -> the length password
 	# @rtrn: a random string
-	def self.generatePassword(length=8)
+	def self.password(length=8)
 		if length.to_i <= 0
 			length = 8
 		else
@@ -328,5 +328,4 @@ class MPW
 
 		return result
 	end
-	
 end
diff --git a/lib/Sync.rb b/lib/Sync.rb
index 9969ea5..e85b0ce 100644
--- a/lib/Sync.rb
+++ b/lib/Sync.rb
@@ -64,7 +64,7 @@ class Sync
 			@error_msg = I18n.t('error.sync.communication')
 			return nil
 		elsif msg['error'].nil?
-			tmp_file = "/tmp/mpw-#{MPW.generatePassword()}.gpg"
+			tmp_file = "/tmp/mpw-#{MPW.password()}.gpg"
 			File.open(tmp_file, 'w') do |file|
 				file << msg['data']
 			end
diff --git a/mpw b/mpw
index b7ebf60..ff27575 100755
--- a/mpw
+++ b/mpw
@@ -83,7 +83,7 @@ OptionParser.new do |opts|
 	end
 
 	opts.on('-G', '--generate-password [LENGTH]', I18n.t('option.generate_password')) do |length|
-		puts MPW::generatePassword(length)
+		puts MPW::password(length)
 		exit 0
 	end