From 5203ce57f2a08fe9aef8b97b569855fa9cd50ba4 Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Tue, 6 Oct 2015 16:29:45 +0530 Subject: Clean setup procedure - Make corresponding app name changes in script - Change app name in setup.py - Minor changes in Readme, it is now split into quickstart & production - rename install script --- yaksh/scripts/cli.py | 149 +++++++++++++++++++++++++++++++++++++++++++++++++ yaksh/scripts/yaksh.py | 147 ------------------------------------------------ 2 files changed, 149 insertions(+), 147 deletions(-) create mode 100644 yaksh/scripts/cli.py delete mode 100644 yaksh/scripts/yaksh.py (limited to 'yaksh/scripts') diff --git a/yaksh/scripts/cli.py b/yaksh/scripts/cli.py new file mode 100644 index 0000000..5ad5ad6 --- /dev/null +++ b/yaksh/scripts/cli.py @@ -0,0 +1,149 @@ +from __future__ import print_function + +import subprocess +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, loader + +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)) +TEMPLATE_DIR = path.join(PARENT_DIR, 'demo_templates') + +def main(): + #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 parser for the "run_demo" subcommand + run_demo_parser = subparser.add_parser("run_demo", + help="Initialise django server and run the demo 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") + + 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() + + 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): + try: + management.call_command('startproject', project_name, project_dir) + print("Demo Django project '{0}' created at '{1}'".format(project_name, + project_dir)) + except Exception, e: + print("Error: {0}\nExiting yaksh Installer".format(e)) + + if project_dir is None: + top_dir = path.join(os.getcwd(), project_name) + else: + top_dir = project_dir + + project_path = path.join(top_dir, project_name) + fixture_dir = path.join(PARENT_DIR, 'fixtures') + # 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}) + urls_template_path = path.join(TEMPLATE_DIR, 'demo_urls.py') + urls_target_path = path.join(project_path, 'demo_urls.py') + command = ("python ../manage.py syncdb " + "--noinput --settings={0}.demo_settings").format(project_name) + + # Create demo_settings 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(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) + subprocess.call(command, shell=True) + +def run_server(): + # try: + from yaksh import code_server + code_server.main() + # 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: + content = template_file.read() + if context: + content = content.decode('utf-8') + template = Template(content) + content = template.render(context) + content = content.encode('utf-8') + + with open(output_path, 'w') as new_file: + new_file.write(content) + +@contextlib.contextmanager +def _chdir(path): + starting_directory = os.getcwd() + try: + os.chdir(path) + yield + finally: + os.chdir(starting_directory) + +if __name__ == '__main__': + main() diff --git a/yaksh/scripts/yaksh.py b/yaksh/scripts/yaksh.py deleted file mode 100644 index 4360d1b..0000000 --- a/yaksh/scripts/yaksh.py +++ /dev/null @@ -1,147 +0,0 @@ -from __future__ import print_function - -import subprocess -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, loader - -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)) -TEMPLATE_DIR = path.join(PARENT_DIR, 'demo_templates') - -def main(): - #Parse command-line to obtain the arguments and/or options - # create top-level parser object - parser = argparse.ArgumentParser(prog="vimarsh") - 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, - help="name of demo Django project") - create_demo_parser.add_argument("-p", "--path", type=str, - help="path of demo Django project") - - # create parser for the "run_demo" subcommand - run_demo_parser = subparser.add_parser("run_demo", - help="Initialise django server and run the demo project") - - # create parser for the "run_code_server" subcommand - code_server_parser = subparser.add_parser("run_code_server", - help="Initialise Vimarsh 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() - - elif args.subcommand == "run_code_server": - if args.ports: - run_server(args.ports) - else: - run_server() - -def create_demo(project_name='vimarsh_demo', project_dir=CUR_DIR): - try: - management.call_command('startproject', project_name, project_dir) - print("Demo Django project '{0}' created at '{1}'".format(project_name, - project_dir)) - except Exception, e: - print("Error: {0}\nExiting Vimarsh Installer".format(e)) - - if project_dir is None: - top_dir = path.join(os.getcwd(), project_name) - else: - top_dir = project_dir - - project_path = path.join(top_dir, project_name) - fixture_dir = path.join(PARENT_DIR, 'fixtures') - # 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}) - urls_template_path = path.join(TEMPLATE_DIR, 'demo_urls.py') - urls_target_path = path.join(project_path, 'demo_urls.py') - command = ("python ../manage.py syncdb " - "--noinput --settings={0}.demo_settings").format(project_name) - - # Create demo_settings 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(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) - subprocess.call(command, shell=True) - -def run_server(): - try: - from yaksh import code_server - code_server.main() - except Exception as e: - print("Error: {0}\nExiting Vimarsh 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: - content = template_file.read() - if context: - content = content.decode('utf-8') - template = Template(content) - content = template.render(context) - content = content.encode('utf-8') - - with open(output_path, 'w') as new_file: - new_file.write(content) - -@contextlib.contextmanager -def _chdir(path): - starting_directory = os.getcwd() - try: - os.chdir(path) - yield - finally: - os.chdir(starting_directory) - -if __name__ == '__main__': - main() -- cgit From 81393bfd4581b3f2217a979aaffec999c89d6755 Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Wed, 7 Oct 2015 17:21:25 +0530 Subject: Modify fixtures and load them on quickstart --- yaksh/scripts/cli.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'yaksh/scripts') diff --git a/yaksh/scripts/cli.py b/yaksh/scripts/cli.py index 5ad5ad6..ecccada 100644 --- a/yaksh/scripts/cli.py +++ b/yaksh/scripts/cli.py @@ -82,6 +82,7 @@ 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, 'initial_fixtures.json') # Store project details _set_project_details(project_name, top_dir) @@ -97,12 +98,14 @@ def create_demo(project_name='yaksh_demo', project_dir=CUR_DIR): command = ("python ../manage.py syncdb " "--noinput --settings={0}.demo_settings").format(project_name) + loaddata_command = "python ../manage.py loaddata {0} ".format(fixture_path) + # Create demo_settings 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(command, shell=True) + subprocess.call("{0}; {1}".format(command, loaddata_command), shell=True) def run_demo(project_name, top_dir): with _chdir(top_dir): -- cgit From d56bd4e6fc72fc03438280db184e2ab2e9137c61 Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Thu, 8 Oct 2015 12:12:24 +0530 Subject: - Modify initial fixtures - Add load data command with settings.py path - Modify Manifest --- yaksh/scripts/cli.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'yaksh/scripts') diff --git a/yaksh/scripts/cli.py b/yaksh/scripts/cli.py index ecccada..1787fda 100644 --- a/yaksh/scripts/cli.py +++ b/yaksh/scripts/cli.py @@ -82,7 +82,7 @@ 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, 'initial_fixtures.json') + fixture_path = path.join(fixture_dir, 'demo_fixtures.json') # Store project details _set_project_details(project_name, top_dir) @@ -98,7 +98,8 @@ def create_demo(project_name='yaksh_demo', project_dir=CUR_DIR): command = ("python ../manage.py syncdb " "--noinput --settings={0}.demo_settings").format(project_name) - loaddata_command = "python ../manage.py loaddata {0} ".format(fixture_path) + loaddata_command = ("python ../manage.py loaddata " + "--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) -- cgit From f39f8e1b2b487426a38d2c69372a1f58dcaeee79 Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Fri, 9 Oct 2015 11:07:38 +0530 Subject: minor changes to README post review --- yaksh/scripts/cli.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'yaksh/scripts') diff --git a/yaksh/scripts/cli.py b/yaksh/scripts/cli.py index 1787fda..79523f9 100644 --- a/yaksh/scripts/cli.py +++ b/yaksh/scripts/cli.py @@ -116,11 +116,11 @@ def run_demo(project_name, top_dir): subprocess.call(command, shell=True) def run_server(): - # try: - from yaksh import code_server - code_server.main() - # except Exception as e: - print("Error: {0}\nExiting yaksh code server".format(e)) + try: + from yaksh import code_server + code_server.main() + 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') -- cgit