options.rb in clickatell-0.2.0

- old
+ new

@@ -5,29 +5,34 @@
   module Utility
     class Options #:nodoc:
       def self.parse(args)
         options = self.default_options
         parser = OptionParser.new do |opts|
-          opts.banner = "Usage: sms [options] recipient_number message"
+          opts.banner = "Usage: sms [options] recipient message"
           opts.separator ""
           opts.separator "Specific options:"
           
-          opts.on('-u', '--username [USERNAME]',
+          opts.on('-u', '--username USERNAME',
             "Specify the clickatell username (overrides ~/.clickatell setting)") do |username|
              options.username = username 
           end
           
-          opts.on('-p', '--password [PASSWORD]',
+          opts.on('-p', '--password PASSWORD',
             "Specify the clickatell password (overrides ~/.clickatell setting)") do |password|
              options.password = password
           end
           
-          opts.on('-k', '--apikey [API_KEY]',
+          opts.on('-k', '--apikey API_KEY',
             "Specify the clickatell API key (overrides ~/.clickatell setting)") do |key|
              options.api_key = key
           end
           
+          opts.on('-b', '--show-balance',
+             "Shows the total number of credits remaining on your account") do
+             options.show_balance = true
+          end
+          
           opts.on_tail('-h', '--help', "Show this message") do
             puts opts
             exit
           end
           
@@ -38,10 +43,23 @@
         end
         
         parser.parse!(args)
         options.recipient = ARGV[-2]
         options.message   = ARGV[-1]
+        
+        if (options.message.nil? || options.recipient.nil?) && !options.show_balance
+          puts "You must specify a recipient and message!"
+          puts parser
+          exit
+        end
+
         return options
+        
+      rescue OptionParser::MissingArgument => e
+        switch_given = e.message.split(':').last.strip
+        puts "The #{switch_given} option requires an argument."
+        puts parser
+        exit
       end
       
       def self.default_options
         options = OpenStruct.new
         config_file = File.open(File.join(ENV['HOME'], '.clickatell'))