Changeset 453 for trunk/moap/extern/command/command.py

Timestamp:

01-11-09 16:44:05 (4 years ago)

Author:

thomas

Message:

• command.py: Add aliases to the interpreter as well.

File:

• trunk/moap/extern/command/command.py (modified) (10 diffs)

trunk/moap/extern/command/command.py

@@ -18 +18 @@
     """
     _commands = None
+    _aliases = None
 
     def addCommand(self, name, description):
@@ -24 +25 @@
         self._commands[name] = description
 
+    def addAlias(self, alias):
+        if self._aliases is None:
+            self._aliases = []
+        self._aliases.append(alias)
+
     ### override parent method
 
@@ -37 +43 @@
                 block))
         ret = "\n".join(rets)
+
+        # add aliases
+        if self._aliases:
+            ret += "\nAliases: " + ", ".join(self._aliases) + "\n"
+
+        # add subcommands
         if self._commands:
             commandDesc = []
@@ -162 +174 @@
                     command.description)
 
+        if self.aliases:
+            for alias in self.aliases:
+                formatter.addAlias(alias)
+
         # expand %command for the bottom usage
         usage = self.usage or ''
@@ -216 +232 @@
         Override me to implement the functionality of the command.
         """
-        pass
+        raise NotImplementedError('Implement %s.do()' % self.__class__)
+        # by default, return 1 and hopefully show help
+        return 1
 
     def parse(self, argv):
@@ -279 +297 @@
                 ret = e.status
                 self.stderr.write(e.output + '\n')
+            except NotImplementedError:
+                self.parser.print_usage(file=self.stderr)
+                self.stderr.write(
+                    "Use --help to get a list of commands.\n")
+                return 1
 
             # if everything's fine, we return 0
@@ -394 +417 @@
 
     # internal class to subclass cmd.Cmd with a Ctrl-D handler
+
     class CommandCmd(cmd.Cmd):
         prompt = '(command) '
@@ -410 +434 @@
             print 'Exit.'
 
-        help_exit = help_EOF
+        def help_exit(self):
+            print 'Exit.'
 
     # populate the Cmd interpreter from our command class
     cmdClass = CommandCmd
 
-    for name, command in command.subCommands.items():
+    for name, command in command.subCommands.items() \
+        + command.aliasedSubCommands.items():
         if name == 'shell':
             continue
@@ -422 +448 @@
         # add do command
         methodName = 'do_' + name
-        def generate(command):
+
+        def generateDo(command):
+
             def do_(s, line):
                 # the do_ method is passed a single argument consisting of
@@ -430 +458 @@
                 command.parse(args)
             return do_
-        method = generate(command)
+
+        method = generateDo(command)
         setattr(cmdClass, methodName, method)
+
 
         # add help command
         methodName = 'help_' + name
-        def generate(command):
+
+        def generateHelp(command):
+
             def help_(s):
                 command.parser.print_help(file=command.stdout)
             return help_
-        method = generate(command)
+
+        method = generateHelp(command)
         setattr(cmdClass, methodName, method)