Start work on a configuration object

lib/App/ClusterSSH.pm

@@ -1097,7 +1097,7 @@ sub open_client_windows(@) {
         $servers{$server}{username}       = $username if ($username);
         $servers{$server}{username}       = $username || '';
         $servers{$server}{port}           = $port || '';
-        $servers{$server}{master}         = $config{mstr} || '';;
+        $servers{$server}{master}         = $config{mstr} || '';
         $servers{$server}{master}         = $master if ($master);
 
         logmsg( 2, "Working on server $server for $_" );
@@ -1549,8 +1549,11 @@ sub add_host_by_name() {
 
     if ( $menus{host_entry} ) {
         logmsg( 2, "host=", $menus{host_entry} );
+        my @names = resolve_names( split( /\s+/, $menus{host_entry} ) );
+        logmsg( 0, 'Opening to: ', join(' ', @names) );
         open_client_windows(
-            resolve_names( split( /\s+/, $menus{host_entry} ) ) );
+            @names
+        );
     }
 
     if ( $menus{listbox}->curselection() ) {
@@ -2229,6 +2232,7 @@ sub run {
     capture_map_events();
 
     setup_helper_script();
+    logmsg( 0, 'Opening to: ', join(' ', @servers) );
     open_client_windows(@servers);
 
     # Check here if we are tiling windows.  Here instead of in func so

lib/App/ClusterSSH/Base.pm

@@ -7,6 +7,9 @@ use App::ClusterSSH::L10N;
 
 use Exception::Class (
     'App::ClusterSSH::Exception',
+    'App::ClusterSSH::Exception::Config' => {
+        fields => 'unknown_config',
+    },
 );
 
 # Dont use SVN revision as it can cause problems

lib/App/ClusterSSH/Config.pm

@@ -0,0 +1,166 @@
+package App::ClusterSSH::Config;
+
+use strict;
+use warnings;
+
+use version;
+our $VERSION = version->new('0.01');
+
+use Carp;
+
+use base qw/ App::ClusterSSH::Base /;
+
+my %default_config = (
+    terminal                   => "xterm",
+    terminal_args              => "",
+    terminal_title_opt         => "-T",
+    terminal_colorize          => 1,
+    terminal_bg_style          => 'dark',
+    terminal_allow_send_events => "-xrm '*.VT100.allowSendEvents:true'",
+    terminal_font              => "6x13",
+    terminal_size              => "80x24",
+
+    use_hotkeys             => "yes",
+    key_quit                => "Control-q",
+    key_addhost             => "Control-Shift-plus",
+    key_clientname          => "Alt-n",
+    key_history             => "Alt-h",
+    key_retilehosts         => "Alt-r",
+    key_paste               => "Control-v",
+    mouse_paste             => "Button-2",
+    auto_quit               => "yes",
+    window_tiling           => "yes",
+    window_tiling_direction => "right",
+    console_position        => "",
+
+    screen_reserve_top    => 0,
+    screen_reserve_bottom => 60,
+    screen_reserve_left   => 0,
+    screen_reserve_right  => 0,
+
+    terminal_reserve_top    => 5,
+    terminal_reserve_bottom => 0,
+    terminal_reserve_left   => 5,
+    terminal_reserve_right  => 0,
+
+    terminal_decoration_height => 10,
+    terminal_decoration_width  => 8,
+
+    rsh_args    => "",
+    telnet_args => "",
+    ssh_args    => "",
+
+    extra_cluster_file => "",
+
+    unmap_on_redraw => "no",
+
+    show_history   => 0,
+    history_width  => 40,
+    history_height => 10,
+
+    command             => q{},
+    max_host_menu_items => 30,
+
+    max_addhost_menu_cluster_items => 6,
+    menu_send_autotearoff          => 0,
+    menu_host_autotearoff          => 0,
+
+    send_menu_xml_file => $ENV{HOME} . '/.csshrc_send_menu',
+);
+
+sub new {
+    my ( $class, %args ) = @_;
+
+    my $self = $class->SUPER::new(%default_config);
+
+    my @unknown = $self->validate_args(%args);
+
+    return $self;
+}
+
+sub validate_args {
+    my ( $self, %args ) = @_;
+
+    my @unknown_config = ();
+
+    foreach my $config ( sort( keys(%args) ) ) {
+        if ( exists $self->{config} ) {
+            $self->config = $args{$config};
+        }
+        else {
+            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) ) ) );
+    }
+
+    return $self;
+}
+
+sub parse_config_file {
+    my ( $self, $config_file ) = @_;
+
+    $self->debug(2, 'Loading in config file: ', $config_file);
+
+    return if ( !-e $config_file || !-r $config_file );
+}
+
+#use overload (
+#    q{""} => sub {
+#        my ($self) = @_;
+#        return $self->{hostname};
+#    },
+#    fallback => 1,
+#);
+
+1;
+
+=pod
+
+=head1 NAME
+
+ClusterSSH::Config
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+Object representing application configuration
+
+=head1 METHODS
+
+=over 4
+
+=item $host=ClusterSSH::Config->new ({ })
+
+Create a new configuration object.
+
+=item $config->parse_config_file('<filename');
+
+Read in configuration from given filename
+
+=item $config->validate_args();
+
+Validate all configuration loaded at this point
+
+=back
+
+=head1 AUTHOR
+
+Duncan Ferguson, C<< <duncan_j_ferguson at yahoo.co.uk> >>
+
+=head1 LICENSE AND COPYRIGHT
+
+Copyright 1999-2010 Duncan Ferguson.
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of either: the GNU General Public License as published
+by the Free Software Foundation; or the Artistic License.
+
+See http://dev.perl.org/licenses/ for more information.
+
+=cut
+
+1;

