Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cli adjustments

Browse source
This commit is contained in:
Matthew Scragg 2014-10-22 17:16:55 -05:00
parent 84a5b51662
commit 03b030e67c
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
realms/cli.py
View file

@ -25,13 +25,8 @@ def cli(ctx):
if ctx.invoked_subcommand in ['setup', 'pip']: if ctx.invoked_subcommand in ['setup', 'pip']:
if not in_virtualenv() and not is_su(): if not in_virtualenv() and not is_su():
# This does not account for people the have user level python installs # This does not account for people the have user level python installs
# that aren't virtual environments! Should be rare I think # that aren't virtual environments! Should be rare I think.
click.secho("This command requires root privileges, use sudo or run as root.", fg='red') red("This command requires root privileges, use sudo or run as root.")
sys.exit()
if ctx.invoked_subcommand in ['setup_upstart']:
if not is_su():
click.secho("This command requires root privileges, use sudo or run as root.", fg='red')
sys.exit() sys.exit()
cli.add_command(cli_) cli.add_command(cli_)
@ -112,9 +107,14 @@ def setup(ctx, **kw):
ctx.invoke(setup_memcached) ctx.invoke(setup_memcached)
green('Config saved to %s' % conf_path) green('Config saved to %s' % conf_path)
if not conf_path.startswith('/etc/realms-wiki'):
yellow('Note: You can move file to /etc/realms-wiki/realms-wiki.conf')
click.echo()
yellow('Type "realms-wiki start" to start server') yellow('Type "realms-wiki start" to start server')
yellow('Type "realms-wiki dev" to start server in development mode') yellow('Type "realms-wiki dev" to start server in development mode')
yellow('Full usage: realms-wiki --help')
@click.command() @click.command()
@click.option('--cache-redis-host', @click.option('--cache-redis-host',
@ -210,14 +210,24 @@ def setup_upstart(**kwargs):
kwargs.update(dict(app_dir=app_dir, path=path)) kwargs.update(dict(app_dir=app_dir, path=path))
conf_file = '/etc/init/realms-wiki.conf' conf_file = '/etc/init/realms-wiki.conf'
script = upstart_script(**kwargs)
with open('/etc/init/realms-wiki.conf', 'w') as f: try:
f.write(upstart_script(**kwargs)) with open(conf_file, 'w') as f:
f.write(script)
green('Wrote file to %s' % conf_file)
except IOError:
with open('/tmp/realms-wiki.conf', 'w') as f:
f.write(script)
yellow("Wrote file to /tmp/realms-wiki.conf, to install type:")
yellow("sudo mv /tmp/realms-wiki.conf /etc/init/realms-wiki.conf")
green('Wrote file to %s' % conf_file) click.echo()
green("Type 'sudo start realms-wiki' to start") click.echo("Upstart usage:")
green("Type 'sudo stop realms-wiki' to stop") green("sudo start realms-wiki")
green("Type 'sudo restart realms-wiki' to restart") green("sudo stop realms-wiki")
green("sudo restart realms-wiki")
green("sudo status realms-wiki")
@cli.command() @cli.command()

2
realms/version.py
View file

@ -1 +1 @@
__version__ = '0.3.25' __version__ = '0.3.26'