cli 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/cli.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cli"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-12-01"
+  s.date = "2011-12-15"
   s.description = "Provides DSL for command-line options, switches and arguments parser and stdin handling with generated usage printer"
   s.email = "jpastuszek@gmail.com"
   s.extra_rdoc_files = [
@@ -30,6 +30,10 @@ Gem::Specification.new do |s|
     "features/step_definitions/cli_steps.rb",
     "features/support/env.rb",
     "lib/cli.rb",
+    "lib/cli/arguments.rb",
+    "lib/cli/dsl.rb",
+    "lib/cli/options.rb",
+    "lib/cli/switches.rb",
     "spec/cli_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/cli.rb

@@ -2,136 +2,102 @@ require 'ostruct'
 require 'stringio'
 require 'yaml'
 
-class CLI
-	class ParsingError < ArgumentError
-	end
-
-	class Parsed < OpenStruct
-		def value(argument, value)
-			send((argument.name.to_s + '=').to_sym, argument.cast(value)) 
-		end
-
-		def set(argument)
-			send((argument.name.to_s + '=').to_sym, true) 
-		end
-	end
-
-	module Options
-		class Base
-			def initialize(name, options = {})
-				@name = name
-				@options = options
-			end
+require 'cli/dsl'
+require 'cli/arguments'
+require 'cli/switches'
+require 'cli/options'
 
-			attr_reader :name
-		end
-		
-		module Cast
-			def cast(value)
-				begin
-					cast_class = @options[:cast]
-					if cast_class == nil
-						value
-					elsif cast_class == Integer
-						value.to_i
-					elsif cast_class == Float
-						value.to_f
-					elsif cast_class == YAML
-						YAML.load(value)
-					else
-						cast_class.new(value)
-					end
-				rescue => e
-					raise ParsingError, "failed to cast: #{@name} to type: #{@options[:cast].name}: #{e}"
-				end
+class CLI
+	class ParserError < ArgumentError
+		class NameArgumetNotSymbolError < ParserError
+			def initialize(type, arg)
+				super("#{type} name has to be of type Symbol, got #{arg.class.name}")
 			end
 		end
 
-		module Description
-			def description?
-				@options.member? :description
-			end
-
-			def description
-				@options[:description]
+		class OptionsArgumentNotHashError < ParserError
+			def initialize(type, arg)
+				super("#{type} options has to be of type Hash, got #{arg.class.name}")
 			end
 		end
 
-		module Value
-			def default
-				@options[:default]
+		class ArgumentNameSpecifiedTwice < ParserError
+			def initialize(arg)
+				super("argument #{arg} specified twice")
 			end
+		end
 
-			def has_default?
-				@options.member? :default
+		class LongNameSpecifiedTwiceError < ParserError
+			def initialize(what, name)
+				super("#{what} #{name} specified twice")
 			end
+		end
 
-			def optional?
-				has_default?
+		class ShortNameSpecifiedTwiceError < ParserError
+			def initialize(what, name)
+				super("short #{what} #{name} specified twice")
 			end
 		end
-	end
-
-	class STDINHandling < Options::Base
-		include Options::Cast
-		include Options::Description
 
-		def to_s
-			(@name or @options[:cast] or 'data').to_s.tr('_', '-')
+		class ShortNameNotSymbolError < ParserError
+			def initialize(short)
+				super("short name has to be of type Symbol, got #{short.class.name}")
+			end
 		end
-	end
-
-	class Argument < Options::Base
-		include Options::Value
-		include Options::Cast
-		include Options::Description
 
-		def to_s
-			name.to_s.tr('_', '-')
+		class ShortNameIsInvalidError < ParserError
+			def initialize(short)
+				super("short name has to be one letter symbol, got #{short}")
+			end
 		end
 	end
 
-	class Switch < Options::Base
-		include Options::Description
-
-		def has_short?
-			@options.member? :short
+	class ParsingError < ArgumentError
+		class MissingOptionValueError < ParsingError
+			def initialize(option)
+				super("missing value for option #{option.switch}")
+			end
 		end
 
-		def short
-			@options[:short]
+		class UnknownSwitchError < ParsingError
+			def initialize(arg)
+				super("unknown switch #{arg}")
+			end
 		end
 
-		def switch
-			'--' + name.to_s.tr('_', '-')
+		class MandatoryOptionsNotSpecifiedError < ParsingError
+			def initialize(options)
+				super("mandatory options not specified: #{options.map{|o| o.switch}.sort.join(', ')}")
+			end
 		end
 
-		def switch_short
-			'-' + short.to_s
+		class MandatoryArgumentNotSpecifiedError < ParsingError
+			def initialize(arg)
+				super("mandatory argument #{arg} not given")
+			end
 		end
 
-		def to_s
-			switch
+		class CastError < ParsingError
+			def initialize(arg, cast_name, error)
+				super("failed to cast: #{arg} to type: #{cast_name}: #{error}")
+			end
 		end
 	end
 
-	class Option < Switch
-		include Options::Value
-		include Options::Cast
+	class Values < OpenStruct
+		def value(argument, value)
+			send((argument.name.to_s + '=').to_sym, value) 
+		end
 
-		def optional?
-			has_default? or not @options[:required]
+		def set(argument)
+			value(argument, true)
 		end
 	end
 
 	def initialize(&block)
-		#TODO: optoins should be in own class?
-		@switches = []
-		@switches_long = {}
-		@switches_short = {}
-		@options_default = []
-		@options_required = []
-		@arguments = []
+		@arguments = Arguments.new
+		@switches = Switches.new
+		@options = Options.new
 		instance_eval(&block) if block_given?
 	end
 
@@ -139,70 +105,74 @@ class CLI
 		@description = desc
 	end
 
-	def stdin(name = nil, options = {})
-		@stdin_handling = STDINHandling.new(name, options)
+	def stdin(name = :data, options = {})
+		@stdin = DSL::Input.new(name, options)
 	end
 
 	def argument(name, options = {})
-		raise ArgumentError, "expected argument options of type Hash, got: #{options.class.name}" unless options.is_a? Hash
-		@arguments << Argument.new(name, options)
+		argument_dsl = DSL::Argument.new(name, options)
+
+		raise ParserError::ArgumentNameSpecifiedTwice.new(argument_dsl.name) if @arguments.has?(argument_dsl)
+
+		@arguments << argument_dsl
 	end
 
 	def switch(name, options = {})
-		o = Switch.new(name, options)
-		@switches << o
-		@switches_long[name] = o
-		@switches_short[o.short] = o if o.has_short?
+		switch_dsl = DSL::Switch.new(name, options)
+
+		raise ParserError::LongNameSpecifiedTwiceError.new('switch', switch_dsl.name) if @switches.has_long?(switch_dsl) 
+		raise ParserError::LongNameSpecifiedTwiceError.new('option and switch', switch_dsl.name) if @options.has_long?(switch_dsl) 
+		raise ParserError::ShortNameSpecifiedTwiceError.new('switch', switch_dsl.short) if @switches.has_short?(switch_dsl) 
+		raise ParserError::ShortNameSpecifiedTwiceError.new('option and switch', switch_dsl.short) if @options.has_short?(switch_dsl) 
+
+		@switches << switch_dsl
 	end
 
 	def option(name, options = {})
-		o = Option.new(name, options)
-		@switches << o
-		@switches_long[name] = o
-		@switches_short[o.short] = o if o.has_short?
-		@options_default << o if o.has_default?
-		@options_required << o unless o.optional?
+		option_dsl = DSL::Option.new(name, options)
+
+		raise ParserError::LongNameSpecifiedTwiceError.new('option', option_dsl.name) if @options.has_long?(option_dsl) 
+		raise ParserError::LongNameSpecifiedTwiceError.new('switch and option', option_dsl.name) if @switches.has_long?(option_dsl) 
+		raise ParserError::ShortNameSpecifiedTwiceError.new('option', option_dsl.short) if @options.has_short?(option_dsl) 
+		raise ParserError::ShortNameSpecifiedTwiceError.new('switch and option', option_dsl.short) if @switches.has_short?(option_dsl) 
+
+		@options << option_dsl
 	end
 
 	def parse(_argv = ARGV, stdin = STDIN, stderr = STDERR)
-		parsed = Parsed.new
-
+		values = Values.new
 		argv = _argv.dup
 
 		# check help
 		if argv.include? '-h' or argv.include? '--help' 
-			parsed.help = usage
-			return parsed
+			values.help = usage
+			return values
 		end
 
 		# set defaults
-		@options_default.each do |o|
-			parsed.value(o, o.default)
+		@options.defaults.each do |o|
+			values.value(o, o.cast(o.default))
 		end
 
 		# process switches
-		options_required = @options_required.dup
-		while argv.first =~ /^-/
-			arg = argv.shift
-			switch = if arg =~ /^--/
-				@switches_long[arg.sub(/^--/, '').tr('-', '_').to_sym]
-			else
-				@switches_short[arg.sub(/^-/, '').tr('-', '_').to_sym]
-			end
+		mandatory_options = @options.mandatory.dup
 
-			raise ParsingError, "unknonw switch: #{arg}" unless switch
+		while Switches.is_switch?(argv.first)
+			arg = argv.shift
 
-			if switch.kind_of? Option
-				value = argv.shift or raise ParsingError, "missing option argument: #{switch}"
-				parsed.value(switch, value)
-				options_required.delete(switch)
+			if switch = @switches.find(arg)
+				values.set(switch)
+			elsif option = @options.find(arg)
+				value = argv.shift or raise ParsingError::MissingOptionValueError.new(option)
+				values.value(option, option.cast(value))
+				mandatory_options.delete(option)
 			else
-				parsed.set(switch)
+				raise ParsingError::UnknownSwitchError.new(arg) unless switch
 			end
 		end
 
-		# check required
-		raise ParsingError, "following options are required but were not specified: #{options_required.map{|o| o.switch}.join(', ')}" unless options_required.empty?
+		# check mandatory options
+		raise ParsingError::MandatoryOptionsNotSpecifiedError.new(mandatory_options) unless mandatory_options.empty?
 
 		# process arguments
 		arguments = @arguments.dup
@@ -210,16 +180,16 @@ class CLI
 			value = if argv.length < arguments.length + 1 and argument.optional?
 				argument.default # not enough arguments, try to skip optional if possible
 			else
-				argv.shift or raise ParsingError, "missing argument: #{argument}"
+				argv.shift or raise ParsingError::MandatoryArgumentNotSpecifiedError.new(argument)
 			end
 
-			parsed.value(argument, value)
+			values.value(argument, argument.cast(value))
 		end
 
 		# process stdin
-		parsed.stdin = @stdin_handling.cast(stdin) if @stdin_handling
+		values.stdin = @stdin.cast(stdin) if @stdin
 
-		parsed
+		values
 	end
 
 	def parse!(argv = ARGV, stdin = STDIN, stderr = STDERR, stdout = STDOUT)
@@ -236,29 +206,26 @@ class CLI
 	end
 
 	def usage(msg = nil)
-		switches = @switches.select{|s| s.class == Switch}
-		options = @switches.select{|s| s.class == Option}
-
 		out = StringIO.new
 		out.puts msg if msg
 		out.print "Usage: #{File.basename $0}"
-		out.print ' [switches|options]' if not switches.empty? and not options.empty?
-		out.print ' [switches]' if not switches.empty? and options.empty?
-		out.print ' [options]' if switches.empty? and not options.empty?
+		out.print ' [switches|options]' if not @switches.empty? and not @options.empty?
+		out.print ' [switches]' if not @switches.empty? and @options.empty?
+		out.print ' [options]' if @switches.empty? and not @options.empty?
 		out.print ' ' + @arguments.map{|a| a.to_s}.join(' ') unless @arguments.empty?
-		out.print " < #{@stdin_handling}" if @stdin_handling
+		out.print " < #{@stdin}" if @stdin
 
 		out.puts
 		out.puts @description if @description
 
-		if @stdin_handling and @stdin_handling.description?
+		if @stdin and @stdin.description?
 			out.puts "Input:"
-			out.puts "   #{@stdin_handling} - #{@stdin_handling.description}"
+			out.puts "   #{@stdin} - #{@stdin.description}"
 		end
 
-		unless switches.empty?
+		unless @switches.empty?
 			out.puts "Switches:"
-			switches.each do |s|
+			@switches.each do |s|
 				out.print '   '
 				out.print s.switch
 				out.print " (#{s.switch_short})" if s.has_short?
@@ -267,9 +234,9 @@ class CLI
 			end
 		end
 
-		unless options.empty?
+		unless @options.empty?
 			out.puts "Options:"
-			options.each do |o|
+			@options.each do |o|
 				out.print '   '
 				out.print o.switch
 				out.print " (#{o.switch_short})" if o.has_short?

data/lib/cli/arguments.rb

@@ -0,0 +1,6 @@
+class CLI::Arguments < Array
+	def has?(argument_dsl)
+		self.find{|a| a.name == argument_dsl.name}
+	end
+end
+

data/lib/cli/dsl.rb

@@ -0,0 +1,121 @@
+class CLI
+	module DSL
+		class Base
+			def initialize(name, options = {})
+				class_name = self.class.name.gsub(/.*:/, '').downcase
+				raise ParserError::NameArgumetNotSymbolError.new(class_name, name) unless name.is_a? Symbol
+				raise ParserError::OptionsArgumentNotHashError.new(class_name, options) unless options.is_a? Hash
+				@name = name
+				@options = options
+			end
+
+			attr_reader :name
+		end
+		
+		module Cast
+			def cast(value)
+				begin
+					cast_class = @options[:cast]
+					if cast_class == nil
+						value
+					elsif cast_class == Integer
+						value.to_i
+					elsif cast_class == Float
+						value.to_f
+					elsif cast_class == YAML
+						YAML.load(value)
+					else
+						cast_class.new(value)
+					end
+				rescue => e
+					raise ParsingError::CastError.new(@name, @options[:cast].name, e)
+				end
+			end
+		end
+
+		module Description
+			def description?
+				@options.member? :description
+			end
+
+			def description
+				@options[:description]
+			end
+		end
+
+		module Value
+			def default
+				@options[:default]
+			end
+
+			def has_default?
+				@options.member? :default
+			end
+
+			def optional?
+				has_default?
+			end
+		end
+
+		class Input < DSL::Base
+			include DSL::Cast
+			include DSL::Description
+
+			def to_s
+				(@name or @options[:cast] or 'data').to_s.tr('_', '-')
+			end
+		end
+
+		class Argument < DSL::Base
+			include DSL::Value
+			include DSL::Cast
+			include DSL::Description
+
+			def to_s
+				name.to_s.tr('_', '-')
+			end
+		end
+
+		class Switch < DSL::Base
+			def initialize(name, options = {})
+				super(name, options)
+				if short = options[:short]
+					raise ParserError::ShortNameNotSymbolError.new(short) if not short.is_a? Symbol
+					raise ParserError::ShortNameIsInvalidError.new(short) if short.to_s.length > 1
+				end
+			end
+
+			include DSL::Description
+
+			def has_short?
+				@options.member? :short
+			end
+
+			def short
+				@options[:short]
+			end
+
+			def switch
+				'--' + name.to_s.tr('_', '-')
+			end
+
+			def switch_short
+				'-' + short.to_s
+			end
+
+			def to_s
+				switch
+			end
+		end
+
+		class Option < Switch
+			include DSL::Value
+			include DSL::Cast
+
+			def optional?
+				has_default? or not @options[:required]
+			end
+		end
+	end
+end
+

data/lib/cli/options.rb

@@ -0,0 +1,19 @@
+require 'cli/switches'
+
+class CLI::Options < CLI::Switches
+	def initialize
+		super
+		@defaults = []
+		@mandatory = []
+	end
+
+	def <<(option_dsl)
+		super option_dsl
+		@defaults << option_dsl if option_dsl.has_default?
+		@mandatory << option_dsl unless option_dsl.optional?
+	end
+
+	attr_reader :defaults
+	attr_reader :mandatory
+end
+

data/lib/cli/switches.rb

@@ -0,0 +1,41 @@
+class CLI::Switches < Array
+	def initialize
+		@long = {}
+		@short = {}
+	end
+
+	def <<(switch_dsl)
+		super(switch_dsl)
+		@long[switch_dsl.name] = switch_dsl
+		@short[switch_dsl.short] = switch_dsl if switch_dsl.has_short?
+	end
+
+	def self.is_switch?(arg)
+		arg =~ /^-/
+	end
+
+	def find(arg)
+		if arg =~ /^--/
+			find_long(arg)
+		else
+			find_short(arg)
+		end
+	end
+
+	def find_long(arg)
+		@long[arg.sub(/^--/, '').tr('-', '_').to_sym]
+	end
+
+	def find_short(arg)
+		@short[arg.sub(/^-/, '').tr('-', '_').to_sym]
+	end
+
+	def has_long?(switch_dsl)
+		@long.member?(switch_dsl.name)
+	end
+
+	def has_short?(switch_dsl)
+		@short.member?(switch_dsl.short) if switch_dsl.has_short?
+	end
+end
+

data/spec/cli_spec.rb

@@ -94,12 +94,35 @@ EOF
 			ps.test.should == 'hello'
 		end
 
+		it "should raise error if not symbol and optional hash is passed" do
+			lambda {
+				ps = CLI.new do
+					argument 'number'
+				end
+			}.should raise_error CLI::ParserError::NameArgumetNotSymbolError, "argument name has to be of type Symbol, got String"
+
+			lambda {
+				ps = CLI.new do
+					argument :number, :test
+				end
+			}.should raise_error CLI::ParserError::OptionsArgumentNotHashError, "argument options has to be of type Hash, got Symbol"
+		end
+
+		it "should raise error if artument name is specified twice" do
+			lambda {
+				ps = CLI.new do
+					argument :number
+					argument :number
+				end
+			}.should raise_error CLI::ParserError::ArgumentNameSpecifiedTwice, 'argument number specified twice'
+		end
+
 		it "should raise error if not given" do
 			lambda {
 				ps = CLI.new do
 					argument :log
 				end.parse([])
-			}.should raise_error CLI::ParsingError
+			}.should raise_error CLI::ParsingError::MandatoryArgumentNotSpecifiedError, 'mandatory argument log not given'
 		end
 
 		it "should raise error if casting fail" do
@@ -108,7 +131,7 @@ EOF
 				ps = CLI.new do
 					argument :log, :cast => IP
 				end.parse(['abc'])
-			}.should raise_error CLI::ParsingError, 'failed to cast: log to type: IP: invalid address'
+			}.should raise_error CLI::ParsingError::CastError, 'failed to cast: log to type: IP: invalid address'
 		end
 
 		describe "with defaults" do
@@ -168,6 +191,34 @@ EOF
 			ps.unset.should be_nil
 		end
 
+		it "should raise error if not symbol and optional hash is passed" do
+			lambda {
+				ps = CLI.new do
+					switch 'number'
+				end.parse([])
+			}.should raise_error CLI::ParserError::NameArgumetNotSymbolError, "switch name has to be of type Symbol, got String"
+
+			lambda {
+				ps = CLI.new do
+					switch :number, :test
+				end
+			}.should raise_error CLI::ParserError::OptionsArgumentNotHashError, "switch options has to be of type Hash, got Symbol"
+		end
+
+		it "shoud raise error is short name is invalid" do
+			lambda {
+				ps = CLI.new do
+					switch :location, :short => "l"
+				end
+			}.should raise_error CLI::ParserError::ShortNameNotSymbolError, 'short name has to be of type Symbol, got String'
+
+			lambda {
+				ps = CLI.new do
+					switch :location, :short => :abc
+				end
+			}.should raise_error CLI::ParserError::ShortNameIsInvalidError, 'short name has to be one letter symbol, got abc'
+		end
+
 		it "should raise error on unrecognized switch" do
 			ps = CLI.new do
 				option :location
