josh/yawpa
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor more common processing into _gather()

Browse Source
This commit is contained in:
Josh Holtrop 2013-01-22 14:43:26 -05:00
parent e5d93df4ae
commit dd4148a3d6
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/yawpa.rb
View File

@ -30,15 +30,7 @@ module Yawpa
opts[param_key] = true opts[param_key] = true
else else
opts[param_key] = [] opts[param_key] = []
opts[param_key] << val if val i += _gather(opt_config[:nargs], i + 1, params, val, param_key, opts[param_key])
if opts[param_key].length < opt_config[:nargs].last
gathered = _gather(i + 1, opt_config[:nargs].last - opts[param_key].length, params)
i += gathered.length
opts[param_key] += gathered
if opts[param_key].length < opt_config[:nargs].first
raise InvalidArgumentsException.new("Not enough arguments supplied for option '#{param_key}'")
end
end
end end
elsif param =~ /^-(.+)$/ elsif param =~ /^-(.+)$/
short_flags = $1 short_flags = $1
@ -53,17 +45,7 @@ module Yawpa
opts[param_key] = true opts[param_key] = true
else else
opts[param_key] = [] opts[param_key] = []
if short_idx + 1 < short_flags.length i += _gather(opt_config[:nargs], i + 1, params, short_flags[short_idx + 1, short_flags.length], param_key, opts[param_key])
opts[param_key] << short_flags[short_idx + 1, short_flags.length]
end
if opts[param_key].length < opt_config[:nargs].last
gathered = _gather(i + 1, opt_config[:nargs].last - opts[param_key].length, params)
i += gathered.length
opts[param_key] += gathered
if opts[param_key].length < opt_config[:nargs].first
raise InvalidArgumentsException.new("Not enough arguments supplied for option '#{param_key}'")
end
end
break break
end end
short_idx += 1 short_idx += 1
@ -84,17 +66,26 @@ module Yawpa
return [opts, args] return [opts, args]
end end
def _gather(start_idx, max, params) def _gather(nargs, start_idx, params, initial, param_key, result)
result = [] n_gathered = 0
if initial and initial != ''
result << initial
n_gathered += 1
end
num_indices_used = 0
index = start_idx index = start_idx
loop do while n_gathered < nargs.last and
break if index >= params.length index < params.length and
break if params[index][0] == '-' params[index][0] != '-' do
result << params[index] result << params[index]
index += 1 index += 1
break if result.length == max num_indices_used += 1
n_gathered += 1
end end
result if n_gathered < nargs.first
raise InvalidArgumentsException.new("Not enough arguments supplied for option '#{param_key}'")
end
num_indices_used
end end
def _massage_options(options) def _massage_options(options)