Update the copyright dates everywhere

[kamaki] / kamaki / cli / command_shell.py

diff --git a/kamaki/cli/command_shell.py b/kamaki/cli/command_shell.py
index ba221a6..43b5a2a 100644 (file)
--- a/kamaki/cli/command_shell.py
+++ b/kamaki/cli/command_shell.py
@@ -1,4 +1,4 @@
-# Copyright 2012 GRNET S.A. All rights reserved.
+# Copyright 2012-2013 GRNET S.A. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or
 # without modification, are permitted provided that the following
@@ -41,6 +41,9 @@ from kamaki.cli.utils import print_dict, split_input
 from kamaki.cli.history import History
 from kamaki.cli.errors import CLIError
 from kamaki.clients import ClientError
+from kamaki.cli.logger import add_file_logger
+
+log = add_file_logger(__name__)
 
 
 def _init_shell(exe_string, parser):
@@ -65,6 +68,8 @@ class Shell(Cmd):
     _context_stack = []
     _prompt_stack = []
     _parser = None
+    auth_base = None
+    cloud = None
 
     undoc_header = 'interactive shell commands:'
 
@@ -95,7 +100,7 @@ class Shell(Cmd):
 
     def greet(self, version):
         print('kamaki v%s - Interactive Shell\n' % version)
-        print('\t\exit     \tterminate kamaki')
+        print('\t/exit     \tterminate kamaki')
         print('\texit or ^D\texit context')
         print('\t? or help \tavailable commands')
         print('\t?command  \thelp on command')
@@ -156,6 +161,21 @@ class Shell(Cmd):
     def _restore(self, oldcontext):
         self.__dict__ = oldcontext
 
+    @staticmethod
+    def _create_help_method(cmd_name, args, descr, syntax):
+        tmp_args = dict(args)
+        tmp_args.pop('options', None)
+        tmp_args.pop('cloud', None)
+        tmp_args.pop('debug', None)
+        tmp_args.pop('verbose', None)
+        tmp_args.pop('include', None)
+        tmp_args.pop('silent', None)
+        tmp_args.pop('config', None)
+        help_parser = ArgumentParseManager(cmd_name, tmp_args)
+        help_parser.parser.description = descr
+        help_parser.syntax = syntax
+        return help_parser.parser.print_help
+
     def _register_command(self, cmd_path):
         cmd = self.cmd_tree.get_command(cmd_path)
         arguments = self._parser.arguments
@@ -168,14 +188,8 @@ class Shell(Cmd):
             """
             subcmd, cmd_args = cmd.parse_out(split_input(line))
             self._history.add(' '.join([cmd.path.replace('_', ' '), line]))
-            tmp_args = dict(self._parser.arguments)
-            tmp_args.pop('options', None)
-            tmp_args.pop('debug', None)
-            tmp_args.pop('verbose', None)
-            tmp_args.pop('include', None)
-            tmp_args.pop('silent', None)
-            cmd_parser = ArgumentParseManager(cmd.name, dict(tmp_args))
-
+            cmd_parser = ArgumentParseManager(
+                cmd.name, dict(self._parser.arguments))
             cmd_parser.parser.description = subcmd.help
 
             # exec command or change context
@@ -185,17 +199,21 @@ class Shell(Cmd):
                     ldescr = getattr(cls, 'long_description', '')
                     if subcmd.path == 'history_run':
                         instance = cls(
-                            dict(cmd_parser.arguments),
-                            self.cmd_tree)
+                            dict(cmd_parser.arguments), self.auth_base,
+                            cmd_tree=self.cmd_tree)
                     else:
-                        instance = cls(dict(cmd_parser.arguments))
+                        instance = cls(
+                            dict(cmd_parser.arguments),
+                            self.auth_base, self.cloud)
                     cmd_parser.update_arguments(instance.arguments)
-                    instance.arguments.pop('config')
                     cmd_parser.arguments = instance.arguments
                     cmd_parser.syntax = '%s %s' % (
                         subcmd.path.replace('_', ' '), cls.syntax)
+                    help_method = self._create_help_method(
+                        cmd.name, cmd_parser.arguments,
+                        subcmd.help, cmd_parser.syntax)
                     if '-h' in cmd_args or '--help' in cmd_args:
-                        cmd_parser.parser.print_help()
+                        help_method()
                         if ldescr.strip():
                             print('\nDetails:')
                             print('%s' % ldescr)
@@ -204,14 +222,9 @@ class Shell(Cmd):
 
                     for name, arg in instance.arguments.items():
                         arg.value = getattr(
-                            cmd_parser.parsed,
-                            name,
-                            arg.default)
-
-                    exec_cmd(
-                        instance,
-                        cmd_parser.unparsed,
-                        cmd_parser.parser.print_help)
+                            cmd_parser.parsed, name, arg.default)
+
+                    exec_cmd(instance, cmd_parser.unparsed, help_method)
                         #[term for term in cmd_parser.unparsed\
                         #    if not term.startswith('-')],
                 except (ClientError, CLIError) as err:
@@ -254,7 +267,7 @@ class Shell(Cmd):
                     except IndexError:
                         break
                 print('Syntax: %s %s' % (' '.join(clist[upto:]), cls.syntax))
-            else:
+            if cmd.subcommands:
                 print_subcommands_help(cmd)
 
         self._register_method(help_method, 'help_%s' % cmd.name)
@@ -267,13 +280,11 @@ class Shell(Cmd):
                 empty, sep, subname = subcmd.path.partition(cmd.path)
                 cmd_name = '%s %s' % (cmd.name, subname.replace('_', ' '))
                 print('\n%s\nSyntax:\t%s %s' % (
-                    cls.description,
-                    cmd_name,
-                    cls.syntax))
+                    cls.description, cmd_name, cls.syntax))
                 cmd_args = {}
                 for arg in instance.arguments.values():
                     cmd_args[','.join(arg.parsed_name)] = arg.help
-                print_dict(cmd_args, ident=2)
+                print_dict(cmd_args, indent=2)
                 stdout.write('%s %s' % (self.prompt, line))
             return subcmd.get_subnames()
         self._register_method(complete_method, 'complete_%s' % cmd.name)
@@ -285,10 +296,12 @@ class Shell(Cmd):
         hdr = tmp_partition[0].strip()
         return '%s commands:' % hdr
 
-    def run(self, parser, path=''):
+    def run(self, auth_base, cloud, parser, path=''):
+        self.auth_base = auth_base
+        self.cloud = cloud
         self._parser = parser
         self._history = History(
-            parser.arguments['config'].get('history', 'file'))
+            parser.arguments['config'].get_global('history_file'))
         if path:
             cmd = self.cmd_tree.get_command(path)
             intro = cmd.path.replace('_', ' ')