diff options
Diffstat (limited to 'yaksh')
| -rw-r--r-- | yaksh/scripts/cli.py | 114 | ||||
| -rw-r--r-- | yaksh/scripts/project_detail.py | 2 |
2 files changed, 60 insertions, 56 deletions
diff --git a/yaksh/scripts/cli.py b/yaksh/scripts/cli.py index 1489af7..4a58e48 100644 --- a/yaksh/scripts/cli.py +++ b/yaksh/scripts/cli.py @@ -6,13 +6,10 @@ import contextlib import os from os import path import argparse -from importlib import import_module from django.conf import settings from django.core import management from django.template import Template, Context -from .project_detail import NAME, PATH - CUR_DIR = os.getcwd() SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__)) PARENT_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir)) @@ -21,61 +18,68 @@ TEMPLATE_DIR = path.join(PARENT_DIR, 'demo_templates') settings.configure() django.setup() + def main(): - #Parse command-line to obtain the arguments and/or options + # Parse command-line to obtain the arguments and/or options # create top-level parser object parser = argparse.ArgumentParser(prog="yaksh") subparser = parser.add_subparsers(dest="subcommand") # create parser for the "create_demo" subcommand - create_demo_parser = subparser.add_parser("create_demo", - help="Create a new demo Django project") - create_demo_parser.add_argument("project_name", type=str, - default="yaksh_demo", - nargs="?", - help="name of demo Django project") - create_demo_parser.add_argument("-p", "--path", type=str, - help="path of demo Django project") - + create_demo_parser = subparser.add_parser( + "create_demo", + help="Create a new demo Django project" + ) + create_demo_parser.add_argument( + "path", type=str, + default=path.join(CUR_DIR, "yaksh_demo"), + nargs="?", + help="Path to the demo Django project (defaults to 'yaksh_demo')" + ) + # create parser for the "run_demo" subcommand - run_demo_parser = subparser.add_parser("run_demo", - help="Initialise django server and run the demo project") + run_parser = subparser.add_parser( + "run", + help="Initialise django server and run the demo project" + ) + run_parser.add_argument( + "path", type=str, nargs=1, + help="full path to the demo yaksh project" + ) # create parser for the "run_code_server" subcommand - code_server_parser = subparser.add_parser("run_code_server", - help="Initialise yaksh code server") - code_server_parser.add_argument("-P", "--ports", type=int, nargs='+', - help="code server ports") + code_server_parser = subparser.add_parser( + "run_code_server", + help="Initialise yaksh code server" + ) + code_server_parser.add_argument("-P", "--ports", type=int, nargs='+', + help="code server ports") args = parser.parse_args() if args.subcommand == "create_demo": - if args.path: - create_demo(args.project_name, args.path) - else: - create_demo(args.project_name) - - elif args.subcommand == "run_demo": - try: - run_demo(NAME, PATH) - except Exception as e: - if not NAME or not PATH: - print("Error: Unable to find Project Name or Path variables\n") - else: - print("Error: {0}\n".format(e)) - subparser.print_help() - + pth = path.abspath(args.path) + name = path.basename(pth) + create_demo(name, pth) + elif args.subcommand == "run": + pth = path.abspath(args.path[0]) + name = path.basename(pth) + run_demo(name, pth) elif args.subcommand == "run_code_server": if args.ports: run_server(args.ports) else: run_server() + def create_demo(project_name='yaksh_demo', project_dir=CUR_DIR): + if not path.exists(project_dir): + os.makedirs(project_dir) try: management.call_command('startproject', project_name, project_dir) - print("Demo Django project '{0}' created at '{1}'".format(project_name, - project_dir)) + print("Demo Django project '{0}' created at '{1}'".format( + project_name, project_dir) + ) except Exception as e: print("Error: {0}\nExiting yaksh Installer".format(e)) @@ -87,50 +91,50 @@ def create_demo(project_name='yaksh_demo', project_dir=CUR_DIR): project_path = path.join(top_dir, project_name) fixture_dir = path.join(PARENT_DIR, 'fixtures') fixture_path = path.join(fixture_dir, 'demo_fixtures.json') - # Store project details - _set_project_details(project_name, top_dir) with _chdir(project_path): root_urlconf = "{0}.{1}".format(project_name, 'demo_urls') settings_template_path = path.join(TEMPLATE_DIR, 'demo_settings.py') settings_target_path = path.join(project_path, 'demo_settings.py') settings_context = Context({'project_name': project_name, - 'root_urlconf': root_urlconf, - 'fixture_dir': fixture_dir}) + 'root_urlconf': root_urlconf, + 'fixture_dir': fixture_dir}) urls_template_path = path.join(TEMPLATE_DIR, 'demo_urls.py') urls_target_path = path.join(project_path, 'demo_urls.py') command = ("python ../manage.py migrate --run-syncdb " - "--noinput --settings={0}.demo_settings").format(project_name) + "--noinput --settings={0}.demo_settings").format( + project_name) loaddata_command = ("python ../manage.py loaddata " - "--settings={0}.demo_settings {1}").format(project_name, fixture_path) + "--settings={0}.demo_settings {1}").format( + project_name, fixture_path) # Create demo_settings file - _render_demo_files(settings_template_path, settings_target_path, settings_context) - # Create demo_urls file + _render_demo_files( + settings_template_path, settings_target_path, settings_context + ) + # Create demo_urls file _render_demo_files(urls_template_path, urls_target_path) # Run syncdb - subprocess.call("{0}; {1}".format(command, loaddata_command), shell=True) + subprocess.call( + "{0}; {1}".format(command, loaddata_command), shell=True + ) + def run_demo(project_name, top_dir): with _chdir(top_dir): - project_path = path.join(top_dir, 'manage.py') command = ("python manage.py runserver " - "--settings={0}.demo_settings").format(project_name) + "--settings={0}.demo_settings").format(project_name) subprocess.call(command, shell=True) -def run_server(): + +def run_server(args=None): try: from yaksh import code_server - code_server.main() + code_server.main(args) except Exception as e: print("Error: {0}\nExiting yaksh code server".format(e)) -def _set_project_details(project_name, top_dir): - file_path = path.join(SCRIPT_DIR, 'project_detail.py') - detail = "NAME ='{0}'\nPATH ='{1}'".format(project_name, top_dir) - with open(file_path, 'w') as data_store: - data_store.write(detail) def _render_demo_files(template_path, output_path, context=None): with open(template_path, 'r') as template_file: @@ -142,6 +146,7 @@ def _render_demo_files(template_path, output_path, context=None): with open(output_path, 'w') as new_file: new_file.write(content) + @contextlib.contextmanager def _chdir(path): starting_directory = os.getcwd() @@ -151,5 +156,6 @@ def _chdir(path): finally: os.chdir(starting_directory) + if __name__ == '__main__': main() diff --git a/yaksh/scripts/project_detail.py b/yaksh/scripts/project_detail.py deleted file mode 100644 index 583e9f4..0000000 --- a/yaksh/scripts/project_detail.py +++ /dev/null @@ -1,2 +0,0 @@ -NAME = None -PATH = None |