cli 0.1.0 → 0.1.1

data/README.md

@@ -96,6 +96,7 @@ Example version output:
 
 ```ruby
 require 'cli'
+require 'yaml'
 
 options = CLI.new do
 	description 'Generate blog posts in given Jekyll directory from input statistics'

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/cli.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cli"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-12-16"
+  s.date = "2011-12-19"
   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 = [

data/examples/processor

@@ -4,6 +4,7 @@ cli_root = Pathname.new(__FILE__).dirname + '..'
 $LOAD_PATH.unshift(cli_root + 'lib')
 
 require 'cli'
+require 'yaml'
 
 options = CLI.new do
 	description 'Generate blog posts in given Jekyll directory from input statistics'

data/lib/cli.rb

@@ -1,6 +1,5 @@
 require 'ostruct'
 require 'stringio'
-require 'yaml'
 
 require 'cli/dsl'
 require 'cli/arguments'
@@ -23,31 +22,31 @@ class CLI
 
 		class ArgumentNameSpecifiedTwice < ParserError
 			def initialize(arg)
-				super("argument #{arg} specified twice")
+				super("argument '#{arg}' specified twice")
 			end
 		end
 
 		class LongNameSpecifiedTwiceError < ParserError
-			def initialize(what, name)
-				super("#{what} #{name} specified twice")
+			def initialize(what, switch_dsl)
+				super("#{what} #{switch_dsl.switch} specified twice")
 			end
 		end
 
 		class ShortNameSpecifiedTwiceError < ParserError
-			def initialize(what, name)
-				super("short #{what} #{name} specified twice")
+			def initialize(what, switch_dsl)
+				super("short #{what} #{switch_dsl.switch_short} specified twice")
 			end
 		end
 
 		class ShortNameNotSymbolError < ParserError
-			def initialize(short)
-				super("short name has to be of type Symbol, got #{short.class.name}")
+			def initialize(switch_dsl, short)
+				super("short name for #{switch_dsl.switch} has to be of type Symbol, got #{short.class.name}")
 			end
 		end
 
 		class ShortNameIsInvalidError < ParserError
-			def initialize(short)
-				super("short name has to be one letter symbol, got #{short}")
+			def initialize(switch_dsl, short)
+				super("short name for #{switch_dsl.switch} has to be one letter symbol, got #{short.inspect}")
 			end
 		end
 	end
@@ -73,13 +72,13 @@ class CLI
 
 		class MandatoryArgumentNotSpecifiedError < ParsingError
 			def initialize(arg)
-				super("mandatory argument #{arg} not given")
+				super("mandatory argument '#{arg}' not given")
 			end
 		end
 
 		class CastError < ParsingError
 			def initialize(arg, cast_name, error)
-				super("failed to cast: #{arg} to type: #{cast_name}: #{error}")
+				super("failed to cast: '#{arg}' to type: #{cast_name}: #{error}")
 			end
 		end
 	end
@@ -128,10 +127,10 @@ class CLI
 	def switch(name, options = {})
 		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) 
+		raise ParserError::LongNameSpecifiedTwiceError.new('switch', switch_dsl) if @switches.has_long?(switch_dsl) 
+		raise ParserError::LongNameSpecifiedTwiceError.new('option and switch', switch_dsl) if @options.has_long?(switch_dsl) 
+		raise ParserError::ShortNameSpecifiedTwiceError.new('switch', switch_dsl) if @switches.has_short?(switch_dsl) 
+		raise ParserError::ShortNameSpecifiedTwiceError.new('option and switch', switch_dsl) if @options.has_short?(switch_dsl) 
 
 		@switches << switch_dsl
 	end
@@ -139,10 +138,10 @@ class CLI
 	def option(name, options = {})
 		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) 
+		raise ParserError::LongNameSpecifiedTwiceError.new('option', option_dsl) if @options.has_long?(option_dsl) 
+		raise ParserError::LongNameSpecifiedTwiceError.new('switch and option', option_dsl) if @switches.has_long?(option_dsl) 
+		raise ParserError::ShortNameSpecifiedTwiceError.new('option', option_dsl) if @options.has_short?(option_dsl) 
+		raise ParserError::ShortNameSpecifiedTwiceError.new('switch and option', option_dsl) if @switches.has_short?(option_dsl) 
 
 		@options << option_dsl
 	end

data/lib/cli/dsl.rb

@@ -22,10 +22,12 @@ class CLI
 							value.to_i
 						elsif cast_to == Float
 							value.to_f
-						elsif cast_to == YAML
-							YAML.load(value)
-						else
+						elsif cast_to.respond_to? :new
 							cast_to.new(value)
+						elsif cast_to.respond_to? :load
+							cast_to.load(value)
+						else
+							raise ArgumentError, "can't cast to class or module #{cast_to.class.name}"
 						end
 					else
 						if cast_to.is_a? Proc
@@ -87,8 +89,8 @@ class CLI
 			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
+					raise ParserError::ShortNameNotSymbolError.new(self, short) if not short.is_a? Symbol
+					raise ParserError::ShortNameIsInvalidError.new(self, short) if short.to_s.length > 1
 				end
 			end
 

data/spec/argument_spec.rb

@@ -63,7 +63,7 @@ describe CLI do
 					argument :number
 					argument :number
 				end
-			}.should raise_error CLI::ParserError::ArgumentNameSpecifiedTwice, 'argument number specified twice'
+			}.should raise_error CLI::ParserError::ArgumentNameSpecifiedTwice, "argument 'number' specified twice"
 		end
 
 		it "should be required by default and raise error if not given" do
@@ -71,7 +71,7 @@ describe CLI do
 				ps = CLI.new do
 					argument :log
 				end.parse([])
-			}.should raise_error CLI::ParsingError::MandatoryArgumentNotSpecifiedError, 'mandatory argument log not given'
+			}.should raise_error CLI::ParsingError::MandatoryArgumentNotSpecifiedError, "mandatory argument 'log' not given"
 		end
 
 		it "should raise error if casting fail" do
@@ -80,7 +80,7 @@ describe CLI do
 				ps = CLI.new do
 					argument :log, :cast => IP
 				end.parse(['abc'])
-			}.should raise_error CLI::ParsingError::CastError, '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

data/spec/conflict_reporting_spec.rb

@@ -9,28 +9,28 @@ describe CLI do
 					switch :location
 					switch :location
 				end
-			}.should raise_error CLI::ParserError::LongNameSpecifiedTwiceError, 'switch location specified twice'
+			}.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'
+			}.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'
+			}.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'
+			}.should raise_error CLI::ParserError::LongNameSpecifiedTwiceError, 'option and switch --location specified twice'
 		end
 	end
 
@@ -41,28 +41,28 @@ describe CLI do
 					switch :location, :short => :l
 					switch :location2, :short => :l
 				end
-			}.should raise_error CLI::ParserError::ShortNameSpecifiedTwiceError, 'short switch l specified twice'
+			}.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'
+			}.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'
+			}.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'
+			}.should raise_error CLI::ParserError::ShortNameSpecifiedTwiceError, 'short option and switch -l specified twice'
 		end
 	end
 end

data/spec/stdin_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'yaml'
 
 describe CLI do
 	describe 'STDIN handling' do
@@ -23,7 +24,7 @@ EOF
 			ps.stdin.should be_a IO
 		end
 
-		it "should support casting to YAML" do
+		it "should support casting to module responding to load" do
 			ps = nil
 			ss = CLI.new do
 				stdin :log_data, :cast => YAML, :description => 'log statistic data in YAML format'

data/spec/switch_spec.rb

@@ -39,13 +39,13 @@ describe CLI do
 				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'
+			}.should raise_error CLI::ParserError::ShortNameNotSymbolError, 'short name for --location 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'
+			}.should raise_error CLI::ParserError::ShortNameIsInvalidError, 'short name for --location has to be one letter symbol, got :abc'
 		end
 
 		it "should raise error on unrecognized switch" do

data/spec/usage_spec.rb

@@ -64,13 +64,13 @@ describe CLI do
 					ps = CLI.new do
 						switch :help
 					end
-				}.should raise_error CLI::ParserError::LongNameSpecifiedTwiceError, 'switch help specified twice'
+				}.should raise_error CLI::ParserError::LongNameSpecifiedTwiceError, 'switch --help specified twice'
 
 				lambda {
 					ps = CLI.new do
 						switch :help2, :short => :h
 					end
-				}.should raise_error CLI::ParserError::ShortNameSpecifiedTwiceError, 'short switch h specified twice'
+				}.should raise_error CLI::ParserError::ShortNameSpecifiedTwiceError, 'short switch -h specified twice'
 			end
 
 			it "should display help switch in the help message as the last entry" do
@@ -119,14 +119,14 @@ describe CLI do
 						version '1.0.2'
 						switch :version
 					end
-				}.should raise_error CLI::ParserError::LongNameSpecifiedTwiceError, 'switch version specified twice'
+				}.should raise_error CLI::ParserError::LongNameSpecifiedTwiceError, 'switch --version specified twice'
 
 				lambda {
 					ps = CLI.new do
 						version '1.0.2'
 						option :version
 					end
-				}.should raise_error CLI::ParserError::LongNameSpecifiedTwiceError, 'option and switch version specified twice'
+				}.should raise_error CLI::ParserError::LongNameSpecifiedTwiceError, 'option and switch --version specified twice'
 			end
 		end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cli
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 Z
+date: 2011-12-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development