diff options
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/cli.py | 15 | ||||
| -rw-r--r-- | ipalib/plugins/example.py | 8 |
2 files changed, 14 insertions, 9 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py index e1cbfa78f..5747fd04b 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -45,20 +45,25 @@ def from_cli(cli_name): class help(public.Application): - 'Display help on command' + 'Display help on command.' def __call__(self, key): - if from_cli(key) not in self.api.Command: + key = str(key) + if key not in self.application: print 'help: no such command %r' % key sys.exit(2) - print 'Help on command %r:' % key + cmd = self.application[key] + print 'Purpose: %s' % cmd.doc + if len(cmd.Option) > 0: + print '\nOptions:' + print '' class console(public.Application): - 'Start IPA Interactive Python Console' + 'Start the IPA Python console.' def __call__(self): code.interact( - '(Custom IPA Interactive Python Console)', + '(Custom IPA interactive Python console)', local=dict(api=self.api) ) diff --git a/ipalib/plugins/example.py b/ipalib/plugins/example.py index 3456b1dc3..ab7529760 100644 --- a/ipalib/plugins/example.py +++ b/ipalib/plugins/example.py @@ -38,19 +38,19 @@ api.register(discover) # Register some methods for the 'user' object: class user_add(public.Method): - 'Add new user' + 'Add a new user.' api.register(user_add) class user_del(public.Method): - 'Delete existing user' + 'Delete an existing user.' api.register(user_del) class user_mod(public.Method): - 'Edit existing user' + 'Edit an existing user.' api.register(user_mod) class user_find(public.Method): - 'Search for users' + 'Search for existing users.' api.register(user_find) |