amassivus/clusterssh
1
0
Fork 0
mirror of https://github.com/duncs/clusterssh.git synced 2025-04-21 09:09:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Further config & test improvements - WIP

Browse source
This commit is contained in:
Duncan Ferguson 2011-07-08 14:30:03 +01:00
parent 98d6edbfd4
commit 3caf243048
2 changed files with 72 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
lib/App/ClusterSSH/Config.pm
View file

@ -73,9 +73,7 @@ sub new {
my $self = $class->SUPER::new(%default_config);
my @unknown = $self->validate_args(%args);
return $self;
return $self->validate_args(%args);
}
sub validate_args {
@ -84,16 +82,24 @@ sub validate_args {
my @unknown_config = ();
foreach my $config ( sort( keys(%args) ) ) {
if ( exists $self->{config} ) {
$self->config = $args{$config};
if ( exists $self->{$config} ) {
$self->{$config} = $args{$config};
}
else {
push(@unknown_config, $config);
push( @unknown_config, $config );
}
}
if(@unknown_config) {
croak( App::ClusterSSH::Exception::Config->throw( unknown_config => \@unknown_config, error => $self->loc('Unknown configuration parameters: [_1]', join(',',@unknown_config) ) ) );
if (@unknown_config) {
croak(
App::ClusterSSH::Exception::Config->throw(
unknown_config => \@unknown_config,
error => $self->loc(
'Unknown configuration parameters: [_1]',
join( ',', @unknown_config )
)
)
);
}
return $self;
@ -102,9 +108,40 @@ sub validate_args {
sub parse_config_file {
my ( $self, $config_file ) = @_;
$self->debug(2, 'Loading in config file: ', $config_file);
$self->debug( 2, 'Loading in config file: ', $config_file );
return if ( !-e $config_file || !-r $config_file );
open( CFG, $config_file ) or die("Couldnt open $config_file: $!");
my $l;
my %read_config;
while ( defined( $l = <CFG> ) ) {
next
if ( $l =~ /^\s*$/ || $l =~ /^#/ )
; # ignore blank lines & commented lines
$l =~ s/#.*//; # remove comments from remaining lines
$l =~ s/\s*$//; # remove trailing whitespace
# look for continuation lines
chomp $l;
if ( $l =~ s/\\\s*$// ) {
$l .= <CFG>;
redo unless eof(CFG);
}
next unless $l =~ m/\s*(\S+)\s*=\s*(.*)\s*/;
my ( $key, $value ) = ( $1, $2 );
if ( defined $key && defined $value ) {
$read_config{$key} = $value;
logmsg( 3, "$key=$value" );
}
}
close(CFG);
# tidy up entries, just in case
$read_config{terminal_font} =~ s/['"]//g;
$self->validate_args(%read_config);
}
#use overload (
@ -143,7 +180,7 @@ Read in configuration from given filename
=item $config->validate_args();
Validate all configuration loaded at this point
Validate and apply all configuration loaded at this point
=back

34
t/15config.t
View file

@ -73,20 +73,36 @@ my $default_config = {
# other bits inheritted from App::ClusterSSH::Base
debug => 0,
lang => 'en',
lang => 'en',
};
is_deeply($config, $default_config, 'default config is correct');
is_deeply( $config, $default_config, 'default config is correct' );
trap {
$config = $config->validate_args(doesnt_exist => 'whoops');
$config = $config->validate_args(
whoops => 'not there',
doesnt_exist => 'whoops',
);
};
isa_ok($trap->die, 'App::ClusterSSH::Exception::Config');
is($trap->die, 'Unknown configuration parameters: doesnt_exist', 'got correct error message');
is_deeply( $trap->die->unknown_config, ['doesnt_exist'], 'Picked up unknown config array' );
isa_ok( $trap->die, 'App::ClusterSSH::Exception::Config' );
is( $trap->die,
'Unknown configuration parameters: doesnt_exist,whoops',
'got correct error message'
);
is_deeply( $trap->die->unknown_config,
['doesnt_exist','whoops'], 'Picked up unknown config array' );
$default_config->{extra_cluster_file} = '/etc/filename';
$default_config->{rsh_args} = 'some args';
$default_config->{max_addhost_menu_cluster_items} = 120;
trap {
$config = $config->validate_args(
extra_cluster_file => '/etc/filename',
rsh_args => 'some args',
max_addhost_menu_cluster_items => 120,
);
};
is( $trap->die, undef, 'validated ok' );
is_deeply( $config, $default_config, 'default config is correct' );
done_testing();