Updated Branches: refs/heads/master 264a0670a -> 13944a0e5
cli: Cosmetic fixes for cloudmonkey and setup.py dependency version fix - Fixes shell class name to CloudMonkey - Fixes prettyprint version req. to 0.6 Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/13944a0e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/13944a0e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/13944a0e Branch: refs/heads/master Commit: 13944a0e5ea5b743fb59821557d1e4ed2a649e10 Parents: 8f51c63 Author: Rohit Yadav <[email protected]> Authored: Thu Dec 20 16:34:36 2012 -0800 Committer: Rohit Yadav <[email protected]> Committed: Thu Dec 20 16:34:36 2012 -0800 ---------------------------------------------------------------------- tools/cli/cloudmonkey/cloudmonkey.py | 14 +++++++------- tools/cli/setup.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13944a0e/tools/cli/cloudmonkey/cloudmonkey.py ---------------------------------------------------------------------- diff --git a/tools/cli/cloudmonkey/cloudmonkey.py b/tools/cli/cloudmonkey/cloudmonkey.py index 34cf5ca..e4fe76f 100644 --- a/tools/cli/cloudmonkey/cloudmonkey.py +++ b/tools/cli/cloudmonkey/cloudmonkey.py @@ -66,7 +66,7 @@ logger = logging.getLogger(__name__) completions = cloudstackAPI.__all__ -class CloudStackShell(cmd.Cmd, object): +class CloudMonkeyShell(cmd.Cmd, object): intro = ("â Apache CloudStack ðµ cloudmonkey " + __version__ + ". Type help or ? to list commands.\n") ruler = "=" @@ -138,7 +138,7 @@ class CloudStackShell(cmd.Cmd, object): print self.intro while True: try: - super(CloudStackShell, self).cmdloop(intro = "") + super(CloudMonkeyShell, self).cmdloop(intro="") self.postloop() except KeyboardInterrupt: print("^C") @@ -425,7 +425,7 @@ class CloudStackShell(cmd.Cmd, object): def do_set(self, args): """ - Set config for CloudStack CLI. Available options are: + Set config for cloudmonkey. For example, options can be: host, port, apikey, secretkey, log_file, history_file You may also edit your ~/.cloudmonkey_config instead of using set. @@ -497,13 +497,13 @@ class CloudStackShell(cmd.Cmd, object): def do_exit(self, args): """ - Quit Apache CloudStack CLI + Quit CloudMonkey CLI """ return self.do_quit(args) def do_quit(self, args): """ - Quit Apache CloudStack CLI + Quit CloudMonkey CLI """ self.print_shell("Bye!") return self.do_EOF(args) @@ -517,7 +517,7 @@ class CloudStackShell(cmd.Cmd, object): def main(): # Create handlers on the fly using closures - self = CloudStackShell + self = CloudMonkeyShell global grammar for rule in grammar: def add_grammar(rule): @@ -547,7 +547,7 @@ def main(): grammar_handler.__name__ = 'do_' + rule setattr(self, grammar_handler.__name__, grammar_handler) - shell = CloudStackShell() + shell = CloudMonkeyShell() if len(sys.argv) > 1: shell.onecmd(' '.join(sys.argv[1:])) else: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13944a0e/tools/cli/setup.py ---------------------------------------------------------------------- diff --git a/tools/cli/setup.py b/tools/cli/setup.py index e6ee1b5..739c044 100644 --- a/tools/cli/setup.py +++ b/tools/cli/setup.py @@ -27,7 +27,7 @@ from cloudmonkey import __version__ name = 'cloudmonkey' version = __version__ requires = ['clint>=0.3.0', - 'prettytable>=0.5', + 'prettytable>=0.6', ] try:
