accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-11 15:51:03 +00:00
Code Issues Releases Activity

Merge pull request #294 from frappe/develop

Browse Source 
[feature] clone bench from existing bench by copying the git repo
This commit is contained in:
Rushabh Mehta 2016-08-08 15:41:12 +05:30 committed by GitHub
commit b34b1e1d27
2 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bench/commands/make.py
View File

@ -5,16 +5,18 @@ import click
@click.option('--apps_path', default=None, help="path to json files with apps to install after init")
@click.option('--frappe-path', default=None, help="path to frappe repo")
@click.option('--frappe-branch', default=None, help="path to frappe repo")
@click.option('--clone-from', default=None, help="copy repos from path")
@click.option('--no-procfile', is_flag=True, help="Pull changes in all the apps in bench")
@click.option('--no-backups',is_flag=True, help="Run migrations for all sites in the bench")
@click.option('--no-auto-update',is_flag=True, help="Build JS and CSS artifacts for the bench")
@click.option('--verbose',is_flag=True, help="Verbose output during install")
def init(path, apps_path, frappe_path, frappe_branch, no_procfile, no_backups,
no_auto_update, verbose):
no_auto_update, clone_from, verbose):
"Create a new bench"
from bench.utils import init
init(path, apps_path=apps_path, no_procfile=no_procfile, no_backups=no_backups,
no_auto_update=no_auto_update, frappe_path=frappe_path, frappe_branch=frappe_branch, verbose=verbose)
no_auto_update=no_auto_update, frappe_path=frappe_path, frappe_branch=frappe_branch,
verbose=verbose, clone_from=clone_from)
click.echo('Bench {} initialized'.format(path))

52
bench/utils.py
View File

@ -25,7 +25,7 @@ def get_env_cmd(cmd, bench_path='.'):
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,
verbose=False):
verbose=False, clone_from=None):
from .app import get_app, install_apps_from_path
from .config.common_site_config import make_config
from .config import redis
@ -47,13 +47,17 @@ def init(path, apps_path=None, no_procfile=False, no_backups=False,
make_config(path)
if not frappe_path:
frappe_path = 'https://github.com/frappe/frappe.git'
if clone_from:
clone_apps_from(bench_path=path, clone_from=clone_from)
else:
if not frappe_path:
frappe_path = 'https://github.com/frappe/frappe.git'
get_app(frappe_path, branch=frappe_branch, bench_path=path, build_asset_files=False, verbose=verbose)
get_app(frappe_path, branch=frappe_branch, bench_path=path, build_asset_files=False, verbose=verbose)
if apps_path:
install_apps_from_path(apps_path, bench_path=path)
if apps_path:
install_apps_from_path(apps_path, bench_path=path)
bench.set_frappe_version(bench_path=path)
if bench.FRAPPE_VERSION > 5:
@ -70,6 +74,42 @@ def init(path, apps_path=None, no_procfile=False, no_backups=False,
if not no_auto_update:
setup_auto_update(bench_path=path)
def clone_apps_from(bench_path, clone_from):
from .app import install_app
print 'Copying apps from {0}...'.format(clone_from)
subprocess.check_output(['cp', '-R', os.path.join(clone_from, 'apps'), bench_path])
print 'Copying node_modules from {0}...'.format(clone_from)
subprocess.check_output(['cp', '-R', os.path.join(clone_from, 'node_modules'), bench_path])
def setup_app(app):
# run git reset --hard in each branch, pull latest updates and install_app
app_path = os.path.join(bench_path, 'apps', app)
if os.path.exists(os.path.join(app_path, '.git')):
print 'Cleaning up {0}'.format(app)
# remove .egg-ino
subprocess.check_output(['rm', '-rf', app + '.egg-info'], cwd=app_path)
remotes = subprocess.check_output(['git', 'remote'], cwd=app_path).strip().split()
if 'upstream' in remotes:
remote = 'upstream'
else:
remote = remotes[0]
branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], cwd=app_path).strip()
subprocess.check_output(['git', 'reset', '--hard'], cwd=app_path)
subprocess.check_output(['git', 'pull', '--rebase', remote, branch], cwd=app_path)
install_app(app, bench_path)
apps = os.listdir(os.path.join(bench_path, 'apps'))
# setup frappe first
setup_app('frappe')
for app in apps:
if app != 'frappe':
setup_app(app)
def exec_cmd(cmd, cwd='.'):
from .cli import from_command_line