cli 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/cli.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "cli"
-  s.version = "1.1.0"
+  s.name = %q{cli}
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2012-01-02"
-  s.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"
-  s.email = "jpastuszek@gmail.com"
+  s.date = %q{2012-02-01}
+  s.description = %q{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}
+  s.email = %q{jpastuszek@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -48,13 +48,14 @@ Gem::Specification.new do |s|
     "spec/switch_spec.rb",
     "spec/usage_spec.rb"
   ]
-  s.homepage = "http://github.com/jpastuszek/cli"
+  s.homepage = %q{http://github.com/jpastuszek/cli}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Command line argument parser with stdin handling and usage generator"
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Command line argument parser with stdin handling and usage generator}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/cli.rb

@@ -98,7 +98,7 @@ class CLI
 		end
 
 		def append(argument, value)
-			v = (send(argument.name.to_s) or [])
+			v = (get(argument) or [])
 			v << value
 			send((argument.name.to_s + '=').to_sym, v) 
 		end
@@ -106,6 +106,10 @@ class CLI
 		def set(argument)
 			value(argument, true)
 		end
+
+		def get(argument)
+			send(argument.name.to_s)
+		end
 	end
 
 	def initialize(&block)
@@ -146,7 +150,7 @@ class CLI
 
 		@arguments << arguments_dsl
 
-		raise ParserError::MultipleArgumentsSpecifierError.new(@arguments.multiple) if @arguments.multiple.length > 1
+		raise ParserError::MultipleArgumentsSpecifierError.new(@arguments.multiary) if @arguments.multiary.length > 1
 	end
 
 	def switch(name, options = {})
@@ -196,15 +200,10 @@ class CLI
 		end
 
 		# initialize multi options
-		@options.multiple.each do |o|
+		@options.multiary.each do |o|
 			values.value(o, [])
 		end
 
-		# set defaults
-		@options.defaults.each do |o|
-			values.value(o, o.cast(o.default))
-		end
-
 		# process switches
 		mandatory_options = @options.mandatory.dup
 
@@ -215,7 +214,7 @@ class CLI
 				values.set(switch)
 			elsif option = @options.find(arg)
 				value = argv.shift or raise ParsingError::MissingOptionValueError.new(option)
-				if option.multiple?
+				if option.multiary?
 					values.append(option, option.cast(value))
 				else
 					values.value(option, option.cast(value))
@@ -226,18 +225,29 @@ class CLI
 			end
 		end
 
-		argv.shift if argv.first == '--'
+		# set defaults
+		@options.unarry.each do |o|
+			next unless o.has_default?
+			values.value(o, o.default_cast) if values.get(o) == nil
+		end
+
+		@options.multiary.each do |o|
+			next unless o.has_default?
+			values.value(o, o.default_cast) if values.get(o) == []
+		end
 
 		# check mandatory options
 		raise ParsingError::MandatoryOptionsNotSpecifiedError.new(mandatory_options) unless mandatory_options.empty?
 
+		argv.shift if argv.first == '--'
+
 		# process arguments
 		arguments = @arguments.dup
 		while argument = arguments.shift
 			value = if arguments.mandatory.length < argv.length
 				arg = argv.shift
 
-				if argument.multiple?
+				if argument.multiary?
 					v = [arg]
 					while argv.length > arguments.length
 						v << argv.shift
@@ -250,7 +260,7 @@ class CLI
 				if argument.has_default?
 					argument.default
 				elsif not argument.mandatory?
-					argument.multiple? ? [] : nil
+					argument.multiary? ? [] : nil
 				else
 					raise ParsingError::MandatoryArgumentNotSpecifiedError.new(argument) if argv.empty?
 				end
@@ -309,7 +319,7 @@ class CLI
 		out.print(@arguments.map do |a|
 			v = ''
 			v += '[' unless a.mandatory?
-			v += a.multiple? ? a.to_s + '*': a.to_s
+			v += a.multiary? ? a.to_s + '*': a.to_s
 			v += ']' unless a.mandatory?
 			v
 		end.join(' '))
@@ -337,7 +347,7 @@ class CLI
 		unless @options.empty?
 			out.puts "Options:"
 			@options.each do |o|
-				unless o.multiple?
+				unless o.multiary?
 					out.print "   #{o.switch}"
 				else
 					out.print "   #{o.switch}*"
@@ -353,7 +363,7 @@ class CLI
 		unless @arguments.empty?
 			out.puts "Arguments:"
 			@arguments.each do |a|
-				unless a.multiple?
+				unless a.multiary?
 					out.print "   #{a}"
 				else
 					out.print "   #{a}*"

data/lib/cli/arguments.rb

@@ -7,8 +7,8 @@ class CLI::Arguments < Array
 		select{|a| a.mandatory?}
 	end
 
