accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2025-01-24 23:48:24 +00:00
Code Issues Releases Activity

add support for app cmds

Browse Source 
Conflicts:
	bench/cli.py
This commit is contained in:
Pratik Vyas 2015-01-13 17:18:03 +05:30
parent cbc1962316
commit e1b69885af
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bench/cli.py
View File

@ -10,13 +10,13 @@ from .utils import setup_procfile as _setup_procfile
from .utils import set_nginx_port as _set_nginx_port from .utils import set_nginx_port as _set_nginx_port
from .utils import set_url_root as _set_url_root from .utils import set_url_root as _set_url_root
from .utils import set_default_site as _set_default_site from .utils import set_default_site as _set_default_site
from .utils import (build_assets, patch_sites, exec_cmd, update_bench, get_frappe, setup_logging, from .utils import (build_assets, patch_sites, exec_cmd, update_bench, get_env_cmd, get_frappe, setup_logging,
get_config, update_config, restart_supervisor_processes, put_config, default_config, update_requirements, get_config, update_config, restart_supervisor_processes, put_config, default_config, update_requirements,
backup_all_sites, backup_site, get_sites, prime_wheel_cache, is_root, set_mariadb_host, drop_privileges, backup_all_sites, backup_site, get_sites, prime_wheel_cache, is_root, set_mariadb_host, drop_privileges,
fix_file_perms, fix_prod_setup_perms, set_ssl_certificate, set_ssl_certificate_key) fix_file_perms, fix_prod_setup_perms, set_ssl_certificate, set_ssl_certificate_key)
from .app import get_app as _get_app from .app import get_app as _get_app
from .app import new_app as _new_app from .app import new_app as _new_app
from .app import pull_all_apps, MajorVersionUpgradeException from .app import pull_all_apps, get_apps, MajorVersionUpgradeException
from .config import generate_nginx_config, generate_supervisor_config, generate_redis_config from .config import generate_nginx_config, generate_supervisor_config, generate_redis_config
from .production_setup import setup_production as _setup_production from .production_setup import setup_production as _setup_production
from .migrate_to_v5 import migrate_to_v5 from .migrate_to_v5 import migrate_to_v5
@ -35,6 +35,8 @@ def cli():
change_uid() change_uid()
if len(sys.argv) > 2 and sys.argv[1] == "frappe": if len(sys.argv) > 2 and sys.argv[1] == "frappe":
return frappe() return frappe()
if len(sys.argv) > 1 and sys.argv[1] in get_apps():
return app_cmd()
return bench() return bench()
def cmd_requires_root(): def cmd_requires_root():
@ -73,6 +75,11 @@ def frappe(bench='.'):
os.chdir(os.path.join(bench, 'sites')) os.chdir(os.path.join(bench, 'sites'))
os.execv(f, [f] + sys.argv[2:]) os.execv(f, [f] + sys.argv[2:])
def app_cmd(bench='.'):
f = get_env_cmd('python', bench=bench)
os.chdir(os.path.join(bench, 'sites'))
os.execv(f, [f] + ['-m', 'frappe.utils.bench_helper'] + sys.argv[1:])
@click.command() @click.command()
def shell(bench='.'): def shell(bench='.'):
if not os.environ.get('SHELL'): if not os.environ.get('SHELL'):

5
bench/utils.py
View File

@ -21,12 +21,15 @@ default_config = {
} }
def get_frappe(bench='.'): def get_frappe(bench='.'):
frappe = os.path.abspath(os.path.join(bench, 'env', 'bin', 'frappe')) frappe = get_env_cmd('frappe', bench=bench)
if not os.path.exists(frappe): if not os.path.exists(frappe):
print 'frappe app is not installed. Run the following command to install frappe' print 'frappe app is not installed. Run the following command to install frappe'
print 'bench get-app frappe https://github.com/frappe/frappe.git' print 'bench get-app frappe https://github.com/frappe/frappe.git'
return frappe return frappe
def get_env_cmd(cmd, bench='.'):
return os.path.abspath(os.path.join(bench, 'env', 'bin', cmd))
def init(path, apps_path=None, no_procfile=False, no_backups=False, def init(path, apps_path=None, no_procfile=False, no_backups=False,
no_auto_update=False, frappe_path=None, frappe_branch=None, wheel_cache_dir=None): no_auto_update=False, frappe_path=None, frappe_branch=None, wheel_cache_dir=None):
from .app import get_app, install_apps_from_path from .app import get_app, install_apps_from_path