Changeset 164

Timestamp:

06/22/04 03:54:43 (4 years ago)

Author:

athomas

Message:

Wildcard arguments are almost working.

Files:

• manage/trunk/CLI/CLI.pm (modified) (6 diffs)
• manage/trunk/manage (modified) (8 diffs)
• manage/trunk/plugins/nodelist2.pm (added)

manage/trunk/CLI/CLI.pm

@@ -101 +101 @@
-# node, or undef if not found.
-#
-
+, $trackall
-sub parse_node {
-my $self = shift;
@@ -210 +210 @@
-                my $key = $rx;
-                my $trackvar = 0;
+                my $trackall = 0;
-
-                        # Skip if help
@@ -216 +217 @@
-                        # Find out if this candidate is a unique minimum match
-                my $unique = 0;
-
-                        if (defined($token)) {
-                        my @candidates = grep(/^(?:\d+\)(?:\$))?$token/, keys(%cmd));
-
-                                $unique = 1 if @candidates == 1 and $candidates[0] eq $key;
-                        }
-
-                        # Remove ordering token
@@ -230 +225 @@
-                                $trackvar = 1;
-                                $rx =~ s/^\$//;
+                                # Remove wildcard
+                                if ($rx =~ /^\*/) {
+                                        $trackall = 1;
+                                        $rx =~ s/^\*//;
+                                }
+                        }
+
+                        if (defined($token)) {
+                        my @candidates = grep(/^(?:\d+\)(?:\$))?$token/, keys(%cmd));
+
+                                $unique = 1 if @candidates == 1 and $candidates[0] eq $key;
-                        }
-
@@ -239 +245 @@
-                                if ($type eq 'HASH') {
-                                        push(@tokens, $token) if $rx eq 'ACTION';
-;
+
-                                } elsif ($type eq 'CODE') {
-                                        # Tokens are still remaining
@@ -245 +251 @@
-                                                return ('HELP', "\e[32m\e[1mOK Command is complete.\e[0m\n")
-                                                        if "@tokens" eq '?';
-'Trailing tokens (possibly missing help?).');
+"Trailing tokens: '@tokens' (possibly missing help?).")
-                                        }
-                                        return ('ACTION', $cmd{$key}, \@args);

manage/trunk/manage

@@ -18 +18 @@
-
-
+my $SELF = $0; $SELF =~ s/.*\///;
-my $DEBUG = 0;
-my $BREAK = 0; $SIG{INT} = sub { $BREAK = 1; };
@@ -23 +24 @@
-my @ALTCOLOURS = ("\e[36m", "\e[36m\e[1m");
-# Global variables
-'manage> '
+"$SELF> "
-my $BANNER = '';
+# Plugin path
-my $PLUGINS = './plugins';
-our %CONF = (
@@ -237 +239 @@
-
-# Initialise terminal and readline
-'manage'
+$SELF
-my $termattribs = $term->Attribs;
-# Do command completion
@@ -259 +261 @@
-};
-# Map the ? key to auto-magic help
-dns
+manage
-my ($type, $action, $args) = $CLI->parse($termattribs->{line_buffer} . ' ?');
-        if ($type eq 'HELP') {
@@ -267 +269 @@
-}, ord('?'));
-
-manage
-manage
+$SELF
+{$SELF}
-
-for my $key (keys %CONF) {
@@ -275 +277 @@
-
-END {
-manage
+{$SELF}
-        if (!$FATAL) {
-                # Compare original config to current config
@@ -284 +286 @@
-                return;
-        COMMIT: info("Committing modified config.");
-manage
+{$SELF}
-                        foreach my $key (keys %CONF) {
-                                print(CONF "# $CONF{$key}->{help}\n");
@@ -294 +296 @@
-}
-
-manage
+{$SELF}
-
-