Changeset 24610

Timestamp:

Jun 26, 2009, 3:28:02 PM (17 years ago)

Author:

jhoblitt

Message:

fwv of console-config

Location:

trunk/console

Files:

• lib/Console.pm (modified) (3 diffs)
• scripts/console-config (modified) (5 diffs)

trunk/console/lib/Console.pm

@@ -8 +8 @@
 
 use Config::YAML;
+use Params::Validate qw(:all);
+
 
 sub find_rcfile
 {
+    validate_pos(@_);
+
     my $rcname = "." . __PACKAGE__ . "rc";
     my $rcfile;
@@ -25 +29 @@
 sub read_rcfile
 {
+    validate_pos(@_, 1);
+
     my $rcfile = shift;
 
@@ -40 +46 @@
 }
 
+sub add_host
+{
+    my %p = validate(@_,
+        {
+            config      => { isa => 'Config::YAML', },
+            hostname    => { type => SCALAR, },
+            console     => { type => SCALAR, },
+         },
+    );
+
+    my $c = $p{config};
+
+    my $hosts = $c->get_hosts;
+    $hosts->{$p{hostname}} = { console => $p{console} };
+    $c->set_hosts($hosts);
+    $c->write;
+
+    return 1;
+}
+
+sub delete_host
+{
+    my %p = validate(@_,
+        {
+            config      => { isa => 'Config::YAML', },
+            hostname    => { type => SCALAR, },
+         },
+    );
+
+    my $c = $p{config};
+
+    my $hosts = $c->get_hosts;
+    delete $hosts->{$p{hostname}};
+    $c->set_hosts($hosts);
+    $c->write;
+
+    return 1;
+}
+
 
 1;

trunk/console/scripts/console-config

@@ -17 +17 @@
     $add,
     $console,
+    $delete,
     $verbose,
 );
@@ -23 +24 @@
     'add|a'         => \$add,
     'console|c=s'   => \$console,
+    'delete|d'      => \$delete,
     'verbose|v'     => \$verbose,
 ) || pod2usage( 2 );
 
 my $hostname = shift @ARGV;
+pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 
 my $rcfile = Console::find_rcfile();
@@ -32 +35 @@
 my $hosts = $c->get_hosts;
 
-unless (defined $add) {
+if (defined $add) {
+    go_add();
+    exit();
+}
+
+if (defined $delete) {
+    go_delete();
+    exit();
+}
+
+# default
+go_list();
+exit();
+
+
+sub go_list
+{
+    pod2usage(
+        -msg        => "--console is meaningless in this context",
+        -exitval    => 2,
+    ) if defined $console;
+
     if (defined $hostname) {
         die "unknown hostname: $hostname" unless exists $hosts->{$hostname}->{console};
@@ -43 +67 @@
         }
     }
-} else {
-    die "--console option is required under --add" unless defined $console;
-    $hosts->{$hostname} = { console => $console };
-    $c->set_hosts($hosts);
-    $c->write;
+}
+
+sub go_add
+{
+    pod2usage(
+        -msg        =>"--console option is required under --add",
+        -exitval    => 2,
+    ) unless defined $console;
+    pod2usage(
+        -msg        => "<hostname> option is required under --add",
+        -exitval    => 2,
+    ) unless defined $hostname;
+    pod2usage(
+        -msg        => "--add and --delete are incompatible options",
+        -exitval    => 2,
+    ) if defined $delete;
+
+    Console::add_host(config => $c, hostname => $hostname, console => $console);
+}
+
+sub go_delete
+{
+    pod2uage(
+        -msg        => "--console and --delete are incompatible options",
+        -exitval    => 2,
+    ) if defined $console;
+    pod2uage(
+        -msg        => "<hostname> option is required under --delete",
+        -exitval    => 2,
+    ) unless defined $hostname;
+    pod2uage(
+        -msg        => "--add and --delete are incompatible options",
+        -exitval    => 2,
+    ) if defined $add;
+
+    Console::delete_host(config => $c, hostname => $hostname);
 }
 
@@ -60 +115 @@
 =head1 SYNOPSIS
 
-    console [--console <console hostname>] [--verbose] <hostname>
+    console [--verbose] [<hostname>]
+
+    or
+
+    console [--verbose] --add --console <console hostname> <hostname>
+
+    or
+
+    console [--verbose] --delete <hostname>
 
 =head1 DESCRIPTION