Changeset 150

Timestamp:

05/31/04 09:15:50 (4 years ago)

Author:

svn

Message:

Plugin overlay seems to work. Any file with a .pm extension is loaded from the
plugins directory. Example plugins are fw.pm, log.pm and nat.pm

Files:

• manage/trunk/CLI/CLI.pm (modified) (11 diffs)
• manage/trunk/drivers/fw (deleted)
• manage/trunk/manage (modified) (11 diffs)
• manage/trunk/plugins (moved) (moved from manage/trunk/drivers)
• manage/trunk/plugins/fw.pm (added)
• manage/trunk/plugins/log.pm (added)
• manage/trunk/plugins/nat.pm (added)
• manage/trunk/README (added)

manage/trunk/CLI/CLI.pm

@@ -4 +4 @@
-use warnings;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+use base qw(Exporter);
-
-use Getopt::Mixed;
-use IO::Handle;
-use Net::DNS;
-Wrap
+Format
-use Term::ReadKey;
-use POSIX qw(ctermid floor);
-
-require Exporter;
-
-@ISA = qw(Exporter);
-
-$VERSION = 0.1;
@@ -22 +19 @@
-# new CLI(
-#   grammar => $GRAMMAR,
+#       stringpattern => '\'(?:\\.|[^\'])*\'|"(?:\\.|[^"])*"',
+#       delimiter => '\s+|($stringpattern)',
-# )
-sub new(%) {
@@ -30 +29 @@
-        die("Grammar not defined") unless defined($args{grammar});
-        $self->{grammar} = $args{grammar};
+        # String pattern
-        if (defined($args{stringpattern})) {
-                $self->{stringpattern} = $args{stringpattern};
@@ -35 +35 @@
-                $self->{stringpattern} = '\'(?:\\.|[^\'])*\'|"(?:\\.|[^"])*"';
-        }
+        # Delimiter
-        if (defined($args{delimiter})) {
-tokenpattern}
+delimiter};
-        } else {
-                $self->{tokenpattern} = "\\s+|($self->{stringpattern})";
-        }
+
+        # Merge plugins
+        if (defined($args{plugins})) {
+        my ($width, $height) = GetTerminalSize(*STDIN);
+        my $format = new Text::Format(
+                columns => $width,
+                firstIndent => 0,
+                leftMargin => 4,
+                );
+
+                if (opendir(D, $args{plugins})) {
+                        while (my $file = readdir(D)) {
+                                if ($file =~ /^[^.].*\.pm$/) {
+                                        $file =~ s/\.pm$//;
+                                        if (my $plugin = do("$args{plugins}/$file.pm")) {
+                                                $self->{plugins}->{$file} = $plugin;
+                                                $self->merge($plugin);
+                                        } else {
+                                                $| = 1;
+                                                print("\e[1m\e[31mCLI plugin '$file' error:\e[22m\n" . $format->format($@) . "\e[0m");
+                                                $| = 0;
+                                        }
+                                }
+                        }
+                }
+                #$self->merge($args{plugins});
+        }
+        return $self;
+}
+
+# Merge a grammar
+sub merge($) {
+my $self = shift;
+my $grammar = shift;
+
+        sub recursive_merge($$);
+        sub recursive_merge($$) {
+        my ($merge, $grammar) = @_;
+
+                for my $key (keys(%$merge)) {
+                        if (defined($grammar->{$key})) {
+                                recursive_merge($merge->{$key}, $grammar->{$key});
+                        } else {
+                                $grammar->{$key} = $merge->{$key};
+                        }
+                }
+        }
+
+        recursive_merge($grammar, $self->{grammar});
-        return $self;
-}
@@ -60 +110 @@
-        my $help = "";
-        my %commands = ();
+        my $format = new Text::Format(
+                columns => $width,
+                firstIndent => 0,
+                );
-
-                # Trailing tokens after help
@@ -65 +119 @@
-
-                # Construct help string
-
-
+
-
-                for my $key (keys %cmd) {
@@ -73 +126 @@
-                        if (ref($cmd{$key}) eq 'HASH' and $cmd{$key}->{HELP}) {
-                        my ($name, $hstr);
+                        my $type = ref($cmd{$key}->{HELP});
-                        
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        } else {
-                                $commands{$key} = '';
@@ -92 +149 @@
-                if ($cmd{ACTION}) {
-                        if (ref($cmd{ACTION}) eq 'HASH' and $cmd{ACTION}->{HELP}) {
-
+
+
+
+
+
+
+
-                        } elsif ($cmd{ACTIONHELP}) {
-                                $commands{'<eol>'} = $cmd{ACTIONHELP};
-                        } elsif ($cmd{HELP}) {
-
+
+
+
+
+
+
+
-                        } else {
-                                $commands{'<eol>'} = "\e[31m\e[1m(need ACTIONHELP, ACTION->HELP or HELP entry)\e[0m";
@@ -102 +171 @@
-                }
-
+        my $keywidth = 0;
+                for my $name (sort keys %commands) {
+                        $keywidth = length($name) if length($name) > $keywidth;
+                }
+                $format->leftMargin($keywidth + 2);
-                for my $name (sort keys %commands) {
-                        if ($commands{$name}) {
-wrap(sprintf("  \e[1m%-19s\e[0m ", $name), (" " x 19), $commands{$name}) . "\n"
+sprintf("  \e[1m%-${keywidth}s\e[0m ", $name) . substr($format->format($commands{$name}), $keywidth + 2)
-                        } else {
-                                $help .= sprintf("  \e[1m%-16s\e[0m\n", $name);
@@ -111 +185 @@
-
-                $help .= "\n" if $cmd{HELPFOOTER} or $cmd{HELPHEADER};
-"\n" . $cmd{HELPFOOTER}
+$cmd{HELPFOOTER} . "\n"
-                return ('ERROR', 'No help available.') unless defined($help) and $help ne '';
-                return ('HELP', $help);
@@ -212 +286 @@
-}
-
-END {
-}
-
-1;

manage/trunk/manage

@@ -2 +2 @@
-
-# Add cli-parser to our module include path
-/root/projects
+.
-
-use warnings;
@@ -21 +21 @@
-my $BANNER = '';
-my $SQLSERVER = '127.0.0.1';
-DRIVERS = './driver
+PLUGINS = './plugin
-
-my %CONF = (
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-);
-my $BREAK = 0;
@@ -140 +157 @@
-entered exactly as shown. Words enclosed in \e[1m< >\e[22m are user defined.
-",
-        'log' => {
-                HELPHEADER => "Use the \e[1mlog\e[22m command to view, query and filter system logs.\n",
-                HELP => 'Manipulate logs.',
-                'tail' => {
-                        HELP => 'Tail the system logs.',
-                        ACTION => sub {
-                        }
-                },
-                ACTION => sub { print("Dumping all logs.\n"); },
-                ACTIONHELP => 'Dump todays logs.',
-        },
-#       'fw' => {
-#               HELP => 'Firewall management.',
@@ -168 +174 @@
-
-                                        if ($CONF{$key}) {
-[1]
-[0]
+->{pattern}
+->{value}
-                                                } else {
-                                                        error("Value for '$key' is invalid.");
@@ -177 +183 @@
-                                        }
-                                },
-
-
-
+
+
+
+
+
+
+
+
+
+
-                        ACTION => {
-                                ACTION => sub {
@@ -185 +198 @@
-
-                                        if ($CONF{$key}) {
-[0]
+->{value}
-                                        } else {
-                                                error("No such setting '$key'.");
@@ -201 +214 @@
-
-                                for my $key (sort keys %CONF) {
-[0]}, $CONF{$key}[2]
+->{value}}, $CONF{$key}->{help}
-                                }   
-                                format_columns(
@@ -218 +231 @@
-$term->ornaments(0);
-my $termattribs = $term->Attribs;
-
+
+
+
+
-
-# Turn off filename completion
@@ -224 +240 @@
-# Map the ? key to auto-magic help
-$term->add_defun('dns-help', sub {
-cli
+CLI
-        if ($type eq 'HELP') {
-                print("\n$action");
@@ -231 +247 @@
-}, ord('?'));
-
-sub load_drivers($;$) {
-my $drivers = shift;
-my $base = shift;
-
-        $base = $GRAMMAR unless defined($base);
-
-        if (!opendir(D, $drivers)) {
-                error("Could not load drivers from '$drivers'");
-                return undef;
-        }
-        while (my $cmd = readdir(D)) {
-                next if $cmd =~ /^\./;
-                print("$cmd\n");
-        }
-        close(D);
-}
-
-sub exec_line {
-cli
+CLI
-
-        if ($type eq 'HELP') {
@@ -260 +259 @@
-}
-
-load_drivers($DRIVERS);
-
-# Command line?
-if (@ARGV) {