cli 1.2.0 → 1.3.0

data/README.md

@@ -391,7 +391,7 @@ In addition to *switch*, option hash can have following pairs:
 * **:default => value** - use default value of *value* if the option was not specified on the command argument list. The *value* will firstly be casted to string (with `#to_s`) and then it will be casted if casting is specified.
 * **:default_label => label** - display *label* in usage rather than default value - useful to descirbe default value if default value is generated if no value is provided
 * **:cast => cast specifier** - cast the provided value (or default) with given *cast specifier*. 
-The specifier can be a class constant (like `Integer` or `Float`); the value will be provided to `#new` method of the class and resulting object used as option value. When provided constant does not respond to `#new` (i.e. it is a module) the `#load` method will be tried. If provided specifier is a Proc (or `lambda {}`) the Proc will be called with the value and resulting value will be used. Otherwise `CLI::ParsingError::CastError` will be raised.
+The specifier can be a class constant - the value will be provided to `#new` method of the class and resulting object used as option value. When provided constant does not respond to `#new` (i.e. it is a module) the `#load` method will be tried instead. If provided specifier is a Proc (or `lambda {}`) the Proc will be called with the value and resulting value will be used. Otherwise `CLI::ParsingError::CastError` will be raised.  Special cast specified `Integer` or `Float` can also be used - the value will be strictly casted to integer or float type.
 * **:required => true** - if used and no *default* value is specified the `#parse` method will fail with `CLI::ParsingError::MissingOptionValueError` if the option was not specified in the command argument list. If `#parse!` method was used the program will exit with appropriate message.
 
 #### options :name [, options hash]

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/cli.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cli"
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]

data/lib/cli/dsl.rb

@@ -19,9 +19,9 @@ class CLI
 
 					if cast_to.is_a? Module # all classes are modules
 						if cast_to == Integer
-							value.to_i
+							Integer(value)
 						elsif cast_to == Float
-							value.to_f
+							Float(value)
 						elsif cast_to.respond_to? :new
 							cast_to.new(value)
 						elsif cast_to.respond_to? :load

data/spec/argument_spec.rb

@@ -32,6 +32,22 @@ describe CLI do
 			ps.number.should == 123.0
 		end
 
+		it "casting should fail if not proper integer given" do
+			lambda {
+				ps = CLI.new do
+					argument :size, :cast => Integer
+				end.parse(['24.99'])
+			}.should raise_error(CLI::ParsingError::CastError)
+		end
+
+		it "casting should fail if not proper float given" do
+			lambda {
+				ps = CLI.new do
+					argument :size, :cast => Float
+				end.parse(['24.99x'])
+			}.should raise_error(CLI::ParsingError::CastError)
+		end
+
 		it "should cast default value" do
 			ps = CLI.new do
 				argument :number, :cast => Integer, :default => '123'

data/spec/option_spec.rb

@@ -26,6 +26,22 @@ describe CLI do
 			ps.size.should == 24
 		end
 
+		it "casting should fail if not proper integer given" do
+			lambda {
+				ps = CLI.new do
+					option :size, :cast => Integer
+				end.parse(['--size', '24.99'])
+			}.should raise_error(CLI::ParsingError::CastError)
+		end
+
+		it "casting should fail if not proper float given" do
+			lambda {
+				ps = CLI.new do
+					option :size, :cast => Float
+				end.parse(['--size', '24.99x'])
+			}.should raise_error(CLI::ParsingError::CastError)
+		end
+
 		it "should support casting of multiple options" do
 			ps = CLI.new do
 				options :size, :cast => Integer
@@ -86,7 +102,7 @@ describe CLI do
 		it "default value is casted" do
 			ps = CLI.new do
 				option :location, :default => 'singapore'
-				option :size, :cast => Integer, :default => 23.99
+				option :size, :cast => Integer, :default => 23
 			end.parse([])
 			ps.location.should be_a String
 			ps.location.should == 'singapore'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70285351383820 !ruby/object:Gem::Requirement
+  requirement: &70249594753380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70285351383820
+  version_requirements: *70249594753380
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70285351398720 !ruby/object:Gem::Requirement
+  requirement: &70249594752900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285351398720
+  version_requirements: *70249594752900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70285351396880 !ruby/object:Gem::Requirement
+  requirement: &70249594752320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70285351396880
+  version_requirements: *70249594752320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70285351395960 !ruby/object:Gem::Requirement
+  requirement: &70249594751660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70285351395960
+  version_requirements: *70249594751660
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70285351395440 !ruby/object:Gem::Requirement
+  requirement: &70249594751120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285351395440
+  version_requirements: *70249594751120
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70285351394160 !ruby/object:Gem::Requirement
+  requirement: &70249594750500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.9'
   type: :development
   prerelease: false
-  version_requirements: *70285351394160
+  version_requirements: *70249594750500
 - !ruby/object:Gem::Dependency
   name: ruby-ip
-  requirement: &70285351393060 !ruby/object:Gem::Requirement
+  requirement: &70249594750020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70285351393060
+  version_requirements: *70249594750020
 description: Command Line Interface gem allows you to quickly specify command argument
   parser that will automatically generate usage, handle stdin, switches, options and
   arguments with default values and value casting
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3157849412785804189
+      hash: 2443358638840763179
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: