r7246 - branches/1.5/turbogears/command

[svn-c...@turbogears.org]

Author: chrisz
Date: Tue Mar 8 08:25:40 2011
New Revision: 7246
URL: http://trac.turbogears.org/changeset/7246

Log:
Support more variants of printing help (for commands) with tg-admin (#1072).

Modified:
branches/1.5/turbogears/command/base.py
branches/1.5/turbogears/command/i18n.py
branches/1.5/turbogears/command/kid2genshi.py

Modified: branches/1.5/turbogears/command/base.py
==============================================================================
--- branches/1.5/turbogears/command/base.py Tue Mar 8 07:27:04 2011 (r7245)
+++ branches/1.5/turbogears/command/base.py Tue Mar 8 08:25:40 2011 (r7246)
@@ -360,7 +360,8 @@

Options:
-c CONFIG --config=CONFIG Config file to use
- -e EGG_SPEC --egg=EGG_SPEC Run command on given Egg
+ -e EGG_SPEC --egg=EGG_SPEC Run command on given egg
+ -h --help Print help (about command)

Commands:""" % (__version__, sys.argv[0])

@@ -371,11 +372,13 @@
for key in commandlist:
print format % (key, commands[key][0])

- parser = optparse.OptionParser()
+ parser = optparse.OptionParser(add_help_option=False)
parser.allow_interspersed_args = False
parser.add_option('-c', '--config', dest='config')
parser.add_option('-e', '--egg', dest='egg')
- parser.print_help = _help
+ parser.add_option('-h', '--help', dest='help', action='store_true')
+ if len(sys.argv) > 1 and sys.argv[1] == 'help':
+ sys.argv[1] = '--help'
options, args = parser.parse_args(sys.argv[1:])

# if command is not found display help
@@ -385,7 +388,10 @@

commandname = args[0]
# strip command and any global options from the sys.argv
- sys.argv = [sys.argv[0]] + args[1:]
+ del sys.argv[1:]
+ if options.help:
+ sys.argv.append('-h')
+ sys.argv.extend(args[1:])
command = commands[commandname][1]
command = command.load()

@@ -402,6 +408,7 @@
If it has been renamed use:
tg-admin --config=<FILE> %s""" % commandname
return
+
command.config = options.config
command = command(__version__)
command.run()

Modified: branches/1.5/turbogears/command/i18n.py
==============================================================================
--- branches/1.5/turbogears/command/i18n.py Tue Mar 8 07:27:04 2011 (r7245)
+++ branches/1.5/turbogears/command/i18n.py Tue Mar 8 08:25:40 2011 (r7246)
@@ -65,7 +65,7 @@

def __init__(self, version):
parser = optparse.OptionParser(usage="""
-%prog [options] <command>
+%prog i18n [options] <command>

Available commands:
add <locale> Creates a message catalog for specified locale

Modified: branches/1.5/turbogears/command/kid2genshi.py
==============================================================================
--- branches/1.5/turbogears/command/kid2genshi.py Tue Mar 8 07:27:04 2011 (r7245)
+++ branches/1.5/turbogears/command/kid2genshi.py Tue Mar 8 08:25:40 2011 (r7246)
@@ -24,7 +24,7 @@

def __init__(self, version):
parser = optparse.OptionParser(
- usage="%prog [options]",
+ usage="%prog kid2genshi [options]",
version="%prog " + version)
parser.add_option("-f", "--force",
help="overwrite existing templates",