@@ -175,7 +226,7 @@ EOF
 			
 			lambda {
 				ps.parse(['--xxx'])
-			}.should raise_error CLI::ParsingError
+			}.should raise_error CLI::ParsingError::UnknownSwitchError, 'unknown switch --xxx'
 		end
 	end
 
@@ -240,6 +291,20 @@ EOF
 			ps.gold.should be_nil
 		end
 
+		it "should raise error if not symbol and optional hash is passed" do
+			lambda {
+				ps = CLI.new do
+					option 'number'
+				end
+			}.should raise_error CLI::ParserError::NameArgumetNotSymbolError, "option name has to be of type Symbol, got String"
+
+			lambda {
+				ps = CLI.new do
+					option :number, :test
+				end
+			}.should raise_error CLI::ParserError::OptionsArgumentNotHashError, "option options has to be of type Hash, got Symbol"
+		end
+
 		it "should raise error on missing option argument" do
 			ps = CLI.new do
 				option :location
@@ -247,12 +312,13 @@ EOF
 			
 			lambda {
 				ps.parse(['--location'])
-			}.should raise_error CLI::ParsingError
+			}.should raise_error CLI::ParsingError::MissingOptionValueError, 'missing value for option --location'
 		end
 
-		it "should raise error on missing required option" do
+		it "should raise error on missing mandatory option" do
 			ps = CLI.new do
 				option :location
