Validate CLI options.

lib/relish/commands/base.rb

@@ -8,13 +8,20 @@ module Command
     class Base
       extend Dsl
 
+      option :organization
+      option :project
+      option :api_token, :default => lambda { get_and_store_api_token }
+      option :host,      :default => lambda { Relish.default_host }, :display => false
+
       attr_writer :args
       attr_reader :cli_options
 
       def initialize(args = [])
         @args = clean_args(args)
         @param = get_param
         @cli_options = Hash[*@args]
+
+        validate_cli_options
       end
 
       def url
@@ -26,12 +33,7 @@ def get_param
       end
 
     private
-
-      option :organization
-      option :project
-      option :api_token, :default => lambda { get_and_store_api_token }
-      option :host,      :default => lambda { Relish.default_host }
-
+
       def get_and_store_api_token
         api_token = get_api_token
         global_options_file.store('api_token' => api_token)
@@ -48,11 +50,30 @@ def get_api_token
       def resource(options = {})
         RestClient::Resource.new(url, options)
       end
-
+      
       def clean_args(args)
         args.inject([]) {|cleaned, arg| cleaned << arg.sub('--', '') }
       end
 
+      def valid_option_names
+        self.class.option_names
+      end
+
+      def option_names_to_display
+        self.class.option_names_to_display
+      end
+
+      def validate_cli_options
+        @cli_options.keys.each do |option|
+          unless valid_option_names.include?(option.to_s)
+            puts "#{option} is not a valid option.\n" +
+                 "Valid options are: #{option_names_to_display.sort.join(', ')}"
+
+            exit 1
+          end
+        end
+      end
+
       def global_options_file
         @global_options ||= OptionsFile.new(Relish.global_options_file)
       end

lib/relish/commands/config.rb

@@ -15,9 +15,7 @@ def show
       end
 
       def add
-        File.open(Relish.local_options_file, 'a') do |f|
-          f.write(YAML::dump(Hash[*@args]))
-        end
+        OptionsFile.new(Relish.local_options_file).store(@cli_options)
       end
 
     end

lib/relish/commands/dsl.rb

@@ -3,13 +3,26 @@ module Command
     module Dsl
 
       def option(name, options = {})
-        default_proc = options[:default] || lambda {}
+        name = name.to_s
+        default_proc = options[:default] || Proc.new {}
+
         define_method(name) do
-          cli_options[name.to_s] ||
-            local_options_file[name.to_s] ||
-            global_options_file[name.to_s] ||
-            instance_exec(&default_proc)
+          cli_options[name] ||
+          local_options_file[name] ||
+          global_options_file[name] ||
+          instance_exec(&default_proc)
         end
+
+        option_names << name
+        option_names_to_display << name unless options[:display] == false
+      end
+
+      def option_names
+        @@option_names ||= []
+      end
+
+      def option_names_to_display
+        @@option_names_to_display ||= []
       end
 
     end