my ($argv, $is_alias) = @_;
my ($def, $cmd) = ($cmddef, $argv);
+ my $cmdstr = $exename;
if (ref($argv) eq 'ARRAY') {
my $expanded = {};
for my $i (0..$last_arg_id) {
$cmd = $expand_command_name->($def, $argv->[$i]);
+ $cmdstr .= " $cmd";
$expanded->{$argv->[$i]} = $cmd if $cmd ne $argv->[$i];
last if !defined($def->{$cmd});
$def = $def->{$cmd};
if (ref($def) eq 'ARRAY') {
# could expand to a real command, rest of $argv are its arguments
my $cmd_args = [ @$argv[$i+1..$last_arg_id] ];
- return ($cmd, $def, $cmd_args, $expanded);
+ return ($cmd, $def, $cmd_args, $expanded, $cmdstr);
}
if (defined($def->{alias})) {
# got either a special command (bashcomplete, verifyapi) or an unknown
# cmd, just return first entry as cmd and the rest of $argv as cmd_arg
my $cmd_args = [ @$argv[1..$last_arg_id] ];
- return ($argv->[0], $def, $cmd_args, $expanded);
+ return ($argv->[0], $def, $cmd_args, $expanded, $cmdstr);
}
- return ($cmd, $def);
+ return ($cmd, $def, undef, undef, $cmdstr);
}
sub generate_usage_str {
$separator //= '';
$indent //= '';
- my $can_read_pass = $cli_handler_class->can('read_password');
- my $can_str_param_fmap = $cli_handler_class->can('string_param_file_mapping');
+ my $read_password_func = $cli_handler_class->can('read_password');
+ my $param_mapping_func = $cli_handler_class->can('param_mapping') ||
+ $cli_handler_class->can('string_param_file_mapping');
- my ($subcmd, $def) = resolve_cmd($cmd);
+ my ($subcmd, $def, undef, undef, $cmdstr) = resolve_cmd($cmd);
my $generate;
$generate = sub {
$str .= $indent;
$str .= $class->usage_str($name, "$prefix $cmd", $arg_param,
$fixed_param, $format,
- $can_read_pass, $can_str_param_fmap);
+ $read_password_func, $param_mapping_func);
$oldclass = $class;
} elsif (defined($def->{$cmd}->{alias}) && ($format eq 'asciidoc')) {
$str .= $indent;
$str .= $class->usage_str($name, $prefix, $arg_param, $fixed_param, $format,
- $can_read_pass, $can_str_param_fmap);
+ $read_password_func, $param_mapping_func);
}
return $str;
};
- my $cmdstr = $exename;
- $cmdstr .= ' ' . join(' ', @$cmd) if defined($cmd);
-
return $generate->($indent, $separator, $def, $cmdstr);
}
}
my $handle_cmd = sub {
- my ($args, $pwcallback, $preparefunc, $stringfilemap) = @_;
+ my ($args, $read_password_func, $preparefunc, $param_mapping_func) = @_;
$cmddef->{help} = [ __PACKAGE__, 'help', ['extra-args'] ];
- my $cmd_str = join(' ', @$args);
- my ($cmd, $def, $cmd_args) = resolve_cmd($args);
+ my ($cmd, $def, $cmd_args, undef, $cmd_str) = resolve_cmd($args);
$abort->("no command specified") if !$cmd;
}
# checked special commands, if def is still a hash we got an incomplete sub command
- $abort->("incomplete command '$exename $cmd_str'") if ref($def) eq 'HASH';
+ $abort->("incomplete command '$cmd_str'") if ref($def) eq 'HASH';
&$preparefunc() if $preparefunc;
my ($class, $name, $arg_param, $uri_param, $outsub) = @{$def || []};
$abort->("unknown command '$cmd_str'") if !$class;
- my $prefix = "$exename $cmd_str";
- my $res = $class->cli_handler($prefix, $name, $cmd_args, $arg_param, $uri_param, $pwcallback, $stringfilemap);
+ my $res = $class->cli_handler($cmd_str, $name, $cmd_args, $arg_param, $uri_param, $read_password_func, $param_mapping_func);
&$outsub($res) if $outsub;
};
my $handle_simple_cmd = sub {
- my ($args, $pwcallback, $preparefunc, $stringfilemap) = @_;
+ my ($args, $read_password_func, $preparefunc, $param_mapping_func) = @_;
my ($class, $name, $arg_param, $uri_param, $outsub) = @{$cmddef};
die "no class specified" if !$class;
&$preparefunc() if $preparefunc;
- my $res = $class->cli_handler($name, $name, \@ARGV, $arg_param, $uri_param, $pwcallback, $stringfilemap);
+ my $res = $class->cli_handler($name, $name, \@ARGV, $arg_param, $uri_param, $read_password_func, $param_mapping_func);
&$outsub($res) if $outsub;
};
my $preparefunc = $params{prepare};
- my $pwcallback = $class->can('read_password');
- my $stringfilemap = $class->can('string_param_file_mapping');
+ my $read_password_func = $class->can('read_password');
+ my $param_mapping_func = $cli_handler_class->can('param_mapping') ||
+ $class->can('string_param_file_mapping');
$exename = &$get_exe_name($class);
$cmddef = ${"${class}::cmddef"};
if (ref($cmddef) eq 'ARRAY') {
- &$handle_simple_cmd(\@ARGV, $pwcallback, $preparefunc, $stringfilemap);
+ &$handle_simple_cmd(\@ARGV, $read_password_func, $preparefunc, $param_mapping_func);
} else {
- &$handle_cmd(\@ARGV, $pwcallback, $preparefunc, $stringfilemap);
+ &$handle_cmd(\@ARGV, $read_password_func, $preparefunc, $param_mapping_func);
}
exit 0;