From 506ee7c16e3d7689a78db6b3ed31f6e93b96cd69 Mon Sep 17 00:00:00 2001
From: icy <kyanh@viettug.org>
Date: Wed, 9 May 2012 17:33:07 +0700
Subject: check if format is valid before creating/seting/...

as the old code only checks if the format name is empty, we can set any
kind of key/value in the database. for example, this command will work
without any error reported:

    trocla set someuser strange_format

I replace the method miss_format by check_format that should be invoked
before any thing related to format.
---
 bin/trocla | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/bin/trocla b/bin/trocla
index ac7389f..5b8ed55 100755
--- a/bin/trocla
+++ b/bin/trocla
@@ -39,7 +39,7 @@ OptionParser.new do |opts|
 end.parse!
 
 def create(options)
-  miss_format unless options[:trocla_format]
+  check_format(options[:trocla_format])
   Trocla.new(options.delete(:config_file)).password(
     options.delete(:trocla_key),
     options.delete(:trocla_format),
@@ -48,14 +48,14 @@ def create(options)
 end
 
 def get(options)
-  miss_format unless options[:trocla_format]
+  check_format(options[:trocla_format])
   Trocla.new(options.delete(:config_file)).get_password(
     options.delete(:trocla_key),
     options.delete(:trocla_format)
   )
 end
 def set(options)
-  miss_format unless options[:trocla_format]
+  check_format(options[:trocla_format])
   if options.delete(:ask_password)
     require 'highline/import'
     password = ask("Enter your password: ") { |q| q.echo = "x" }
@@ -76,7 +76,7 @@ def set(options)
 end
 
 def reset(options)
-  miss_format unless options[:trocla_format]
+  check_format(options[:trocla_format])
   Trocla.new(options.delete(:config_file)).reset_password(
     options.delete(:trocla_key),
     options.delete(:trocla_format),
@@ -91,9 +91,15 @@ def delete(options)
   )
 end
 
-def miss_format
-  STDERR.puts "Missing format, exiting..."
-  exit 1
+def check_format(format_name)
+  if format_name.nil?
+    STDERR.puts "Missing format, exiting..."
+    exit 1
+  elsif not Trocla::Formats.available?(format_name)
+    STDERR.puts ":: Error: The format #{format_name} is not available"
+    exit 1
+  end
+  false
 end
 
 actions=['create','get','set','reset','delete']
-- 
cgit v1.2.3