-	def multiple
-		select{|a| a.multiple?}
+	def multiary
+		select{|a| a.multiary?}
 	end
 end
 

data/lib/cli/dsl.rb

@@ -57,6 +57,10 @@ class CLI
 				@options[:default].to_s
 			end
 
+			def default_cast
+				cast(default)
+			end
+
 			def has_default?
 				@options.member? :default
 			end
@@ -71,6 +75,10 @@ class CLI
 				value = @options[:default]
 				value.is_a?(Array) ? value.map{|v| v.to_s} : [value.to_s]
 			end
+
+			def default_cast
+				default.map{|d| cast(d)}
+			end
 		end
 
 		class Input < DSL::Base
@@ -96,7 +104,7 @@ class CLI
 				name.to_s.tr('_', '-')
 			end
 
-			def multiple?
+			def multiary?
 				false
 			end
 		end
@@ -112,7 +120,7 @@ class CLI
 				out
 			end
 
-			def multiple?
+			def multiary?
 				true
 			end
 		end
@@ -153,7 +161,7 @@ class CLI
 			include DSL::Value
 			include DSL::Cast
 
-			def multiple?
+			def multiary?
 				false
 			end
 		end
@@ -161,7 +169,7 @@ class CLI
 		class Options < Option
 			include DSL::MultiDefault
 
-			def multiple?
+			def multiary?
 				true
 			end
 		end

data/lib/cli/options.rb

@@ -1,10 +1,6 @@
 require 'cli/switches'
 
 class CLI::Options < CLI::Switches
-	def defaults
-		select{|o| o.has_default?}
-	end
-
 	def mandatory
 		select{|o| o.mandatory?}
 	end
@@ -13,8 +9,12 @@ class CLI::Options < CLI::Switches
 		select{|o| not o.mandatory?}
 	end
 
-	def multiple
-		select{|a| a.multiple?}
+	def unarry
+		select{|a| not a.multiary?}
+	end
+
+	def multiary
+		select{|a| a.multiary?}
 	end
 end
 

data/spec/option_spec.rb

@@ -34,6 +34,21 @@ describe CLI do
 			ps.size.should == [24, 10]
 		end
 
+		it "should support casting of multiple options with default" do
+			ps = CLI.new do
+				options :log_file, :cast => Pathname, :default => 'test.log'
+			end.parse(['--log-file', 'server.log', '--log-file', 'error.log'])
+
+			ps.log_file.should be_a Array
+			ps.log_file.length.should == 2
+
+			ps.log_file.first.should be_a Pathname
+			ps.log_file.first.to_s.should == 'server.log'
+
+			ps.log_file.last.should be_a Pathname
+			ps.log_file.last.to_s.should == 'error.log'
+		end
+
 		it "should support casting with lambda" do
 			ps = CLI.new do
 				option :size, :cast => lambda{|v| v.to_i + 2}

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: cli
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: 17
+  prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  segments_generated: true
+  version: 1.1.1
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,10 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-02 00:00:00 Z
+date: 2012-02-01 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,12 +30,13 @@ dependencies:
         - 2
         - 3
         - 0
+        segments_generated: true
         version: 2.3.0
-  prerelease: false
+  type: :development
   name: rspec
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,12 +45,13 @@ dependencies:
         hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  prerelease: false
+  type: :development
   name: cucumber
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,12 +62,13 @@ dependencies:
         - 1
         - 0
         - 0
+        segments_generated: true
         version: 1.0.0
-  prerelease: false
+  type: :development
   name: bundler
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,12 +79,13 @@ dependencies:
         - 1
         - 6
         - 4
+        segments_generated: true
         version: 1.6.4
-  prerelease: false
+  type: :development
   name: jeweler
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -89,12 +94,13 @@ dependencies:
         hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  prerelease: false
+  type: :development
   name: rcov
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -104,12 +110,13 @@ dependencies:
         segments: 
         - 3
         - 9
+        segments_generated: true
         version: "3.9"
-  prerelease: false
+  type: :development
   name: rdoc
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -119,9 +126,11 @@ dependencies:
         segments: 
         - 0
         - 9
+        segments_generated: true
         version: "0.9"
-  prerelease: false
+  type: :development
   name: ruby-ip
+  prerelease: false
   version_requirements: *id007
 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
 email: jpastuszek@gmail.com
@@ -163,6 +172,7 @@ files:
 - spec/stdin_spec.rb
 - spec/switch_spec.rb
 - spec/usage_spec.rb
+has_rdoc: true
 homepage: http://github.com/jpastuszek/cli
 licenses: 
 - MIT
@@ -179,6 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -188,11 +199,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Command line argument parser with stdin handling and usage generator