+				option :weight, :required => true
 				option :size, :required => true
 				option :group, :default => 'red'
 				option :speed, :short => :s, :cast => Integer
@@ -260,7 +326,7 @@ EOF
 			
 			lambda {
 				ps.parse(['--location', 'singapore'])
-			}.should raise_error CLI::ParsingError, "following options are required but were not specified: --size"
+			}.should raise_error CLI::ParsingError::MandatoryOptionsNotSpecifiedError, "mandatory options not specified: --size, --weight"
 		end
 	end
 
@@ -291,6 +357,70 @@ EOF
 		ps.debug.should be_true
 	end
 
+	describe "name conflict reporting" do
+		it "raise error when long names configlict" do
+			lambda {
+				ps = CLI.new do
+					switch :location
+					switch :location
+				end
+			}.should raise_error CLI::ParserError::LongNameSpecifiedTwiceError, 'switch location specified twice'
+
+			lambda {
+				ps = CLI.new do
+					option :location
+					option :location
+				end
+			}.should raise_error CLI::ParserError::LongNameSpecifiedTwiceError, 'option location specified twice'
+
+			lambda {
+				ps = CLI.new do
+					switch :location
+					option :location
+				end
+			}.should raise_error CLI::ParserError::LongNameSpecifiedTwiceError, 'switch and option location specified twice'
+
+			lambda {
+				ps = CLI.new do
+					option :location
+					switch :location
+				end
+			}.should raise_error CLI::ParserError::LongNameSpecifiedTwiceError, 'option and switch location specified twice'
+		end
+	end
+
+	describe "short name conflict reporting" do
+		it "raise error when short names configlict" do
+			lambda {
+				ps = CLI.new do
+					switch :location, :short => :l
+					switch :location2, :short => :l
+				end
+			}.should raise_error CLI::ParserError::ShortNameSpecifiedTwiceError, 'short switch l specified twice'
+
+			lambda {
+				ps = CLI.new do
+					option :location, :short => :l
+					option :location2, :short => :l
+				end
+			}.should raise_error CLI::ParserError::ShortNameSpecifiedTwiceError, 'short option l specified twice'
+
+			lambda {
+				ps = CLI.new do
+					switch :location, :short => :l
+					option :location2, :short => :l
+				end
+			}.should raise_error CLI::ParserError::ShortNameSpecifiedTwiceError, 'short switch and option l specified twice'
+
+			lambda {
+				ps = CLI.new do
+					option :location2, :short => :l
+					switch :location, :short => :l
+				end
+			}.should raise_error CLI::ParserError::ShortNameSpecifiedTwiceError, 'short option and switch l specified twice'
+		end
+	end
+
 	describe "usage and description" do
 		it "parse should set help variable if -h or --help specified in the argument list and not parse the input" do
 			ss = CLI.new do
@@ -359,6 +489,31 @@ EOF
 			ss.usage.should include("log file to process")
 		end
 
+		it "should suggest that switches can be used in usage line" do
+			ss = CLI.new do
+				switch :location, :short => :l
+			end
+
+			ss.usage.first.should == "Usage: rspec [switches]\n"
+		end
+
+		it "should suggest that options can be used in usage line" do
+			ss = CLI.new do
+				option :location, :short => :l
+			end
+
+			ss.usage.first.should == "Usage: rspec [options]\n"
+		end
+
+		it "should suggest that switches or options can be used in usage line" do
+			ss = CLI.new do
+				switch :location, :short => :l
+				option :size, :short => :s
+			end
+
+			ss.usage.first.should == "Usage: rspec [switches|options]\n"
+		end
+
 		it "should allow describing whole script" do
 			ss = CLI.new do
 				description 'Log file processor'
@@ -398,7 +553,7 @@ EOF
 				switch :debug, :short => :d, :description => "enable debugging"
 				switch :logging, :short => :l
 				switch :run
-				option :location, :short => :l, :description => "place where server is located"
+				option :location, :short => :r, :description => "place where server is located"
 				option :group, :default => 'red'
 				option :power_up, :short => :p
 				option :speed, :short => :s, :cast => Integer
@@ -425,7 +580,7 @@ Switches:
    --logging (-l)
    --run
 Options:
-   --location (-l) - place where server is located
+   --location (-r) - place where server is located
    --group [red]
    --power-up (-p)
    --speed (-s)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cli
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 Z
+date: 2011-12-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -146,6 +146,10 @@ files:
 - features/step_definitions/cli_steps.rb
 - features/support/env.rb
 - lib/cli.rb
+- lib/cli/arguments.rb
+- lib/cli/dsl.rb
+- lib/cli/options.rb
+- lib/cli/switches.rb
 - spec/cli_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/jpastuszek/cli