t/15config.file1

@@ -0,0 +1,3 @@
+comms=telnet
+method=telnet
+telnet=/usr/bin/telnet

t/15config.t

@@ -0,0 +1,92 @@
+use strict;
+use warnings;
+
+use FindBin qw($Bin);
+use lib "$Bin/../lib";
+
+use Test::More;
+use Test::Trap;
+
+BEGIN { use_ok("App::ClusterSSH::Config") }
+
+my $config;
+
+$config = App::ClusterSSH::Config->new();
+isa_ok( $config, 'App::ClusterSSH::Config' );
+
+my $default_config = {
+    terminal                   => "xterm",
+    terminal_args              => "",
+    terminal_title_opt         => "-T",
+    terminal_colorize          => 1,
+    terminal_bg_style          => 'dark',
+    terminal_allow_send_events => "-xrm '*.VT100.allowSendEvents:true'",
+    terminal_font              => "6x13",
+    terminal_size              => "80x24",
+
+    use_hotkeys             => "yes",
+    key_quit                => "Control-q",
+    key_addhost             => "Control-Shift-plus",
+    key_clientname          => "Alt-n",
+    key_history             => "Alt-h",
+    key_retilehosts         => "Alt-r",
+    key_paste               => "Control-v",
+    mouse_paste             => "Button-2",
+    auto_quit               => "yes",
+    window_tiling           => "yes",
+    window_tiling_direction => "right",
+    console_position        => "",
+
+    screen_reserve_top    => 0,
+    screen_reserve_bottom => 60,
+    screen_reserve_left   => 0,
+    screen_reserve_right  => 0,
+
+    terminal_reserve_top    => 5,
+    terminal_reserve_bottom => 0,
+    terminal_reserve_left   => 5,
+    terminal_reserve_right  => 0,
+
+    terminal_decoration_height => 10,
+    terminal_decoration_width  => 8,
+
+    rsh_args    => "",
+    telnet_args => "",
+    ssh_args    => "",
+
+    extra_cluster_file => "",
+
+    unmap_on_redraw => "no",
+
+    show_history   => 0,
+    history_width  => 40,
+    history_height => 10,
+
+    command             => q{},
+    max_host_menu_items => 30,
+
+    max_addhost_menu_cluster_items => 6,
+    menu_send_autotearoff          => 0,
+    menu_host_autotearoff          => 0,
+
+    send_menu_xml_file => $ENV{HOME} . '/.csshrc_send_menu',
+
+    # other bits inheritted from App::ClusterSSH::Base
+    debug => 0,
+    lang => 'en',
+
+};
+is_deeply($config, $default_config, 'default config is correct');
+
+trap {
+    $config = $config->validate_args(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' );
+
+
+
+
+
+done_testing();